svn commit: r360446 - in head/archivers: arc file-roller gzip javatar lha-ac libarchive libcomprex liborange libpar2 linux-f10-upx lzo2 makeself nomarch p7zip pear-Horde_Compress pigz py-lzma rar r...
Adam Weinberger
adamw at FreeBSD.org
Thu Jul 3 19:06:13 UTC 2014
Author: adamw
Date: Thu Jul 3 19:06:07 2014
New Revision: 360446
URL: http://svnweb.freebsd.org/changeset/ports/360446
QAT: https://qat.redports.org/buildarchive/r360446/
Log:
Reduce unnecessary bsd.port.options.mk inclusions by using OPTIONS helpers.
For liborange, reverse the logic, as I'm pretty sure the OPTIONS were being
used to disable the selected options.
Approved by: portmgr (blanket)
Modified:
head/archivers/arc/Makefile
head/archivers/file-roller/Makefile
head/archivers/gzip/Makefile
head/archivers/javatar/Makefile
head/archivers/lha-ac/Makefile
head/archivers/libarchive/Makefile
head/archivers/libcomprex/Makefile
head/archivers/liborange/Makefile
head/archivers/libpar2/Makefile
head/archivers/linux-f10-upx/Makefile
head/archivers/lzo2/Makefile
head/archivers/makeself/Makefile
head/archivers/nomarch/Makefile
head/archivers/p7zip/Makefile
head/archivers/pear-Horde_Compress/Makefile
head/archivers/pigz/Makefile
head/archivers/py-lzma/Makefile
head/archivers/rar/Makefile
head/archivers/rpm4/Makefile
head/archivers/ruby-zip/Makefile
head/archivers/squeeze/Makefile
head/archivers/squeeze/pkg-plist
head/archivers/unadf/Makefile
head/archivers/unarj/Makefile
head/archivers/xarchive/Makefile
head/archivers/xarchiver/Makefile
head/archivers/xmill/Makefile
Modified: head/archivers/arc/Makefile
==============================================================================
--- head/archivers/arc/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/arc/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -13,18 +13,16 @@ LICENSE= GPLv2
CONFLICTS= php5-arcanist-*
+OPTIONS_DEFINE= DOCS
+
PLIST_FILES= bin/arc bin/marc man/man1/arc.1.gz
PORTDOCS= Arc521.doc
-.include <bsd.port.pre.mk>
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/arc ${WRKSRC}/marc\
${STAGEDIR}/${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/arc.1 ${STAGEDIR}/${PREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}/${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/Arc521.doc ${STAGEDIR}/${DOCSDIR}
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/archivers/file-roller/Makefile
==============================================================================
--- head/archivers/file-roller/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/file-roller/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -25,6 +25,7 @@ USE_GNOME= gnomeprefix intlhack gnomedoc
GNOME_DESKTOP_VERSION=2
USE_XORG= sm
GNU_CONFIGURE= yes
+OPTIONS_SUB= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-packagekit
@@ -37,15 +38,8 @@ NAUTILUS_DESC= Enable Nautilus extension
OPTIONS_DEFAULT=NAUTILUS
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNAUTILUS}
-USE_GNOME+= nautilus2
-PLIST_SUB+= NAUTILUS=""
-.else
-PLIST_SUB+= NAUTILUS="@comment "
-CONFIGURE_ARGS+=--disable-nautilus-actions
-.endif
+NAUTILUS_USE= GNOME=nautilus2
+NAUTILUS_CONFIGURE_OFF= --disable-nautilus-actions
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
@@ -53,11 +47,9 @@ post-patch:
${WRKSRC}/src/fr-command-zip.c
post-install:
-.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
.endfor
-.endif
.include <bsd.port.mk>
Modified: head/archivers/gzip/Makefile
==============================================================================
--- head/archivers/gzip/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/gzip/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -21,18 +21,12 @@ OPTIONS_DEFINE= RSYNCABLE DOCS
OPTIONS_DEFAULT= RSYNCABLE
RSYNCABLE_DESC= Include --rsyncable patch
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MRSYNCABLE}
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-gzip-rsyncable.diff
-.endif
+RSYNCABLE_EXTRA_PATCHES= ${FILESDIR}/extra-patch-gzip-rsyncable.diff
post-install:
-.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for file in ${DOC_FILES}
@${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
.endfor
-.endif
.include <bsd.port.mk>
Modified: head/archivers/javatar/Makefile
==============================================================================
--- head/archivers/javatar/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/javatar/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -25,8 +25,6 @@ PLIST_FILES= ${JARFILES:S,^,%%JAVAJARDIR
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
@${ECHO_MSG} -n ">> Install JAR file in ${STAGEDIR}${JAVAJARDIR}..."
@${INSTALL_DATA} ${WRKSRC}/jars/tar.jar ${STAGEDIR}${JAVAJARDIR}/
Modified: head/archivers/lha-ac/Makefile
==============================================================================
--- head/archivers/lha-ac/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/lha-ac/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -22,14 +22,7 @@ MAN1_JA= lha-ac.1
PLIST_FILES+= ${__MANPAGES}
OPTIONS_DEFINE= NLS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-CONFIGURE_ARGS+= --disable-multibyte-filename
-.else
-CONFIGURE_ARGS+= --enable-multibyte-filename=auto
-.endif
+NLS_CONFIGURE_ENABLE= multibyte-filename=auto
do-install:
-${MKDIR} ${STAGEDIR}${PREFIX}/man/ja/man1
Modified: head/archivers/libarchive/Makefile
==============================================================================
--- head/archivers/libarchive/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/libarchive/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -78,31 +78,19 @@ CFLAGS+= "-I${LOCALBASE}/include"
CPPFLAGS+= "-I${LOCALBASE}/include"
LDFLAGS+= "-L${LOCALBASE}/lib"
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLIBXML2}
-USE_GNOME+= libxml2
-CONFIGURE_ARGS+= --with-xml2
-.else
-CFLAGS+= -DHAVE_BSDXML_H=1
-LDFLAGS+= -lbsdxml
-CONFIGURE_ARGS+= --without-xml2
-.endif
-
-.if ${PORT_OPTIONS:MLZO}
-LIB_DEPENDS= liblzo2.so:${PORTSDIR}/archivers/lzo2
-CONFIGURE_ARGS+= --with-lzo2
-.else
-CONFIGURE_ARGS+= --without-lzo2
-.endif
-
-.if ${PORT_OPTIONS:MNETTLE}
-LIB_DEPENDS+= nettle:${PORTSDIR}/security/nettle
-CONFIGURE_ARGS+= --without-openssl --with-nettle
-.else
-USE_OPENSSL= yes
-CONFIGURE_ARGS+= --with-openssl --without-nettle
-.endif
+LIBXML2_USE= GNOME=libxml2
+LIBXML2_CONFIGURE_WITH= xml2
+LIBXML2_CFLAGS= -DHAVE_BSDXML_H=1
+LIBXML2_LDFLAGS= -lbsdxml
+
+LZO_LIB_DEPENDS= liblzo2.so:${PORTSDIR}/archivers/lzo2
+LZO_CONFIGURE_WITH= lzo2
+
+NETTLE_LIB_DEPENDS= nettle:${PORTSDIR}/security/nettle
+NETTLE_CONFIGURE_WITH= nettle
+NETTLE_CONFIGURE_ON= --without-openssl
+NETTLE_USE_OFF= OPENSSL=yes
+NETTLE_CONFIGURE_OFF= --with-openssl
check:
(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} check)
Modified: head/archivers/libcomprex/Makefile
==============================================================================
--- head/archivers/libcomprex/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/libcomprex/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -20,9 +20,9 @@ USES= libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-NLS_USES+= gettext
-NLS_CPPFLAGS+= -I${LOCALBASE}/include
-NLS_LDFLAGS+= -L${LOCALBASE}/lib -lintl
+NLS_USES= gettext
+NLS_CPPFLAGS= -I${LOCALBASE}/include
+NLS_LDFLAGS= -L${LOCALBASE}/lib -lintl
NLS_CONFIGURE_ARGS= nls
.include <bsd.port.mk>
Modified: head/archivers/liborange/Makefile
==============================================================================
--- head/archivers/liborange/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/liborange/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -28,43 +28,34 @@ CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
+LIBSYNCE_LIB_DEPENDS= libsynce.so:${PORTSDIR}/palm/synce-libsynce
+LIBSYNCE_CONFIGURE_WITH= libsynce
+
+LIBDYNAMITE_LIB_DEPENDS= libdynamite.so:${PORTSDIR}/archivers/libdynamite
+LIBDYNAMITE_CONFIGURE_WITH= libdynamite
+
+LIBUNSHIELD_LIB_DEPENDS= libunshield.so:${PORTSDIR}/archivers/unshield
+LIBUNSHIELD_CONFIGURE_WITH= libunshield
+
+INNO_CONFIGURE_ENABLE= inno
+
+VISE_CONFIGURE_ENABLE= vise
+
+MSI_LIB_DEPENDS= libgsf-1.so.114:${PORTSDIR}/devel/libgsf
+MSI_CONFIGURE_ENABLE= msi libgsf
+
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MLIBSYNCE}
-CONFIGURE_ARGS+= --without-libsynce
REQUIRES+= libsynce
-.else
-LIB_DEPENDS+= libsynce.so:${PORTSDIR}/palm/synce-libsynce
-CONFIGURE_ARGS+= --with-libsynce
.endif
.if ${PORT_OPTIONS:MLIBDYNAMITE}
-CONFIGURE_ARGS+= --without-libdynamite
REQUIRES+= libdynamite
-.else
-LIB_DEPENDS+= libdynamite.so:${PORTSDIR}/archivers/libdynamite
-CONFIGURE_ARGS+= --with-libdynamite
.endif
.if ${PORT_OPTIONS:MLIBUNSHIELD}
-CONFIGURE_ARGS+= --without-libunshield
REQUIRES+= libunshield
-.else
-LIB_DEPENDS+= libunshield.so:${PORTSDIR}/archivers/unshield
-CONFIGURE_ARGS+= --with-libunshield
-.endif
-
-.if ${PORT_OPTIONS:MINNO}
-CONFIGURE_ARGS+= --enable-inno
-.endif
-
-.if ${PORT_OPTIONS:MVISE}
-CONFIGURE_ARGS+= --enable-vise
-.endif
-
-.if ${PORT_OPTIONS:MMSI}
-CONFIGURE_ARGS+= --enable-msi --with-libgsf
-LIB_DEPENDS+= libgsf-1.so.114:${PORTSDIR}/devel/libgsf
.endif
post-patch:
Modified: head/archivers/libpar2/Makefile
==============================================================================
--- head/archivers/libpar2/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/libpar2/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -24,17 +24,13 @@ USES= pkgconfig libtool
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} -e "s/-lstdc++//g" \
${WRKSRC}/Makefile.in \
${WRKSRC}/configure
post-install:
-.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/archivers/linux-f10-upx/Makefile
==============================================================================
--- head/archivers/linux-f10-upx/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/linux-f10-upx/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -25,4 +25,6 @@ PORTDOCS= BUGS COPYING LICENSE NEWS PRO
THANKS TODO elf-to-mem.txt filter.txt loader.txt selinux.txt
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+OPTIONS_DEFINE= DOCS
+
.include <bsd.port.mk>
Modified: head/archivers/lzo2/Makefile
==============================================================================
--- head/archivers/lzo2/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/lzo2/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -20,11 +20,7 @@ USE_LDCONFIG= yes
OPTIONS_DEFINE= DOCS EXAMPLES
-.include <bsd.port.options.mk>
-
-.if !${PORT_OPTIONS:MDOCS}
-INSTALL_TARGET= install-exec install-pkgincludeHEADERS
-.endif
+DOCS_INSTALL_TARGET_OFF= install-exec install-pkgincludeHEADERS
post-build:
.if !defined(WITHOUT_CHECKS)
@@ -35,17 +31,13 @@ post-build:
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblzo2.so.2
-.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,doc/,,' NEWS README
.for i in AUTHORS BUGS COPYING NEWS README THANKS
${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
.endfor
${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}/
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/examples/[a-z]*.[ch] ${STAGEDIR}${EXAMPLESDIR}/
-.endif
.include <bsd.port.mk>
Modified: head/archivers/makeself/Makefile
==============================================================================
--- head/archivers/makeself/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/makeself/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -26,8 +26,6 @@ PORTDOCS= README
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} -e \
's|#!/bin/sh|#!${LOCALBASE}/bin/bash|g' ${WRKSRC}/makeself.sh
@@ -38,9 +36,7 @@ do-install:
@${LN} -sf ${i}.sh ${STAGEDIR}${PREFIX}/bin/${i}
.endfor
-.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/archivers/nomarch/Makefile
==============================================================================
--- head/archivers/nomarch/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/nomarch/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -14,6 +14,8 @@ PLIST_FILES= bin/nomarch man/man1/nomarc
PORTDOCS= COPYING ChangeLog NEWS README TODO
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}"
+OPTIONS_DEFINE= DOCS
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/nomarch ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/nomarch.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
Modified: head/archivers/p7zip/Makefile
==============================================================================
--- head/archivers/p7zip/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/p7zip/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -24,8 +24,6 @@ CFLAGS_ia64= -fPIC
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
post-patch:
${SED} -e 's!g\+\+!${CXX}!' \
-e 's!gcc!${CC}!' \
Modified: head/archivers/pear-Horde_Compress/Makefile
==============================================================================
--- head/archivers/pear-Horde_Compress/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/pear-Horde_Compress/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -17,11 +17,8 @@ USE_HORDE_RUN= Horde_Exception \
Horde_Util \
Horde_Stream_Filter
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MZLIB}
-USE_PHP+= zlib
-.endif
+ZLIP_USE= PHP=zlib
+.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
.include <bsd.port.post.mk>
Modified: head/archivers/pigz/Makefile
==============================================================================
--- head/archivers/pigz/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/pigz/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -13,9 +13,7 @@ COMMENT= Parallel GZIP
USES= gmake
PLIST_FILES= bin/pigz bin/pigzn bin/pigzt bin/unpigz
-.if !defined(NO_INSTALL_MANPAGES)
PLIST_FILES+= man/man1/pigz.1.gz
-.endif
post-patch:
${REINPLACE_CMD} -e 's/ -lz/ -lm -lz/g' ${WRKSRC}/Makefile
@@ -24,8 +22,6 @@ do-install:
.for FILE in pigz pigzn pigzt unpigz
${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${PREFIX}/bin
.endfor
-.if !defined(NO_INSTALL_MANPAGES)
${INSTALL_MAN} ${WRKSRC}/pigz.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
-.endif
.include <bsd.port.mk>
Modified: head/archivers/py-lzma/Makefile
==============================================================================
--- head/archivers/py-lzma/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/py-lzma/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -27,12 +27,8 @@ PORTDOCS= usage.txt
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
post-install:
-.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/archivers/rar/Makefile
==============================================================================
--- head/archivers/rar/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/rar/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -23,6 +23,8 @@ PLIST_FILES= bin/rar lib/default.sfx etc
PORTDOCS= technote.txt license.txt whatsnew.txt order.htm \
readme.txt
+OPTIONS_DEFINE= DOCS
+
.include <bsd.port.pre.mk>
.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
Modified: head/archivers/rpm4/Makefile
==============================================================================
--- head/archivers/rpm4/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/rpm4/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -16,7 +16,7 @@ LIB_DEPENDS= libpopt.so:${PORTSDIR}/deve
libnss3.so:${PORTSDIR}/security/nss
BUILD_DEPENDS= ${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
-OPTIONS_DEFINE= PYTHON NLS
+OPTIONS_DEFINE= PYTHON NLS DOCS
OPTIONS_DEFAULT=PYTHON NLS
OPTIONS_SUB= yes
PYTHON_CONFIGURE_ENABLE=python
Modified: head/archivers/ruby-zip/Makefile
==============================================================================
--- head/archivers/ruby-zip/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/ruby-zip/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -22,6 +22,8 @@ NO_BUILD= yes
DOCS= ChangeLog NEWS README TODO
EXAMPLES= samples/*
+OPTIONS_DEFINE= DOCS EXAMPLES
+
do-install:
${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}/zip
${INSTALL_DATA} ${WRKSRC}/lib/zip/*.rb ${STAGEDIR}${RUBY_SITELIBDIR}/zip
Modified: head/archivers/squeeze/Makefile
==============================================================================
--- head/archivers/squeeze/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/squeeze/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -25,16 +25,11 @@ USE_GNOME= gtk20 glib20 intltool intlhac
USE_LDCONFIG= yes
MAKE_JOB_SAFE= yes
-OPTIONS_DEFINE= DOCS
+OPTIONS_DEFINE= DOCS
+OPTIONS_SUB= yes
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MDOCS}
-PLIST_SUB= GTKDOC=""
-.else
-PLIST_SUB= GTKDOC="@comment "
-.endif
-
post-patch:
# Needed to remove gtk-doc installation
.if empty(PORT_OPTIONS:MDOCS)
Modified: head/archivers/squeeze/pkg-plist
==============================================================================
--- head/archivers/squeeze/pkg-plist Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/squeeze/pkg-plist Thu Jul 3 19:06:07 2014 (r360446)
@@ -30,28 +30,28 @@ share/locale/tr/LC_MESSAGES/squeeze.mo
share/locale/uk/LC_MESSAGES/squeeze.mo
share/pixmaps/squeeze/archive-add.png
share/pixmaps/squeeze/archive-extract.png
-%%GTKDOC%%share/gtk-doc/html/libsqueeze/LSQArchive.html
-%%GTKDOC%%share/gtk-doc/html/libsqueeze/LSQArchiveCommand.html
-%%GTKDOC%%share/gtk-doc/html/libsqueeze/archiving.html
-%%GTKDOC%%share/gtk-doc/html/libsqueeze/home.png
-%%GTKDOC%%share/gtk-doc/html/libsqueeze/index.html
-%%GTKDOC%%share/gtk-doc/html/libsqueeze/index.sgml
-%%GTKDOC%%share/gtk-doc/html/libsqueeze/ix01.html
-%%GTKDOC%%share/gtk-doc/html/libsqueeze/left.png
-%%GTKDOC%%share/gtk-doc/html/libsqueeze/libsqueeze-LSQArchiveSupport.html
-%%GTKDOC%%share/gtk-doc/html/libsqueeze/libsqueeze-libsqueeze.html
-%%GTKDOC%%share/gtk-doc/html/libsqueeze/libsqueeze.devhelp
-%%GTKDOC%%share/gtk-doc/html/libsqueeze/libsqueeze.devhelp2
-%%GTKDOC%%share/gtk-doc/html/libsqueeze/libsqueeze.html
-%%GTKDOC%%share/gtk-doc/html/libsqueeze/right.png
-%%GTKDOC%%share/gtk-doc/html/libsqueeze/style.css
-%%GTKDOC%%share/gtk-doc/html/libsqueeze/up.png
+%%PORTDOCS%%share/gtk-doc/html/libsqueeze/LSQArchive.html
+%%PORTDOCS%%share/gtk-doc/html/libsqueeze/LSQArchiveCommand.html
+%%PORTDOCS%%share/gtk-doc/html/libsqueeze/archiving.html
+%%PORTDOCS%%share/gtk-doc/html/libsqueeze/home.png
+%%PORTDOCS%%share/gtk-doc/html/libsqueeze/index.html
+%%PORTDOCS%%share/gtk-doc/html/libsqueeze/index.sgml
+%%PORTDOCS%%share/gtk-doc/html/libsqueeze/ix01.html
+%%PORTDOCS%%share/gtk-doc/html/libsqueeze/left.png
+%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze-LSQArchiveSupport.html
+%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze-libsqueeze.html
+%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze.devhelp
+%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze.html
+%%PORTDOCS%%share/gtk-doc/html/libsqueeze/right.png
+%%PORTDOCS%%share/gtk-doc/html/libsqueeze/style.css
+%%PORTDOCS%%share/gtk-doc/html/libsqueeze/up.png
share/icons/hicolor/16x16/apps/squeeze.png
share/icons/hicolor/48x48/apps/squeeze.png
share/icons/hicolor/scalable/apps/squeeze.svg
share/applications/squeeze.desktop
@dirrmtry share/pixmaps/squeeze
-%%GTKDOC%%@dirrm share/gtk-doc/html/libsqueeze
+%%PORTDOCS%%@dirrm share/gtk-doc/html/libsqueeze
@dirrmtry libexec/thunar-archive-plugin
@dirrmtry include/libsqueeze-0.2/libsqueeze
@dirrmtry include/libsqueeze-0.2
Modified: head/archivers/unadf/Makefile
==============================================================================
--- head/archivers/unadf/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/unadf/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -43,6 +43,8 @@ FAQSIMGS= FAQ/image/adf_dir.gif FAQ/imag
PORTDOCS= *
+OPTIONS_DEFINE= DOCS
+
# XXX: work around an issue with automake-1.13 erroring out on a
# non-existent m4 directory before libtoolize creates it
pre-configure::
Modified: head/archivers/unarj/Makefile
==============================================================================
--- head/archivers/unarj/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/unarj/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -15,6 +15,8 @@ COMMENT= Allows files to be extracted fr
PLIST_FILES= bin/unarj
PORTDOCS= unarj.txt technote.txt
+OPTIONS_DEFINE= DOCS
+
post-patch:
${CP} ${FILESDIR}/sanitize.c ${WRKSRC}
Modified: head/archivers/xarchive/Makefile
==============================================================================
--- head/archivers/xarchive/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/xarchive/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -27,14 +27,14 @@ RPM_DESC= RPM archive support
ZIP_DESC= ZIP archive support
7ZIP_RUN_DEPENDS= 7z:${PORTSDIR}/archivers/p7zip
-ARJ_RUN_DEPENDS+= arj:${PORTSDIR}/archivers/arj
-ACE_RUN_DEPENDS+= unace:${PORTSDIR}/archivers/unace
-DEB_RUN_DEPENDS+= dpkg-deb:${PORTSDIR}/archivers/dpkg
-RAR_RUN_DEPENDS+= rar:${PORTSDIR}/archivers/rar \
+ARJ_RUN_DEPENDS= arj:${PORTSDIR}/archivers/arj
+ACE_RUN_DEPENDS= unace:${PORTSDIR}/archivers/unace
+DEB_RUN_DEPENDS= dpkg-deb:${PORTSDIR}/archivers/dpkg
+RAR_RUN_DEPENDS= rar:${PORTSDIR}/archivers/rar \
unrar:${PORTSDIR}/archivers/unrar
-RPM_RUN_DEPENDS+= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \
+RPM_RUN_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \
rpm:${PORTSDIR}/archivers/rpm4
-ZIP_RUN_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
+ZIP_RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip
.include <bsd.port.mk>
Modified: head/archivers/xarchiver/Makefile
==============================================================================
--- head/archivers/xarchiver/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/xarchiver/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -22,20 +22,16 @@ GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
OPTIONS_DEFINE= DOCS NLS
+OPTIONS_SUB= yes
-.include <bsd.port.options.mk>
+NLS_USES= gettext
+NLS_CPPFLAGS+= -I${LOCALBASE}/include
+NLS_LDFLAGS+= -L${LOCALBASE}/lib
-.if !empty(PORT_OPTIONS:MNLS)
-USES+= gettext
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-PLIST_SUB+= NLS=""
-.else
-PLIST_SUB+= NLS="@comment "
-.endif
+.include <bsd.port.options.mk>
post-patch:
-.if ! ${PORT_OPTIONS:MDOCS}
+.if empty(PORT_OPTIONS:MDOCS)
@${REINPLACE_CMD} -e 's|doc||g' ${WRKSRC}/Makefile.in
.endif
.if empty(PORT_OPTIONS:MNLS)
Modified: head/archivers/xmill/Makefile
==============================================================================
--- head/archivers/xmill/Makefile Thu Jul 3 18:57:48 2014 (r360445)
+++ head/archivers/xmill/Makefile Thu Jul 3 19:06:07 2014 (r360446)
@@ -23,8 +23,6 @@ PORTEXAMPLES= *
OPTIONS_DEFINE= DOCS EXAMPLES
-.include <bsd.port.options.mk>
-
post-patch:
# Allow to build with modern GCC
@${REINPLACE_CMD} -e 's,friend,& class,' ${WRKSRC}/XMill/*.?pp \
More information about the svn-ports-head
mailing list