diff options
-rw-r--r-- | sysutils/cdrdao/Makefile | 4 | ||||
-rw-r--r-- | sysutils/condor/Makefile | 5 | ||||
-rw-r--r-- | sysutils/extipl/Makefile | 4 | ||||
-rw-r--r-- | sysutils/feather/Makefile | 10 | ||||
-rw-r--r-- | sysutils/fusefs-chironfs/Makefile | 6 | ||||
-rw-r--r-- | sysutils/fusefs-gnome-vfs/Makefile | 6 | ||||
-rw-r--r-- | sysutils/fusefs-sqlfs/Makefile | 12 | ||||
-rw-r--r-- | sysutils/hatop/Makefile | 4 | ||||
-rw-r--r-- | sysutils/logtool/Makefile | 6 | ||||
-rw-r--r-- | sysutils/mcollective/Makefile | 4 | ||||
-rw-r--r-- | sysutils/p5-Schedule-Load/Makefile | 4 | ||||
-rw-r--r-- | sysutils/snowlog/Makefile | 6 | ||||
-rw-r--r-- | sysutils/synergy/Makefile | 4 | ||||
-rw-r--r-- | sysutils/uniutils/Makefile | 6 | ||||
-rw-r--r-- | sysutils/vimpager/Makefile | 11 | ||||
-rw-r--r-- | sysutils/xvidcap/Makefile | 8 |
16 files changed, 53 insertions, 47 deletions
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile index 72a64e48a3e4..0eea68a05209 100644 --- a/sysutils/cdrdao/Makefile +++ b/sysutils/cdrdao/Makefile @@ -20,6 +20,8 @@ MP3OGG_LIB_DEPENDS= ao.4:${PORTSDIR}/audio/libao \ mad.2:${PORTSDIR}/audio/libmad \ vorbis.4:${PORTSDIR}/audio/libvorbis +OPTIONS_DEFINE= DOCS + .if ${PORTNAME} == "gcdmaster" USES+= pkgconfig USE_GNOME= gnomehier @@ -155,12 +157,10 @@ do-install: .if defined(WITH_TOC2MP3) @${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2mp3 ${STAGEDIR}{PREFIX}/bin .endif -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in CREDITS ChangeLog README README.PlexDAE @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .endif -.endif .include <bsd.port.post.mk> diff --git a/sysutils/condor/Makefile b/sysutils/condor/Makefile index 97313097f551..ca6aa1c143e4 100644 --- a/sysutils/condor/Makefile +++ b/sysutils/condor/Makefile @@ -36,6 +36,8 @@ USE_RC_SUBR= condor PORTEXAMPLES= * PORTDOCS= * +OPTIONS_DEFINE= DOCS EXAMPLES + .include <bsd.port.pre.mk> pre-everything:: @@ -53,9 +55,6 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/condor_config ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/condor_config.local ${STAGEDIR}${ETCDIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.if defined(NOPORTEXAMPLES) - ${RM} -rf ${STAGEDIR}${EXAMPLESDIR} -.endif @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/sysutils/extipl/Makefile b/sysutils/extipl/Makefile index 6d8cab93d316..a0185018280d 100644 --- a/sysutils/extipl/Makefile +++ b/sysutils/extipl/Makefile @@ -16,8 +16,6 @@ ONLY_FOR_ARCHS= i386 amd64 WRKSRC= ${WRKDIR}/${DISTNAME}/src OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: cd ${WRKSRC}; \ ${SED} -e 's|!!DOCDIR!!|${DOCSDIR}|g' \ @@ -28,11 +26,9 @@ post-patch: do-install: ${INSTALL_PROGRAM} -m 700 ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR}/English ${INSTALL_DATA} ${WRKSRC}/../doc/English/*.txt ${STAGEDIR}${DOCSDIR}/English @${MKDIR} ${STAGEDIR}${DOCSDIR}/Japanese ${INSTALL_DATA} ${WRKSRC}/../doc/Japanese/*.txt ${STAGEDIR}${DOCSDIR}/Japanese -.endif .include <bsd.port.mk> diff --git a/sysutils/feather/Makefile b/sysutils/feather/Makefile index 2766e0d2f0ea..ce0d7737866b 100644 --- a/sysutils/feather/Makefile +++ b/sysutils/feather/Makefile @@ -20,13 +20,13 @@ STRIP= SUB_FILES= pkg-message +OPTIONS_DEFINE= DOCS + do-install: @${INSTALL_PROGRAM} ${WRKSRC}/feather ${STAGEDIR}${PREFIX}/bin - @${INSTALL_DATA} ${WRKSRC}/feather.yaml.dist ${STAGEDIR}${PREFIX}/etc -.if !defined(NOPORTDOCS) - @${INSTALL} -d ${STAGEDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.endif + ${INSTALL_DATA} ${WRKSRC}/feather.yaml.dist ${STAGEDIR}${PREFIX}/etc + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} x-generate-tarball: ${SETENV} ${FETCH_ENV} ${FETCH_BINARY} -m -o ${PORTNAME}.tar.gz \ diff --git a/sysutils/fusefs-chironfs/Makefile b/sysutils/fusefs-chironfs/Makefile index 46ef8eceea80..0f11a03fd2c3 100644 --- a/sysutils/fusefs-chironfs/Makefile +++ b/sysutils/fusefs-chironfs/Makefile @@ -19,8 +19,12 @@ USES= fuse PLIST_FILES= bin/chironfs bin/chirctl man/man8/chironfs.8.gz PORTDOCS= * +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + post-patch: -.if defined(NOPORTDOCS) +.if empty(PORT_OPTIONS:MDOCS) @${REINPLACE_CMD} -e 's, doc , ,' ${WRKSRC}/Makefile.in .endif @${REINPLACE_CMD} -e 's,-liconv,${ICONV_LIB},' ${WRKSRC}/src/Makefile.* diff --git a/sysutils/fusefs-gnome-vfs/Makefile b/sysutils/fusefs-gnome-vfs/Makefile index 25b2ac564fb0..bd36562d884d 100644 --- a/sysutils/fusefs-gnome-vfs/Makefile +++ b/sysutils/fusefs-gnome-vfs/Makefile @@ -18,11 +18,11 @@ USE_GNOME= gnomevfs2 PLIST_FILES= bin/gnomevfs-mount PORTDOCS= README +OPTIONS_DEFINE= DOCS + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gnomevfs-mount ${STAGEDIR}${PREFIX}/bin -.if !defined(NOPORTDOCS) - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> diff --git a/sysutils/fusefs-sqlfs/Makefile b/sysutils/fusefs-sqlfs/Makefile index d96e919e295e..10e936bb215b 100644 --- a/sysutils/fusefs-sqlfs/Makefile +++ b/sysutils/fusefs-sqlfs/Makefile @@ -17,9 +17,9 @@ COMMENT= SQLite backed FUSE file system USES= fuse USE_SQLITE= 3 -.if !defined(NOPORTDOCS) +OPTIONS_DEFINE= DOCS + PORTDOCS= README -.endif PLIST_FILES= bin/sqlfs @@ -33,11 +33,9 @@ do-build: -o sqlfs) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sqlfs ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/sqlfs ${STAGEDIR}${PREFIX}/bin -.if !defined(NOPORTDOCS) - @${MKDIR} ${STAGEDIR}${DOCSDIR}/ - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include <bsd.port.post.mk> diff --git a/sysutils/hatop/Makefile b/sysutils/hatop/Makefile index fd40d742cf74..07fc9da404a4 100644 --- a/sysutils/hatop/Makefile +++ b/sysutils/hatop/Makefile @@ -19,12 +19,12 @@ LICENSE= GPLv3 PLIST_FILES= bin/hatop man/man1/hatop.1.gz PORTDOCS= HACKING KEYBINDS README +OPTIONS_DEFINE= DOCS + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/bin/hatop ${STAGEDIR}${PREFIX}/bin/hatop ${INSTALL_MAN} ${WRKSRC}/man/hatop.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 -.if !defined(NOPORTDOCS) ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) -.endif .include <bsd.port.mk> diff --git a/sysutils/logtool/Makefile b/sysutils/logtool/Makefile index 05c63b2b5501..f3d2223ca423 100644 --- a/sysutils/logtool/Makefile +++ b/sysutils/logtool/Makefile @@ -18,8 +18,10 @@ PKGMESSAGE= ${WRKDIR}/pkg-message DOCS= CHANGES CREDITS README TODO doc/logtool.txt +OPTIONS_DEFINE= DOCS + do-build: - cd ${WRKSRC}/src && ${MAKE_CMD} INCLUDES="${CPPFLAGS}" + (cd ${WRKSRC}/src && ${MAKE_CMD} INCLUDES="${CPPFLAGS}") do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/logtool ${STAGEDIR}${PREFIX}/bin @@ -28,10 +30,8 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${EXAMPLESDIR} @${RM} ${STAGEDIR}${EXAMPLESDIR}/logtool.conf.in ${INSTALL_DATA} ${WRKSRC}/scripts/* ${STAGEDIR}${EXAMPLESDIR}/scripts -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} -.endif @${SED} -e 's!PREFIX!${PREFIX}!' ${.CURDIR}/pkg-message > ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/sysutils/mcollective/Makefile b/sysutils/mcollective/Makefile index 42140cca6b92..03bee0a1e4df 100644 --- a/sysutils/mcollective/Makefile +++ b/sysutils/mcollective/Makefile @@ -24,6 +24,8 @@ SCRIPTS= mco SUB_LIST+= RUBY=${RUBY} +OPTIONS_DEFINE= DOCS + do-patch: @${REINPLACE_CMD} -e "s|/etc/mcollective|${ETCDIR}|" \ ${WRKSRC}/bin/mcollectived \ @@ -50,9 +52,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/etc/client.cfg.dist ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/etc/server.cfg.dist ${STAGEDIR}${ETCDIR} -.if !defined(NOPORTDOCS) ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) -.endif .include <bsd.port.mk> diff --git a/sysutils/p5-Schedule-Load/Makefile b/sysutils/p5-Schedule-Load/Makefile index 615e3d6e3c64..c5248ad29ad2 100644 --- a/sysutils/p5-Schedule-Load/Makefile +++ b/sysutils/p5-Schedule-Load/Makefile @@ -23,11 +23,11 @@ MAKE_JOBS_UNSAFE= yes USES= perl5 USE_PERL5= configure +OPTIONS_DEFINE= EXAMPLES + post-install: -.ifndef(NOPORTEXAMPLES) @${ECHO_MSG} "===> Installing examples for ${PKGNAME}" @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/init.d ${INSTALL_SCRIPT} ${WRKSRC}/init.d/* ${STAGEDIR}${EXAMPLESDIR}/init.d -.endif .include <bsd.port.mk> diff --git a/sysutils/snowlog/Makefile b/sysutils/snowlog/Makefile index d5146bf78349..824ddcc61cb6 100644 --- a/sysutils/snowlog/Makefile +++ b/sysutils/snowlog/Makefile @@ -15,14 +15,12 @@ LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre DOCS= INSTALLATION doc/README doc/filters.example SHAREDOCS= referers.regexp useragents.regexp -.include <bsd.port.pre.mk> +OPTIONS_DEFINE= DOCS post-install: -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC}/share && ${INSTALL_DATA} ${SHAREDOCS} ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile index 1fa5bbf35b73..0b0b845159ca 100644 --- a/sysutils/synergy/Makefile +++ b/sysutils/synergy/Makefile @@ -28,6 +28,8 @@ PLIST_FILES= bin/synergyc bin/synergyd bin/synergys bin/syntool \ PORTEXAMPLES= synergy.conf.example synergy.conf.example-basic \ synergy.conf.example-advanced +OPTIONS_DEFINE= EXAMPLES + post-extract: cd ${WRKSRC}/ext/ ${MKDIR} ${WRKSRC}/ext/cryptopp562 @@ -41,11 +43,9 @@ do-install: ${STAGEDIR}${MANPREFIX}/man/man1/synergyc.1 ${INSTALL_MAN} ${WRKSRC}/doc/synergys.man \ ${STAGEDIR}${MANPREFIX}/man/man1/synergys.1 -.if !defined(NOPORTEXAMPLES) ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for f in ${PORTEXAMPLES} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${EXAMPLESDIR} .endfor -.endif .include <bsd.port.mk> diff --git a/sysutils/uniutils/Makefile b/sysutils/uniutils/Makefile index c8207f3368d6..aa0588366ff0 100644 --- a/sysutils/uniutils/Makefile +++ b/sysutils/uniutils/Makefile @@ -23,6 +23,8 @@ TESTFILES= Test1.ann Test1.u Test2.ann Test2.u Test3.ann Test3.u \ Test4.ann Test4.u Test5.ann Test5.u PORTDOCS= AUTHORS NEWS README +OPTIONS_DEFINE= DOCS EXAMPLES + pre-configure: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/Makefile.in ${REINPLACE_CMD} -e 's|TestData|${EXAMPLESDIR}|' ${WRKSRC}/README @@ -33,13 +35,9 @@ regression-test: ./uniname TestData/Test1.ann) post-install: -.if !defined(NOPORTDOCS) ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.endif -.if !defined(NOPORTEXAMPLES) ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${TESTFILES:S|^|${WRKSRC}/TestData/|} ${STAGEDIR}${EXAMPLESDIR} -.endif .include <bsd.port.mk> diff --git a/sysutils/vimpager/Makefile b/sysutils/vimpager/Makefile index 83fd5aee4627..cab4184f4810 100644 --- a/sysutils/vimpager/Makefile +++ b/sysutils/vimpager/Makefile @@ -13,14 +13,23 @@ LICENSE= BSD2CLAUSE RUN_DEPENDS= vim:${PORTSDIR}/editors/vim -OPTIONS_DEFINE= VIMCAT +OPTIONS_DEFINE= VIMCAT TACOS BOB BOB2 BOB3 OPTIONS_DEFAULT= VIMCAT VIMCAT_DESC= Install vimcat(1) (requires shells/bash) VIMCAT_RUN_DEPENDS= bash:${PORTSDIR}/shells/bash VIMCAT_PLIST_FILES= bin/vimcat man/man1/vimcat.1.gz +VIMCAT_IMPLIES= TACOS +TACOS_IMPLIES= BOB +BOB_IMPLIES= BOB2 +BOB2_IMPLIES= BOB3 +TACOS_RUN_DEPENDS= curl:${PORTSDIR}/ftp/curl + PLIST_FILES= bin/${PORTNAME} etc/${PORTNAME}rc man/man1/${PORTNAME}.1.gz +.include <bsd.port.options.mk> +bob: + @echo ${PORT_OPTIONS:M} do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/vimcat ${STAGEDIR}${PREFIX}/bin diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile index b08cbf4fe6fa..16d0c889c8d1 100644 --- a/sysutils/xvidcap/Makefile +++ b/sysutils/xvidcap/Makefile @@ -38,15 +38,19 @@ CFLAGS+= -O2 -fno-strict-aliasing PORTDOCS= AUTHORS ChangeLog README NULLDOCS= COPYING +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + pre-configure: -.if defined(NOPORTDOCS) +.if empty(PORT_OPTIONS:MDOCS) ${REINPLACE_CMD} -e 's|pkgdataDATA install-xvidcapdocDATA|pkgdataDATA|' \ ${WRKSRC}/Makefile.in .endif ${REINPLACE_CMD} -e 's|/bin/bash | /bin/sh|' ${WRKSRC}/ppm2mpeg.sh post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${RM} -f ${NULLDOCS:S|^|${STAGEDIR}${DOCSDIR}/|} .endif |