From b26a28d61964b5c5877f0d97003ba7d9ec101b09 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Fri, 4 Jul 2014 00:20:03 +0000 Subject: [PATCH] Remove NOPORTDOCS and NOPORTEXAMPLES. --- java/avis/Makefile | 7 +- java/jakarta-bcel/Makefile | 6 +- java/jakarta-commons-discovery/Makefile | 6 +- java/jdbcpool/Makefile | 4 +- java/jdbcpool/pkg-plist | 18 +-- java/jflex/Makefile | 6 +- java/jflex/pkg-plist | 140 ++++++++++++------------ java/jgrapht/Makefile | 10 +- java/jmf/Makefile | 6 +- java/langspec/Makefile | 4 +- 10 files changed, 98 insertions(+), 109 deletions(-) diff --git a/java/avis/Makefile b/java/avis/Makefile index 8fe740613b3f..b7385e201a9e 100644 --- a/java/avis/Makefile +++ b/java/avis/Makefile @@ -25,11 +25,11 @@ ANT_TARGETS= jar-server JAVA_BUILD= yes .endif -.if !defined(NOPORTDOCS) +OPTIONS_DEFINE= DOCS + PORTDOCS= README.txt\ LICENSE.txt\ history.txt -.endif .include @@ -38,7 +38,6 @@ pre-fetch: @${ECHO_MSG} "You may use the following build options:" @${ECHO_MSG} "" @${ECHO_MSG} " WITHOUT_COMPILE=yes Install the pre-compiled .jar file" - @${ECHO_MSG} " NOPORTDOCS=yes Don't install the port documentation" @${ECHO_MSG} "" do-build: @@ -54,11 +53,9 @@ do-install: @${ECHO_CMD} " [DONE]" @${INSTALL_DATA} ${WRKSRC}/server/etc/avisd.config ${STAGEDIR}${PREFIX}/etc/avisd.conf.sample -.if !defined(NOPORTDOCS) @${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..." @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC}/server/doc && ${FIND} . \ | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} -.endif .include diff --git a/java/jakarta-bcel/Makefile b/java/jakarta-bcel/Makefile index 99a24b693356..03f6078a48df 100644 --- a/java/jakarta-bcel/Makefile +++ b/java/jakarta-bcel/Makefile @@ -17,17 +17,15 @@ JAVA_VERSION= 1.6+ PLIST_FILES= %%JAVAJARDIR%%/bcel.jar -.if !defined(NOPORTDOCS) +OPTIONS_DEFINE= DOCS + PORTDOCS= * -.endif do-install: ${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar \ ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar -.if !defined(NOPORTDOCS) ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/docs && ${FIND} . -print | \ ${CPIO} -pdmu -R${DOCOWN}:${DOCGRP} ${STAGEDIR}${DOCSDIR}) -.endif .include diff --git a/java/jakarta-commons-discovery/Makefile b/java/jakarta-commons-discovery/Makefile index 4ec43a259160..e3b33dda7f1d 100644 --- a/java/jakarta-commons-discovery/Makefile +++ b/java/jakarta-commons-discovery/Makefile @@ -17,17 +17,15 @@ JAVA_VERSION= 1.6+ NO_BUILD= YES WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -.if !defined(NOPORTDOCS) +OPTIONS_DEFINE= DOCS + PORTDOCS= * -.endif JARFILE= ${PORTNAME}.jar PLIST_FILES+= %%JAVAJARDIR%%/${JARFILE} do-install: ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${JARFILE} -.if !defined(NOPORTDOCS) cd ${WRKSRC}/apidocs && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; cd ${WRKSRC}/apidocs && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \; -.endif .include diff --git a/java/jdbcpool/Makefile b/java/jdbcpool/Makefile index 8ae76b9541b9..c0dfab23c191 100644 --- a/java/jdbcpool/Makefile +++ b/java/jdbcpool/Makefile @@ -15,9 +15,9 @@ JAVA_VERSION= 1.6+ NO_BUILD= yes PORTDOCS= CHANGES LICENSE README -.if !defined(NOPORTDOCS) PORTDOCS+= javadoc -.endif + +OPTIONS_DEFINE= DOCS EXAMPLES post-extract: @${FIND} ${WRKSRC} -name CVS -type dir | ${XARGS} ${RM} -rf diff --git a/java/jdbcpool/pkg-plist b/java/jdbcpool/pkg-plist index b06d612c2ccc..89cdd3f4fe90 100644 --- a/java/jdbcpool/pkg-plist +++ b/java/jdbcpool/pkg-plist @@ -1,10 +1,10 @@ %%JAVAJARDIR%%/jdbcpool.jar -%%EXAMPLESDIR%%/PoolTest.class -%%EXAMPLESDIR%%/PoolTest.java -%%EXAMPLESDIR%%/gsp/JDBCApplication.class -%%EXAMPLESDIR%%/gsp/JDBCApplication.java -%%EXAMPLESDIR%%/gsp/README -%%EXAMPLESDIR%%/gsp/monitor_pool.gsp -%%EXAMPLESDIR%%/gsp/query.gsp -@dirrm %%EXAMPLESDIR%%/gsp -@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/PoolTest.class +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/PoolTest.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gsp/JDBCApplication.class +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gsp/JDBCApplication.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gsp/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gsp/monitor_pool.gsp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gsp/query.gsp +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gsp +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% diff --git a/java/jflex/Makefile b/java/jflex/Makefile index 60e8955550b0..9a547fe4c12a 100644 --- a/java/jflex/Makefile +++ b/java/jflex/Makefile @@ -22,12 +22,12 @@ BUILD_WRKSRC= ${WRKSRC}/src ALL_TARGET= jar MAKE_ENV+= CLASSPATH="${JAVALIBDIR}/junit.jar" -.if !defined(NOPORTDOCS) PORTDOCS= * -.endif SUB_FILES= jflex.sh +OPTIONS_DEFINE= DOCS EXAMPLES + post-extract: ${MKDIR} ${WRKSRC}/tools ${CP} ${DISTDIR}/JFlex.jar ${WRKSRC}/tools/ @@ -36,10 +36,8 @@ post-extract: do-install: ${INSTALL_SCRIPT} ${WRKDIR}/jflex.sh ${STAGEDIR}${PREFIX}/bin/jflex ${INSTALL_DATA} ${WRKSRC}/lib/JFlex.jar ${STAGEDIR}${JAVAJARDIR}/JFlex.jar -.if !defined(NOPORTDOCS) ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR} -.endif ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for EXAMPLE in binary byaccj cup interpreter java simple standalone ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${EXAMPLE} diff --git a/java/jflex/pkg-plist b/java/jflex/pkg-plist index 2db4f46c92e6..264033edb6f2 100644 --- a/java/jflex/pkg-plist +++ b/java/jflex/pkg-plist @@ -1,72 +1,72 @@ bin/jflex %%JAVAJARDIR%%/JFlex.jar -%%EXAMPLESDIR%%/binary/Makefile -%%EXAMPLESDIR%%/binary/README -%%EXAMPLESDIR%%/binary/StraightStreamReader.java -%%EXAMPLESDIR%%/binary/binary.flex -@dirrm %%EXAMPLESDIR%%/binary -%%EXAMPLESDIR%%/byaccj/Makefile -%%EXAMPLESDIR%%/byaccj/README -%%EXAMPLESDIR%%/byaccj/calc.flex -%%EXAMPLESDIR%%/byaccj/calc.y -@dirrm %%EXAMPLESDIR%%/byaccj -%%EXAMPLESDIR%%/cup/Main.java -%%EXAMPLESDIR%%/cup/Makefile -%%EXAMPLESDIR%%/cup/README -%%EXAMPLESDIR%%/cup/lcalc.flex -%%EXAMPLESDIR%%/cup/output.good -%%EXAMPLESDIR%%/cup/test.txt -%%EXAMPLESDIR%%/cup/ycalc.cup -@dirrm %%EXAMPLESDIR%%/cup -%%EXAMPLESDIR%%/interpreter/AST.java -%%EXAMPLESDIR%%/interpreter/Main.java -%%EXAMPLESDIR%%/interpreter/Makefile -%%EXAMPLESDIR%%/interpreter/README -%%EXAMPLESDIR%%/interpreter/STEfun.java -%%EXAMPLESDIR%%/interpreter/STEvar.java -%%EXAMPLESDIR%%/interpreter/SymTab.java -%%EXAMPLESDIR%%/interpreter/SymtabEntry.java -%%EXAMPLESDIR%%/interpreter/Tboolexp.java -%%EXAMPLESDIR%%/interpreter/Tdekl.java -%%EXAMPLESDIR%%/interpreter/Tdekllist.java -%%EXAMPLESDIR%%/interpreter/Texp.java -%%EXAMPLESDIR%%/interpreter/Texpinfix.java -%%EXAMPLESDIR%%/interpreter/Texplist.java -%%EXAMPLESDIR%%/interpreter/Tfun.java -%%EXAMPLESDIR%%/interpreter/Tident.java -%%EXAMPLESDIR%%/interpreter/Tifthenelse.java -%%EXAMPLESDIR%%/interpreter/Tnumber.java -%%EXAMPLESDIR%%/interpreter/Tparlist.java -%%EXAMPLESDIR%%/interpreter/Tprogram.java -%%EXAMPLESDIR%%/interpreter/Tuminus.java -%%EXAMPLESDIR%%/interpreter/build.xml -%%EXAMPLESDIR%%/interpreter/example.as -%%EXAMPLESDIR%%/interpreter/parser.cup -%%EXAMPLESDIR%%/interpreter/scanner.flex -@dirrm %%EXAMPLESDIR%%/interpreter -%%EXAMPLESDIR%%/java/JavaParser.java -%%EXAMPLESDIR%%/java/JavaSymbol.java -%%EXAMPLESDIR%%/java/Makefile -%%EXAMPLESDIR%%/java/README -%%EXAMPLESDIR%%/java/TestLexer.java -%%EXAMPLESDIR%%/java/build.xml -%%EXAMPLESDIR%%/java/java.flex -%%EXAMPLESDIR%%/java/java12.cup -%%EXAMPLESDIR%%/java/lexer-output.good -%%EXAMPLESDIR%%/java/unicode.flex -@dirrm %%EXAMPLESDIR%%/java -%%EXAMPLESDIR%%/simple/Makefile -%%EXAMPLESDIR%%/simple/README -%%EXAMPLESDIR%%/simple/Utility.java -%%EXAMPLESDIR%%/simple/Yytoken.java -%%EXAMPLESDIR%%/simple/output.good -%%EXAMPLESDIR%%/simple/simple.flex -%%EXAMPLESDIR%%/simple/test.txt -@dirrm %%EXAMPLESDIR%%/simple -%%EXAMPLESDIR%%/standalone/Makefile -%%EXAMPLESDIR%%/standalone/README -%%EXAMPLESDIR%%/standalone/build.xml -%%EXAMPLESDIR%%/standalone/sample.inp -%%EXAMPLESDIR%%/standalone/standalone.flex -@dirrm %%EXAMPLESDIR%%/standalone -@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/binary/Makefile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/binary/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/binary/StraightStreamReader.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/binary/binary.flex +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/binary +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/byaccj/Makefile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/byaccj/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/byaccj/calc.flex +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/byaccj/calc.y +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/byaccj +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cup/Main.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cup/Makefile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cup/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cup/lcalc.flex +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cup/output.good +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cup/test.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cup/ycalc.cup +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cup +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/AST.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/Main.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/Makefile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/STEfun.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/STEvar.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/SymTab.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/SymtabEntry.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/Tboolexp.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/Tdekl.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/Tdekllist.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/Texp.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/Texpinfix.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/Texplist.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/Tfun.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/Tident.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/Tifthenelse.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/Tnumber.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/Tparlist.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/Tprogram.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/Tuminus.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/build.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/example.as +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/parser.cup +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter/scanner.flex +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/interpreter +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/JavaParser.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/JavaSymbol.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/Makefile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/TestLexer.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/build.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/java.flex +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/java12.cup +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/lexer-output.good +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/unicode.flex +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple/Makefile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple/Utility.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple/Yytoken.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple/output.good +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple/simple.flex +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple/test.txt +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/simple +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/standalone/Makefile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/standalone/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/standalone/build.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/standalone/sample.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/standalone/standalone.flex +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/standalone +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% diff --git a/java/jgrapht/Makefile b/java/jgrapht/Makefile index 12e1d3bdea9f..947fc6d446c8 100644 --- a/java/jgrapht/Makefile +++ b/java/jgrapht/Makefile @@ -14,19 +14,21 @@ USES= zip USE_JAVA= yes JAVA_VERSION= 1.6 1.7 +OPTIONS_DEFINE= DOCS + +.include + .if !defined(WITHOUT_COMPILE) USE_ANT= yes ALL_TARGET= jar -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ALL_TARGET+= javadoc .endif .else NO_BUILD= yes .endif -.if !defined(NOPORTDOCS) PORTDOCS= * -.endif PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar @@ -48,7 +50,7 @@ do-install: @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..." @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-jdk1.5.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar @${ECHO_MSG} " [DONE]" -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." @cd ${WRKSRC}/javadoc && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; @cd ${WRKSRC}/javadoc && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \; diff --git a/java/jmf/Makefile b/java/jmf/Makefile index 85053e170b24..283d9e367bf5 100644 --- a/java/jmf/Makefile +++ b/java/jmf/Makefile @@ -20,9 +20,9 @@ WRKSRC= ${WRKDIR}/JMF-${PORTVERSION} RESTRICTED= Redistribution of pre-compiled binaries is not permitted -.if !defined(NOPORTDOCS) +OPTIONS_DEFINE= DOCS + PORTDOCS= * -.endif .include @@ -47,9 +47,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/bin/jm* ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${WRKSRC}/lib/jmf.properties \ ${STAGEDIR}${JAVAJARDIR}/ -.if !defined(NOPORTDOCS) ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}/ -.endif .include diff --git a/java/langspec/Makefile b/java/langspec/Makefile index 2c532e659c9c..368298c61390 100644 --- a/java/langspec/Makefile +++ b/java/langspec/Makefile @@ -14,9 +14,7 @@ NO_BUILD= yes NO_WRKSUBDIR= yes PORTDOCS= * -.if defined(NOPORTDOCS) -IGNORE= installs *only* documentation, unset NOPORTDOCS -.endif +OPTIONS_SET_FORCE= DOCS do-install: @${ECHO} -n ">> Installing documentation in ${DOCSDIR}..."