From owner-svn-ports-all@freebsd.org Thu Mar 23 01:27:36 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D6BAD168AE; Thu, 23 Mar 2017 01:27:36 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D99C81512; Thu, 23 Mar 2017 01:27:35 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2N1RY0d022386; Thu, 23 Mar 2017 01:27:34 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2N1RYBk022383; Thu, 23 Mar 2017 01:27:34 GMT (envelope-from ler@FreeBSD.org) Message-Id: <201703230127.v2N1RYBk022383@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Thu, 23 Mar 2017 01:27:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436749 - in head/graphics/opennurbs: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Mar 2017 01:27:36 -0000 Author: ler Date: Thu Mar 23 01:27:34 2017 New Revision: 436749 URL: https://svnweb.freebsd.org/changeset/ports/436749 Log: fix finding of the zlib sources. PR: 216212 Submitted by: mdmi3 Approved by: fernando.apesteguia@gmail.com, phk, adamw (mentor) Differential Revision: https://reviews.freebsd.org/D10110 Modified: head/graphics/opennurbs/Makefile head/graphics/opennurbs/files/patch-opennurbs__system.h head/graphics/opennurbs/pkg-plist Modified: head/graphics/opennurbs/Makefile ============================================================================== --- head/graphics/opennurbs/Makefile Wed Mar 22 23:50:24 2017 (r436748) +++ head/graphics/opennurbs/Makefile Thu Mar 23 01:27:34 2017 (r436749) @@ -17,13 +17,18 @@ USES= iconv:build dos2unix gmake zip MAKE_ARGS= CC="${CC}" CCC="${CXX}" MAKEFILE= makefile -BINEXAMPLESDIR= ${PREFIX}/libexec/openNURBS -MKFILE= ${EXAMPLESDIR}/bsd.openNURBS.mk + +OPTIONS_DEFINE= EXAMPLES .include -.if !exists(${SRC_BASE}/lib/libz) -IGNORE= needs SRC_BASE to compile. Install base system sources and try again +# In r311275 zlib.h was moved to contrib/zlib/zlib.h from lib/libz/zlib.h +LIBZ= ${SRC_BASE}/contrib/zlib +.if !exists(${LIBZ}/zlib.h) +LIBZ:= ${SRC_BASE}/lib/libz +. if !exists(${LIBZ}/zlib.h) +IGNORE= needs SRC_BASE to compile. Install base system sources and try again +. endif .endif .if ${ARCH} != i386 @@ -31,50 +36,25 @@ MAKE_ARGS+= ON_GNU_OPTIMIZER_FLAGS="-g - .endif 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 ${SRC_BASE}/lib/libz ${WRKSRC}/zlib + @${RM} -r ${WRKSRC}/zlib + ${CP} -R ${LIBZ} ${WRKSRC}/zlib do-install: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} \ - ${STAGEDIR}${BINEXAMPLESDIR} \ - ${STAGEDIR}${PREFIX}/include/openNURBS/zlib + @${MKDIR} ${STAGEDIR}${PREFIX}/include/openNURBS/zlib ${INSTALL_DATA} ${WRKSRC}/libopenNURBS.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/openNURBS + ${INSTALL_DATA} ${WRKSRC}/zlib/*.h \ + ${STAGEDIR}${PREFIX}/include/openNURBS/zlib + +do-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples_linking_pragmas.h \ ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/opennurbs.h ${STAGEDIR}${EXAMPLESDIR} - ${PRINTF} "CFLAGS+=-I${PREFIX}/include/openNURBS -I$$\{.CURDIR\}\n" \ - > ${STAGEDIR}${MKFILE} - @echo "LDADD+=-L${PREFIX}/lib -lm -lopenNURBS" >> ${STAGEDIR}${MKFILE} - ${PRINTF} ".PATH: $$\{.CURDIR\}/../example_userdata\n" \ - >> ${STAGEDIR}${MKFILE} - echo "NO_MAN=YES" >> ${STAGEDIR}${MKFILE} - echo ".include " >> ${STAGEDIR}${MKFILE} - ${PRINTF} "SUBDIR =" > ${STAGEDIR}${EXAMPLESDIR}/Makefile .for i in brep read roundtrip userdata write - ${PRINTF} " example_${i}" >> ${STAGEDIR}${EXAMPLESDIR}/Makefile @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/example_${i} - ${INSTALL_DATA} ${WRKSRC}/example_${i}/example_${i}.cpp \ - ${STAGEDIR}${EXAMPLESDIR}/example_${i}/example_${i}.cc - echo "PROG_CXX=example_${i}" \ - > ${STAGEDIR}${EXAMPLESDIR}/example_${i}/Makefile - echo "SRCS=example_${i}.cc example_ud.cc" \ - >> ${STAGEDIR}${EXAMPLESDIR}/example_${i}/Makefile - echo ".include \"../bsd.openNURBS.mk\"" \ - >> ${STAGEDIR}${EXAMPLESDIR}/example_${i}/Makefile - ${INSTALL_PROGRAM} ${WRKSRC}/example_${i}/example_${i} \ - ${STAGEDIR}${BINEXAMPLESDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/example_${i}/example_${i} ${STAGEDIR}${EXAMPLESDIR}/example_${i} + cd ${WRKSRC}/example_${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/example_${i} "-name *\.cpp -or -name *\.h" .endfor - ${INSTALL_DATA} ${WRKSRC}/example_userdata/example_ud.cpp \ - ${STAGEDIR}${EXAMPLESDIR}/example_userdata/example_ud.cc - ${INSTALL_DATA} ${WRKSRC}/example_userdata/example_ud.h \ - ${STAGEDIR}${EXAMPLESDIR}/example_userdata/example_ud.h - ${PRINTF} "\n.include \n" \ - >> ${STAGEDIR}${EXAMPLESDIR}/Makefile - ${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/openNURBS/ - ${INSTALL_DATA} ${WRKSRC}/zlib/*.h \ - ${STAGEDIR}${PREFIX}/include/openNURBS/zlib .include Modified: head/graphics/opennurbs/files/patch-opennurbs__system.h ============================================================================== --- head/graphics/opennurbs/files/patch-opennurbs__system.h Wed Mar 22 23:50:24 2017 (r436748) +++ head/graphics/opennurbs/files/patch-opennurbs__system.h Thu Mar 23 01:27:34 2017 (r436749) @@ -1,4 +1,4 @@ ---- opennurbs_system.h.orig 2015-08-14 13:19:05 UTC +--- opennurbs_system.h.orig 2017-02-11 10:13:51 UTC +++ opennurbs_system.h @@ -219,11 +219,7 @@ Modified: head/graphics/opennurbs/pkg-plist ============================================================================== --- head/graphics/opennurbs/pkg-plist Wed Mar 22 23:50:24 2017 (r436748) +++ head/graphics/opennurbs/pkg-plist Thu Mar 23 01:27:34 2017 (r436749) @@ -116,24 +116,17 @@ include/openNURBS/zlib/zconf.h include/openNURBS/zlib/zlib.h include/openNURBS/zlib/zutil.h lib/libopenNURBS.a -libexec/openNURBS/example_brep -libexec/openNURBS/example_read -libexec/openNURBS/example_roundtrip -libexec/openNURBS/example_userdata -libexec/openNURBS/example_write -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bsd.openNURBS.mk -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_brep/Makefile -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_brep/example_brep.cc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_read/Makefile -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_read/example_read.cc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_roundtrip/Makefile -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_roundtrip/example_roundtrip.cc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/Makefile -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_ud.cc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_brep/example_brep +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_brep/example_brep.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_read/example_read +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_read/example_read.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_roundtrip/example_roundtrip +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_roundtrip/example_roundtrip.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_ud.cpp %%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%%/example_userdata/example_userdata +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_userdata.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_write/example_write +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_write/example_write.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples_linking_pragmas.h %%PORTEXAMPLES%%%%EXAMPLESDIR%%/opennurbs.h