Attachment #130309 for bug #174199




# $FreeBSD: head/cad/leocad/Makefile 310871 2013-01-23 15:00:18Z makc $

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

MAINTAINER=	ports@FreeBSD.org
COMMENT=	CAD modeling with LEGO-like bricks

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
INSTALL_ICONS=	yes
MAKE_JOBS_SAFE=	yes

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

LEOCAD_PIECES=	pieces-7114.zip

.include <bsd.port.pre.mk>

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

post-extract:
	@${UNZIP_CMD} -q -o ${DISTDIR}/${DIST_SUBDIR}/${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:
	(cd ${WRKDIR}/pieces && ${INSTALL_DATA} * ${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 (-4 / +4 lines)
1	SHA256 (leocad-0.79.0-src.tgz) = 85f34dd560dec590ac5b0a5a7983359758fa58a729dbe3208a89c61f12440f24	1	SHA256 (leocad/leocad-0.79.2-src.tgz) = d2b0a515ce8302cd9234450773a339e330718463edf52d721e20edf6ccfa74e3
2	SIZE (leocad-0.79.0-src.tgz) = 624961	2	SIZE (leocad/leocad-0.79.2-src.tgz) = 2115720
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




--- 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

Line 0 Link Here

(-)cad/leocad/pkg-plist (+11 lines)
	1	bin/leocad
	2	share/applications/leocad.desktop
	3	share/icons/hicolor/scalable/mimetypes/application-vnd.leocad.svg
	4	%%DATADIR%%/icon.png
	5	%%DATADIR%%/library.bin
	6	share/mime/packages/leocad-mime.xml
	7	share/pixmaps/leocad.svg
	8	@dirrm %%DATADIR%%
	9	@dirrmtry share/applications
	10	@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
	11	@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime

Return to bug 174199

Lines 2-13 Link Here

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