From owner-svn-ports-all@FreeBSD.ORG Fri Jul 4 00:24:37 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ADCF2A06; Fri, 4 Jul 2014 00:24:37 +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 8FADC25DD; Fri, 4 Jul 2014 00:24:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s640Obdr081522; Fri, 4 Jul 2014 00:24:37 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s640OZgE081511; Fri, 4 Jul 2014 00:24:35 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407040024.s640OZgE081511@svn.freebsd.org> From: Adam Weinberger Date: Fri, 4 Jul 2014 00:24:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360495 - in head/lang: dmd2 elan ici icon libhx nesasm ptoc spl 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 00:24:37 -0000 Author: adamw Date: Fri Jul 4 00:24:35 2014 New Revision: 360495 URL: http://svnweb.freebsd.org/changeset/ports/360495 QAT: https://qat.redports.org/buildarchive/r360495/ Log: Remove NOPORTDOCS and NOPORTEXAMPLES. Modified: head/lang/dmd2/Makefile head/lang/elan/Makefile head/lang/ici/Makefile head/lang/icon/Makefile head/lang/libhx/Makefile head/lang/nesasm/Makefile head/lang/ptoc/Makefile head/lang/ptoc/pkg-plist head/lang/spl/Makefile head/lang/spl/pkg-plist Modified: head/lang/dmd2/Makefile ============================================================================== --- head/lang/dmd2/Makefile Fri Jul 4 00:20:03 2014 (r360494) +++ head/lang/dmd2/Makefile Fri Jul 4 00:24:35 2014 (r360495) @@ -23,6 +23,8 @@ LICENSE_NAME_DMD= Digital Mars license LICENSE_FILE_DMD= ${WRKSRC}/backendlicense.txt LICENSE_PERMS_DMD= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept +OPTIONS_DEFINE= DOCS + .include .if ${OSVERSION} < 800000 @@ -96,7 +98,6 @@ do-install: cd ${WRKSRC}/../phobos && ${COPYTREE_SHARE} std ${STAGEDIR}${MODULEDIR} ${MKDIR} ${STAGEDIR}${MODULEDIR}/../druntime cd ${WRKSRC}/../druntime && ${COPYTREE_SHARE} import ${STAGEDIR}${MODULEDIR}/../druntime -.if !defined(NOPORTDOCS) ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${DOCSDIR} cd ${WRKDIR}/dmd2 && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR} @@ -104,6 +105,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/../druntime/LICENSE ${STAGEDIR}${DOCSDIR}/druntime ${INSTALL_DATA} ${WRKSRC}/../druntime/README.md ${STAGEDIR}${DOCSDIR}/druntime cd ${WRKSRC}/../druntime && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR}/druntime -.endif .include Modified: head/lang/elan/Makefile ============================================================================== --- head/lang/elan/Makefile Fri Jul 4 00:20:03 2014 (r360494) +++ head/lang/elan/Makefile Fri Jul 4 00:24:35 2014 (r360495) @@ -18,16 +18,14 @@ USES= gmake libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes -.include +OPTIONS_DEFINE= DOCS post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liberts.so.1.0.7 -.if !defined (NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/manuals/compiler/comp.ps \ ${STAGEDIR}${DOCSDIR}/elan-compiler.ps ${INSTALL_DATA} ${WRKSRC}/manuals/language/elan.ps \ ${STAGEDIR}${DOCSDIR}/elan-language.ps -.endif .include Modified: head/lang/ici/Makefile ============================================================================== --- head/lang/ici/Makefile Fri Jul 4 00:20:03 2014 (r360494) +++ head/lang/ici/Makefile Fri Jul 4 00:24:35 2014 (r360495) @@ -16,6 +16,8 @@ ALL_TARGET= all ici.h ICIHDRS= ici.h icistr-setup.h ICIDOCS= doc/ici.pdf +OPTIONS_DEFINE= DOCS + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ici ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/libici4.a ${STAGEDIR}${PREFIX}/lib @@ -29,11 +31,9 @@ do-install: .for f in ${ICIHDRS} ${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${PREFIX}/include .endfor -.if !defined(NOPORTDOCS) ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ici4 .for f in ${ICIDOCS} ${INSTALL_MAN} ${WRKSRC}/$f ${STAGEDIR}${PREFIX}/share/doc/ici4 .endfor -.endif .include Modified: head/lang/icon/Makefile ============================================================================== --- head/lang/icon/Makefile Fri Jul 4 00:20:03 2014 (r360494) +++ head/lang/icon/Makefile Fri Jul 4 00:24:35 2014 (r360495) @@ -20,6 +20,8 @@ ICONDIR= ${PREFIX}/lib/${PORTNAME} BINS= icont iconx BINXS= colrbook colrpick fontpick palette vib wevents xgamma +OPTIONS_DEFINE= DOCS + .if defined(WITHOUT_X11) CONFIG_CMD= Configure PLIST_SUB= WITHOUT_X11="@comment " @@ -64,10 +66,8 @@ do-install: .endfor @${LN} -sf ${ICONDIR}/bin/vib ${STAGEDIR}${PREFIX}/bin/vib .endif -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc; ${INSTALL_DATA} *.* ${STAGEDIR}${DOCSDIR} -.endif .if defined(MAINTAINER_MODE) test: install Modified: head/lang/libhx/Makefile ============================================================================== --- head/lang/libhx/Makefile Fri Jul 4 00:20:03 2014 (r360494) +++ head/lang/libhx/Makefile Fri Jul 4 00:24:35 2014 (r360495) @@ -18,14 +18,16 @@ GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS+=--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig -.if !defined(NOPORTDOCS) +OPTIONS_DEFINE= DOCS + PORTDOCS= * DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:tl} -.endif + +.include post-patch: ${REINPLACE_CMD} -e 's| -lrt||g' ${WRKSRC}/src/Makefile.in -.if defined(NOPORTDOCS) +.if empty(PORT_OPTIONS:MDOCS) ${REINPLACE_CMD} -e 's|libHX_Documentation.pdf||' \ ${WRKSRC}/doc/Makefile.in ${WRKSRC}/doc/Makefile.am .endif Modified: head/lang/nesasm/Makefile ============================================================================== --- head/lang/nesasm/Makefile Fri Jul 4 00:20:03 2014 (r360494) +++ head/lang/nesasm/Makefile Fri Jul 4 00:24:35 2014 (r360495) @@ -11,9 +11,11 @@ DISTNAME= nbasic_2004_03_14 MAINTAINER= ninjin@kth.se COMMENT= The nesasm assembler is a 6502 assembler with specific NES support -WRKSRC= ${WRKDIR}/nbasic_2004_03_14/source/${PORTNAME}/source/ +WRKSRC= ${WRKDIR}/nbasic_2004_03_14/source/${PORTNAME}/source/ USES= zip +OPTIONS_DEFINE= DOCS + post-patch: .SILENT ${REINPLACE_CMD} -e '/^CC/s/=/?=/' \ -e '/^CFLAGS/{s/=/+=/;s/-O2//;}' \ @@ -21,11 +23,9 @@ post-patch: .SILENT do-install: ${INSTALL_PROGRAM} ${WRKSRC}/nesasm ${STAGEDIR}${PREFIX}/bin -.ifndef(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}../documentation/*.txt ${STAGEDIR}${DOCSDIR} # The next install will overwrite readme.txt with a newer readme.txt ${INSTALL_DATA} ${WRKSRC}../readme.txt ${STAGEDIR}${DOCSDIR} -.endif .include Modified: head/lang/ptoc/Makefile ============================================================================== --- head/lang/ptoc/Makefile Fri Jul 4 00:20:03 2014 (r360494) +++ head/lang/ptoc/Makefile Fri Jul 4 00:24:35 2014 (r360495) @@ -22,6 +22,8 @@ EXAMPLES= arr.pas bgidemo.pas ccall.pas vibrkinp.pas vibrkinp.txt vibrtabl.pas war2.pas war2.txt \ xy2.txt xy2orig.txt +OPTIONS_DEFINE= DOCS EXAMPLES + pre-build: @${LN} -sf makefile.bsd ${WRKSRC}/Makefile @${LN} -sf makefile.bsd ${WRKSRC}/Xbgi/Makefile @@ -44,9 +46,7 @@ do-install: .for f in ${EXAMPLES} ${INSTALL_DATA} ${WRKSRC}/examples/${f} ${STAGEDIR}${EXAMPLESDIR} .endfor -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/Readme.htm ${STAGEDIR}${DOCSDIR} -.endif .include Modified: head/lang/ptoc/pkg-plist ============================================================================== --- head/lang/ptoc/pkg-plist Fri Jul 4 00:20:03 2014 (r360494) +++ head/lang/ptoc/pkg-plist Fri Jul 4 00:24:35 2014 (r360495) @@ -10,44 +10,44 @@ include/ptoc/set.h lib/libXbgi.a lib/libptoc.a %%PORTDOCS%%%%DOCSDIR%%/Readme.htm -%%EXAMPLESDIR%%/arr.pas -%%EXAMPLESDIR%%/bgidemo.pas -%%EXAMPLESDIR%%/ccall.pas -%%EXAMPLESDIR%%/coord.txt -%%EXAMPLESDIR%%/dos.h -%%EXAMPLESDIR%%/dos.pas -%%EXAMPLESDIR%%/func.pas -%%EXAMPLESDIR%%/hello.pas -%%EXAMPLESDIR%%/impact.pas -%%EXAMPLESDIR%%/lister.pas -%%EXAMPLESDIR%%/makefile.bsd -%%EXAMPLESDIR%%/nested.pas -%%EXAMPLESDIR%%/objpas.pas -%%EXAMPLESDIR%%/polut2.pas -%%EXAMPLESDIR%%/printer.pas -%%EXAMPLESDIR%%/q2.txt -%%EXAMPLESDIR%%/random.txt -%%EXAMPLESDIR%%/rename.cxx -%%EXAMPLESDIR%%/rename.pas -%%EXAMPLESDIR%%/set.pas -%%EXAMPLESDIR%%/str.pas -%%EXAMPLESDIR%%/test.c -%%EXAMPLESDIR%%/test.cxx -%%EXAMPLESDIR%%/test.pas -%%EXAMPLESDIR%%/test.txt -%%EXAMPLESDIR%%/tpascal.pas -%%EXAMPLESDIR%%/trinor.pas -%%EXAMPLESDIR%%/vibrkinp.pas -%%EXAMPLESDIR%%/vibrkinp.txt -%%EXAMPLESDIR%%/vibrtabl.pas -%%EXAMPLESDIR%%/war2.pas -%%EXAMPLESDIR%%/war2.txt -%%EXAMPLESDIR%%/xy2.txt -%%EXAMPLESDIR%%/xy2orig.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/arr.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgidemo.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ccall.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coord.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dos.h +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dos.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/func.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/impact.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lister.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/makefile.bsd +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nested.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/objpas.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/polut2.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printer.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/q2.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/random.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rename.cxx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rename.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/set.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/str.pas +%%PORTEXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.cxx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tpascal.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trinor.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vibrkinp.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vibrkinp.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vibrtabl.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/war2.pas +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/war2.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xy2.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xy2orig.txt %%DATADIR%%/graph.pas %%DATADIR%%/ptoc.pas %%DATADIR%%/tptoc.pas -@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/ptoc Modified: head/lang/spl/Makefile ============================================================================== --- head/lang/spl/Makefile Fri Jul 4 00:20:03 2014 (r360494) +++ head/lang/spl/Makefile Fri Jul 4 00:24:35 2014 (r360495) @@ -15,6 +15,8 @@ USES= bison gmake ALL_EXAMPLES= Makefile fibonacci.spl fibonacci2.spl guess.spl hello.spl \ primes.spl reverse.spl shakesbeer.spl +OPTIONS_DEFINE= EXAMPLES + post-patch: .for f in . examples ${REINPLACE_CMD} -e 's,= gcc,?= gcc,' -e 's,^CCFLAGS.*,CFLAGS += -Wall,' \ @@ -25,9 +27,7 @@ post-patch: do-install: ${TAR} -C ${WRKSRC}/spl -cf - . | ${TAR} -C ${STAGEDIR}${PREFIX} -xf - -.if !defined(NOPORTDOCS) ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples && ${INSTALL_DATA} ${ALL_EXAMPLES} ${STAGEDIR}${EXAMPLESDIR} -.endif .include Modified: head/lang/spl/pkg-plist ============================================================================== --- head/lang/spl/pkg-plist Fri Jul 4 00:20:03 2014 (r360494) +++ head/lang/spl/pkg-plist Fri Jul 4 00:24:35 2014 (r360495) @@ -1,12 +1,12 @@ bin/spl2c include/spl.h lib/libspl.a -%%PORTDOCS%%share/examples/spl/Makefile -%%PORTDOCS%%share/examples/spl/hello.spl -%%PORTDOCS%%share/examples/spl/primes.spl -%%PORTDOCS%%share/examples/spl/reverse.spl -%%PORTDOCS%%share/examples/spl/fibonacci.spl -%%PORTDOCS%%share/examples/spl/fibonacci2.spl -%%PORTDOCS%%share/examples/spl/guess.spl -%%PORTDOCS%%share/examples/spl/shakesbeer.spl -%%PORTDOCS%%@dirrm share/examples/spl +%%PORTEXAMPLES%%share/examples/spl/Makefile +%%PORTEXAMPLES%%share/examples/spl/hello.spl +%%PORTEXAMPLES%%share/examples/spl/primes.spl +%%PORTEXAMPLES%%share/examples/spl/reverse.spl +%%PORTEXAMPLES%%share/examples/spl/fibonacci.spl +%%PORTEXAMPLES%%share/examples/spl/fibonacci2.spl +%%PORTEXAMPLES%%share/examples/spl/guess.spl +%%PORTEXAMPLES%%share/examples/spl/shakesbeer.spl +%%PORTEXAMPLES%%@dirrm share/examples/spl