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

Collapse All | Expand All

(-)Makefile (-40 / +20 lines)
Lines 17-29 Link Here
17
MAKE_ARGS=	CC="${CC}" CCC="${CXX}"
17
MAKE_ARGS=	CC="${CC}" CCC="${CXX}"
18
18
19
MAKEFILE=	makefile
19
MAKEFILE=	makefile
20
BINEXAMPLESDIR=	${PREFIX}/libexec/openNURBS
21
MKFILE=		${EXAMPLESDIR}/bsd.openNURBS.mk
22
20
21
OPTIONS_DEFINE=	EXAMPLES
22
23
.include <bsd.port.pre.mk>
23
.include <bsd.port.pre.mk>
24
24
25
.if !exists(${SRC_BASE}/lib/libz)
25
# In r311275 zlib.h was moved to contrib/zlib/zlib.h from lib/libz/zlib.h
26
IGNORE=	needs SRC_BASE to compile. Install base system sources and try again
26
LIBZ=		${SRC_BASE}/contrib/zlib
27
.if !exists(${LIBZ}/zlib.h)
28
LIBZ:=		${SRC_BASE}/lib/libz
29
.  if !exists(${LIBZ}/zlib.h)
30
IGNORE=		needs SRC_BASE to compile. Install base system sources and try again
31
.  endif
27
.endif
32
.endif
28
33
29
.if ${ARCH} != i386
34
.if ${ARCH} != i386
Lines 31-80 Link Here
31
.endif
36
.endif
32
37
33
pre-build:
38
pre-build:
34
	${ICONV_CMD} -c -f utf-8 -t ascii ${WRKSRC}/opennurbs_version.h \
39
	@${RM} -r ${WRKSRC}/zlib
35
		> ${WRKSRC}/opennurbs_version.h.tmp || ${TRUE}
40
	${CP} -R ${LIBZ} ${WRKSRC}/zlib
36
	${MV} ${WRKSRC}/opennurbs_version.h.tmp ${WRKSRC}/opennurbs_version.h
37
	${MV} ${WRKSRC}/zlib ${WRKSRC}/zlib_
38
	${CP} -R ${SRC_BASE}/lib/libz ${WRKSRC}/zlib
39
41
40
do-install:
42
do-install:
41
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR} \
43
	@${MKDIR} ${STAGEDIR}${PREFIX}/include/openNURBS/zlib
42
		${STAGEDIR}${BINEXAMPLESDIR} \
44
	${INSTALL_DATA} ${WRKSRC}/libopenNURBS.a ${STAGEDIR}${PREFIX}/lib
