svn commit: r395960 - in head: security/aescrypt security/amavis-stats security/bugs security/ccsrch security/cvm security/engine_pkcs11 security/gsasl security/ipv6toolkit security/libsparkcrypto ...
Dmitry Marakasov
amdmi3 at FreeBSD.org
Thu Sep 3 14:09:30 UTC 2015
Author: amdmi3
Date: Thu Sep 3 14:09:17 2015
New Revision: 395960
URL: https://svnweb.freebsd.org/changeset/ports/395960
Log:
- Switch to options helpers
- Add some NO_ARCHes
- Fix and unsilence some installation commands
- Other minor fixes
Approved by: portmgr blanket
Modified:
head/security/aescrypt/Makefile
head/security/amavis-stats/Makefile
head/security/bugs/Makefile
head/security/ccsrch/Makefile
head/security/cvm/Makefile
head/security/engine_pkcs11/Makefile
head/security/gsasl/Makefile
head/security/ipv6toolkit/Makefile
head/security/libsparkcrypto/Makefile
head/security/mac-robber/Makefile
head/security/opensaml2/Makefile
head/security/sancp/Makefile
head/security/switzerland/Makefile
head/sysutils/asusoled/Makefile
head/sysutils/cmospwd/Makefile
head/sysutils/daa2iso/Makefile
head/sysutils/dd_rescue/Makefile
head/sysutils/dupmerge/Makefile
head/sysutils/farbot/Makefile
head/sysutils/fusefs-chironfs/Makefile
head/sysutils/fusefs-cryptofs/Makefile
head/sysutils/fusefs-wikipediafs/Makefile
head/sysutils/fusefs-zip/Makefile
head/sysutils/hal/Makefile
head/sysutils/hfsexplorer/Makefile
head/sysutils/hourglass/Makefile
head/sysutils/jailrc/Makefile
head/sysutils/javaservicewrapper/Makefile
head/sysutils/ldap-account-manager/Makefile
head/sysutils/logwatch/Makefile
head/sysutils/pax-utils/Makefile
head/sysutils/slack/Makefile
head/sysutils/tbku/Makefile
head/sysutils/tenshi/Makefile
head/sysutils/tren/Makefile
head/sysutils/ucspi-ipc/Makefile
head/sysutils/ucspi-unix/Makefile
head/sysutils/uif2iso/Makefile
head/sysutils/usermatic/Makefile
head/sysutils/userneu-devel/Makefile
head/sysutils/userneu/Makefile
head/sysutils/vobcopy/Makefile
head/textproc/dblatex/Makefile
head/textproc/dictem/Makefile
head/textproc/elasticsearch/Makefile
head/textproc/gdome2/Makefile
head/textproc/google-ctemplate/Makefile
head/textproc/hevea/Makefile
head/textproc/jakarta-commons-digester/Makefile
head/textproc/jq/Makefile
head/textproc/liblingoteach/Makefile
head/textproc/perl2html/Makefile
head/textproc/redet/Makefile
head/textproc/sablotron/Makefile
head/textproc/spiff/Makefile
head/textproc/templates_parser/Makefile
head/textproc/words/Makefile
head/textproc/xmlenc/Makefile
head/textproc/xmlstarlet/Makefile
head/textproc/xqilla/Makefile
head/textproc/xslint/Makefile
head/textproc/xstream/Makefile
Modified: head/security/aescrypt/Makefile
==============================================================================
--- head/security/aescrypt/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/security/aescrypt/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -21,17 +21,14 @@ BINS= aescrypt aesget
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
.for f in ${BINS}
${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/${f}.1 ${STAGEDIR}${MANPREFIX}/man/man1
.endfor
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README.html ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/security/amavis-stats/Makefile
==============================================================================
--- head/security/amavis-stats/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/security/amavis-stats/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -19,13 +19,14 @@ perl_CMD= ${PERL} -w
USE_PHP= pcre
NO_BUILD= yes
+NO_ARCH= yes
PORTDOCS= README
AMAVISUSER?= amavis
AMAVISGROUP?= amavis
-USERS= ${AMAVISUSER}
-GROUPS= ${AMAVISGROUP}
+USERS= ${AMAVISUSER}
+GROUPS= ${AMAVISGROUP}
PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} USERS=${USERS} GROUPS=${GROUPS}
PKGMESSAGE= ${WRKDIR}/pkg-message
@@ -34,20 +35,17 @@ SUB_FILES= pkg-message
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/amavis-stats ${STAGEDIR}${PREFIX}/sbin
- ${INSTALL_DATA} ${WRKSRC}/amavis-stats.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/amavis-stats.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
${MKDIR} ${STAGEDIR}${PREFIX}/www/amavis-stats
${MKDIR} ${STAGEDIR}${PREFIX}/www/amavis-stats/img
${TOUCH} ${STAGEDIR}${PREFIX}/www/amavis-stats/img/.keep
${INSTALL_DATA} ${WRKSRC}/amavis-stats.php ${STAGEDIR}${PREFIX}/www/amavis-stats
cd ${STAGEDIR}${PREFIX}/www/amavis-stats && ${LN} -s amavis-stats.php index.php
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/security/bugs/Makefile
==============================================================================
--- head/security/bugs/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/security/bugs/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -22,8 +22,6 @@ DOCSDIR= ${PREFIX}/${DISTNAME}/doc
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
post-patch:
# Sanitize permissions so "make clean" can work
@${CHMOD} +x ${WRKSRC}/lib/unix ${WRKSRC}/lib/windows
@@ -50,10 +48,10 @@ post-install:
.for file in bchat bcrypt bhide bkey block blogin bmore bpass bpassdel bunlock
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${DISTNAME}/${file}
.endfor
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-.endif
test: build
${MAKE_CMD} -C ${WRKSRC} test
Modified: head/security/ccsrch/Makefile
==============================================================================
--- head/security/ccsrch/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/security/ccsrch/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -18,17 +18,13 @@ USES= tar:tgz
PORTDOCS= README
PLIST_FILES= bin/${PORTNAME}
-.include <bsd.port.options.mk>
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}; \
for f in ${PORTDOCS}; do \
${INSTALL_DATA} ${WRKSRC}/$$f ${STAGEDIR}${DOCSDIR}; \
done
-.endif
.include <bsd.port.mk>
Modified: head/security/cvm/Makefile
==============================================================================
--- head/security/cvm/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/security/cvm/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -36,8 +36,6 @@ VCHKPW_ALL_TARGET= cvm-vchkpw
VCHKPW_BUILD_DEPENDS= ${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
-.include <bsd.port.options.mk>
-
do-configure:
${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/conf-home
${ECHO_CMD} "${STAGEDIR}${PREFIX}/bin" > ${WRKSRC}/conf-bin
@@ -52,9 +50,9 @@ post-install:
.for l in command local module qmail sasl sql udp v1client v2client
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}-${l}.so*
.endfor
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/security/engine_pkcs11/Makefile
==============================================================================
--- head/security/engine_pkcs11/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/security/engine_pkcs11/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -25,10 +25,6 @@ CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENS
PORTDOCS= *
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=--enable-doc
-.endif
+DOCS_CONFIGURE_ON= --enable-doc
.include <bsd.port.mk>
Modified: head/security/gsasl/Makefile
==============================================================================
--- head/security/gsasl/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/security/gsasl/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -34,15 +34,13 @@ post-patch:
@${REINPLACE_CMD} -e '/^en@/d' \
${WRKSRC}/lib/po/LINGUAS ${WRKSRC}/po/LINGUAS
-.include <bsd.port.options.mk>
-
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgsasl.so
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/reference
- @${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/doc/reference/html/* \
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/reference/html/* \
${STAGEDIR}${DOCSDIR}/reference
-.endif
.include <bsd.port.mk>
Modified: head/security/ipv6toolkit/Makefile
==============================================================================
--- head/security/ipv6toolkit/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/security/ipv6toolkit/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -24,8 +24,6 @@ LIBDIRS= libipv6
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
post-extract:
@cd ${WRKSRC} && ${MKDIR} ${PROGDIRS} ${LIBDIRS}
@@ -41,9 +39,9 @@ post-patch: apply-slist
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/tools/blackhole6 ${WRKSRC}/tools/script6 \
${STAGEDIR}${PREFIX}/sbin
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/security/libsparkcrypto/Makefile
==============================================================================
--- head/security/libsparkcrypto/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/security/libsparkcrypto/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -28,13 +28,8 @@ MAKE_ENV+= SPARKARCH=${SPARKARCH} \
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+= adabrowse:${PORTSDIR}/textproc/adabrowse
-.else
-MAKE_ENV+= NO_APIDOC=true
-.endif
+DOCS_BUILD_DEPENDS= adabrowse:${PORTSDIR}/textproc/adabrowse
+DOCS_MAKE_ENV_OFF= NO_APIDOC=true
post-patch:
# ports passed unwanted ARCH definition to Makefile
Modified: head/security/mac-robber/Makefile
==============================================================================
--- head/security/mac-robber/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/security/mac-robber/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -14,20 +14,16 @@ LICENSE= GPLv2
PLIST_FILES= bin/mac-robber
PORTDOCS= CHANGES README
+OPTIONS_DEFINE= DOCS
+
do-build:
cd ${WRKSRC}; ${CC} ${CFLAGS} -o mac-robber mac-robber.c
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/mac-robber ${STAGEDIR}${PREFIX}/bin
-OPTIONS_DEFINE= DOCS
-
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/security/opensaml2/Makefile
==============================================================================
--- head/security/opensaml2/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/security/opensaml2/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -25,14 +25,11 @@ USE_LDCONFIG= yes
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} -e 's,^pkgdocdir.*=.*,pkgdocdir = ${DOCSDIR},' \
${WRKSRC}/doc/Makefile.in
-.if empty(PORT_OPTIONS:MDOCS)
+post-patch-DOCS-off:
@${REINPLACE_CMD} -e '/^SUBDIRS/s,doc ,,' ${WRKSRC}/Makefile.in
-.endif
.include <bsd.port.mk>
Modified: head/security/sancp/Makefile
==============================================================================
--- head/security/sancp/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/security/sancp/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -31,8 +31,6 @@ MAKE_ARGS= CFLAGS="${CFLAGS}" CXXFLAGS="
LFLAGS="${LDFLAGS}"
SUB_FILES= pkg-message
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} -e 's|gcc|$${CC}|g ; s|g++|$${CXX}|g' \
${WRKSRC}/Makefile
@@ -43,9 +41,9 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/etc/sancp/sancp.conf \
${STAGEDIR}${PREFIX}/etc/sancp.conf.sample
${MKDIR} ${STAGEDIR}/var/log/sancp
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/security/switzerland/Makefile
==============================================================================
--- head/security/switzerland/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/security/switzerland/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -5,32 +5,27 @@ PORTNAME= switzerland
PORTVERSION= 0.1.0
CATEGORIES= security python
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/zero%20point%20one
-EXTRACT_SUFX= .tgz
MAINTAINER= cs at FreeBSD.org
COMMENT= Test the integrity of communications over networks and firewalls
LICENSE= GPLv3
-USES= python
+USES= python tar:tgz
USE_PYTHON= distutils
PORTDOCS= *
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} -e 's,gcc -O3,${CC} ${CFLAGS}, ; \
s,"Switzerland","switzerland", ; \
s,"0\.0","${PORTVERSION}",' ${WRKSRC}/setup.py
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/BUGS.txt ${WRKSRC}/README.txt \
${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/sysutils/asusoled/Makefile
==============================================================================
--- head/sysutils/asusoled/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/asusoled/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -27,17 +27,15 @@ FONTDIR?= ${LOCALBASE}/share/fonts
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/asusoled ${STAGEDIR}${PREFIX}/sbin
+ ${INSTALL_PROGRAM} ${WRKSRC}/asusoled ${STAGEDIR}${PREFIX}/sbin
@${MKDIR} ${STAGEDIR}${DATADIR}
.for i in ${PORTDATA}
- @${INSTALL_DATA} ${WRKSRC}/data/${i} ${STAGEDIR}${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/data/${i} ${STAGEDIR}${DATADIR}
.endfor
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
- @${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README.FreeBSD
-.endif
+ ${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README.FreeBSD
.include <bsd.port.mk>
Modified: head/sysutils/cmospwd/Makefile
==============================================================================
--- head/sysutils/cmospwd/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/cmospwd/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -21,13 +21,9 @@ ONLY_FOR_ARCHS= i386 amd64
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
-post-patch:
-.if ${PORT_OPTIONS:MDOCS}
+post-patch-DOCS-on:
@${REINPLACE_CMD} -e "s/`${ECHO_CMD} -e '\r'`*$$//" \
${WRKSRC}/cmospwd.txt
-.endif
do-build:
${CC} ${CFLAGS} ${WRKSRC}/src/${PORTNAME}.c -o ${WRKSRC}/${PORTNAME}
Modified: head/sysutils/daa2iso/Makefile
==============================================================================
--- head/sysutils/daa2iso/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/daa2iso/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -19,20 +19,16 @@ WRKSRC= ${WRKDIR}/src
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} 's|exit(1)|exit(0)|' \
${WRKSRC}/daa2iso.c
@${REINPLACE_CMD} 's|/usr/local|${STAGEDIR}${PREFIX}|' \
${WRKSRC}/Makefile
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
.for doc in COPYING daa2iso.txt
${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR}
.endfor
-.endif
.include <bsd.port.mk>
Modified: head/sysutils/dd_rescue/Makefile
==============================================================================
--- head/sysutils/dd_rescue/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/dd_rescue/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -22,17 +22,14 @@ ALL_TARGET= default
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/dd_rescue ${STAGEDIR}${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/libddr_hash.so ${STAGEDIR}${PREFIX}/lib
${INSTALL_PROGRAM} ${WRKSRC}/libddr_null.so ${STAGEDIR}${PREFIX}/lib
${INSTALL_MAN} ${WRKSRC}/dd_rescue.1 ${STAGEDIR}${PREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README.dd_rescue ${STAGEDIR}${DOCSDIR}
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/sysutils/dupmerge/Makefile
==============================================================================
--- head/sysutils/dupmerge/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/dupmerge/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -10,8 +10,8 @@ MAINTAINER= ports at FreeBSD.org
COMMENT= Searches for files with equal content
USES= zip
-MAKE_FLAGS=
-MAKEFILE=
+MAKE_FLAGS= # empty
+MAKEFILE= # empty
LDFLAGS+= -lroken -lcrypt
ALL_TARGET= dupmerge
PLIST_FILES= bin/dupmerge
@@ -19,13 +19,11 @@ PORTDOCS= readme.txt
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/dupmerge ${STAGEDIR}${PREFIX}/bin/
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}/
-.endif
.include <bsd.port.mk>
Modified: head/sysutils/farbot/Makefile
==============================================================================
--- head/sysutils/farbot/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/farbot/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -20,16 +20,15 @@ USES= python
USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= farb
PYDISTUTILS_PKGVERSION= 0.1
+NO_ARCH= yes
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
post-install:
${INSTALL_DATA} ${WRKSRC}/farbot.conf ${STAGEDIR}${PREFIX}/etc/farbot.conf.sample
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}/xhtml
${INSTALL_MAN} ${WRKSRC}/docs/xhtml/* ${STAGEDIR}${DOCSDIR}/xhtml
-.endif
.include <bsd.port.mk>
Modified: head/sysutils/fusefs-chironfs/Makefile
==============================================================================
--- head/sysutils/fusefs-chironfs/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/fusefs-chironfs/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -21,12 +21,10 @@ PORTDOCS= *
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
post-patch:
-.if empty(PORT_OPTIONS:MDOCS)
- @${REINPLACE_CMD} -e 's, doc , ,' ${WRKSRC}/Makefile.in
-.endif
@${REINPLACE_CMD} -e 's,-liconv,${ICONV_LIB},' ${WRKSRC}/src/Makefile.*
+post-patch-DOCS-off:
+ @${REINPLACE_CMD} -e 's, doc , ,' ${WRKSRC}/Makefile.in
+
.include <bsd.port.mk>
Modified: head/sysutils/fusefs-cryptofs/Makefile
==============================================================================
--- head/sysutils/fusefs-cryptofs/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/fusefs-cryptofs/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -20,12 +20,8 @@ DOCS= README cryptofs.conf
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/sysutils/fusefs-wikipediafs/Makefile
==============================================================================
--- head/sysutils/fusefs-wikipediafs/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/fusefs-wikipediafs/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -16,22 +16,22 @@ LICENSE= GPLv2
RUN_DEPENDS= py*-fusefs>=0.2:${PORTSDIR}/devel/py-fusefs
USES= fuse python
-USE_PYTHON= distutils autoplist
+USE_PYTHON= autoplist distutils
PORTDOCS= AUTHORS ChangeLog HACKING NEWS README TODO
+NO_ARCH= yes
OPTIONS_DEFINE= DOCS
PLIST_FILES= man/man1/mount.${PORTNAME}.1.gz
-.include <bsd.port.options.mk>
post-extract:
@${GUNZIP_CMD} ${WRKSRC}/doc/*gz
post-install:
- @cd ${WRKSRC}/doc/&&${INSTALL_MAN} mount.${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/
-.if ${PORT_OPTIONS:MDOCS}
- @${INSTALL} -d ${STAGEDIR}${DOCSDIR}/
- @cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-.endif
+ @cd ${WRKSRC}/doc && ${INSTALL_MAN} mount.${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/
+
+post-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
.include <bsd.port.mk>
Modified: head/sysutils/fusefs-zip/Makefile
==============================================================================
--- head/sysutils/fusefs-zip/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/fusefs-zip/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -21,8 +21,6 @@ PORTDOCS= README TODO changelog
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} -e 's|make|$${MAKE}|' ${WRKSRC}/Makefile
@@ -30,10 +28,8 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/sysutils/hal/Makefile
==============================================================================
--- head/sysutils/hal/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/hal/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -95,13 +95,13 @@ post-install:
${STAGEDIR}${PREFIX}/share/hal/fdi/policy/10osvendor
${INSTALL_SCRIPT} ${FILESDIR}/mount-fuse \
${STAGEDIR}${PREFIX}/share/hal/mount-fuse
-.if ${PORT_OPTIONS:MDOCS}
+ @${MKDIR} ${STAGEDIR}/var/lib/hal
+
+post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \
${STAGEDIR}${DOCSDIR}/README.freebsd
${INSTALL_DATA} ${WRKDIR}/README.fuse \
${STAGEDIR}${DOCSDIR}/README.fuse
-.endif
- @${MKDIR} ${STAGEDIR}/var/lib/hal
.include <bsd.port.post.mk>
Modified: head/sysutils/hfsexplorer/Makefile
==============================================================================
--- head/sysutils/hfsexplorer/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/hfsexplorer/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -27,8 +27,6 @@ OPTIONS_DEFINE= DOCS
NO_ARCH= yes
WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_PROJECT}-${DISTVERSION}
-.include <bsd.port.options.mk>
-
do-configure:
@cd ${WRKSRC}/dist/bin && ${REINPLACE_CMD} -e 's|BASEDIR=".*"|BASEDIR="${DATADIR}/lib"|g' \
hfsx.sh resview.sh unhfs.sh
@@ -39,12 +37,6 @@ do-build:
@cd ${WRKSRC} && ${SH} buildall.sh
do-install:
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- @cd ${WRKSRC}/dist/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}/
-.endif
-
-post-install:
@${MKDIR} ${STAGEDIR}${DATADIR}/lib
@${MKDIR} ${STAGEDIR}${DATADIR}/res
.for f in hfsx.sh resview.sh unhfs.sh
@@ -54,4 +46,8 @@ post-install:
@cd ${WRKSRC} && ${INSTALL_DATA} dist/lib/*.jar ${STAGEDIR}${DATADIR}/lib
@cd ${WRKSRC} && ${INSTALL_DATA} dist/res/icon.png ${STAGEDIR}${DATADIR}/res
+do-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @cd ${WRKSRC}/dist/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}/
+
.include <bsd.port.mk>
Modified: head/sysutils/hourglass/Makefile
==============================================================================
--- head/sysutils/hourglass/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/hourglass/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -19,8 +19,6 @@ PORTDOCS= CALIBRATION
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
THREAD_LIBS= -pthread
post-patch:
@@ -31,12 +29,10 @@ post-patch:
@${REINPLACE_CMD} -e 's,%THREAD_CFLAGS%,${THREAD_CFLAGS},g' \
${WRKSRC}/configure
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
-. for doc in ${PORTDOCS}
+.for doc in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
-. endfor
-.endif
+.endfor
.include <bsd.port.mk>
Modified: head/sysutils/jailrc/Makefile
==============================================================================
--- head/sysutils/jailrc/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/jailrc/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -11,17 +11,14 @@ MAINTAINER= mm at FreeBSD.org
COMMENT= Improved jail startup/shutdown script
NO_BUILD= yes
+NO_ARCH= yes
NO_INSTALL= yes
USE_RC_SUBR= jailrc
PORTDOCS= *
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
@${INSTALL_DATA} ${FILESDIR}/README ${STAGEDIR}${DOCSDIR}/README
-.endif
.include <bsd.port.mk>
Modified: head/sysutils/javaservicewrapper/Makefile
==============================================================================
--- head/sysutils/javaservicewrapper/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/javaservicewrapper/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -40,9 +40,9 @@ do-install:
cd ${WRKSRC} && ${CP} -rp bin conf lib test ${STAGEDIR}${DATADIR}
${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/wrapper
${LN} -sf ${DATADIR}/bin/wrapper ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/sysutils/ldap-account-manager/Makefile
==============================================================================
--- head/sysutils/ldap-account-manager/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/ldap-account-manager/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -15,6 +15,7 @@ RUN_DEPENDS= p5-Quota>=0:${PORTSDIR}/sys
p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
NO_BUILD= yes
+NO_ARCH= yes
USES= gettext perl5 tar:bzip2
USE_PHP= gettext hash iconv ldap mcrypt pcre session simplexml spl xml json zip openssl
WANT_PHP_WEB= yes
@@ -28,8 +29,6 @@ WRITEABLES= config sess tmp
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
@${ECHO_CMD} '@exec if [ -f %D/${WWWDIR_REL}/config/shells ]; then ${RM} -f %D/${WWWDIR_REL}/config/shells; fi' >> ${TMPPLIST}
.for CONFIG in ${CONFIGS}
@@ -48,9 +47,9 @@ do-install:
.endfor
@${ECHO_CMD} '@exec ${CHOWN} ${WWWOWN} %D/${WWWDIR_REL}/${DIR}/lib/lamdaemon.pl' >> ${TMPPLIST}
@${ECHO_CMD} '@exec ${CHMOD} u+x %D/${WWWDIR_REL}/${DIR}/lib/lamdaemon.pl' >> ${TMPPLIST}
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
@cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/sysutils/logwatch/Makefile
==============================================================================
--- head/sysutils/logwatch/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/logwatch/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -20,11 +20,10 @@ USE_PERL5= run
SHEBANG_FILES= scripts/logwatch.pl
PORTDOCS= HOWTO-Customize-LogWatch README
NO_BUILD= yes
+NO_ARCH= yes
MAKE_ENV+= SITE_PERL_REL=${SITE_PERL_REL}
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
pre-configure:
@${CP} ${FILESDIR}/Makefile ${WRKSRC}
@@ -44,11 +43,9 @@ post-patch:
-e "s,/var/cache/logwatch,${LOCALBASE}/var/${PORTNAME}," \
${WRKSRC}/conf/logwatch.conf
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_MAN} ${WRKSRC}/HOWTO-Customize-LogWatch ${STAGEDIR}${DOCSDIR}
- ${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
+ ${INSTALL_DATA} ${WRKSRC}/HOWTO-Customize-LogWatch ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Modified: head/sysutils/pax-utils/Makefile
==============================================================================
--- head/sysutils/pax-utils/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/pax-utils/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -21,17 +21,14 @@ PORTDOCS= BUGS README TODO
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-.endif
-
.for f in dumpelf pspax scanelf scanmacho
${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/man/${f}.1 ${STAGEDIR}${PREFIX}/man/man1
.endfor
+do-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+
.include <bsd.port.mk>
Modified: head/sysutils/slack/Makefile
==============================================================================
--- head/sysutils/slack/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/slack/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -14,6 +14,7 @@ COMMENT= Configuration management system
RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync
USES= perl5 gmake
+NO_ARCH= yes
PORTDOCS= ChangeLog COPYING CREDITS FAQ GPL README TODO \
fixfiles-and-dirs.txt slack-intro
@@ -22,11 +23,9 @@ MAKE_ARGS= prefix=${PREFIX} exec_prefix=
localstatedir=/var
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
pre-build:
${REINPLACE_CMD} -e '1s,^#!.*perl,#!${PERL},' ${WRKSRC}/test/gen_config_file
-
+
post-build:
@for f in ${WRKSRC}/src/build/*; do \
${REINPLACE_CMD} -e '1s,^#!.*perl,#!${PERL},' $$f; \
@@ -34,17 +33,17 @@ post-build:
post-install:
@${INSTALL_DATA} ${WRKSRC}/src/build/slack.conf ${STAGEDIR}${PREFIX}/etc/slack.conf.sample
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/CREDITS ${STAGEDIR}${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/FAQ ${STAGEDIR}${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/GPL ${STAGEDIR}${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/doc/fixfiles-and-dirs.txt ${STAGEDIR}${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/doc/slack-intro ${STAGEDIR}${DOCSDIR}
-.endif
+ ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/CREDITS ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/FAQ ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/GPL ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/fixfiles-and-dirs.txt ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/slack-intro ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Modified: head/sysutils/tbku/Makefile
==============================================================================
--- head/sysutils/tbku/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/tbku/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -9,20 +9,18 @@ MASTER_SITES= http://www.tundraware.com/
MAINTAINER= tbku at tundraware.com
COMMENT= Tool For Incremental And Imaging Backups
-OPTIONS_DEFINE= DOCS
+NO_ARCH= yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE= DOCS
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in WHATSNEW.txt tbku-license.txt tbku.html tbku.pdf tbku.ps tbku.txt \
Imaging-FreeBSD-With-tbku.txt Imaging-FreeBSD-With-tbku.html \
Imaging-FreeBSD-With-tbku.pdf Imaging-FreeBSD-With-tbku.ps \
Imaging-SUSE-Linux-With-tbku.txt Imaging-SUSE-Linux-With-tbku.html \
Imaging-SUSE-Linux-With-tbku.pdf Imaging-SUSE-Linux-With-tbku.ps
- @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
.endfor
-.endif
.include <bsd.port.mk>
Modified: head/sysutils/tenshi/Makefile
==============================================================================
--- head/sysutils/tenshi/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/tenshi/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -16,6 +16,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/gtail:${P
USES= perl5
USE_PERL5= run build patch
NO_BUILD= yes
+NO_ARCH= yes
USE_RC_SUBR= tenshi
SUB_LIST= PERL=${PERL}
@@ -25,8 +26,6 @@ PLIST_FILES= bin/tenshi etc/tenshi.conf
PORTDOCS= README Changelog
-.include <bsd.port.options.mk>
-
post-patch:
@${PERL5} -pi.bak -e ' \
s"/usr/bin/perl"${PERL}" if $$. == 1; \
@@ -38,9 +37,9 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/tenshi ${STAGEDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/tenshi.conf ${STAGEDIR}${PREFIX}/etc/tenshi.conf.sample
${INSTALL_MAN} ${WRKSRC}/tenshi.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/sysutils/tren/Makefile
==============================================================================
--- head/sysutils/tren/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/tren/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -12,14 +12,12 @@ COMMENT= Powerful File And Directory Bat
USES= python
PLIST_FILES= bin/tren.py man/man1/tren.1.gz
PORTDOCS= WHATSNEW.txt tren-license.txt tren.html tren.pdf tren.ps tren.rst
-OPTIONS_DEFINE= DOCS
+NO_ARCH= yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE= DOCS
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}/
cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-.endif
.include <bsd.port.mk>
Modified: head/sysutils/ucspi-ipc/Makefile
==============================================================================
--- head/sysutils/ucspi-ipc/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/ucspi-ipc/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -19,8 +19,6 @@ WRKSRC= ${WRKDIR}/host/superscript.com/
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-configure:
${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/src/conf-cc
${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/src/conf-ld
@@ -36,9 +34,9 @@ do-install:
ipcexecrules ipcexecrulescheck ipcperl ipcrules ipcrulescheck ipcserver
${INSTALL_PROGRAM} ${WRKSRC}/command/${x} ${STAGEDIR}${PREFIX}/bin
.endfor
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC}/src && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/sysutils/ucspi-unix/Makefile
==============================================================================
--- head/sysutils/ucspi-unix/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/ucspi-unix/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -27,8 +27,6 @@ OPTIONS_DEFINE= DOCS
MAKE_JOBS_UNSAFE=yes
-.include <bsd.port.options.mk>
-
post-patch: .SILENT
${ECHO_CMD} "${STAGEDIR}${PREFIX}" > ${WRKSRC}/conf-home
${ECHO_CMD} "${STAGEDIR}${PREFIX}/bin" > ${WRKSRC}/conf-bin
@@ -40,9 +38,9 @@ post-patch: .SILENT
do-install:
cd ${WRKSRC} && ./installer
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/sysutils/uif2iso/Makefile
==============================================================================
--- head/sysutils/uif2iso/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/uif2iso/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -19,8 +19,6 @@ WRKSRC= ${WRKDIR}/src
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} 's|exit(1)|exit(0)|' \
${WRKSRC}/uif2iso.c
@@ -28,12 +26,10 @@ post-patch:
s|$$(DESTDIR)||' \
${WRKSRC}/Makefile
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
.for doc in README uif2iso.txt
${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR}
.endfor
-.endif
.include <bsd.port.mk>
Modified: head/sysutils/usermatic/Makefile
==============================================================================
--- head/sysutils/usermatic/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/usermatic/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -14,6 +14,7 @@ COMMENT= Scripts to automate the mainten
RUN_DEPENDS= ${PREFIX}/sbin/userneu.pl:${PORTSDIR}/sysutils/userneu
NO_BUILD= yes
+NO_ARCH= yes
USES= perl5 shebangfix
SHEBANG_FILES= digestion/digestion.pl hunter-seeker/hunter-seeker.pl \
newusers/newusers.pl reaper/reaper.pl
@@ -25,8 +26,6 @@ EXAMPLES= digestion/list_digested digest
newusers/sums_to_ignore
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
cd ${WRKSRC}/doc && ${INSTALL_MAN} digestion.pl.1 ${STAGEDIR}${MANPREFIX}/man/man1
cd ${WRKSRC}/doc && ${INSTALL_MAN} hunter-seeker.pl.8 newusers.pl.8 reaper.pl.8 ${STAGEDIR}${MANPREFIX}/man/man8
@@ -38,9 +37,9 @@ do-install:
cd ${WRKSRC}/newusers && ${INSTALL_SCRIPT} newusers.pl ${STAGEDIR}${PREFIX}/sbin
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/sysutils/userneu-devel/Makefile
==============================================================================
--- head/sysutils/userneu-devel/Makefile Thu Sep 3 14:03:33 2015 (r395959)
+++ head/sysutils/userneu-devel/Makefile Thu Sep 3 14:09:17 2015 (r395960)
@@ -23,6 +23,7 @@ USES= perl5 shebangfix
SHEBANG_FILES= userneu.pl smbrepair.pl
USE_PERL5= run
NO_BUILD= yes
+NO_ARCH= yes
CONFLICTS= userneu-1.*
@@ -33,8 +34,6 @@ PORTDOCS= ${LDOCS1} ${LDOCS2}
EXAMPLES= userlist userneu.conf.example
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
cd ${WRKSRC}/doc && ${INSTALL_MAN} userneu.8 ${STAGEDIR}${MANPREFIX}/man/man8
cd ${WRKSRC}/doc && ${INSTALL_MAN} userneu.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5
@@ -42,10 +41,10 @@ do-install:
${LN} -sf userneu.pl ${STAGEDIR}${PREFIX}/sbin/userquick
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list