From owner-svn-ports-all@FreeBSD.ORG Fri Jul 4 22:08:17 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0566A786; Fri, 4 Jul 2014 22:08:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 E526D274B; Fri, 4 Jul 2014 22:08:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s64M8G81008920; Fri, 4 Jul 2014 22:08:16 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s64M8FYS008906; Fri, 4 Jul 2014 22:08:15 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407042208.s64M8FYS008906@svn.freebsd.org> From: Adam Weinberger Date: Fri, 4 Jul 2014 22:08:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360670 - in head/science: cdf chemtool colt dcl getdp gnudatalanguage medit ncs ruby-dcl 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.18 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: Fri, 04 Jul 2014 22:08:17 -0000 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/ Log: Remove NOPORTDOCS and NOPORTEXAMPLES. 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 Modified: head/science/cdf/Makefile ============================================================================== --- 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= ${WRKDIR}/pkg-message DEFS= B C K PORTDOCS= CDF_copyright.txt CHANGES.txt Release.notes Welcome.txt +OPTIONS_DEFINE= DOCS EXAMPLES + .include .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" @@ -45,14 +47,10 @@ pre-configure: post-install: ${MV} ${STAGEDIR}${PREFIX}/lib/libcdf.so ${STAGEDIR}${PREFIX}/lib/libcdf.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 regression-test: (cd ${BUILD_WRKSRC} ; \ Modified: head/science/chemtool/Makefile ============================================================================== --- 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+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-emf=yes --with-localedir=${PREFIX} +OPTIONS_DEFINE= EXAMPLES + .include #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 .include Modified: head/science/colt/Makefile ============================================================================== --- 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= yes JAVA_VERSION= 1.6+ WRKSRC= ${WRKDIR}/${PORTNAME} -.if !defined(WITHOUT_COMPILE) +OPTIONS_DEFINE= DOCS COMPILE +OPTIONS_DEFAULT=COMPILE +COMPILE_DESC= Install the pre-compiled .jar file + +.include + +.if ${PORT_OPTIONS:MCOMPILE} USE_ANT= yes ALL_TARGET= build MAKE_ENV= LANG=en_US.ISO8859-1 -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ALL_TARGET+= javadoc .endif .else NO_BUILD= yes .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} PORTDOCS= * .endif @@ -33,15 +39,8 @@ PLIST_FILES= %%JAVAJARDIR%%/colt.jar .include -pre-fetch: - @${ECHO_MSG} "" - @${ECHO_MSG} "You may use the following build options:" - @${ECHO_MSG} "" - @${ECHO_MSG} " WITHOUT_COMPILE=yes Install the pre-compiled .jar file" - @${ECHO_MSG} "" - do-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} -n ">> Installing documentation in ${STAGEDIR}${DOCSDIR}..." @cd ${WRKSRC}/doc && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; @cd ${WRKSRC}/doc && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \; Modified: head/science/dcl/Makefile ============================================================================== --- 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= * RESTRICTED= No commercial use +OPTIONS_DEFINE= 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 .include Modified: head/science/getdp/Makefile ============================================================================== --- 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= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +OPTIONS_DEFINE= DOCS EXAMPLES + post-patch: @${REINPLACE_CMD} -e 's/-lgfortran/& $${LDFLAGS}/' ${WRKSRC}/configure 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#${WRKSRC}/demos/##' | ${CPIO} -pmud -R ${BINOWN}:${BINGRP} ${STAGEDIR}${EXAMPLESDIR} -.endif .include Modified: head/science/gnudatalanguage/Makefile ============================================================================== --- head/science/gnudatalanguage/Makefile Fri Jul 4 21:58:59 2014 (r360669) +++ head/science/gnudatalanguage/Makefile Fri Jul 4 22:08:14 2014 (r360670) @@ -52,6 +52,8 @@ LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE} SLAVEDIRS= science/py-gnudatalanguage +OPTIONS_DEFINE= EXAMPLES + .if defined(BUILD_PYTHON_MODULE) CATEGORIES+= python CMAKE_ARGS+= -DPYTHON_MODULE:BOOL=YES -DOPENMP:BOOL=NO @@ -134,10 +136,8 @@ do-install: .if !defined(BUILD_PYTHON_MODULE) post-stage: -. if !defined(NOPORTEXAMPLES) ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/testsuite (cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/testsuite/) -. endif .endif .if defined(MAINTAINER_MODE) Modified: head/science/medit/Makefile ============================================================================== --- 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= library.${LIBVERSION}${EXTRA PLIST_FILES= bin/${PORTNAME} -. if !defined(NOPORTEXAMPLES) +OPTIONS_DEFINE= EXAMPLES + +.include + +. if ${PORT_OPTIONS:MEXAMPLES} || make(makesum) DISTFILES+= meshes.tar.gz EXTRACT_ONLY+= meshes.tar.gz MESHES= DEFAULT.medit ozark.gis part.bb part.mesh thepart.mesh @@ -55,7 +59,7 @@ pre-build: 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}${EXAMPLESDIR} .endif Modified: head/science/ncs/Makefile ============================================================================== --- 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= yes FORTRANLIBDIR= `${DIRNAME} \\`${FC} -print-libgcc-file-name\\`` FORTRANLIBDIR2= `${DIRNAME} \\`${FC} -print-libgcc-file-name\\``/../../../ +OPTIONS_DEFINE= DOCS EXAMPLES + +.include + .if defined(PACKAGE_BUILDING) TERM= vt100 # Force for pointyhat to override su .else @@ -70,7 +74,7 @@ RUN_DEPENDS+= ${MPI_HOME}/bin/mpirun:${P MPI_LIBS= -lmpich -lmpl ${PTHREAD_LIBS} .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} USE_TEX= tex:build BUILD_DEPENDS+= fig2dev:${PORTSDIR}/print/transfig ALL_TARGET= all pdf @@ -107,11 +111,11 @@ pre-everything:: @${ECHO_MSG} 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 Modified: head/science/ruby-dcl/Makefile ============================================================================== --- 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= ${RUBY_MODEXAMPLESDIR} PORTDOCS= ChangeLog README ToDo PORTEXAMPLES= * +OPTIONS_DEFINE= DOCS EXAMPLES + .include .if ${ARCH} == "ia64" @@ -45,15 +47,11 @@ BROKEN= Does not build on ${ARCH} (Needs .endif post-install: -.if !defined(NOPORTEXAMPLES) ${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR} (cd ${WRKSRC}/demo/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_MODEXAMPLESDIR}) -.endif -.if !defined(PORT_OPTIONS:MDOCS) ${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR} .endfor -.endif .include