Date: Tue, 15 Jan 2013 13:40:29 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310443 - in head: archivers/ecm archivers/gzrecover archivers/mar archivers/ppmd audio/festalon audio/gbsplay audio/malint audio/milkytracker audio/ocp audio/openspc audio/sidplayer au... Message-ID: <201301151340.r0FDeTCH042305@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Tue Jan 15 13:40:28 2013 New Revision: 310443 URL: http://svnweb.freebsd.org/changeset/ports/310443 Log: - Use DOC instead of NOPORTDOCS - Pacify portlint - Convert header Modified: head/archivers/ecm/Makefile head/archivers/gzrecover/Makefile head/archivers/mar/Makefile head/archivers/ppmd/Makefile head/audio/festalon/Makefile head/audio/gbsplay/Makefile head/audio/malint/Makefile head/audio/milkytracker/Makefile head/audio/ocp/Makefile head/audio/openspc/Makefile head/audio/sidplayer/Makefile head/audio/uade/Makefile head/audio/xmms-sexypsf/Makefile head/audio/xmp/Makefile head/comms/remserial/Makefile head/devel/bunny/Makefile head/devel/ccache/Makefile head/devel/cvsspam/Makefile head/dns/dnswall/Makefile head/ftp/weex/Makefile head/graphics/fractorama/Makefile head/graphics/metacam/Makefile head/mail/isync/Makefile head/mail/sylpheed/Makefile head/math/mathomatic/Makefile head/misc/countrycodes/Makefile head/misc/gopod/Makefile head/misc/ree/Makefile head/net-im/bsflite/Makefile head/net/corkscrew/Makefile head/net/rsync/Makefile head/net/socat/Makefile head/news/brag/Makefile head/security/bcrypt/Makefile head/security/bsdsfv/Makefile head/security/cksfv/Makefile head/security/idea/Makefile head/security/pkcrack/Makefile head/security/pure-sfv/Makefile head/security/vpnc/Makefile head/sysutils/cmospwd/Makefile head/sysutils/disktype/Makefile head/sysutils/dvdbackup/Makefile head/sysutils/fatback/Makefile head/sysutils/highlnk/Makefile head/sysutils/hploscripts/Makefile head/sysutils/magicrescue/Makefile head/sysutils/rej/Makefile head/sysutils/tmpreaper/Makefile head/sysutils/watchfolder/Makefile head/sysutils/zeroer/Makefile head/textproc/fldiff/Makefile head/x11/gtk-launch/Makefile Modified: head/archivers/ecm/Makefile ============================================================================== --- head/archivers/ecm/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/archivers/ecm/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ecm -# Date created: 9 Aug 2005 -# Whom: Emanuel Haupt <ehaupt@critical.ch> -# +# Created by: Emanuel Haupt <ehaupt@critical.ch> # $FreeBSD$ -# PORTNAME= ecm PORTVERSION= 1.0 @@ -23,12 +19,16 @@ MAKE_JOBS_SAFE= yes PLIST_FILES= bin/ecm bin/unecm PORTDOCS= format.txt +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + do-install: .for f in ${PORTNAME} un${PORTNAME} ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin .endfor -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR} .endif Modified: head/archivers/gzrecover/Makefile ============================================================================== --- head/archivers/gzrecover/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/archivers/gzrecover/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -20,12 +20,16 @@ CFLAGS+= -D_LARGEFILE_SOURCE -D_FILE_OFF PLIST_FILES= bin/${PORTNAME} PORTDOCS= README +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + do-build: ${CC} -o ${WRKSRC}/${PORTNAME} ${CFLAGS} ${WRKSRC}/${PORTNAME}.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif Modified: head/archivers/mar/Makefile ============================================================================== --- head/archivers/mar/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/archivers/mar/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -18,6 +18,10 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVER MAN1= mar.1 +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + post-patch: @${REINPLACE_CMD} -E "s#^(CFLAGS\ |CXXFLAGS\ |CC\ |CXX\ )#\1?#" \ ${WRKSRC}/src/Makefile @@ -26,7 +30,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/man1/mar.1 ${MAN1PREFIX}/man/man1 -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${DOCSDIR} .endif Modified: head/archivers/ppmd/Makefile ============================================================================== --- head/archivers/ppmd/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/archivers/ppmd/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -15,11 +15,15 @@ MAN1= ppmd.1 PORTDOCS= read_me.txt PLIST_FILES= bin/ppmd +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1 -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR} .endif Modified: head/audio/festalon/Makefile ============================================================================== --- head/audio/festalon/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/audio/festalon/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: festalon -# Date created: 13 Jul 2005 -# Whom: Emanuel Haupt <ehaupt@critical.ch> -# +# Created by: Emanuel Haupt <ehaupt@critical.ch> # $FreeBSD$ -# PORTNAME= festalon PORTVERSION= 0.5.5 @@ -18,7 +14,7 @@ COMMENT?= A command line player for .nsf LICENSE= GPLv2 -LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate +LIB_DEPENDS+= samplerate:${PORTSDIR}/audio/libsamplerate USE_AUTOTOOLS= libtool USE_BZIP2= yes @@ -30,7 +26,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME} ONLY_FOR_ARCHS= i386 amd64 -.include <bsd.port.pre.mk> +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> .if ${PKGNAMEPREFIX} == "" @@ -42,7 +40,7 @@ PORTDOCS= README do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin/${PORTNAME} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif @@ -52,4 +50,4 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/audio/gbsplay/Makefile ============================================================================== --- head/audio/gbsplay/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/audio/gbsplay/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -27,7 +27,7 @@ MAN1= gbsplay.1 gbsinfo.1 MAN5= gbsplayrc.5 PORTDOCS= COPYRIGHT HISTORY README -OPTIONS_DEFINE= NAS +OPTIONS_DEFINE= NAS DOCS .endif @@ -85,7 +85,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/po/${l}.mo ${PREFIX}/share/locale/${l}/LC_MESSAGES/gbsplay.mo .endfor -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} Modified: head/audio/malint/Makefile ============================================================================== --- head/audio/malint/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/audio/malint/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: malint -# Date created: 20 Jun 2005 -# Whom: Emanuel Haupt <ehaupt@critical.ch> -# +# Created by: Emanuel Haupt <ehaupt@critical.ch> # $FreeBSD$ -# PORTNAME= malint DISTVERSION= 0.2 @@ -23,7 +19,11 @@ MAKE_JOBS_SAFE= yes PORTDOCS= README PLIST_FILES= bin/malint -.if !defined(NOPORTDOCS) +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} post-install: ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} Modified: head/audio/milkytracker/Makefile ============================================================================== --- head/audio/milkytracker/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/audio/milkytracker/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: milkytracker -# Date created: 13 Mar 2008 -# Whom: Emanuel Haupt <ehaupt@FreeBSD.org> -# +# Created by: Emanuel Haupt <ehaupt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= milkytracker PORTVERSION= 0.90.85 @@ -18,7 +14,7 @@ COMMENT= A free music creation tool insp LICENSE= GPLv3 LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack \ - zzip.13:${PORTSDIR}/devel/zziplib + zzip:${PORTSDIR}/devel/zziplib GNU_CONFIGURE= yes USE_SDL= sdl @@ -35,23 +31,25 @@ PLIST_FILES= bin/milkytracker share/pixm PORTDOCS= FAQ.html MilkyTracker.html ChangeLog.html ICONS= carton.ico carton.png +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + post-install: .for f in ${ICONS} ${INSTALL_DATA} ${WRKSRC}/resources/pictures/${f} \ ${LOCALBASE}/share/pixmaps/${f:C/carton/milkytracker/} .endfor -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR} .endfor .endif -.include <bsd.port.pre.mk> - .if ${ARCH} == "powerpc" BROKEN= Does not compile on powerpc: fails in assembler .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/audio/ocp/Makefile ============================================================================== --- head/audio/ocp/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/audio/ocp/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -52,7 +52,7 @@ PFILES= configure cpiface/cpianal.c cpi stuff/poutput-dga.c stuff/poutput-keyboard.c \ stuff/poutput-vcsa.c stuff/poutput-x11.c -OPTIONS_DEFINE= ADPLUG FLAC MIDI X11 SDL +OPTIONS_DEFINE= ADPLUG FLAC MIDI X11 SDL DOCS ADPLUG_DESC= adplug support MIDI_DESC= timidity support @@ -109,7 +109,7 @@ PLIST_SUB+= FLAC="@comment " CONFIGURE_ARGS+= --without-flac .endif -.if defined(NOPORTDOCS) +.if empty(PORT_OPTIONS:MDOCS) MAKE_ENV+= DOCS="\#" .endif Modified: head/audio/openspc/Makefile ============================================================================== --- head/audio/openspc/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/audio/openspc/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: openspc -# Date created: 10 Jul 2005 -# Whom: Emanuel Haupt <ehaupt@critical.ch> -# +# Created by: Emanuel Haupt <ehaupt@critical.ch> # $FreeBSD$ -# PORTNAME= openspc PORTVERSION= 0.3.1 @@ -25,7 +21,11 @@ PORTDOCS= README PLIST_FILES= bin/OpenSPClite include/OpenSPC.h lib/libOpenSPC.so \ lib/libOpenSPC.so.3 lib/libOpenSPC.la lib/libOpenSPC.a -.if !defined(NOPORTDOCS) +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} post-install: ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} Modified: head/audio/sidplayer/Makefile ============================================================================== --- head/audio/sidplayer/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/audio/sidplayer/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: sidplayer -# Date created: 27 May 2005 -# Whom: Emanuel Haupt <ehaupt@critical.ch> -# +# Created by: Emanuel Haupt <ehaupt@critical.ch> # $FreeBSD$ -# PORTNAME= sidplayer PORTVERSION= 4.4 @@ -24,13 +20,17 @@ MAKE_JOBS_SAFE= yes SDLINCLUDEDIR= SDL +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + post-patch: @${REINPLACE_CMD} -e 's|SDL/SDL_endian\.h|${SDLINCLUDEDIR}/SDL_endian\.h|' \ ${WRKSRC}/src/main_sdl.cpp do-install: ${INSTALL} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin/${PORTNAME} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${CP} ${WRKSRC}/PSID\ Demo/* ${DOCSDIR}/ .endif @@ -38,7 +38,7 @@ do-install: post-install: @${ECHO_MSG} "==============================================================" @${ECHO_MSG} "A huge SID tune archive can be found at http://hvsc.c64.org/" -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} "You can find a few examples in ${DOCSDIR}" .endif @${ECHO_MSG} "==============================================================" Modified: head/audio/uade/Makefile ============================================================================== --- head/audio/uade/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/audio/uade/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -32,7 +32,7 @@ PORTDOCS= BUGS PLANS REDUNDANT_REPLAYERS play_loop_state_diagram.dia play_loop_state_diagram.eps \ play_loop_state_diagram.txt uade.html -OPTIONS_DEFINE= TEXTSCOPE FUSE XMMS +OPTIONS_DEFINE= TEXTSCOPE FUSE XMMS DOCS TEXTSCOPE_DESC= Audio register debug mode XMMS_DESC= XMMS plugin @@ -67,7 +67,7 @@ post-patch: post-install: @${RM} -rf ${DATADIR}/players/S -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR} Modified: head/audio/xmms-sexypsf/Makefile ============================================================================== --- head/audio/xmms-sexypsf/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/audio/xmms-sexypsf/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: xmms-sexypsf -# Date created: 10 Jul 2005 -# Whom: Emanuel Haupt <ehaupt@critical.ch> -# +# Created by: Emanuel Haupt <ehaupt@critical.ch> # $FreeBSD$ -# PORTNAME= xmms-sexypsf PORTVERSION= 0.4.8 @@ -34,6 +30,10 @@ SOURCES= PsxBios PsxCounters PsxDma Spu PLIST_FILES= lib/xmms/Input/libsexypsf.so +OPTIONS_DEFINE=DOCS + +.include <bsd.port.options.mk> + do-build: .for f in ${SOURCES} ${CC} ${CFLAGS} ${DEFINES} `gtk-config --cflags` -c -o ${WRKSRC}/${f}.o ${WRKSRC}/${f}.c @@ -44,7 +44,7 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/libsexypsf.so ${PREFIX}/lib/xmms/Input/libsexypsf.so -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/Docs/${f} ${DOCSDIR} Modified: head/audio/xmp/Makefile ============================================================================== --- head/audio/xmp/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/audio/xmp/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -21,7 +21,7 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/e MAN1= xmp.1 -OPTIONS_DEFINE= ALSA BMP ESOUND NAS PULSEAUDIO UNZIP XMMS +OPTIONS_DEFINE= ALSA BMP ESOUND NAS PULSEAUDIO UNZIP XMMS DOCS BMP_DESC= Beep media player plugin XMMS_DESC= XMMS plugin @@ -34,9 +34,7 @@ CFLAGS+= -I${LOCALBASE}/include .include <bsd.port.options.mk> -.if !defined(NOPORTDOCS) PORTDOCS= * -.endif .if ${PORT_OPTIONS:MALSA} LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib @@ -112,7 +110,7 @@ post-install: .SILENT ${ETCDIR}/modules.conf; \ fi -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${ECHO_MSG} Installing documentation in ${DOCSDIR} ( cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* \ ${DOCSDIR} '! ( -name Makefile -or -name xmp.1 \ Modified: head/comms/remserial/Makefile ============================================================================== --- head/comms/remserial/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/comms/remserial/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: remserial -# Date created: 05 Jan 2011 -# Whom: Emanuel Haupt <ehaupt@FreeBSD.org> -# +# Created by: Emanuel Haupt <ehaupt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= remserial PORTVERSION= 1.4 @@ -22,9 +18,13 @@ PORTDOCS= README.txt CFLAGS+= -DOSVERSION=\"${OSVERSION}\" +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR} .endif Modified: head/devel/bunny/Makefile ============================================================================== --- head/devel/bunny/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/devel/bunny/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: bunny -# Date created: 28 Jan 2008 -# Whom: Emanuel Haupt <ehaupt@FreeBSD.org> -# +# Created by: Emanuel Haupt <ehaupt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= bunny PORTVERSION= 0.93 @@ -26,6 +22,10 @@ PLIST_FILES= bin/bunny-trace bin/bunny-g ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Fails to compile: invokes i386 asm +OPTIONS_DEFINE=DOCS + +.include <bsd.port.options.mk> + post-patch: @${REINPLACE_CMD} -e '/^CFLAGS/d' ${WRKSRC}/${MAKEFILE} @@ -34,7 +34,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${f:C/bin\///} ${PREFIX}/bin .endfor -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR} .endif Modified: head/devel/ccache/Makefile ============================================================================== --- head/devel/ccache/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/devel/ccache/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -21,7 +21,7 @@ MAN1= ccache.1 PORTDOCS= ccache-howto-freebsd.txt MANUAL.html -OPTIONS_DEFINE= CLANGLINK LLVMLINK STATIC +OPTIONS_DEFINE= CLANGLINK LLVMLINK STATIC DOCS CLANGLINK_DESC= Create clang compiler links if clang is installed LLVMLINK_DESC= Create llvm compiler links if llvm is installed @@ -75,7 +75,7 @@ do-install: ${PREFIX}/bin/ccache-update-links ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.tar ${DATADIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/MANUAL.html ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/${HOWTO} ${DOCSDIR} Modified: head/devel/cvsspam/Makefile ============================================================================== --- head/devel/cvsspam/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/devel/cvsspam/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: cvsspam -# Date created: 16 Sep 2005 -# Whom: Emanuel Haupt <ehaupt@critical.ch> -# +# Created by: Emanuel Haupt <ehaupt@critical.ch> # $FreeBSD$ -# PORTNAME= cvsspam PORTVERSION= 0.2.12 @@ -21,6 +17,10 @@ NO_BUILD= yes PORTDOCS= COPYING CREDITS TODO cvsspam-doc.html cvsspam-doc.pdf +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + post-patch: .for f in collect_diffs.rb cvsspam.rb record_lastdir.rb @${REINPLACE_CMD} -e 's|/usr/bin/ruby|${RUBY}|' \ @@ -39,7 +39,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/cvsspam.conf ${PREFIX}/etc/cvsspam.conf .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} Modified: head/dns/dnswall/Makefile ============================================================================== --- head/dns/dnswall/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/dns/dnswall/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: dnswall -# Date created: 28 Jan 2008 -# Whom: Emanuel Haupt <ehaupt@FreeBSD.org> -# +# Created by: Emanuel Haupt <ehaupt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= dnswall PORTVERSION= 0.1.4 @@ -28,11 +24,15 @@ PLIST_FILES= bin/dnswall AUTOTOOLSFILES= aclocal.m4 +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + post-patch: @${REINPLACE_CMD} -e 's|1.10|%%AUTOMAKE_APIVER%%|g' \ -e 's|2.61|%%AUTOCONF_VERSION%%|g' \ ${WRKSRC}/aclocal.m4 -.if defined(NOPORTDOCS) +.if empty(PORT_OPTIONS:MDOCS) @${REINPLACE_CMD} -e '/^dist_doc_DATA/d' ${WRKSRC}/Makefile.am .endif Modified: head/ftp/weex/Makefile ============================================================================== --- head/ftp/weex/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/ftp/weex/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: weex -# Date created: 8 Sep 2005 -# Whom: Emanuel Haupt <ehaupt@critical.ch> -# +# Created by: Emanuel Haupt <ehaupt@critical.ch> # $FreeBSD$ -# PORTNAME= weex PORTVERSION= 2.6.1.5 @@ -21,6 +17,10 @@ MAKE_JOBS_SAFE= yes PORTDOCS= ChangeLog README MAN1= weex.1 +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + post-patch: @${REINPLACE_CMD} -e 's|^\(SUBDIRS.*\)debian|\1|' \ ${WRKSRC}/Makefile.in @@ -29,7 +29,7 @@ post-install: ${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/sample.weexrc ${EXAMPLESDIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR} Modified: head/graphics/fractorama/Makefile ============================================================================== --- head/graphics/fractorama/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/graphics/fractorama/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: fractorama -# Date created: Apr 15, 2001 -# Whom: Ying-Chieh Liao <ijliao@FreeBSD.org> -# +# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org> # $FreeBSD$ -# PORTNAME= fractorama PORTVERSION= 1.6.7 @@ -32,6 +28,10 @@ ALL_TARGET= release CXXFLAGS+= -I${LOCALBASE}/include +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + post-extract: .for e in cpp h @${CP} ${WRKSRC}/lib/tiff/TiffWriter.${e} ${WRKSRC} @@ -56,7 +56,7 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/../fractorama.exe ${PREFIX}/bin/fractorama -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} cd ${WRKSRC}/../doc && ${FIND} . | \ ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} Modified: head/graphics/metacam/Makefile ============================================================================== --- head/graphics/metacam/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/graphics/metacam/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: metacam -# Date created: 2 Sep 2005 -# Whom: Emanuel Haupt <ehaupt@critical.ch> -# +# Created by: Emanuel Haupt <ehaupt@critical.ch> # $FreeBSD$ -# PORTNAME= metacam PORTVERSION= 1.2 @@ -25,11 +21,15 @@ MAN1= metacam.1 ALL_TARGET= ${PORTNAME} +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin ${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.1 ${MANPREFIX}/man/man1 -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} Modified: head/mail/isync/Makefile ============================================================================== --- head/mail/isync/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/mail/isync/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: isync -# Date created: 2000-12-23 -# Whom: eivind -# +# Created by: eivind # $FreeBSD$ -# PORTNAME= isync PORTVERSION= 1.0.5 @@ -27,11 +23,15 @@ PLIST_FILES= bin/get-cert bin/isync bin/ CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${OPENSSLINC} LDFLAGS+= -L${BDB_LIB_DIR} -L${OPENSSLLIB} -lssl -lcrypto +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + post-patch: @${REINPLACE_CMD} -e 's|: install-docDATA|:|g' ${WRKSRC}/Makefile.in post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for file in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} Modified: head/mail/sylpheed/Makefile ============================================================================== --- head/mail/sylpheed/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/mail/sylpheed/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -31,7 +31,7 @@ CONFIGURE_ARGS= --enable-ipv6 \ CONFLICTS= sylpheed-1.[0-8]* sylpheed-2.[0-9]* sylpheed-gtk2-[0-9]* -OPTIONS_DEFINE= GPGME COMPFACE JPILOT LDAP SSL GTKSPELL ONIGURUMA +OPTIONS_DEFINE= GPGME COMPFACE JPILOT LDAP SSL GTKSPELL ONIGURUMA DOCS GPGME_DESC= GnuPG support using GPGME COMPFACE_DESC= X-Face support @@ -114,7 +114,7 @@ post-patch: @${REINPLACE_CMD} -e 's|^\(DEFS.*\.\.\)$$|\1 -I../libsylph|' \ ${WRKSRC}/src/Makefile.in -.if defined(NOPORTDOCS) +.if empty(PORT_OPTIONS:MDOCS) @${REINPLACE_CMD} -e 's|^SUBDIRS = ac libsylph src plugin po manual faq nsis$$|SUBDIRS = ac libsylph src plugin po nsis|g' \ ${WRKSRC}/Makefile.in .else @@ -126,7 +126,7 @@ post-patch: .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for i in ChangeLog INSTALL README TODO @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} Modified: head/math/mathomatic/Makefile ============================================================================== --- head/math/mathomatic/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/math/mathomatic/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -24,6 +24,10 @@ MAN1= mathomatic.1 MAKE_ARGS= READLINE=1 +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + regression-test: build @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check @@ -34,7 +38,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/icons/mathomatic.desktop \ ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/icons/mathomatic.png ${PREFIX}/share/pixmaps -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} .for d in m4 tests ${MKDIR} ${DOCSDIR}/${d} ${INSTALL_DATA} ${WRKSRC}/${d}/* ${DOCSDIR}/${d} Modified: head/misc/countrycodes/Makefile ============================================================================== --- head/misc/countrycodes/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/misc/countrycodes/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: countrycodes -# Date created: 6 Jul 2005 -# Whom: Emanuel Haupt <ehaupt@critical.ch> -# +# Created by: Emanuel Haupt <ehaupt@critical.ch> # $FreeBSD$ -# PORTNAME= countrycodes PORTVERSION= 1.0.5 @@ -27,8 +23,12 @@ MAN1= iso3166.1 MAKE_ARGS= prefix="${PREFIX}" CC="${CC}" CCOPTS="${CFLAGS}" WARNINGS="" +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/${PORTDOCS} ${DOCSDIR} .endif Modified: head/misc/gopod/Makefile ============================================================================== --- head/misc/gopod/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/misc/gopod/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gopod -# Date created: 4 April 2005 -# Whom: Emanuel Haupt <ehaupt@critical.ch> -# +# Created by: Emanuel Haupt <ehaupt@critical.ch> # $FreeBSD$ -# PORTNAME= gopod PORTVERSION= 1.4 @@ -19,6 +15,7 @@ COMMENT?= Utility to cap/uncap an iPod HAS_CONFIGURE= yes USE_GMAKE= yes +USE_DOS2UNIX= yes MAKE_JOBS_SAFE= yes MAKE_ARGS+= CC="${CC}" @@ -32,9 +29,9 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/console-v PORTDOCS= README_EN README_FR -post-extract: - @${FIND} -E ${WRKDIR} -type f -iregex ".*\.(c|h)" -print0 | \ - ${XARGS} -0 ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> post-patch: .if ${PKGNAMEPREFIX} == "gtk-" @@ -59,7 +56,7 @@ do-install: ${PREFIX}/bin/${UNIQUENAME} .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} Modified: head/misc/ree/Makefile ============================================================================== --- head/misc/ree/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/misc/ree/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ree -# Date created: 7 Jul 2005 -# Whom: Emanuel Haupt <ehaupt@critical.ch> -# +# Created by: Emanuel Haupt <ehaupt@critical.ch> # $FreeBSD$ -# PORTNAME= ree PORTVERSION= 1.3 @@ -21,6 +17,10 @@ MAKE_JOBS_SAFE= yes ONLY_FOR_ARCHS= i386 amd64 +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + do-build: .for f in ${PORTNAME} fontdump ${CC} ${CFLAGS} ${WRKSRC}/${f}.c -o ${WRKSRC}/${f} @@ -30,7 +30,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/rom-${PORTNAME} ${INSTALL_PROGRAM} ${WRKSRC}/fontdump ${PREFIX}/bin -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/readme ${DOCSDIR} .endif Modified: head/net-im/bsflite/Makefile ============================================================================== --- head/net-im/bsflite/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/net-im/bsflite/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: bsflite -# Date created: 3 June 2005 -# Whom: Emanuel Haupt <ehaupt@critical.ch> -# +# Created by: Emanuel Haupt <ehaupt@critical.ch> # $FreeBSD$ -# PORTNAME= bsflite DISTVERSION= 0.85 @@ -19,6 +15,10 @@ PLIST_FILES= bin/bsflite %%EXAMPLESDIR%% PLIST_DIRS= %%EXAMPLESDIR%% PORTDOCS= COPYING ChangeLog README +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + post-patch: @${REINPLACE_CMD} -E '/^(CC|CFLAGS)/d' \ ${WRKSRC}/${MAKEFILE} \ @@ -29,7 +29,7 @@ do-install: ${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/config-example ${EXAMPLESDIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} Modified: head/net/corkscrew/Makefile ============================================================================== --- head/net/corkscrew/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/net/corkscrew/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: corkscrew -# Date created: Apr 12, 2001 -# Whom: Mark Pulford <mark@kyne.com.au> -# +# Created by: Mark Pulford <mark@kyne.com.au> # $FreeBSD$ -# PORTNAME= corkscrew PORTVERSION= 2.0 @@ -19,8 +15,12 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for file in NEWS README TODO ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} Modified: head/net/rsync/Makefile ============================================================================== --- head/net/rsync/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/net/rsync/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -27,14 +27,12 @@ MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --disable-debug --enable-ipv6 \ --with-rsyncd-conf=${PREFIX}/etc/rsyncd.conf -.if !defined(NOPORTDOCS) PORTDOCS= NEWS README csprotocol.txt tech_report.tex -.endif MAN1= rsync.1 MAN5= rsyncd.conf.5 -OPTIONS_DEFINE= POPT_PORT SSH FLAGS ATIMES ACL ICONV TIMELIMIT RENAMED +OPTIONS_DEFINE= POPT_PORT SSH FLAGS ATIMES ACL ICONV TIMELIMIT RENAMED DOCS POPT_PORT_DESC= Use popt from devel/popt instead of bundled one SSH_DESC= Use SSH instead of RSH FLAGS_DESC= File system flags support patch, adds --fileflags @@ -132,7 +130,7 @@ post-install: @[ -f ${PREFIX}/etc/rsyncd.conf ] || \ ${CP} ${PREFIX}/etc/rsyncd.conf.sample \ ${PREFIX}/etc/rsyncd.conf -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} .endif Modified: head/net/socat/Makefile ============================================================================== --- head/net/socat/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/net/socat/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# Ports collection makefile for: socat -# Date created: May 14, 2002 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= socat PORTVERSION= 1.7.2.1 @@ -32,21 +28,23 @@ PORTDOCS= EXAMPLES README SECURITY FAQ CFLAGS+= -Wno-unused-comparison .endif +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + do-install: .for f in filan procan socat ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin .endfor ${INSTALL_SCRIPT} ${FILESDIR}/socat_wrapper ${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MAN1PREFIX}/man/man1 -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif -.include <bsd.port.pre.mk> - .if ${ARCH} == "arm" BROKEN= Does not configure on arm .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/news/brag/Makefile ============================================================================== --- head/news/brag/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/news/brag/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: brag -# Date created: 19 Jul 2005 -# Whom: Emanuel Haupt <ehaupt@critical.ch> -# +# Created by: Emanuel Haupt <ehaupt@critical.ch> # $FreeBSD$ -# PORTNAME= brag PORTVERSION= 1.4.1 @@ -25,6 +21,10 @@ PORTDOCS= CHANGES README TCLSH= tclsh8.4 +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + post-patch: @${REINPLACE_CMD} -e 's|^\(exec\ \)tclsh|\1${TCLSH}|' \ ${WRKSRC}/${PORTNAME} @@ -33,7 +33,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1 -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} Modified: head/security/bcrypt/Makefile ============================================================================== --- head/security/bcrypt/Makefile Tue Jan 15 13:39:07 2013 (r310442) +++ head/security/bcrypt/Makefile Tue Jan 15 13:40:28 2013 (r310443) @@ -1,9 +1,5 @@ -# New ports collection makefile for: bcrypt -# Date created: 11 Aug 2005 -# Whom: Emanuel Haupt <ehaupt@critical.ch> -# *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301151340.r0FDeTCH042305>