aboutsummaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/asusoled/Makefile12
-rw-r--r--sysutils/cmospwd/Makefile6
-rw-r--r--sysutils/daa2iso/Makefile6
-rw-r--r--sysutils/dd_rescue/Makefile9
-rw-r--r--sysutils/dupmerge/Makefile10
-rw-r--r--sysutils/farbot/Makefile7
-rw-r--r--sysutils/fusefs-chironfs/Makefile8
-rw-r--r--sysutils/fusefs-cryptofs/Makefile6
-rw-r--r--sysutils/fusefs-wikipediafs/Makefile14
-rw-r--r--sysutils/fusefs-zip/Makefile6
-rw-r--r--sysutils/hal/Makefile6
-rw-r--r--sysutils/hfsexplorer/Makefile12
-rw-r--r--sysutils/hourglass/Makefile10
-rw-r--r--sysutils/jailrc/Makefile7
-rw-r--r--sysutils/javaservicewrapper/Makefile4
-rw-r--r--sysutils/ldap-account-manager/Makefile7
-rw-r--r--sysutils/logwatch/Makefile11
-rw-r--r--sysutils/pax-utils/Makefile11
-rw-r--r--sysutils/slack/Makefile27
-rw-r--r--sysutils/tbku/Makefile10
-rw-r--r--sysutils/tenshi/Makefile7
-rw-r--r--sysutils/tren/Makefile8
-rw-r--r--sysutils/ucspi-ipc/Makefile6
-rw-r--r--sysutils/ucspi-unix/Makefile6
-rw-r--r--sysutils/uif2iso/Makefile6
-rw-r--r--sysutils/usermatic/Makefile7
-rw-r--r--sysutils/userneu-devel/Makefile7
-rw-r--r--sysutils/userneu/Makefile9
-rw-r--r--sysutils/vobcopy/Makefile14
29 files changed, 97 insertions, 162 deletions
diff --git a/sysutils/asusoled/Makefile b/sysutils/asusoled/Makefile
index 99d4c12c9394..92b34364de9b 100644
--- a/sysutils/asusoled/Makefile
+++ b/sysutils/asusoled/Makefile
@@ -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>
diff --git a/sysutils/cmospwd/Makefile b/sysutils/cmospwd/Makefile
index b375c048b006..464a2bcbd765 100644
--- a/sysutils/cmospwd/Makefile
+++ b/sysutils/cmospwd/Makefile
@@ -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}
diff --git a/sysutils/daa2iso/Makefile b/sysutils/daa2iso/Makefile
index 994272e46921..443765dce7fc 100644
--- a/sysutils/daa2iso/Makefile
+++ b/sysutils/daa2iso/Makefile
@@ -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>
diff --git a/sysutils/dd_rescue/Makefile b/sysutils/dd_rescue/Makefile
index 21a1e8c17b4f..e31a805e3bd5 100644
--- a/sysutils/dd_rescue/Makefile
+++ b/sysutils/dd_rescue/Makefile
@@ -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>
diff --git a/sysutils/dupmerge/Makefile b/sysutils/dupmerge/Makefile
index ae454ae7f7a9..a4b53b140933 100644
--- a/sysutils/dupmerge/Makefile
+++ b/sysutils/dupmerge/Makefile
@@ -10,8 +10,8 @@ MAINTAINER= ports@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>
diff --git a/sysutils/farbot/Makefile b/sysutils/farbot/Makefile
index f23433466b6a..292a3311aa61 100644
--- a/sysutils/farbot/Makefile
+++ b/sysutils/farbot/Makefile
@@ -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>
diff --git a/sysutils/fusefs-chironfs/Makefile b/sysutils/fusefs-chironfs/Makefile
index c5c97f1e2f76..c6e6e56917fd 100644
--- a/sysutils/fusefs-chironfs/Makefile
+++ b/sysutils/fusefs-chironfs/Makefile
@@ -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>
diff --git a/sysutils/fusefs-cryptofs/Makefile b/sysutils/fusefs-cryptofs/Makefile
index d4b1ce892820..a6caf89e0aec 100644
--- a/sysutils/fusefs-cryptofs/Makefile
+++ b/sysutils/fusefs-cryptofs/Makefile
@@ -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>
diff --git a/sysutils/fusefs-wikipediafs/Makefile b/sysutils/fusefs-wikipediafs/Makefile
index fc8dfef4fad5..2d0d93b2ca07 100644
--- a/sysutils/fusefs-wikipediafs/Makefile
+++ b/sysutils/fusefs-wikipediafs/Makefile
@@ -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>
diff --git a/sysutils/fusefs-zip/Makefile b/sysutils/fusefs-zip/Makefile
index 8e23a099f7cf..72b6dd097a02 100644
--- a/sysutils/fusefs-zip/Makefile
+++ b/sysutils/fusefs-zip/Makefile
@@ -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>
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index db65793be3f5..9cf5be49fea2 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -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>
diff --git a/sysutils/hfsexplorer/Makefile b/sysutils/hfsexplorer/Makefile
index 09909ffb801b..7339ff2d27a2 100644
--- a/sysutils/hfsexplorer/Makefile
+++ b/sysutils/hfsexplorer/Makefile
@@ -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>
diff --git a/sysutils/hourglass/Makefile b/sysutils/hourglass/Makefile
index 89ccf75a18ce..81b7406dfac3 100644
--- a/sysutils/hourglass/Makefile
+++ b/sysutils/hourglass/Makefile
@@ -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>
diff --git a/sysutils/jailrc/Makefile b/sysutils/jailrc/Makefile
index d82523b77ef8..0233ef813e61 100644
--- a/sysutils/jailrc/Makefile
+++ b/sysutils/jailrc/Makefile
@@ -11,17 +11,14 @@ MAINTAINER= mm@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>
diff --git a/sysutils/javaservicewrapper/Makefile b/sysutils/javaservicewrapper/Makefile
index 324903a174a9..8bb2b9bf7bbf 100644
--- a/sysutils/javaservicewrapper/Makefile
+++ b/sysutils/javaservicewrapper/Makefile
@@ -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>
diff --git a/sysutils/ldap-account-manager/Makefile b/sysutils/ldap-account-manager/Makefile
index f13c0bbf3b93..2c715e679346 100644
--- a/sysutils/ldap-account-manager/Makefile
+++ b/sysutils/ldap-account-manager/Makefile
@@ -15,6 +15,7 @@ RUN_DEPENDS= p5-Quota>=0:${PORTSDIR}/sysutils/p5-Quota \
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>
diff --git a/sysutils/logwatch/Makefile b/sysutils/logwatch/Makefile
index ffb6e44c9234..858a9bfbbe75 100644
--- a/sysutils/logwatch/Makefile
+++ b/sysutils/logwatch/Makefile
@@ -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>
diff --git a/sysutils/pax-utils/Makefile b/sysutils/pax-utils/Makefile
index 536d2d187490..66fea6abf70b 100644
--- a/sysutils/pax-utils/Makefile
+++ b/sysutils/pax-utils/Makefile
@@ -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>
diff --git a/sysutils/slack/Makefile b/sysutils/slack/Makefile
index f6db3997cea1..8f85f7942cbf 100644
--- a/sysutils/slack/Makefile
+++ b/sysutils/slack/Makefile
@@ -14,6 +14,7 @@ COMMENT= Configuration management system designed to appeal to lazy admins
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=${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>
diff --git a/sysutils/tbku/Makefile b/sysutils/tbku/Makefile
index a9bd8154fbd2..4883b10ae786 100644
--- a/sysutils/tbku/Makefile
+++ b/sysutils/tbku/Makefile
@@ -9,20 +9,18 @@ MASTER_SITES= http://www.tundraware.com/Software/tbku/
MAINTAINER= tbku@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>
diff --git a/sysutils/tenshi/Makefile b/sysutils/tenshi/Makefile
index eb893ded468f..8f344b9765e4 100644
--- a/sysutils/tenshi/Makefile
+++ b/sysutils/tenshi/Makefile
@@ -16,6 +16,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/gtail:${PORTSDIR}/sysutils/coreutils \
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.sample man/man8/tenshi.8.gz
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>
diff --git a/sysutils/tren/Makefile b/sysutils/tren/Makefile
index 1f18e4933e51..ebaa71ddc128 100644
--- a/sysutils/tren/Makefile
+++ b/sysutils/tren/Makefile
@@ -12,14 +12,12 @@ COMMENT= Powerful File And Directory Batch Renaming Tool
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>
diff --git a/sysutils/ucspi-ipc/Makefile b/sysutils/ucspi-ipc/Makefile
index 696dcceabafe..f0f81151bddf 100644
--- a/sysutils/ucspi-ipc/Makefile
+++ b/sysutils/ucspi-ipc/Makefile
@@ -19,8 +19,6 @@ WRKSRC= ${WRKDIR}/host/superscript.com/net/${DISTNAME}
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>
diff --git a/sysutils/ucspi-unix/Makefile b/sysutils/ucspi-unix/Makefile
index 7b09a3a6a231..065da5e8237c 100644
--- a/sysutils/ucspi-unix/Makefile
+++ b/sysutils/ucspi-unix/Makefile
@@ -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>
diff --git a/sysutils/uif2iso/Makefile b/sysutils/uif2iso/Makefile
index 85dfa34af537..83d3596a4ce2 100644
--- a/sysutils/uif2iso/Makefile
+++ b/sysutils/uif2iso/Makefile
@@ -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>
diff --git a/sysutils/usermatic/Makefile b/sysutils/usermatic/Makefile
index 659106eb610a..8f4475d96888 100644
--- a/sysutils/usermatic/Makefile
+++ b/sysutils/usermatic/Makefile
@@ -14,6 +14,7 @@ COMMENT= Scripts to automate the maintenance of accounts
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 digestion/list_raw \
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>
diff --git a/sysutils/userneu-devel/Makefile b/sysutils/userneu-devel/Makefile
index 09737509f8ee..c50e4ecbddff 100644
--- a/sysutils/userneu-devel/Makefile
+++ b/sysutils/userneu-devel/Makefile
@@ -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}
cd ${WRKSRC} && ${INSTALL_DATA} ${LDOCS1} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC}/doc && ${INSTALL_DATA} ${LDOCS2} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
diff --git a/sysutils/userneu/Makefile b/sysutils/userneu/Makefile
index 4fee0d6dddfc..27a0ae823b5c 100644
--- a/sysutils/userneu/Makefile
+++ b/sysutils/userneu/Makefile
@@ -16,11 +16,12 @@ COMMENT= Account management and creation tool
LICENSE= GPLv2
RUN_DEPENDS= p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
- p5-Crypt-RandPasswd>=0:${PORTSDIR}/security/p5-Crypt-RandPasswd
+ p5-Crypt-RandPasswd>=0:${PORTSDIR}/security/p5-Crypt-RandPasswd
USES= perl5 shebangfix
USE_PERL5= run
NO_BUILD= yes
+NO_ARCH= yes
SHEBANG_FILES= userquick.pl smbrepair.pl userneu.pl
CONFLICTS= userneu-devel-[0-9]*
@@ -31,16 +32,14 @@ DOCS= BUGS CHANGES CREDITS REQUIREMENTS TODO \
EXAMPLES= list-sample
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
cd ${WRKSRC}/doc && ${INSTALL_MAN} userneu.8 userquick.8 ${STAGEDIR}${MANPREFIX}/man/man8
cd ${WRKSRC} && ${INSTALL_SCRIPT} ${SCRIPTS} ${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>
diff --git a/sysutils/vobcopy/Makefile b/sysutils/vobcopy/Makefile
index 3bbe0000a033..e2a0f0ea756c 100644
--- a/sysutils/vobcopy/Makefile
+++ b/sysutils/vobcopy/Makefile
@@ -24,8 +24,6 @@ PORTDOCS= COPYING Changelog README TODO \
alternative_programs.txt
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
post-extract:
@${CHMOD} a+x ${WRKSRC}/${CONFIGURE_SCRIPT}
@@ -56,14 +54,12 @@ post-configure:
${WRKSRC}/Makefile
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/vobcopy ${STAGEDIR}${PREFIX}/bin/vobcopy
- @${INSTALL_MAN} ${WRKSRC}/vobcopy.1${MAN1_SUFX} \
+ ${INSTALL_PROGRAM} ${WRKSRC}/vobcopy ${STAGEDIR}${PREFIX}/bin/vobcopy
+ ${INSTALL_MAN} ${WRKSRC}/vobcopy.1${MAN1_SUFX} \
${STAGEDIR}${MANPREFIX}/man/man1/vobcopy.1
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
- @${INSTALL} -d ${STAGEDIR}${DOCSDIR}
- @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
+do-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>