Attachment #130306 for bug #174199





PORTNAME=	leocad
PORTVERSION=	0.79.0
PORTREVISION=	1
CATEGORIES=	cad
MASTER_SITES=	GOOGLE_CODE
DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tgz ${LEOCAD_PIECES}
EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-src.tgz

MAINTAINER=	ports@FreeBSD.org
COMMENT=	CAD program that uses bricks similar to those found in many toys

EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
		png15:${PORTSDIR}/graphics/png

LEOCAD_DISTNAME=leocad-${PORTVERSION}-src.tgz
LEOCAD_PIECES=	pieces-5823b.zip
WRKSRC=		${WRKDIR}/${PORTNAME}

USE_GL=		gl
USE_XORG=	x11
USE_GMAKE=	yes
USE_GNOME=	gtk20
USE_GMAKE=	yes
MAKE_JOBS_SAFE=	yes

DESKTOP_ENTRIES="Leocad" "${COMMENT}" "" "${PORTNAME}" "Engineering;" "true"

PLIST_FILES=	bin/leocad \
		${DATADIR_REL}/pieces.bin \
		${DATADIR_REL}/pieces.idx
PLIST_DIRS=	${DATADIR_REL}
MAN1=		leocad.1
PLIST_FILES=	bin/leocad %%DATADIR%%/pieces.bin %%DATADIR%%/pieces.idx
PLIST_DIRS=	%%DATADIR%%

LEOCAD_PIECES=	pieces-6152.zip

.include <bsd.port.pre.mk>

.if ${ARCH} == "sparc64"
BROKEN=		Does not compile on sparc64
.endif

post-extract:
	@${UNZIP_CMD} -q -o ${DISTDIR}/${LEOCAD_PIECES} -d ${WRKDIR}/pieces

post-patch:
	@${REINPLACE_CMD} -e \
		's|%%LOCALBASE%%|${LOCALBASE}| ; \
		 s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}| ; \
		 s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' ${WRKSRC}/config.mk
	@${REINPLACE_CMD} -e \
		's|+= -g|+=| ; \
		 s|@$$(CXX)|$$(CXX)| ; \
		 s|install -c -m 0755|$${BSD_INSTALL_PROGRAM}| ; \
		 s|install -c -m 0644|$${BSD_INSTALL_MAN}| ; \
		 s|share/man|man|' ${WRKSRC}/Makefile

do-configure:
	cd ${WRKSRC} && ${SETENV} PREFIX="${PREFIX}" ${GMAKE} config

