svn commit: r338542 - in head/archivers: bzip2 dact deutex freeze javatar lbrate macutils ocaml-bz2 rar ruby-libarchive torrentzip
Adam Weinberger
adamw at FreeBSD.org
Fri Jan 3 14:42:10 UTC 2014
Author: adamw
Date: Fri Jan 3 14:42:07 2014
New Revision: 338542
URL: http://svnweb.freebsd.org/changeset/ports/338542
Log:
Remove NOPORT* from archivers. The only holdouts here are ruby@ now.
Modified:
head/archivers/bzip2/Makefile
head/archivers/dact/Makefile
head/archivers/deutex/Makefile
head/archivers/freeze/Makefile
head/archivers/javatar/Makefile
head/archivers/lbrate/Makefile
head/archivers/macutils/Makefile
head/archivers/ocaml-bz2/Makefile
head/archivers/rar/Makefile
head/archivers/ruby-libarchive/Makefile
head/archivers/torrentzip/Makefile
Modified: head/archivers/bzip2/Makefile
==============================================================================
--- head/archivers/bzip2/Makefile Fri Jan 3 14:23:01 2014 (r338541)
+++ head/archivers/bzip2/Makefile Fri Jan 3 14:42:07 2014 (r338542)
@@ -24,6 +24,7 @@ MLINKS= bzip2.1 bunzip2.1 bzip2.1 bzc
.error You have `USE_BZIP2' variable defined either in environment or in make(1) arguments. Please undefine and try again.
.endif
+.include <bsd.port.options.mk>
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bzip2 ${PREFIX}/bin
${LN} -sf ${PREFIX}/bin/bzip2 ${PREFIX}/bin/bunzip2
@@ -42,7 +43,7 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/bzip2.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/bzgrep.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/bzmore.1 ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${PREFIX}/share/doc/bzip2
${INSTALL_DATA} ${WRKSRC}/manual* ${PREFIX}/share/doc/bzip2
${INSTALL_DATA} ${WRKSRC}/bzip2.txt ${PREFIX}/share/doc/bzip2
Modified: head/archivers/dact/Makefile
==============================================================================
--- head/archivers/dact/Makefile Fri Jan 3 14:23:01 2014 (r338541)
+++ head/archivers/dact/Makefile Fri Jan 3 14:42:07 2014 (r338542)
@@ -23,6 +23,7 @@ MAKE_ARGS= TOBUILD="dact libdact.so dact
MAN1= dact.1
USE_LDCONFIG= yes
+.include <bsd.port.options.mk>
post-patch:
@${REINPLACE_CMD} -e "s|prefix = @prefix@|prefix = ${PREFIX}|" \
-e "s|libdir = @libdir@|libdir = ${PREFIX}/lib|" \
@@ -32,11 +33,11 @@ pre-install:
@${RM} -f ${WRKSRC}/libdact.a
post-install:
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
@${MKDIR} ${EXAMPLESDIR}
${CP} -n ${WRKSRC}/dact.conf ${EXAMPLESDIR} || ${TRUE}
.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/Docs/dact.txt ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
Modified: head/archivers/deutex/Makefile
==============================================================================
--- head/archivers/deutex/Makefile Fri Jan 3 14:23:01 2014 (r338541)
+++ head/archivers/deutex/Makefile Fri Jan 3 14:42:07 2014 (r338542)
@@ -20,6 +20,8 @@ MAN6= ${PORTNAME}.6
PLIST_FILES= bin/deusf bin/deutex
PORTDOCS= *
+.include <bsd.port.options.mk>
+
post-extract:
@${REINPLACE_CMD} -e 's,-mkdir,mkdir -p,' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e 's,malloc\.h,stdlib.h,' ${WRKSRC}/src/tools.c
@@ -29,7 +31,7 @@ post-extract:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/deusf ${WRKSRC}/deutex ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/${MAN6} ${MANPREFIX}/man/man6
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/TODO ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/dtexman6.txt ${DOCSDIR}/MANUAL
Modified: head/archivers/freeze/Makefile
==============================================================================
--- head/archivers/freeze/Makefile Fri Jan 3 14:23:01 2014 (r338541)
+++ head/archivers/freeze/Makefile Fri Jan 3 14:42:07 2014 (r338542)
@@ -20,8 +20,10 @@ MAN1= freeze.1 melt.1 unfreeze.1 fcat.1
PLIST_FILES= bin/fcat bin/freeze bin/melt bin/statist bin/unfreeze
PORTDOCS= README
+.include <bsd.port.options.mk>
+
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
.endif
Modified: head/archivers/javatar/Makefile
==============================================================================
--- head/archivers/javatar/Makefile Fri Jan 3 14:23:01 2014 (r338541)
+++ head/archivers/javatar/Makefile Fri Jan 3 14:42:07 2014 (r338542)
@@ -24,11 +24,13 @@ PORTDOCS= api LICENSE License.html readm
JARFILES= tar.jar
PLIST_FILES= ${JARFILES:S,^,%%JAVAJARDIR%%/,}
+.include <bsd.port.options.mk>
+
do-install:
@${ECHO_MSG} -n ">> Install JAR file in ${JAVAJARDIR}..."
@${INSTALL_DATA} ${WRKSRC}/jars/tar.jar ${JAVAJARDIR}/
@${ECHO_MSG} " [ DONE ]"
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
@${MKDIR} ${DOCSDIR}
@cd ${WRKSRC}/doc && ${FIND} ${PORTDOCS} \
Modified: head/archivers/lbrate/Makefile
==============================================================================
--- head/archivers/lbrate/Makefile Fri Jan 3 14:23:01 2014 (r338541)
+++ head/archivers/lbrate/Makefile Fri Jan 3 14:42:07 2014 (r338542)
@@ -20,10 +20,12 @@ MAN1= lbrate.1
PORTDOCS= ChangeLog README TODO
PLIST_FILES= bin/lbrate
+.include <bsd.port.options.mk>
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/lbrate ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/lbrate.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
.endif
Modified: head/archivers/macutils/Makefile
==============================================================================
--- head/archivers/macutils/Makefile Fri Jan 3 14:23:01 2014 (r338541)
+++ head/archivers/macutils/Makefile Fri Jan 3 14:42:07 2014 (r338542)
@@ -23,6 +23,8 @@ DOCFILES= README.crc README.hexbin READM
README.zoom README.crc.orig README.macget README.scan \
README.unsit ../README
+.include <bsd.port.options.mk>
+
# The distribution has a naff install target which doesn't install man
# pages so here is a decent one.
#
@@ -44,7 +46,7 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/man/tomac.1 ${MANPREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/man/frommac.1 ${MANPREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/man/macutil.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${ECHO_MSG} "===> Installing supplementary documents..."
@${MKDIR} ${DOCSDIR}
.for file in ${DOCFILES}
Modified: head/archivers/ocaml-bz2/Makefile
==============================================================================
--- head/archivers/ocaml-bz2/Makefile Fri Jan 3 14:23:01 2014 (r338541)
+++ head/archivers/ocaml-bz2/Makefile Fri Jan 3 14:42:07 2014 (r338542)
@@ -27,7 +27,7 @@ PORTDOCS= *
.include <bsd.port.pre.mk>
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR})
Modified: head/archivers/rar/Makefile
==============================================================================
--- head/archivers/rar/Makefile Fri Jan 3 14:23:01 2014 (r338541)
+++ head/archivers/rar/Makefile Fri Jan 3 14:42:07 2014 (r338542)
@@ -44,7 +44,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/default.sfx ${PREFIX}/lib
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
.for i in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
Modified: head/archivers/ruby-libarchive/Makefile
==============================================================================
--- head/archivers/ruby-libarchive/Makefile Fri Jan 3 14:23:01 2014 (r338541)
+++ head/archivers/ruby-libarchive/Makefile Fri Jan 3 14:42:07 2014 (r338542)
@@ -21,8 +21,10 @@ WRKSRC= ${WRKDIR}/ext
DOCS= README.txt doc
+.include <bsd.port.options.mk>
+
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${RUBY_MODDOCDIR}
cd ${WRKDIR}; ${COPYTREE_SHARE} "${DOCS}" ${RUBY_MODDOCDIR}/
.endif
Modified: head/archivers/torrentzip/Makefile
==============================================================================
--- head/archivers/torrentzip/Makefile Fri Jan 3 14:23:01 2014 (r338541)
+++ head/archivers/torrentzip/Makefile Fri Jan 3 14:42:07 2014 (r338542)
@@ -23,7 +23,9 @@ PORTDOCS= README
run-autotools:: run-autotools-aclocal run-autotools-autoheader \
run-autotools-autoconf run-autotools-automake
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
pre-install:
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README
More information about the svn-ports-all
mailing list