45
	${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/openNURBS/
46
	${INSTALL_DATA} ${WRKSRC}/zlib/*.h \
43
		${STAGEDIR}${PREFIX}/include/openNURBS/zlib
47
		${STAGEDIR}${PREFIX}/include/openNURBS/zlib
44
	${INSTALL_DATA} ${WRKSRC}/libopenNURBS.a ${STAGEDIR}${PREFIX}/lib
48
49
do-install-EXAMPLES-on:
50
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
45
	${INSTALL_DATA} ${WRKSRC}/examples_linking_pragmas.h \
51
	${INSTALL_DATA} ${WRKSRC}/examples_linking_pragmas.h \
46
		${STAGEDIR}${EXAMPLESDIR}
52
		${STAGEDIR}${EXAMPLESDIR}
47
	${INSTALL_DATA} ${WRKSRC}/opennurbs.h ${STAGEDIR}${EXAMPLESDIR}
53
	${INSTALL_DATA} ${WRKSRC}/opennurbs.h ${STAGEDIR}${EXAMPLESDIR}
48
	${PRINTF} "CFLAGS+=-I${PREFIX}/include/openNURBS -I$$\{.CURDIR\}\n" \
49
		> ${STAGEDIR}${MKFILE}
50
	@echo "LDADD+=-L${PREFIX}/lib -lm -lopenNURBS" >> ${STAGEDIR}${MKFILE}
51
	${PRINTF} ".PATH: $$\{.CURDIR\}/../example_userdata\n" \
52
		>> ${STAGEDIR}${MKFILE}
53
	echo "NO_MAN=YES" >> ${STAGEDIR}${MKFILE}
54
	echo ".include <bsd.prog.mk>" >> ${STAGEDIR}${MKFILE}
55
	${PRINTF} "SUBDIR =" > ${STAGEDIR}${EXAMPLESDIR}/Makefile
56
.for i in brep read roundtrip userdata write
54
.for i in brep read roundtrip userdata write
57
	${PRINTF} " example_${i}" >> ${STAGEDIR}${EXAMPLESDIR}/Makefile
58
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/example_${i}
55
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/example_${i}
59
	${INSTALL_DATA} ${WRKSRC}/example_${i}/example_${i}.cpp \
56
	${INSTALL_PROGRAM} ${WRKSRC}/example_${i}/example_${i} ${STAGEDIR}${EXAMPLESDIR}/example_${i}
60
		${STAGEDIR}${EXAMPLESDIR}/example_${i}/example_${i}.cc
57
	cd ${WRKSRC}/example_${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/example_${i} "-name *\.cpp -or -name *\.h"
61
	echo "PROG_CXX=example_${i}" \
62
		> ${STAGEDIR}${EXAMPLESDIR}/example_${i}/Makefile
63
	echo "SRCS=example_${i}.cc example_ud.cc" \
64
		>> ${STAGEDIR}${EXAMPLESDIR}/example_${i}/Makefile
65
	echo ".include \"../bsd.openNURBS.mk\"" \
66
		>> ${STAGEDIR}${EXAMPLESDIR}/example_${i}/Makefile
67
	${INSTALL_PROGRAM} ${WRKSRC}/example_${i}/example_${i} \
68
		${STAGEDIR}${BINEXAMPLESDIR}
69
.endfor
58
.endfor
70
	${INSTALL_DATA} ${WRKSRC}/example_userdata/example_ud.cpp \
71
		${STAGEDIR}${EXAMPLESDIR}/example_userdata/example_ud.cc
72
	${INSTALL_DATA} ${WRKSRC}/example_userdata/example_ud.h \
73
		${STAGEDIR}${EXAMPLESDIR}/example_userdata/example_ud.h
74
	${PRINTF} "\n.include <bsd.subdir.mk>\n" \
75
		>> ${STAGEDIR}${EXAMPLESDIR}/Makefile
76
	${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/openNURBS/
77
	${INSTALL_DATA} ${WRKSRC}/zlib/*.h \
78
		${STAGEDIR}${PREFIX}/include/openNURBS/zlib
79
59
80
.include <bsd.port.post.mk>
60
.include <bsd.port.post.mk>
(-)files/patch-opennurbs__system.h (-1 / +1 lines)
Lines 1-4 Link Here
1
--- opennurbs_system.h.orig	2015-08-14 13:19:05 UTC
1
--- opennurbs_system.h.orig	2017-02-11 10:13:51 UTC
2
+++ opennurbs_system.h
2
+++ opennurbs_system.h
3
@@ -219,11 +219,7 @@
3
@@ -219,11 +219,7 @@
4
 
4
 
(-)pkg-plist (-18 / +11 lines)
Lines 116-139 Link Here
116
include/openNURBS/zlib/zlib.h
116
include/openNURBS/zlib/zlib.h
117
include/openNURBS/zlib/zutil.h
117
include/openNURBS/zlib/zutil.h
118
lib/libopenNURBS.a
118
lib/libopenNURBS.a
119
libexec/openNURBS/example_brep
119
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_brep/example_brep
120
libexec/openNURBS/example_read
120
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_brep/example_brep.cpp
121
libexec/openNURBS/example_roundtrip
121
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_read/example_read
122
libexec/openNURBS/example_userdata
122
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_read/example_read.cpp
123
libexec/openNURBS/example_write
123
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_roundtrip/example_roundtrip
124
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
124
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_roundtrip/example_roundtrip.cpp
125
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bsd.openNURBS.mk
125
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_ud.cpp
126
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_brep/Makefile
127
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_brep/example_brep.cc
128
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_read/Makefile
129
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_read/example_read.cc
130
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_roundtrip/Makefile
131
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_roundtrip/example_roundtrip.cc
132
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/Makefile
133
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_ud.cc
134
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_ud.h
126
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_ud.h
135
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_userdata.cc
127
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_userdata
136
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_write/Makefile
128
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_userdata.cpp
137
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_write/example_write.cc
129
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_write/example_write
130
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_write/example_write.cpp
138
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples_linking_pragmas.h
131
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples_linking_pragmas.h
139
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opennurbs.h
132
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opennurbs.h

Return to bug 216212