post-install:
	@${MKDIR} ${DATADIR}
	${INSTALL_DATA} ${WRKDIR}/pieces/* ${DATADIR}

.include <bsd.port.pre.mk>

.if ${ARCH} == "sparc64"
BROKEN=		Does not compile on sparc64
.endif

.include <bsd.port.post.mk>

Lines 1-4 Link Here

(-)cad/leocad/distinfo (-2 / +2 lines)
1	SHA256 (leocad-0.79.0-src.tgz) = 85f34dd560dec590ac5b0a5a7983359758fa58a729dbe3208a89c61f12440f24	1	SHA256 (leocad-0.79.0-src.tgz) = 85f34dd560dec590ac5b0a5a7983359758fa58a729dbe3208a89c61f12440f24
2	SIZE (leocad-0.79.0-src.tgz) = 624961	2	SIZE (leocad-0.79.0-src.tgz) = 624961
3	SHA256 (pieces-5823b.zip) = 4c833bd1d89730757d8b391e20ba20ab133cd242b6717e89cee8fdf1c26f9a23	3	SHA256 (pieces-6152.zip) = f713f9d752f6717cc5d5333b950a6cdc3cbf56e135f5f5534486513a8f9a0c9f
4	SIZE (pieces-5823b.zip) = 44541797	4	SIZE (pieces-6152.zip) = 47305056




--- config.mk.orig	2012-12-14 07:50:24.000000000 +0900
+++ config.mk	2012-12-15 04:42:02.000000000 +0900
@@ -6,17 +6,18 @@
 
 default: all
 
-CC    := gcc
-CXX   := g++
+CC    ?= gcc
+CXX   ?= g++
 OSDIR := linux
 
 # (Add a -g for debugging)
-CPPFLAGS += -O2 -Wall
+CPPFLAGS += -Wall
+LDFLAGS	+= %%PTHREAD_LIBS%%
 
 ### FreeBSD configuration
 
 ifeq ($(shell uname), FreeBSD)
-CPPFLAGS += -L/usr/local/lib
+CPPFLAGS += -I%%LOCALBASE%%/include %%PTHREAD_LIBS%%
+LDFLAGS  += -L%%LOCALBASE%%/lib %%PTHREAD_LIBS%%
 endif
 
 ### Default directory

Return to bug 174199

Lines 3-61 Link Here

(-)cad/leocad/Makefile (-28 / +29 lines)
3		3
4	PORTNAME= leocad	4	PORTNAME= leocad
5	PORTVERSION= 0.79.0	5	PORTVERSION= 0.79.0
		6	PORTREVISION= 1
6	CATEGORIES= cad	7	CATEGORIES= cad
7	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}	8	MASTER_SITES= GOOGLE_CODE
8	DISTFILES= ${LEOCAD_DISTNAME} ${LEOCAD_PIECES}	9	DISTFILES= ${PORTNAME}-${PORTVERSION}-src.tgz ${LEOCAD_PIECES}
9	EXTRACT_ONLY= ${LEOCAD_DISTNAME}	10	EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}-src.tgz
10		11
11	MAINTAINER= ports@FreeBSD.org	12	MAINTAINER= ports@FreeBSD.org
12	COMMENT= A CAD program that uses bricks similar to those found in many toys	13	COMMENT= CAD program that uses bricks similar to those found in many toys
13		14
14	EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip	15	EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
15	LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \	16	LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
16	png15:${PORTSDIR}/graphics/png	17	png15:${PORTSDIR}/graphics/png
17		18
18	LEOCAD_DISTNAME=leocad-${PORTVERSION}-src.tgz
19	LEOCAD_PIECES= pieces-5823b.zip
20	WRKSRC= ${WRKDIR}/${PORTNAME}	19	WRKSRC= ${WRKDIR}/${PORTNAME}
21		20
22	USE_GL= glut	21	USE_GL= gl
23	USE_XORG= x11
24	USE_GMAKE= yes
25	USE_GNOME= gtk20	22	USE_GNOME= gtk20
26	MAKE_JOBS_UNSAFE= yes	23	USE_GMAKE= yes
		24	MAKE_JOBS_SAFE= yes
27		25
28	DESKTOP_ENTRIES="Leocad" "${COMMENT}" "" "${PORTNAME}" "Engineering;" "true"	26	DESKTOP_ENTRIES="Leocad" "${COMMENT}" "" "${PORTNAME}" "Engineering;" "true"
29		27
30	PLIST_FILES= bin/leocad \
31	${DATADIR_REL}/pieces.bin \
32	${DATADIR_REL}/pieces.idx
33	PLIST_DIRS= ${DATADIR_REL}
34	MAN1= leocad.1	28	MAN1= leocad.1
		29	PLIST_FILES= bin/leocad %%DATADIR%%/pieces.bin %%DATADIR%%/pieces.idx
		30	PLIST_DIRS= %%DATADIR%%
		31
		32	LEOCAD_PIECES= pieces-6152.zip
		33
		34	.include <bsd.port.pre.mk>
		35
		36	.if ${ARCH} == "sparc64"
		37	BROKEN= Does not compile on sparc64
		38	.endif
35		39
36	post-extract:	40	post-extract:
37	@${UNZIP_CMD} -q -o ${DISTDIR}/${LEOCAD_PIECES} -d ${WRKDIR}/pieces	41	@${UNZIP_CMD} -q -o ${DISTDIR}/${LEOCAD_PIECES} -d ${WRKDIR}/pieces
38		42
39	post-patch:	43	post-patch:
40	@${REINPLACE_CMD} -e \	44	@${REINPLACE_CMD} -e \
41	's\|%%LOCALBASE%%\|${LOCALBASE}\|g; \	45	's\|%%LOCALBASE%%\|${LOCALBASE}\| ; \
42	s\|%%PTHREAD_CFLAGS%%\|${PTHREAD_CFLAGS}\|; \	46	s\|%%PTHREAD_CFLAGS%%\|${PTHREAD_CFLAGS}\| ; \
43	s\|%%PTHREAD_LIBS%%\|${PTHREAD_LIBS}\|' \	47	s\|%%PTHREAD_LIBS%%\|${PTHREAD_LIBS}\|' ${WRKSRC}/config.mk
44	${WRKSRC}/config.mk	48	@${REINPLACE_CMD} -e \
45	@${REINPLACE_CMD} 's\|share/man\|man\|g' \	49	's\|+= -g\|+=\| ; \
46	${WRKSRC}/Makefile	50	s\|@$$(CXX)\|$$(CXX)\| ; \
		51	s\|install -c -m 0755\|$${BSD_INSTALL_PROGRAM}\| ; \
		52	s\|install -c -m 0644\|$${BSD_INSTALL_MAN}\| ; \
		53	s\|share/man\|man\|' ${WRKSRC}/Makefile
47		54
48	do-configure:	55	do-configure:
49	cd ${WRKSRC} && ${GMAKE} config	56	cd ${WRKSRC} && ${SETENV} PREFIX="${PREFIX}" ${GMAKE} config
50		57
51	post-install:	58	post-install:
52	${MKDIR} ${DATADIR}	59	@${MKDIR} ${DATADIR}
53	${INSTALL_DATA} ${WRKDIR}/pieces/* ${DATADIR}	60	${INSTALL_DATA} ${WRKDIR}/pieces/* ${DATADIR}
54		61
55	.include <bsd.port.pre.mk>
56
57	.if ${ARCH} == "sparc64"
58	BROKEN= Does not compile on sparc64
59	.endif
60
61	.include <bsd.port.post.mk>	62	.include <bsd.port.post.mk>

Lines 1-19 Link Here

(-)cad/leocad/files/patch-config.mk (-7 / +13 lines)
1	--- config.mk.orig 2012-12-14 12:16:05.000000000 -0500	1	--- config.mk.orig 2012-12-14 07:50:24.000000000 +0900
2	+++ config.mk 2012-12-14 12:16:51.000000000 -0500	2	+++ config.mk 2012-12-15 04:42:02.000000000 +0900
3	@@ -6,12 +6,13 @@ ERROR_SETTING=2> /dev/null	3	@@ -6,17 +6,18 @@
4		4
5	default: all	5	default: all
6		6
7	-CC := gcc	7	-CC := gcc
8	-CXX := g++	8	-CXX := g++
9	+CC ?= cc	9	+CC ?= gcc
10	+CXX ?= c++	10	+CXX ?= g++
11	OSDIR := linux	11	OSDIR := linux
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%%	15	+CPPFLAGS += -Wall
16	+LDFLAGS += %%PTHREAD_LIBS%%
17		16
18	### FreeBSD configuration	17	### FreeBSD configuration
19		18
		19	ifeq ($(shell uname), FreeBSD)
		20	-CPPFLAGS += -L/usr/local/lib
		21	+CPPFLAGS += -I%%LOCALBASE%%/include %%PTHREAD_LIBS%%
		22	+LDFLAGS += -L%%LOCALBASE%%/lib %%PTHREAD_LIBS%%
		23	endif
		24
		25	### Default directory