diff options
| author | pi <pi@FreeBSD.org> | 2015-02-07 04:14:06 +0800 |
|---|---|---|
| committer | pi <pi@FreeBSD.org> | 2015-02-07 04:14:06 +0800 |
| commit | 59be395aa1bd85c11876fbbcae03ace414c675a0 (patch) | |
| tree | 7e28767aa58b115a15e1a148129faf7f5a15745d /graphics | |
| parent | 05471f722d4200bcff6b43df4912ebda6188524c (diff) | |
| download | freebsd-ports-graphics-59be395aa1bd85c11876fbbcae03ace414c675a0.tar.gz freebsd-ports-graphics-59be395aa1bd85c11876fbbcae03ace414c675a0.tar.zst freebsd-ports-graphics-59be395aa1bd85c11876fbbcae03ace414c675a0.zip | |
graphics/opennurbs: link opennurbs against system zlib
Linking opennurbs against system zlib fixes other ports, see 187506
PR: 197135, 187506
Submitted by: fernando.apesteguia@gmail.com (maintainer)
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/opennurbs/Makefile | 7 | ||||
| -rw-r--r-- | graphics/opennurbs/pkg-plist | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/graphics/opennurbs/Makefile b/graphics/opennurbs/Makefile index a436b6d04d6..548989c742b 100644 --- a/graphics/opennurbs/Makefile +++ b/graphics/opennurbs/Makefile @@ -3,7 +3,7 @@ PORTNAME= opennurbs PORTVERSION= 20121024 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://files.na.mcneel.com/opennurbs/5.0/2012-10-24/ MASTER_SITE_SUBDIR= ${PORTNAME}_${PORTVERSION} @@ -31,6 +31,8 @@ pre-build: ${ICONV_CMD} -c -f utf-8 -t ascii ${WRKSRC}/opennurbs_version.h \ > ${WRKSRC}/opennurbs_version.h.tmp || ${TRUE} ${MV} ${WRKSRC}/opennurbs_version.h.tmp ${WRKSRC}/opennurbs_version.h + ${MV} ${WRKSRC}/zlib ${WRKSRC}/zlib_ + ${CP} -R /usr/src/lib/libz ${WRKSRC}/zlib do-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} \ @@ -71,5 +73,8 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/openNURBS/ ${INSTALL_DATA} ${WRKSRC}/zlib/*.h \ ${STAGEDIR}${PREFIX}/include/openNURBS/zlib +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900000 + ${TOUCH} ${STAGEDIR}${PREFIX}/include/openNURBS/zlib/gzguts.h +.endif .include <bsd.port.post.mk> diff --git a/graphics/opennurbs/pkg-plist b/graphics/opennurbs/pkg-plist index 8b23a32f003..46533dddfc4 100644 --- a/graphics/opennurbs/pkg-plist +++ b/graphics/opennurbs/pkg-plist @@ -104,6 +104,7 @@ include/openNURBS/opennurbs_xform.h include/openNURBS/opennurbs_zlib.h include/openNURBS/zlib/crc32.h include/openNURBS/zlib/deflate.h +include/openNURBS/zlib/gzguts.h include/openNURBS/zlib/inffast.h include/openNURBS/zlib/inffixed.h include/openNURBS/zlib/inflate.h @@ -120,8 +121,6 @@ libexec/openNURBS/example_userdata libexec/openNURBS/example_write %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bsd.openNURBS.mk -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples_linking_pragmas.h -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opennurbs.h %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_brep/Makefile %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_brep/example_brep.cc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_read/Makefile @@ -129,8 +128,10 @@ libexec/openNURBS/example_write %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_roundtrip/Makefile %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_roundtrip/example_roundtrip.cc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/Makefile -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_userdata.cc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_ud.cc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_ud.h +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_userdata.cc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_write/Makefile %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_write/example_write.cc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples_linking_pragmas.h +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opennurbs.h |