Date: Fri, 6 Feb 2015 20:14:07 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378553 - head/graphics/opennurbs Message-ID: <201502062014.t16KE7EA009098@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Fri Feb 6 20:14:06 2015 New Revision: 378553 URL: https://svnweb.freebsd.org/changeset/ports/378553 QAT: https://qat.redports.org/buildarchive/r378553/ Log: 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) Modified: head/graphics/opennurbs/Makefile head/graphics/opennurbs/pkg-plist Modified: head/graphics/opennurbs/Makefile ============================================================================== --- head/graphics/opennurbs/Makefile Fri Feb 6 20:00:19 2015 (r378552) +++ head/graphics/opennurbs/Makefile Fri Feb 6 20:14:06 2015 (r378553) @@ -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> Modified: head/graphics/opennurbs/pkg-plist ============================================================================== --- head/graphics/opennurbs/pkg-plist Fri Feb 6 20:00:19 2015 (r378552) +++ head/graphics/opennurbs/pkg-plist Fri Feb 6 20:14:06 2015 (r378553) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502062014.t16KE7EA009098>