diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2015-09-03 14:09:17 +0000 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2015-09-03 14:09:17 +0000 |
| commit | b9560a010dde5c10d0575a15a5862a211627e3ba (patch) | |
| tree | aa7d1cdb860adb0016f7fed0c6f208abcb26070a | |
| parent | be01f73a1cd89e19d5796464e935cc3cb8eb5033 (diff) | |
| download | FreeBSD-ports-b9560a010dde5c10d0575a15a5862a211627e3ba.zip FreeBSD-ports-b9560a010dde5c10d0575a15a5862a211627e3ba.tar.gz | |
- Switch to options helpers
- Add some NO_ARCHes
- Fix and unsilence some installation commands
- Other minor fixes
Approved by: portmgr blanket
62 files changed, 181 insertions, 328 deletions
diff --git a/security/aescrypt/Makefile b/security/aescrypt/Makefile index 8589694..a19b344 100644 --- a/security/aescrypt/Makefile +++ b/security/aescrypt/Makefile @@ -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> diff --git a/security/amavis-stats/Makefile b/security/amavis-stats/Makefile index ae7bf49..b175a5c 100644 --- a/security/amavis-stats/Makefile +++ b/security/amavis-stats/Makefile @@ -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> diff --git a/security/bugs/Makefile b/security/bugs/Makefile index ff6195f..0218831 100644 --- a/security/bugs/Makefile +++ b/security/bugs/Makefile @@ -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 diff --git a/security/ccsrch/Makefile b/security/ccsrch/Makefile index c649918..8c66bc5 100644 --- a/security/ccsrch/Makefile +++ b/security/ccsrch/Makefile @@ -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> diff --git a/security/cvm/Makefile b/security/cvm/Makefile index a0498c2..4e9262a 100644 --- a/security/cvm/Makefile +++ b/security/cvm/Makefile @@ -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> diff --git a/security/engine_pkcs11/Makefile b/security/engine_pkcs11/Makefile index ea30974..1470e77 100644 --- a/security/engine_pkcs11/Makefile +++ b/security/engine_pkcs11/Makefile @@ -25,10 +25,6 @@ CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ PORTDOCS= * -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+=--enable-doc -.endif +DOCS_CONFIGURE_ON= --enable-doc .include <bsd.port.mk> diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile index 3ee50d4..be464c9 100644 --- a/security/gsasl/Makefile +++ b/security/gsasl/Makefile @@ -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> diff --git a/security/ipv6toolkit/Makefile b/security/ipv6toolkit/Makefile index 34db523..6030763 100644 --- a/security/ipv6toolkit/Makefile +++ b/security/ipv6toolkit/Makefile @@ -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> diff --git a/security/libsparkcrypto/Makefile b/security/libsparkcrypto/Makefile index 6b086ce..ab2f232 100644 --- a/security/libsparkcrypto/Makefile +++ b/security/libsparkcrypto/Makefile @@ -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 diff --git a/security/mac-robber/Makefile b/security/mac-robber/Makefile index efe8536..ead0585 100644 --- a/security/mac-robber/Makefile +++ b/security/mac-robber/Makefile @@ -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> diff --git a/security/opensaml2/Makefile b/security/opensaml2/Makefile index 864e8bd..1410bd0 100644 --- a/security/opensaml2/Makefile +++ b/security/opensaml2/Makefile @@ -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> diff --git a/security/sancp/Makefile b/security/sancp/Makefile index 73f9937..933be99 100644 --- a/security/sancp/Makefile +++ b/security/sancp/Makefile @@ -31,8 +31,6 @@ MAKE_ARGS= CFLAGS="${CFLAGS}" CXXFLAGS="${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> diff --git a/security/switzerland/Makefile b/security/switzerland/Makefile index 25598bc..ac567b6 100644 --- a/security/switzerland/Makefile +++ b/security/switzerland/Makefile @@ -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@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> diff --git a/sysutils/asusoled/Makefile b/sysutils/asusoled/Makefile index 99d4c12..92b3436 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 b375c04..464a2bc 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 994272e..443765d 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 21a1e8c..e31a805 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 ae454ae..a4b53b1 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 f2343346..292a331 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 c5c97f1..c6e6e56 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 d4b1ce8..a6caf89 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 fc8dfef..2d0d93b 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 8e23a09..72b6dd0 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 db65793..9cf5be4 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 09909ff..7339ff2 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 89ccf75..81b7406 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 d82523b..0233ef8 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 324903a..8bb2b9b 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 f13c0bb..2c715e6 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 ffb6e44..858a9bf 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 536d2d1..66fea6a 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 f6db399..8f85f79 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 a9bd815..4883b10 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 eb893de..8f344b9 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 1f18e49..ebaa71d 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 696dcce..f0f8115 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 7b09a3a..065da5e 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 85dfa34..83d3596 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 659106e..8f4475d 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 0973750..c50e4ec 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 4fee0d6..27a0ae8 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 3bbe000..e2a0f0e 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> diff --git a/textproc/dblatex/Makefile b/textproc/dblatex/Makefile index d321341..0bb24ee 100644 --- a/textproc/dblatex/Makefile +++ b/textproc/dblatex/Makefile @@ -16,19 +16,18 @@ RUN_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \ USES= tar:bzip2 python:2 USE_PYTHON= distutils autoplist USE_TEX= tex +NO_ARCH= yes PYDISTUTILS_INSTALLARGS+= --catalogs=${LOCALBASE}/share/xml/catalog.ports OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: -.if ! ${PORT_OPTIONS:MDOCS} - @${REINPLACE_CMD} -e '/pdfdocs),/d ; /htmldoc)/d' ${WRKSRC}/setup.py -.endif @${REINPLACE_CMD} -e "s,share/man/man1,man/man1,g" ${WRKSRC}/setup.py +post-patch-DOCS-off: + @${REINPLACE_CMD} -e '/pdfdocs),/d ; /htmldoc)/d' ${WRKSRC}/setup.py + post-install: # shebangfix can't be used because dblatex is built from scratch ${REINPLACE_CMD} -e 's|/usr/bin/env python|${PREFIX}/bin/python2|' \ diff --git a/textproc/dictem/Makefile b/textproc/dictem/Makefile index 3334d99..65d7cbb 100644 --- a/textproc/dictem/Makefile +++ b/textproc/dictem/Makefile @@ -46,12 +46,10 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${SRC_EL} ${SRC_EL:S/.el$/.elc/} \ ${STAGEDIR}${PREFIX}/${LISPDIR}/ -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.post.mk> diff --git a/textproc/elasticsearch/Makefile b/textproc/elasticsearch/Makefile index cdaa062..7946952 100644 --- a/textproc/elasticsearch/Makefile +++ b/textproc/elasticsearch/Makefile @@ -112,11 +112,10 @@ do-install: cd ${STAGEDIR}${PREFIX}/lib/elasticsearch/sigar && ${LN} -s ${JAVAJARDIR}/sigar.jar cd ${STAGEDIR}${PREFIX}/lib/elasticsearch/sigar && ${LN} -s ${JAVAJARDIR}/${SIGAR_LIBNAME} -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile index 9cce228..a2d742c 100644 --- a/textproc/gdome2/Makefile +++ b/textproc/gdome2/Makefile @@ -23,17 +23,7 @@ OPTIONS_DEFINE= DOCS PORTDOCS= * -.include <bsd.port.options.mk> - post-patch: -.if ${PORT_OPTIONS:MDOCS} - @${REINPLACE_CMD} -E -e \ - 's,^(HTML_DIR *= *).*,\1\$$(DESTDIR)$$(prefix)/share/doc,' \ - ${WRKSRC}/gtk-doc/Makefile.in -.else - @${REINPLACE_CMD} '/gtk-doc/d' ${WRKSRC}/Makefile.in -.endif - @${FIND} ${WRKSRC} -type f -and \ '(' -name '*.[ch]' -or -name '*.xml' ')' | \ ${XARGS} ${REINPLACE_CMD} -e ' \ @@ -46,6 +36,14 @@ post-patch: s,<parserInternals\.h>,<libxml/parserInternals.h>,; \ s,<entities\.h>,<libxml/entities.h>,' +post-patch-DOCS-on: + @${REINPLACE_CMD} -E -e \ + 's,^(HTML_DIR *= *).*,\1\$$(DESTDIR)$$(prefix)/share/doc,' \ + ${WRKSRC}/gtk-doc/Makefile.in + +post-patch-DOCS-off: + @${REINPLACE_CMD} '/gtk-doc/d' ${WRKSRC}/Makefile.in + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdome.so diff --git a/textproc/google-ctemplate/Makefile b/textproc/google-ctemplate/Makefile index 3957651..40ddeff 100644 --- a/textproc/google-ctemplate/Makefile +++ b/textproc/google-ctemplate/Makefile @@ -21,17 +21,15 @@ USE_LDCONFIG= yes BROKEN_powerpc= Does not compile on powerpc -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e \ 's|$$(prefix)/share/doc/$$(PACKAGE)-$$(VERSION)|${DOCSDIR}|' \ ${WRKSRC}/Makefile.in -.if empty(PORT_OPTIONS:MDOCS) + +post-patch-DOCS-off: @${REINPLACE_CMD} -e \ '/install-data-am/ s|install-dist_docDATA||' \ ${WRKSRC}/Makefile.in -.endif tests: build @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile index 65bf41c..13dad4f 100644 --- a/textproc/hevea/Makefile +++ b/textproc/hevea/Makefile @@ -22,8 +22,6 @@ PORTDOCS= * DOCS_DISTFILES+= ${PORTNAME}-${PORTVERSION}-manual.pdf \ ${PORTNAME}-${PORTVERSION}-manual.tar.gz -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e '/^PREFIX=/s|/usr/local|${PREFIX}|' \ ${WRKSRC}/Makefile @@ -33,10 +31,10 @@ post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bibhva @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hevea @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hacha -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/hevea ${INSTALL_DATA} ${DISTDIR}/${PORTNAME}-${PORTVERSION}-manual.pdf ${STAGEDIR}${PREFIX}/share/doc/hevea (cd ${STAGEDIR}${PREFIX}/share/doc/hevea; ${TAR} xvfz ${DISTDIR}/${PORTNAME}-${PORTVERSION}-manual.tar.gz) -.endif .include <bsd.port.mk> diff --git a/textproc/jakarta-commons-digester/Makefile b/textproc/jakarta-commons-digester/Makefile index 0e4f888..952a377 100644 --- a/textproc/jakarta-commons-digester/Makefile +++ b/textproc/jakarta-commons-digester/Makefile @@ -19,6 +19,7 @@ RUN_DEPENDS= ${JAR_DEPENDS} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} NO_BUILD= yes +NO_ARCH= yes USE_JAVA= yes JAVA_VERSION= 1.6+ @@ -43,13 +44,13 @@ do-install: @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..." ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${JARFILE} @${ECHO_MSG} " [ DONE ]" -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." @cd ${WRKSRC}/apidocs \ && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \ && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \; ${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ @${ECHO_MSG} " [ DONE ]" -.endif .include <bsd.port.post.mk> diff --git a/textproc/jq/Makefile b/textproc/jq/Makefile index c34e55b..438c0cc 100644 --- a/textproc/jq/Makefile +++ b/textproc/jq/Makefile @@ -24,11 +24,7 @@ PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz PORTDOCS= * -.include <bsd.port.options.mk> - -.if !${PORT_OPTIONS:MDOCS} -MAKE_ARGS= docdir= -.endif +DOCS_MAKE_ARGS_OFF= docdir= post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libjq.so.1.0.4 diff --git a/textproc/liblingoteach/Makefile b/textproc/liblingoteach/Makefile index 549f783..9078d2b 100644 --- a/textproc/liblingoteach/Makefile +++ b/textproc/liblingoteach/Makefile @@ -22,13 +22,9 @@ DEBUG_DESC= Additional debugging information and output ZLIB_CONFIGURE_WITH= compression DEBUG_CONFIGURE_ENABLE= debug -.include <bsd.port.options.mk> - -.if ! ${PORT_OPTIONS:MDOCS} -post-patch: +post-patch-DOCS-off: @${REINPLACE_CMD} 's|SUBDIRS = src test doc|SUBDIRS = src test|' \ ${WRKSRC}/Makefile.in -.endif post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so diff --git a/textproc/perl2html/Makefile b/textproc/perl2html/Makefile index 9adf5cb..a771373 100644 --- a/textproc/perl2html/Makefile +++ b/textproc/perl2html/Makefile @@ -15,14 +15,10 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in AUTHORS NEWS README ${INSTALL_MAN} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> diff --git a/textproc/redet/Makefile b/textproc/redet/Makefile index 52ec89a..d16ce3b 100644 --- a/textproc/redet/Makefile +++ b/textproc/redet/Makefile @@ -11,16 +11,15 @@ COMMENT= Visual regexp development and execution RUN_DEPENDS= iwidgets>0:${PORTSDIR}/x11-toolkits/iwidgets -OPTIONS_DEFINE= DOCS - NO_BUILD= yes -USES+= tk:run tar:bzip2 +NO_ARCH= yes +USES= tk:run tar:bzip2 PORTDOCS= AUTHORS COPYING CREDITS LICENSE NEWS README-General ChangeLog PLIST_FILES= bin/redet \ man/man1/redet.1.gz -.include <bsd.port.options.mk> +OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e "s@exec wish@exec ${WISH}@" ${WRKSRC}/redet.tcl @@ -28,9 +27,9 @@ post-patch: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/redet.tcl ${STAGEDIR}${PREFIX}/bin/redet ${INSTALL_MAN} ${WRKSRC}/redet.1 ${STAGEDIR}${PREFIX}/man/man1 -.if ${PORT_OPTIONS:MDOCS} - @${INSTALL} -d ${STAGEDIR}${DOCSDIR} - @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.endif + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile index 9ae7626..50e364a 100644 --- a/textproc/sablotron/Makefile +++ b/textproc/sablotron/Makefile @@ -41,12 +41,8 @@ LDFLAGS+= -L${LOCALBASE}/lib -lexpat ${ICONV_LIB} PORTDOCS= * -.include <bsd.port.options.mk> - -post-patch: -.if ! ${PORT_OPTIONS:MDOCS} +post-patch-DOCS-off: @${REINPLACE_CMD} -e '/^SUBDIRS =/s/apidoc//' ${WRKSRC}/doc/Makefile.in -.endif post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsablot.so diff --git a/textproc/spiff/Makefile b/textproc/spiff/Makefile index 9abf6fa..df43c17 100644 --- a/textproc/spiff/Makefile +++ b/textproc/spiff/Makefile @@ -22,8 +22,6 @@ STRIP= # stripping can break go binaries OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: @cd ${WRKSRC} ; ${MKDIR} src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \ ${MV} .gitignore .travis.yml Godeps LICENSE Makefile README.md \ @@ -42,13 +40,13 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin/ -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${CP} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/LICENSE \ + ${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/LICENSE \ ${STAGEDIR}${DOCSDIR} - ${CP} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/README.md \ + ${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/README.md \ ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} && ${COPYTREE_SHARE} examples ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> diff --git a/textproc/templates_parser/Makefile b/textproc/templates_parser/Makefile index 0206e0e..4badbc3 100644 --- a/textproc/templates_parser/Makefile +++ b/textproc/templates_parser/Makefile @@ -30,16 +30,14 @@ PORTDOCS= html OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx -.include <bsd.port.options.mk> - do-build: # Override build target to avoid -jX getting passed to makefile # Parallel builds are handled with PROCESSORS setting cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} build -.if ${PORT_OPTIONS:MDOCS} + +do-build-DOCS-on: cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_ARGS} html -.endif post-install: ${RM} -rf ${STAGEDIR}${PREFIX}/share/gpr/manifests diff --git a/textproc/words/Makefile b/textproc/words/Makefile index 36f6f25..73042b6 100644 --- a/textproc/words/Makefile +++ b/textproc/words/Makefile @@ -24,8 +24,6 @@ GNATMAKE= ${SETENV} ${MAKE_ENV} gnatmake OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - do-build: @cd ${WRKSRC} && \ ${GNATMAKE} -O3 words ${GNATLINK_ARGS} && \ @@ -50,9 +48,9 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/ADDONS.LAT ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/UNIQUES.LAT ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKDIR}/words.sh ${STAGEDIR}${PREFIX}/bin/words -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/wordsdoc.htm ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> diff --git a/textproc/xmlenc/Makefile b/textproc/xmlenc/Makefile index df96b86..5ee713b 100644 --- a/textproc/xmlenc/Makefile +++ b/textproc/xmlenc/Makefile @@ -6,13 +6,14 @@ PORTVERSION= 0.52 PORTREVISION= 2 CATEGORIES= textproc java MASTER_SITES= SF -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Light-weight XML encoding library for Java +USES= tar:tgz USE_JAVA= yes USE_ANT= yes +NO_ARCH= yes OPTIONS_DEFINE= DOCS @@ -37,12 +38,11 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/build/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/ @${ECHO_MSG} " [ DONE ]" -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..." @cd ${WRKSRC}/build/javadoc/ \ && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \ && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \; @${ECHO_MSG} " [ DONE ]" -.endif .include <bsd.port.post.mk> diff --git a/textproc/xmlstarlet/Makefile b/textproc/xmlstarlet/Makefile index 115c05a..8b8e51a 100644 --- a/textproc/xmlstarlet/Makefile +++ b/textproc/xmlstarlet/Makefile @@ -27,12 +27,8 @@ PORTDOCS= xmlstarlet.txt \ html.css OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -post-install: +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> diff --git a/textproc/xqilla/Makefile b/textproc/xqilla/Makefile index d9edb10..bc977e0 100644 --- a/textproc/xqilla/Makefile +++ b/textproc/xqilla/Makefile @@ -28,18 +28,14 @@ OPTIONS_DEFINE= DOCS MAKE_JOBS_UNSAFE= yes -.include <bsd.port.options.mk> +DOCS_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen \ + dot:${PORTSDIR}/graphics/graphviz -.if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \ - dot:${PORTSDIR}/graphics/graphviz - -post-build: +post-build-DOCS-on: cd ${WRKSRC} && ${MAKE_CMD} docs -post-install: +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \*-api ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> diff --git a/textproc/xslint/Makefile b/textproc/xslint/Makefile index 105d2c9..1a52e9a 100644 --- a/textproc/xslint/Makefile +++ b/textproc/xslint/Makefile @@ -17,6 +17,7 @@ USE_PERL5= run WRKSRC= ${WRKDIR}/${PORTNAME}-0.05 NO_BUILD= yes +NO_ARCH= yes SHEBANG_FILES= xslint.pl @@ -25,16 +26,14 @@ PORTDOCS= README xslint.html xslint.xml OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> diff --git a/textproc/xstream/Makefile b/textproc/xstream/Makefile index 8f58e72..0c7c996 100644 --- a/textproc/xstream/Makefile +++ b/textproc/xstream/Makefile @@ -18,23 +18,22 @@ OPTIONS_DEFINE= DOCS USES= zip USE_JAVA= yes NO_BUILD= yes +NO_ARCH= yes PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar PORTDOCS= * -.include <bsd.port.options.mk> - do-install: @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..." - @${INSTALL_DATA} ${WRKSRC}/lib/${DISTNAME}.jar \ + ${INSTALL_DATA} ${WRKSRC}/lib/${DISTNAME}.jar \ ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar @${ECHO_MSG} " [ DONE ]" -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." @${MKDIR} ${STAGEDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}/ @${ECHO_MSG} " [ DONE ]" -.endif .include <bsd.port.mk> |
