View | Details | Raw Unified | Return to bug 174911 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-18 / +50 lines)
Lines 2-23 Link Here
2
# $FreeBSD: head/cad/leocad/Makefile 308912 2012-12-14 17:27:03Z eadler $
2
# $FreeBSD: head/cad/leocad/Makefile 308912 2012-12-14 17:27:03Z eadler $
3
3
4
PORTNAME=	leocad
4
PORTNAME=	leocad
5
PORTVERSION=	0.79.0
5
PORTVERSION=	0.79.1
6
CATEGORIES=	cad
6
CATEGORIES=	cad
7
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
7
MASTER_SITES=	GOOGLE_CODE
8
DISTFILES=	${LEOCAD_DISTNAME} ${LEOCAD_PIECES}
8
DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tgz \
9
EXTRACT_ONLY=	${LEOCAD_DISTNAME}
9
		${LEOCAD_PIECES}
10
DIST_SUBDIR=	${PORTNAME}
11
EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-src.tgz
10
12
11
MAINTAINER=	ports@FreeBSD.org
13
MAINTAINER=	nemysis@gmx.ch
12
COMMENT=	A CAD program that uses bricks similar to those found in many toys
14
COMMENT=	CAD program that uses bricks similar to those found in many toys
15
16
LICENSE=	GPLv2
13
17
14
EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
18
EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
15
LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
19
LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
16
		png15:${PORTSDIR}/graphics/png
20
		png15:${PORTSDIR}/graphics/png
17
21
18
LEOCAD_DISTNAME=leocad-${PORTVERSION}-src.tgz
19
LEOCAD_PIECES=	pieces-5823b.zip
20
WRKSRC=		${WRKDIR}/${PORTNAME}
22
WRKSRC=		${WRKDIR}/${PORTNAME}
23
LEOCAD_PIECES=	pieces-7114.zip
21
24
22
USE_GL=		glut
25
USE_GL=		glut
23
USE_XORG=	x11
26
USE_XORG=	x11
Lines 25-49 Link Here
25
USE_GNOME=	gtk20
28
USE_GNOME=	gtk20
26
MAKE_JOBS_UNSAFE=	yes
29
MAKE_JOBS_UNSAFE=	yes
27
30
28
DESKTOP_ENTRIES="Leocad" "${COMMENT}" "" "${PORTNAME}" "Engineering;" "true"
31
PORTDOCS=	*
32
33
DOCSRCDIR1=	${WRKSRC}
34
DOC_FILES1=	CREDITS.txt README.txt
35
36
DOCSRCDIR2=	${WRKSRC}/docs
37
DOCSDIR2=	${DOCSDIR}/docs
38
DOC_FILES2=	LINUX.txt TODO.txt
39
40
INSTALLS_ICONS=	yes
41
ICON_SIZES=	16x16 24x24 32x32 48x48 256x256
42
43
DESKTOP_ENTRIES="LeoCAD" "${COMMENT}" "${PORTNAME}" \
44
		"${PORTNAME}" "Development;Electronics;Engineering;" ${FALSE}
29
45
30
PLIST_FILES=	bin/leocad \
31
		${DATADIR_REL}/pieces.bin \
32
		${DATADIR_REL}/pieces.idx
33
PLIST_DIRS=	${DATADIR_REL}
34
MAN1=		leocad.1
46
MAN1=		leocad.1
35
47
48
.include <bsd.port.options.mk>
49
36
post-extract:
50
post-extract:
37
	@${UNZIP_CMD} -q -o ${DISTDIR}/${LEOCAD_PIECES} -d ${WRKDIR}/pieces
51
	@${UNZIP_CMD} -q -o ${_DISTDIR}/${LEOCAD_PIECES} -d ${WRKDIR}/pieces
38
52
39
post-patch:
53
post-patch:
40
	@${REINPLACE_CMD} -e \
54
	@${REINPLACE_CMD} \
41
		's|%%LOCALBASE%%|${LOCALBASE}|g; \
55
		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
42
		s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|; \
56
		-e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|' \
43
		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
57
		-e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
44
		${WRKSRC}/config.mk
58
		${WRKSRC}/config.mk
45
	@${REINPLACE_CMD} 's|share/man|man|g' \
59
	@${REINPLACE_CMD} 's|share/man|man|g' \
46
		${WRKSRC}/Makefile
60
		${WRKSRC}/Makefile
61
.for s in 16 24 32 48 256
62
	@cd ${WRKSRC}/tools/icon && \
63
		${MV} icon${s}.png ${PORTNAME}_${s}x${s}.png
64
.endfor
47
65
48
do-configure:
66
do-configure:
49
	cd ${WRKSRC} && ${GMAKE} config
67
	cd ${WRKSRC} && ${GMAKE} config
Lines 52-57 Link Here
52
	${MKDIR} ${DATADIR}
70
	${MKDIR} ${DATADIR}
