Date: Sun, 6 Jul 2014 03:59:41 +0000 From: Steve Wills <swills@freebsd.org> To: Adam Weinberger <adamw@freebsd.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r360670 - in head/science: cdf chemtool colt dcl getdp gnudatalanguage medit ncs ruby-dcl Message-ID: <20140706035940.GB69694@mouf.net> In-Reply-To: <201407042208.s64M8FYS008906@svn.freebsd.org> References: <201407042208.s64M8FYS008906@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--WhfpMioaduB5tiZL Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, FYI: https://jenkins.freebsd.org/pci/head-amd64/poudriere/data/headamd64-default= /517/logs/errors/cdf3-3.3.0_2.log https://jenkins.freebsd.org/pci/head-i386/poudriere/data/headi386-default/5= 17/logs/errors/cdf3-3.3.0_2.log Error: 'bin/definitions.K' is referring to /wrkdirs/usr/ports/science/cdf/w= ork/stage Error: 'bin/definitions.B' is referring to /wrkdirs/usr/ports/science/cdf/w= ork/stage Error: 'bin/definitions.C' is referring to /wrkdirs/usr/ports/science/cdf/w= ork/stage Steve On Fri, Jul 04, 2014 at 10:08:15PM +0000, Adam Weinberger wrote: > Author: adamw > Date: Fri Jul 4 22:08:14 2014 > New Revision: 360670 > URL: http://svnweb.freebsd.org/changeset/ports/360670 > QAT: https://qat.redports.org/buildarchive/r360670/ >=20 > Log: > Remove NOPORTDOCS and NOPORTEXAMPLES. >=20 > Modified: > head/science/cdf/Makefile > head/science/chemtool/Makefile > head/science/colt/Makefile > head/science/dcl/Makefile > head/science/getdp/Makefile > head/science/gnudatalanguage/Makefile > head/science/medit/Makefile > head/science/ncs/Makefile > head/science/ruby-dcl/Makefile >=20 > Modified: head/science/cdf/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/science/cdf/Makefile Fri Jul 4 21:58:59 2014 (r360669) > +++ head/science/cdf/Makefile Fri Jul 4 22:08:14 2014 (r360670) > @@ -30,6 +30,8 @@ PKGMESSAGE=3D ${WRKDIR}/pkg-message > DEFS=3D B C K > PORTDOCS=3D CDF_copyright.txt CHANGES.txt Release.notes Welcome.txt > =20 > +OPTIONS_DEFINE=3D DOCS EXAMPLES > + > .include <bsd.port.pre.mk> > =20 > .if ${ARCH} =3D=3D "ia64" || ${ARCH} =3D=3D "powerpc" || ${ARCH} =3D=3D = "sparc64" > @@ -45,14 +47,10 @@ pre-configure: > post-install: > ${MV} ${STAGEDIR}${PREFIX}/lib/libcdf.so ${STAGEDIR}${PREFIX}/lib/libcd= f.so.0 > ${LN} -sf libcdf.so.0 ${STAGEDIR}${PREFIX}/lib/libcdf.so > -.if !defined(NOPORTDOCS) > ${MKDIR} ${STAGEDIR}${DOCSDIR} > ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} > -.endif > -.if !defined(NOPORTEXAMPLES) > ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} > ${INSTALL_DATA} ${WRKSRC}/samples/* ${STAGEDIR}${EXAMPLESDIR} > -.endif > =20 > regression-test: > (cd ${BUILD_WRKSRC} ; \ >=20 > Modified: head/science/chemtool/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/science/chemtool/Makefile Fri Jul 4 21:58:59 2014 (r360669) > +++ head/science/chemtool/Makefile Fri Jul 4 22:08:14 2014 (r360670) > @@ -19,6 +19,8 @@ CFLAGS+=3D -I${LOCALBASE}/include > LDFLAGS+=3D -L${LOCALBASE}/lib > CONFIGURE_ARGS=3D --enable-emf=3Dyes --with-localedir=3D${PREFIX} > =20 > +OPTIONS_DEFINE=3D EXAMPLES > + > .include <bsd.port.pre.mk> > =20 > #isolate libEMF stuff > @@ -30,10 +32,8 @@ do-install: > ${INSTALL_PROGRAM} ${WRKSRC}/src-cht/cht ${STAGEDIR}${PREFIX}/bin > ${INSTALL_MAN} ${WRKSRC}/chemtool.1 ${STAGEDIR}${MANPREFIX}/man/man1 > ${INSTALL_MAN} ${WRKSRC}/cht.1 ${STAGEDIR}${MANPREFIX}/man/man1 > -.if !defined(NOPORTEXAMPLES) > @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} > cd ${WRKSRC}/examples && ${FIND} . | \ > ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR} > -.endif > =20 > .include <bsd.port.post.mk> >=20 > Modified: head/science/colt/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/science/colt/Makefile Fri Jul 4 21:58:59 2014 (r360669) > +++ head/science/colt/Makefile Fri Jul 4 22:08:14 2014 (r360670) > @@ -14,18 +14,24 @@ USE_JAVA=3D yes > JAVA_VERSION=3D 1.6+ > WRKSRC=3D ${WRKDIR}/${PORTNAME} > =20 > -.if !defined(WITHOUT_COMPILE) > +OPTIONS_DEFINE=3D DOCS COMPILE > +OPTIONS_DEFAULT=3DCOMPILE > +COMPILE_DESC=3D Install the pre-compiled .jar file > + > +.include <bsd.port.options.mk> > + > +.if ${PORT_OPTIONS:MCOMPILE} > USE_ANT=3D yes > ALL_TARGET=3D build > MAKE_ENV=3D LANG=3Den_US.ISO8859-1 > -.if !defined(NOPORTDOCS) > +.if ${PORT_OPTIONS:MDOCS} > ALL_TARGET+=3D javadoc > .endif > .else > NO_BUILD=3D yes > .endif > =20 > -.if !defined(NOPORTDOCS) > +.if ${PORT_OPTIONS:MDOCS} > PORTDOCS=3D * > .endif > =20 > @@ -33,15 +39,8 @@ PLIST_FILES=3D %%JAVAJARDIR%%/colt.jar > =20 > .include <bsd.port.pre.mk> > =20 > -pre-fetch: > - @${ECHO_MSG} "" > - @${ECHO_MSG} "You may use the following build options:" > - @${ECHO_MSG} "" > - @${ECHO_MSG} " WITHOUT_COMPILE=3Dyes Install the pre-compiled .ja= r file" > - @${ECHO_MSG} "" > - > do-install: > -.if !defined(NOPORTDOCS) > +.if ${PORT_OPTIONS:MDOCS} > @${ECHO_MSG} -n ">> Installing documentation in ${STAGEDIR}${DOCSDIR}..= =2E" > @cd ${WRKSRC}/doc && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCS= DIR}/{} \; > @cd ${WRKSRC}/doc && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGE= DIR}${DOCSDIR}/{} \; >=20 > Modified: head/science/dcl/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/science/dcl/Makefile Fri Jul 4 21:58:59 2014 (r360669) > +++ head/science/dcl/Makefile Fri Jul 4 22:08:14 2014 (r360670) > @@ -23,16 +23,14 @@ PORTEXAMPLES=3D * > =20 > RESTRICTED=3D No commercial use > =20 > +OPTIONS_DEFINE=3D DOCS EXAMPLES > + > post-install: > -.if !defined(NOPORTEXAMPLES) > @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} > (cd ${WRKSRC}/demo/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) > -.endif > -.if !defined(NOPORTDOCS) > @${MKDIR} ${STAGEDIR}${DOCSDIR} > .for i in ${PORTDOCS} > ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/ > .endfor > -.endif > =20 > .include <bsd.port.mk> >=20 > Modified: head/science/getdp/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/science/getdp/Makefile Fri Jul 4 21:58:59 2014 (r360669) > +++ head/science/getdp/Makefile Fri Jul 4 22:08:14 2014 (r360670) > @@ -28,16 +28,14 @@ MAKE_JOBS_UNSAFE=3D yes > =20 > WRKSRC=3D ${WRKDIR}/${PORTNAME}-${PORTVERSION} > =20 > +OPTIONS_DEFINE=3D DOCS EXAMPLES > + > post-patch: > @${REINPLACE_CMD} -e 's/-lgfortran/& $${LDFLAGS}/' ${WRKSRC}/configure > =20 > post-install: > -.if !defined(NOPORTDOCS) > cd ${WRKSRC}/doc && ${FIND} -s ${WRKSRC}/doc/* | ${SED} -e 's#${WRKSRC}= /doc/##' | ${CPIO} -pmud -R ${BINOWN}:${BINGRP} ${STAGEDIR}${DOCSDIR} > -.endif > -.if !defined(NOPORTEXAMPLES) > cd ${WRKSRC}/demos && ${FIND} -s ${WRKSRC}/demos/* | ${SED} -e 's#${WRK= SRC}/demos/##' | ${CPIO} -pmud -R ${BINOWN}:${BINGRP} ${STAGEDIR}${EXAMPLES= DIR} > -.endif > =20 > .include <bsd.port.pre.mk> > =20 >=20 > Modified: head/science/gnudatalanguage/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/science/gnudatalanguage/Makefile Fri Jul 4 21:58:59 2014 (r3606= 69) > +++ head/science/gnudatalanguage/Makefile Fri Jul 4 22:08:14 2014 (r3606= 70) > @@ -52,6 +52,8 @@ LDFLAGS+=3D ${PTHREAD_LIBS} -L${LOCALBASE} > =20 > SLAVEDIRS=3D science/py-gnudatalanguage > =20 > +OPTIONS_DEFINE=3D EXAMPLES > + > .if defined(BUILD_PYTHON_MODULE) > CATEGORIES+=3D python > CMAKE_ARGS+=3D -DPYTHON_MODULE:BOOL=3DYES -DOPENMP:BOOL=3DNO > @@ -134,10 +136,8 @@ do-install: > =20 > .if !defined(BUILD_PYTHON_MODULE) > post-stage: > -. if !defined(NOPORTEXAMPLES) > ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/testsuite > (cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDI= R}/testsuite/) > -. endif > .endif > =20 > .if defined(MAINTAINER_MODE) >=20 > Modified: head/science/medit/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/science/medit/Makefile Fri Jul 4 21:58:59 2014 (r360669) > +++ head/science/medit/Makefile Fri Jul 4 22:08:14 2014 (r360670) > @@ -34,7 +34,11 @@ LIBTARBALL=3D library.${LIBVERSION}${EXTRA > =20 > PLIST_FILES=3D bin/${PORTNAME} > =20 > -. if !defined(NOPORTEXAMPLES) > +OPTIONS_DEFINE=3D EXAMPLES > + > +.include <bsd.port.options.mk> > + > +. if ${PORT_OPTIONS:MEXAMPLES} || make(makesum) > DISTFILES+=3D meshes.tar.gz > EXTRACT_ONLY+=3D meshes.tar.gz > MESHES=3D DEFAULT.medit ozark.gis part.bb part.mesh thepart.mesh > @@ -55,7 +59,7 @@ pre-build: > =20 > do-install: > ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin > -.if !defined(NOPORTEXAMPLES) > +.if ${PORT_OPTIONS:MEXAMPLES} > ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} > ${INSTALL_DATA} ${MESHES:S|^|${WRKSRC}/INRIA.dir/|} ${STAGEDIR}${EXAMPL= ESDIR} > .endif >=20 > Modified: head/science/ncs/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/science/ncs/Makefile Fri Jul 4 21:58:59 2014 (r360669) > +++ head/science/ncs/Makefile Fri Jul 4 22:08:14 2014 (r360670) > @@ -41,6 +41,10 @@ NEED_ROOT=3D yes > FORTRANLIBDIR=3D `${DIRNAME} \\`${FC} -print-libgcc-file-name\\`` > FORTRANLIBDIR2=3D `${DIRNAME} \\`${FC} -print-libgcc-file-name\\``/../..= /../ > =20 > +OPTIONS_DEFINE=3D DOCS EXAMPLES > + > +.include <bsd.port.options.mk> > + > .if defined(PACKAGE_BUILDING) > TERM=3D vt100 # Force for pointyhat to override su > .else > @@ -70,7 +74,7 @@ RUN_DEPENDS+=3D ${MPI_HOME}/bin/mpirun:${P > MPI_LIBS=3D -lmpich -lmpl ${PTHREAD_LIBS} > .endif > =20 > -.if !defined(NOPORTDOCS) > +.if ${PORT_OPTIONS:MDOCS} > USE_TEX=3D tex:build > BUILD_DEPENDS+=3D fig2dev:${PORTSDIR}/print/transfig > ALL_TARGET=3D all pdf > @@ -107,11 +111,11 @@ pre-everything:: > @${ECHO_MSG} > =20 > post-install: > -.if !defined(NOPORTDOCS) > +.if ${PORT_OPTIONS:MDOCS} > ${MKDIR} ${STAGEDIR}${DOCSDIR} > ${INSTALL_DATA} ${DOCS:C|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} > .endif > -.if !defined(NOPORTEXAMPLES) > +.if ${PORT_OPTIONS:MEXAMPLES} > ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} > cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} > .endif >=20 > Modified: head/science/ruby-dcl/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/science/ruby-dcl/Makefile Fri Jul 4 21:58:59 2014 (r360669) > +++ head/science/ruby-dcl/Makefile Fri Jul 4 22:08:14 2014 (r360670) > @@ -38,6 +38,8 @@ EXAMPLESDIR=3D ${RUBY_MODEXAMPLESDIR} > PORTDOCS=3D ChangeLog README ToDo > PORTEXAMPLES=3D * > =20 > +OPTIONS_DEFINE=3D DOCS EXAMPLES > + > .include <bsd.port.pre.mk> > =20 > .if ${ARCH} =3D=3D "ia64" > @@ -45,15 +47,11 @@ BROKEN=3D Does not build on ${ARCH} (Needs > .endif > =20 > post-install: > -.if !defined(NOPORTEXAMPLES) > ${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR} > (cd ${WRKSRC}/demo/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_MODEXAMPL= ESDIR}) > -.endif > -.if !defined(PORT_OPTIONS:MDOCS) > ${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR} > .for f in ${PORTDOCS} > ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR} > .endfor > -.endif > =20 > .include <bsd.port.post.mk> --WhfpMioaduB5tiZL Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJTuMmrAAoJEPXPYrMgexuhkMIIAKeoLRwY0Zelo6qQBUUK2a/u uOzpXXfOt7PPNC4rS6oVZy447eC8uV1kuBw3b1jtr4HJ+8tGX+74bqtJ3zj8HNqM 3Uq3QW1xHaX+KE6mbTGrzQxsGeZq5LIamOppDIyY5d2y1fE2G6wT+rC6tKWq5/fO RTTtSEnmyf11eNw+MnpXInR2L1CUFEHZfYttK6RnfOF5HnCDX/QAitc11M0fU9D/ DE0OjvkrGB1NtjciOlWlpL8PQPTl6sG0q4BY8WZDWDl6KxQFELkm7rl3u7zOlSPM cYPY6MhT81aNzc4iIImwtUPmJzu7O8gTRipvwsHy+6NiSUr4TIdiThKz2RX+02Q= =alBc -----END PGP SIGNATURE----- --WhfpMioaduB5tiZL--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140706035940.GB69694>