53
	${INSTALL_DATA} ${WRKDIR}/pieces/* ${DATADIR}
71
	${INSTALL_DATA} ${WRKDIR}/pieces/* ${DATADIR}
54
72
73
.for s in ${ICON_SIZES}
74
	${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps
75
	${INSTALL_DATA} ${WRKSRC}/tools/icon/${PORTNAME}_${s}.png \
76
		${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
77
.endfor
78
	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps
79
80
.if ${PORT_OPTIONS:MDOCS}
81
	${MKDIR} ${DOCSDIR}
82
	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
83
	${MKDIR} ${DOCSDIR2}
84
	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
85
.endif
86
55
.include <bsd.port.pre.mk>
87
.include <bsd.port.pre.mk>
56
88
57
.if ${ARCH} == "sparc64"
89
.if ${ARCH} == "sparc64"
(-)./distinfo (-4 / +4 lines)
Lines 1-4 Link Here
1
SHA256 (leocad-0.79.0-src.tgz) = 85f34dd560dec590ac5b0a5a7983359758fa58a729dbe3208a89c61f12440f24
1
SHA256 (leocad/leocad-0.79.1-src.tgz) = c13266380f3d9d34f1cf60f496640b2bad0d145ff9c892b48f93563ee3b7b023
2
SIZE (leocad-0.79.0-src.tgz) = 624961
2
SIZE (leocad/leocad-0.79.1-src.tgz) = 626772
3
SHA256 (pieces-5823b.zip) = 4c833bd1d89730757d8b391e20ba20ab133cd242b6717e89cee8fdf1c26f9a23
3
SHA256 (leocad/pieces-7114.zip) = 16506da21d139769524d140ce47bfce57bc5415f541fbd6f66a67025c1f535ab
4
SIZE (pieces-5823b.zip) = 44541797
4
SIZE (leocad/pieces-7114.zip) = 20546651
(-)./files/patch-config.mk (-5 / +10 lines)
Lines 1-6 Link Here
1
--- config.mk.orig	2012-12-14 12:16:05.000000000 -0500
1
--- config.mk.orig	2013-01-02 08:56:54.000000000 +0100
2
+++ config.mk	2012-12-14 12:16:51.000000000 -0500
2
+++ config.mk	2013-01-02 18:38:58.000000000 +0100
3
@@ -6,12 +6,13 @@ ERROR_SETTING=2> /dev/null
3
@@ -6,17 +6,17 @@
4
 
4
 
5
 default: all
5
 default: all
6
 
6
 
Lines 12-19 Link Here
12
 
12
 
13
 # (Add a -g for debugging)
13
 # (Add a -g for debugging)
14
-CPPFLAGS += -O2 -Wall
14
-CPPFLAGS += -O2 -Wall
15
+CPPFLAGS += -Wall -I%%LOCALBASE%%/include %%PTHREAD_CFLAGS%%
16
+LDFLAGS	+= %%PTHREAD_LIBS%%
17
 
15
 
18
 ### FreeBSD configuration
16
 ### FreeBSD configuration
19
 
17
 
18
 ifeq ($(shell uname), FreeBSD)
19
-CPPFLAGS += -L/usr/local/lib
20
+CPPFLAGS += -Wall -I%%LOCALBASE%%/include %%PTHREAD_CFLAGS%%
21
+LDFLAGS += -L%%LOCALBASE%%/lib %%PTHREAD_LIBS%%
22
 endif
23
 
24
 ### Default directory
(-)./pkg-descr (-4 / +3 lines)
Lines 1-6 Link Here
1
LeoCAD is a CAD program that uses bricks similar to those found in
1
LeoCAD is a CAD program that can be used to create virtual LEGO models.
2
many toys (but they don't represent any particular brand). Currently
2
It has an easy to use interface and currently features over 4000 different
3
it has a library of more than 1000 different pieces, most of them
3
pieces created by the LDraw community.
4
were created by James Jessiman (the author of LDraw).
5
4
6
WWW: http://www.leocad.org
5
WWW: http://www.leocad.org
(-)./pkg-plist (+21 lines)
Line 0 Link Here
1
bin/leocad
2
share/icons/hicolor/16x16/apps/leocad.png
3
share/icons/hicolor/24x24/apps/leocad.png
4
share/icons/hicolor/256x256/apps/leocad.png
5
share/icons/hicolor/32x32/apps/leocad.png
6
share/icons/hicolor/48x48/apps/leocad.png
7
%%DATADIR%%/library.bin
8
share/pixmaps/leocad.png
9
@dirrm %%DATADIR%%
10
@dirrmtry share/icons/hicolor/48x48/apps
11
@dirrmtry share/icons/hicolor/48x48
12
@dirrmtry share/icons/hicolor/32x32/apps
13
@dirrmtry share/icons/hicolor/32x32
14
@dirrmtry share/icons/hicolor/256x256/apps
15
@dirrmtry share/icons/hicolor/256x256
16
@dirrmtry share/icons/hicolor/24x24/apps
17
@dirrmtry share/icons/hicolor/24x24
18
@dirrmtry share/icons/hicolor/16x16/apps
19
@dirrmtry share/icons/hicolor/16x16
20
@dirrmtry share/icons/hicolor
21
@dirrmtry share/icons

Return to bug 174911