Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Jul 2014 07:45:57 +0200
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        Adam Weinberger <adamw@freebsd.org>
Cc:        "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, "ports-committers@freebsd.org" <ports-committers@freebsd.org>
Subject:   Re: svn commit: r360487 - in head/devel: bicyclerepair bullet cweb ding-libs distel global gnome-js-common google-sparsehash java-findbugs libcii libiqxmlrpc log4cpp luajava p5-App-Build p5-Class-Alzab...
Message-ID:  <CAALwa8k5WujiRV5GTfyuYqXM7cX4iPxP=9=8NQQ2NQ68kBMXZA@mail.gmail.com>
In-Reply-To: <201407032357.s63Nv8cV065323@svn.freebsd.org>
References:  <201407032357.s63Nv8cV065323@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Jul 4, 2014 at 1:57 AM, Adam Weinberger <adamw@freebsd.org> wrote:
> Author: adamw
> Date: Thu Jul  3 23:57:07 2014
> New Revision: 360487
> URL: http://svnweb.freebsd.org/changeset/ports/360487
> QAT: https://qat.redports.org/buildarchive/r360487/
>
> Log:
>   Remove NOPORTDOCS and NOPORTEXAMPLES.
>
>   Approved by:  portmgr (blanket)

Hi,

Thanks for your work,  but please don't commit untested changes.
The portmgr blanket doesn't cover breaking previously working ports.

Cheers,

Antoine

> Modified:
>   head/devel/bicyclerepair/Makefile
>   head/devel/bullet/Makefile
>   head/devel/cweb/Makefile
>   head/devel/ding-libs/Makefile
>   head/devel/distel/Makefile
>   head/devel/global/Makefile
>   head/devel/gnome-js-common/Makefile
>   head/devel/google-sparsehash/Makefile
>   head/devel/java-findbugs/Makefile
>   head/devel/libcii/Makefile
>   head/devel/libiqxmlrpc/Makefile
>   head/devel/log4cpp/Makefile
>   head/devel/log4cpp/pkg-plist
>   head/devel/luajava/Makefile
>   head/devel/p5-App-Build/Makefile
>   head/devel/p5-Class-AlzaboWrapper/Makefile
>   head/devel/p5-Class-Contract/Makefile
>   head/devel/p5-Class-Delegation/Makefile
>   head/devel/p5-Data-Dump/Makefile
>   head/devel/p5-Data-Uniqid/Makefile
>   head/devel/p5-DateTime-Format-Epoch/Makefile
>   head/devel/p5-DateTime-Incomplete/Makefile
>   head/devel/p5-Devel-Diagram/Makefile
>   head/devel/p5-Devel-Size-Report/Makefile
>   head/devel/p5-File-Modified/Makefile
>   head/devel/p5-Locale-Maketext-Gettext/Makefile
>   head/devel/p5-POE-Component-Daemon/Makefile
>   head/devel/p5-POE-Loop-Glib/Makefile
>   head/devel/p5-Pod-Coverage/Makefile
>   head/devel/p5-Spoon/Makefile
>   head/devel/p5-Test-Tester/Makefile
>   head/devel/p5-TheSchwartz/Makefile
>   head/devel/pcsc-lite/Makefile
>   head/devel/py-akismet/Makefile
>   head/devel/py-coil/Makefile
>   head/devel/py-cxx/Makefile
>   head/devel/py-interface/Makefile
>   head/devel/py-log4py/Makefile
>   head/devel/py-notifier/Makefile
>   head/devel/py-pycallgraph/Makefile
>   head/devel/py-pyke/Makefile
>   head/devel/py-pyshapelib/Makefile
>   head/devel/py-pytemplate/Makefile
>   head/devel/radare2/Makefile
>   head/devel/scalatest/Makefile
>   head/devel/skalibs/Makefile
>   head/devel/xmltooling/Makefile
>
> Modified: head/devel/bicyclerepair/Makefile
> ==============================================================================
> --- head/devel/bicyclerepair/Makefile   Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/bicyclerepair/Makefile   Thu Jul  3 23:57:07 2014        (r360487)
> @@ -13,11 +13,12 @@ COMMENT=    Python refactoring tool
>  USE_PYTHON=    yes
>  USE_PYDISTUTILS=yes
>
> +OPTIONS_DEFINE=        DOCS
> +
>  .if defined(EMACS_PORT_NAME)
>  RUN_DEPENDS+=  ${LOCALBASE}/bin/pymacs-services:${PORTSDIR}/devel/pymacs
>  .endif
>
> -.if !defined(NOPORTDOCS)
>  post-install:
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         ${INSTALL_DATA} ${WRKSRC}/ide-integration/bike.vim ${STAGEDIR}${DOCSDIR}
> @@ -27,6 +28,5 @@ post-install:
>         @${ECHO} "* See" ${DOCSDIR} "for instructions on configuring IDLE"
>         @${ECHO} "* and vim to use Bicycle Repair Man."
>         @${ECHO} "================================================================"
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/bullet/Makefile
> ==============================================================================
> --- head/devel/bullet/Makefile  Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/bullet/Makefile  Thu Jul  3 23:57:07 2014        (r360487)
> @@ -27,6 +27,9 @@ WRKSRC=               ${WRKDIR}/${PORTNAME}-${PORTVER
>  PORTDOCS=      *
>
>  SVN_COMMIT=    r2704
> +
> +OPTIONS_DEFINE=        DOCS
> +
>  .include <bsd.port.pre.mk>
>
>  .if (${ARCH} == "amd64") || (${ARCH} == "ia64")
> @@ -37,11 +40,9 @@ post-patch:
>         @${REINPLACE_CMD} -e "s|{OPENGL_glu_LIBRARY}|{OPENGL_glu_LIBRARY} -lcompat|g" ${WRKSRC}/Demos/AllBulletDemos/CMakeLists.txt
>
>  post-install:
> -.if !defined(NOPORTDOCS)
>         @${MKDIR} ${STAGEDIR}/${DOCSDIR}
>         ${INSTALL_DATA} ${WRKSRC}/*.pdf ${STAGEDIR}/${DOCSDIR}
>         ${INSTALL_DATA} ${WRKSRC}/BulletLicense.txt ${STAGEDIR}/${DOCSDIR}
>         ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}/${DOCSDIR}/CHANGELOG
> -.endif
>
>  .include <bsd.port.post.mk>
>
> Modified: head/devel/cweb/Makefile
> ==============================================================================
> --- head/devel/cweb/Makefile    Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/cweb/Makefile    Thu Jul  3 23:57:07 2014        (r360487)
> @@ -18,6 +18,8 @@ MAKE_ARGS=    CWEBINPUTS="${DATADIR}" \
>                 LINKFLAGS="" \
>                 CC="${CC}"
>
> +OPTIONS_DEFINE=        DOCS
> +
>  post-patch:
>         @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/cweb.1
>
> @@ -32,9 +34,7 @@ do-install:
>         @${MKDIR} ${STAGEDIR}${PREFIX}/share/texmf/tex/generic/misc
>         ${INSTALL_DATA} ${WRKSRC}/cwebmac.tex \
>                 ${STAGEDIR}${PREFIX}/share/texmf/tex/generic/misc
> -.if !defined(NOPORTDOCS)
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         ${INSTALL_DATA} ${WRKDIR}/cwebman.tex ${STAGEDIR}${DOCSDIR}
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/ding-libs/Makefile
> ==============================================================================
> --- head/devel/ding-libs/Makefile       Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/ding-libs/Makefile       Thu Jul  3 23:57:07 2014        (r360487)
> @@ -19,7 +19,11 @@ USE_LDCONFIG=        yes
>
>  CONFIGURE_ENV+=        DOXYGEN=""
>
> -.if !defined(NOPORTDOCS)
> +OPTIONS_DEFINE=        DOCS
> +
> +.include <bsd.port.options.mk>
> +
> +.if ${PORT_OPTIONS:MDOCS}
>  CONFIGURE_ARGS=        --docdir=${DOCSDIR}
>  .else
>  CONFIGURE_ARGS=        --docdir=/dev/null
>
> Modified: head/devel/distel/Makefile
> ==============================================================================
> --- head/devel/distel/Makefile  Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/distel/Makefile  Thu Jul  3 23:57:07 2014        (r360487)
> @@ -22,6 +22,8 @@ USE_EMACS=    yes
>  DISTEL_DOCS=   AUTHORS ChangeLog INSTALL INSTALL.WIN32 NEWS README README.ie-session
>  DISTEL_ROOT=   ${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}
>
> +OPTIONS_DEFINE=        DOCS
> +
>  do-build:
>         @${MKDIR} ${WRKSRC}/ebin
>         @cd ${WRKSRC} && erlc -W0 -o ebin/ +debug_info src/*.erl
> @@ -30,7 +32,6 @@ do-install:
>         @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
>         @${INSTALL_DATA} ${WRKSRC}/elisp/*el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
>
> -.if !defined(NOPORTDOCS)
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         @for FILE in ${DISTEL_DOCS}; do \
>                 ${INSTALL_DATA} ${WRKSRC}/$${FILE} ${STAGEDIR}${DOCSDIR}; \
> @@ -38,7 +39,7 @@ do-install:
>         @${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${STAGEDIR}${DOCSDIR}
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}/html
>         @${INSTALL_DATA} ${WRKSRC}/doc/distel/*.html ${STAGEDIR}${DOCSDIR}/html
> -.endif
> +
>         @${MKDIR} ${STAGEDIR}${DISTEL_ROOT}/src
>         @${MKDIR} ${STAGEDIR}${DISTEL_ROOT}/ebin
>         @${INSTALL_DATA} ${WRKSRC}/src/*.erl ${STAGEDIR}${DISTEL_ROOT}/src
>
> Modified: head/devel/global/Makefile
> ==============================================================================
> --- head/devel/global/Makefile  Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/global/Makefile  Thu Jul  3 23:57:07 2014        (r360487)
> @@ -20,11 +20,11 @@ DOCS=               AUTHORS COPYING ChangeLog FAQ INS
>  post-patch:
>         ${REINPLACE_CMD} -E 's,^(gtags_DATA = )AUTHORS .* THANKS( \\$$),\1\2,' ${WRKSRC}/Makefile.in
>
> +OPTIONS_DEFINE=        DOCS
> +
>  post-install:
> -.if !defined(NOPORTDOCS)
> -       ${MKDIR} ${STAGEDIR}${DOCSDIR}/
> -       cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
> -.endif
> +       ${MKDIR} ${STAGEDIR}${DOCSDIR}
> +       cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
>
>  # This target is only meant to be used by the port maintainer.
>  x-generate-plist:
>
> Modified: head/devel/gnome-js-common/Makefile
> ==============================================================================
> --- head/devel/gnome-js-common/Makefile Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/gnome-js-common/Makefile Thu Jul  3 23:57:07 2014        (r360487)
> @@ -19,10 +19,14 @@ USES=               pkgconfig gettext gmake
>
>  PORTDOCS=      AUTHORS COPYING INSTALL NEWS README ChangeLog
>
> +OPTIONS_DEFINE=        DOCS
> +
> +.include <bsd.port.options.mk>
> +
>  post-patch:
>         @${REINPLACE_CMD} -e 's|== x|= x|g' \
>                 ${WRKSRC}/configure
> -.if !defined(NOPORTDOCS)
> +.if ${PORT_OPTIONS:MDOCS}
>         @${REINPLACE_CMD} -e 's|$${prefix}/share/doc/gnome_js_common|${DOCSDIR}|' \
>                 ${WRKSRC}/Makefile.in
>  .else
>
> Modified: head/devel/google-sparsehash/Makefile
> ==============================================================================
> --- head/devel/google-sparsehash/Makefile       Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/google-sparsehash/Makefile       Thu Jul  3 23:57:07 2014        (r360487)
> @@ -17,13 +17,13 @@ COMMENT=    Extremely memory-efficient hash
>  GNU_CONFIGURE= yes
>  USE_GCC=       4.8+
>
> -.include <bsd.port.pre.mk>
> +.include <bsd.port.options.mk>
>
>  post-patch:
>         ${REINPLACE_CMD} -e \
>                 's|^pkgconfigdir = .*|pkgconfigdir = ${LOCALBASE}/libdata/pkgconfig|' \
>                 ${WRKSRC}/Makefile.in
> -.if !defined(NOPORTDOCS)
> +.if ${PORT_OPTIONS:MDOCS}
>         ${REINPLACE_CMD} -e \
>                 's|^docdir = .*|docdir = ${DOCSDIR}|' \
>                 ${WRKSRC}/Makefile.in
> @@ -38,4 +38,4 @@ regression-test: check
>  check: build
>         cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check
>
> -.include <bsd.port.post.mk>
> +.include <bsd.port.mk>
>
> Modified: head/devel/java-findbugs/Makefile
> ==============================================================================
> --- head/devel/java-findbugs/Makefile   Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/java-findbugs/Makefile   Thu Jul  3 23:57:07 2014        (r360487)
> @@ -44,13 +44,11 @@ PLIST_DIRS+=                %%DATADIR%%/lib \
>                         %%DATADIR%%/bin \
>                         %%DATADIR%%
>
> -.if !defined(NOPORTDOCS)
> +OPTIONS_DEFINE=        DOCS EXAMPLES
> +
>  PORTDOCS=      *
> -.endif
>
> -.if !defined(NOPORTEXAMPLES)
>  PORTEXAMPLES=  *
> -.endif
>
>  do-install:
>         @-${MKDIR} ${STAGEDIR}${DATADIR}/lib
> @@ -62,17 +60,13 @@ do-install:
>                 -e "s:%%JAVAJARDIR%%:${JAVAJARDIR}:" ${WRKSRC}/bin/${PORTNAME}2
>         ${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME}2 ${STAGEDIR}${DATADIR}/bin/${PORTNAME}
>         ${LN} -sf ${DATADIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
> -.if !defined(NOPORTDOCS)
>         @-${MKDIR} ${STAGEDIR}${DOCSDIR}
>  .for f in LICENSE* README*
>         @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
>  .endfor
>         @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/
> -.endif
> -.if !defined(NOPORTEXAMPLES)
>         @-${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>         @cd ${WRKSRC}/src && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/
>         @cd ${WRKSRC}/bin && ${COPYTREE_BIN} . ${STAGEDIR}${EXAMPLESDIR}/
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/libcii/Makefile
> ==============================================================================
> --- head/devel/libcii/Makefile  Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/libcii/Makefile  Thu Jul  3 23:57:07 2014        (r360487)
> @@ -26,6 +26,8 @@ SAMPLES=      double calc ids mpcalc wf xref
>                 idents words basename dirname
>  I386_SAMPLES=  sort spin sieve
>
> +OPTIONS_DEFINE=        DOCS
> +
>  .include <bsd.port.pre.mk>
>
>  .if ${ARCH} != "i386"
> @@ -75,7 +77,6 @@ do-install:
>  .  endfor
>  .endif
>  ##
> -.if !defined(NOPORTDOCS)
>         @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/cii
>         @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/cii/examples
>         @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/cii/src
> @@ -84,6 +85,5 @@ do-install:
>  .endfor
>         ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${PREFIX}/share/doc/cii/examples
>         ${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/share/doc/cii/src
> -.endif
>
>  .include <bsd.port.post.mk>
>
> Modified: head/devel/libiqxmlrpc/Makefile
> ==============================================================================
> --- head/devel/libiqxmlrpc/Makefile     Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/libiqxmlrpc/Makefile     Thu Jul  3 23:57:07 2014        (r360487)
> @@ -10,24 +10,25 @@ MASTER_SITES=       SF
>  MAINTAINER=    fjoe@FreeBSD.org
>  COMMENT=       Free, object-oriented XML-RPC implementation written in C++
>
> -.if !defined(NOPORTDOCS)
> -BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen
> -.endif
>  LIB_DEPENDS=   libboost_thread.so:${PORTSDIR}/devel/boost-libs
>
> +OPTIONS_DEFINE=        DOCS
> +OPTIONS_DEFAULT=
> +
> +DOCS_BUILD_DEPENDS=    doxygen:${PORTSDIR}/devel/doxygen
> +DOCS_CMAKE_ARGS_OFF=   -Dbuild_docs=off
> +
>  LICENSE=       BSD
>
>  USE_BZIP2=     yes
>  USE_GNOME=     libxml2
>  USES=          cmake
> -.if defined(NOPORTDOCS)
> -CMAKE_ARGS=    -Dbuild_docs=off
> -.endif
>  LDFLAGS+=      -L${LOCALBASE}/lib
>  USE_LDCONFIG=  yes
>  USE_OPENSSL=   yes
>
>  PORTDATA=      *
> +PORTDOCS=      *
>
>  post-patch:
>         ${REINPLACE_CMD} -e 's,lib/pkgconfig,libdata/pkgconfig,' ${WRKSRC}/libiqxmlrpc/CMakeLists.txt
>
> Modified: head/devel/log4cpp/Makefile
> ==============================================================================
> --- head/devel/log4cpp/Makefile Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/log4cpp/Makefile Thu Jul  3 23:57:07 2014        (r360487)
> @@ -16,13 +16,10 @@ CONFIGURE_ARGS=     --with-pthreads --disabl
>  USE_LDCONFIG=  yes
>  WRKSRC=                ${WRKDIR}/${PORTNAME}
>
> -.include <bsd.port.pre.mk>
> -
>  # doxygen build is BROKEN atm
>  #.if exists (${LOCALBASE}/bin/doxygen) || !defined (NOPORTDOCS)
>  #BUILD_DEPENDS+=       doxygen:${PORTSDIR}/devel/doxygen
>  #.else
> -NOPORTDOCS=            true
>  CONFIGURE_ARGS+=       --disable-doxygen
>  #.endif
>
> @@ -39,4 +36,4 @@ CONFIGURE_ARGS+=      --disable-doxygen
>  post-patch:
>         @${REINPLACE_CMD} -e 's| -pedantic||g' ${WRKSRC}/configure
>
> -.include <bsd.port.post.mk>
> +.include <bsd.port.mk>
>
> Modified: head/devel/log4cpp/pkg-plist
> ==============================================================================
> --- head/devel/log4cpp/pkg-plist        Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/log4cpp/pkg-plist        Thu Jul  3 23:57:07 2014        (r360487)
> @@ -57,9 +57,9 @@ lib/liblog4cpp.so.5
>  lib/liblog4cpp.so.5.0.6
>  libdata/pkgconfig/log4cpp.pc
>  share/aclocal/log4cpp.m4
> -%%PORTDOCS%%%%DOCSDIR%%/index.html
> -%%PORTDOCS%%%%DOCSDIR%%/default.css
> -%%PORTDOCS%%%%DOCSDIR%%/sflogo.png
> +@comment %%PORTDOCS%%%%DOCSDIR%%/index.html
> +@comment %%PORTDOCS%%%%DOCSDIR%%/default.css
> +@comment %%PORTDOCS%%%%DOCSDIR%%/sflogo.png
>  @dirrm include/log4cpp/threading
>  @dirrm include/log4cpp
> -%%PORTDOCS%%@dirrm %%DOCSDIR%%
> +@comment %%PORTDOCS%%@dirrm %%DOCSDIR%%
>
> Modified: head/devel/luajava/Makefile
> ==============================================================================
> --- head/devel/luajava/Makefile Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/luajava/Makefile Thu Jul  3 23:57:07 2014        (r360487)
> @@ -19,6 +19,8 @@ MAKE_JOBS_UNSAFE=     yes
>  ALL_TARGET=    run
>  DOS2UNIX_REGEX=        .*\.*
>
> +OPTIONS_DEFINE=        DOCS
> +
>  .include <bsd.port.pre.mk>
>
>  .if ${JAVA_PORT_VERSION} == 1.7
> @@ -42,9 +44,7 @@ do-install:
>         ${INSTALL_DATA} ${WRKSRC}/luajava-1.1.jar ${STAGEDIR}${JAVAJARDIR}
>
>  post-install:
> -.if !defined(NOPORTDOCS)
>         ${MKDIR} ${STAGEDIR}${DOCSDIR}
> -       (cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
> -.endif
> +       (cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
>
>  .include <bsd.port.post.mk>
>
> Modified: head/devel/p5-App-Build/Makefile
> ==============================================================================
> --- head/devel/p5-App-Build/Makefile    Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/p5-App-Build/Makefile    Thu Jul  3 23:57:07 2014        (r360487)
> @@ -19,12 +19,9 @@ BUILD_DEPENDS=       p5-Test-Differences>=0.47
>  USES=          perl5
>  USE_PERL5=     modbuild
>
> -.if !defined(NOPORTDOCS)
> -
>  post-install:
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         @${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
>         @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/p5-Class-AlzaboWrapper/Makefile
> ==============================================================================
> --- head/devel/p5-Class-AlzaboWrapper/Makefile  Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/p5-Class-AlzaboWrapper/Makefile  Thu Jul  3 23:57:07 2014        (r360487)
> @@ -18,13 +18,13 @@ RUN_DEPENDS:=       ${BUILD_DEPENDS}
>  USES=          perl5
>  USE_PERL5=     modbuild
>
> -.if !defined(NOPORTDOCS)
>  PORTDOCS=      Changes README
>
> +OPTIONS_DEFINE=        DOCS
> +
>  post-install:
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
>         @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/p5-Class-Contract/Makefile
> ==============================================================================
> --- head/devel/p5-Class-Contract/Makefile       Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/p5-Class-Contract/Makefile       Thu Jul  3 23:57:07 2014        (r360487)
> @@ -14,14 +14,14 @@ USES=               perl5 dos2unix
>  USE_PERL5=     configure
>  PLIST_SUB+=    EXAMPLESDIR="share/examples/${PORTNAME}"
>
> +OPTIONS_DEFINE=        EXAMPLES
> +
>  pre-configure:
>         ${MKDIR} ${WRKSRC}/examples
>         ${MV} ${WRKSRC}/demo.pl ${WRKSRC}/examples
>
>  post-install:
> -.ifndef(NOPORTDOCS)
>         @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>         ${INSTALL_SCRIPT} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/p5-Class-Delegation/Makefile
> ==============================================================================
> --- head/devel/p5-Class-Delegation/Makefile     Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/p5-Class-Delegation/Makefile     Thu Jul  3 23:57:07 2014        (r360487)
> @@ -18,11 +18,11 @@ RUN_DEPENDS:=       ${BUILD_DEPENDS}
>  USES=          perl5
>  USE_PERL5=     configure
>
> +OPTIONS_DEFINE=        EXAMPLES
> +
>  post-install:
> -.ifndef(NOPORTDOCS)
>         @${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
>         @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>         ${INSTALL_SCRIPT} ${WRKSRC}/demo/* ${STAGEDIR}${EXAMPLESDIR}
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/p5-Data-Dump/Makefile
> ==============================================================================
> --- head/devel/p5-Data-Dump/Makefile    Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/p5-Data-Dump/Makefile    Thu Jul  3 23:57:07 2014        (r360487)
> @@ -13,13 +13,13 @@ COMMENT=    Pretty printing of data structu
>  USES=          perl5
>  USE_PERL5=     configure
>
> -.if !defined(NOPORTDOCS)
> +OPTIONS_DEFINE=        DOCS
> +
>  PORTDOCS=      Changes README
>
>  post-install:
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
>         @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/p5-Data-Uniqid/Makefile
> ==============================================================================
> --- head/devel/p5-Data-Uniqid/Makefile  Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/p5-Data-Uniqid/Makefile  Thu Jul  3 23:57:07 2014        (r360487)
> @@ -15,11 +15,11 @@ USE_PERL5=  configure
>
>  PORTDOCS=      Changes README
>
> +OPTIONS_DEFINE=        DOCS
> +
>  post-install:
> -.if !defined(NOPORTDOCS)
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
>         @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/p5-DateTime-Format-Epoch/Makefile
> ==============================================================================
> --- head/devel/p5-DateTime-Format-Epoch/Makefile        Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/p5-DateTime-Format-Epoch/Makefile        Thu Jul  3 23:57:07 2014        (r360487)
> @@ -20,12 +20,12 @@ PORTSCOUT=  skipv:0.801
>  USES=          perl5
>  USE_PERL5=     modbuild
>
> -.if !defined(NOPORTDOCS)
> +OPTIONS_DEFINE=        DOCS
> +
>  PORTDOCS=      Changes README TODO
>
>  post-install:
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/p5-DateTime-Incomplete/Makefile
> ==============================================================================
> --- head/devel/p5-DateTime-Incomplete/Makefile  Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/p5-DateTime-Incomplete/Makefile  Thu Jul  3 23:57:07 2014        (r360487)
> @@ -22,12 +22,12 @@ RUN_DEPENDS:=       ${BUILD_DEPENDS}
>  USES=          perl5
>  USE_PERL5=     configure
>
> -.if !defined(NOPORTDOCS)
> +OPTIONS_DEFINE=        DOCS
> +
>  PORTDOCS=      Changes LICENSE MANIFEST README TODO
>
>  post-install:
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/p5-Devel-Diagram/Makefile
> ==============================================================================
> --- head/devel/p5-Devel-Diagram/Makefile        Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/p5-Devel-Diagram/Makefile        Thu Jul  3 23:57:07 2014        (r360487)
> @@ -13,10 +13,10 @@ COMMENT=    Discover the classes of an arbi
>  USES=          perl5 dos2unix
>  USE_PERL5=     configure
>
> +OPTIONS_DEFINE=        EXAMPLES
> +
>  post-install:
> -.ifndef(NOPORTDOCS)
>         @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>         ${INSTALL_SCRIPT} ${WRKSRC}/eg/* ${STAGEDIR}${EXAMPLESDIR}
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/p5-Devel-Size-Report/Makefile
> ==============================================================================
> --- head/devel/p5-Devel-Size-Report/Makefile    Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/p5-Devel-Size-Report/Makefile    Thu Jul  3 23:57:07 2014        (r360487)
> @@ -18,13 +18,13 @@ RUN_DEPENDS:=       ${BUILD_DEPENDS}
>  USES=          perl5
>  USE_PERL5=     configure
>
> -.if !defined(NOPORTDOCS)
> +OPTIONS_DEFINE=        DOCS
> +
>  PORTDOCS=      CHANGES
>
>  post-install:
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
>         @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/p5-File-Modified/Makefile
> ==============================================================================
> --- head/devel/p5-File-Modified/Makefile        Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/p5-File-Modified/Makefile        Thu Jul  3 23:57:07 2014        (r360487)
> @@ -19,7 +19,8 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
>  USES=          perl5
>  USE_PERL5=     configure
>
> -.if !defined(NOPORTDOCS)
> +OPTIONS_DEFINE=        DOCS EXAMPLES
> +
>  PORTDOCS=      Changes README bug.txt
>  EXAMPLES=      example/1.pl example/Export.cfg example/Import.cfg
>
> @@ -27,6 +28,5 @@ post-install:
>         @${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR}
>         ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
>         ${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/p5-Locale-Maketext-Gettext/Makefile
> ==============================================================================
> --- head/devel/p5-Locale-Maketext-Gettext/Makefile      Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/p5-Locale-Maketext-Gettext/Makefile      Thu Jul  3 23:57:07 2014        (r360487)
> @@ -14,12 +14,12 @@ COMMENT=    Joins gettext and Maketext fram
>  USES=          perl5
>  USE_PERL5=     configure
>
> -.if !defined(NOPORTDOCS)
> +OPTIONS_DEFINE=        DOCS
> +
>  PORTDOCS=      BUGS Changes README THANKS
>
>  post-install:
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/p5-POE-Component-Daemon/Makefile
> ==============================================================================
> --- head/devel/p5-POE-Component-Daemon/Makefile Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/p5-POE-Component-Daemon/Makefile Thu Jul  3 23:57:07 2014        (r360487)
> @@ -19,6 +19,8 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
>  USES=          perl5
>  USE_PERL5=     configure
>
> +OPTIONS_DEFINE=        DOCS EXAMPLES
> +
>  PORTDOCS=      *
>
>  post-install:
> @@ -29,11 +31,9 @@ post-install:
>                 ${INSTALL_SCRIPT} $${i} ${STAGEDIR}${EXAMPLESDIR}; \
>         done
>
> -.ifndef(NOPORTDOCS)
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         for i in ${WRKSRC}/eg/*.png ${WRKSRC}/eg/*.dot; do \
>                 ${INSTALL_DATA} $${i} ${STAGEDIR}${DOCSDIR}; \
>         done
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/p5-POE-Loop-Glib/Makefile
> ==============================================================================
> --- head/devel/p5-POE-Loop-Glib/Makefile        Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/p5-POE-Loop-Glib/Makefile        Thu Jul  3 23:57:07 2014        (r360487)
> @@ -21,11 +21,11 @@ PLIST_SUB=  EXAMPLESDIR="share/examples/$
>  USES=          perl5
>  USE_PERL5=     configure
>
> +OPTIONS_DEFINE=        EXAMPLES
> +
>  post-install:
> -.ifndef(NOPORTEXAMPLES)
>         @${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
>         @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>         ${INSTALL_SCRIPT} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/p5-Pod-Coverage/Makefile
> ==============================================================================
> --- head/devel/p5-Pod-Coverage/Makefile Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/p5-Pod-Coverage/Makefile Thu Jul  3 23:57:07 2014        (r360487)
> @@ -21,14 +21,12 @@ USE_PERL5=  configure
>  PORTDOCS=      Changes
>  PORTEXAMPLES=  check_installed script-covered
>
> +OPTIONS_DEFINE=        DOCS EXAMPLES
> +
>  post-install:
> -.if !defined(NOPORTDOCS)
> -       @${MKDIR} ${STAGEDIR}${DOCSDIR}/
> -       ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/
> -.endif
> -.if !defined(NOPORTEXAMPLES)
> -       @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
> -       ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/examples/|} ${STAGEDIR}${EXAMPLESDIR}/
> -.endif
> +       @${MKDIR} ${STAGEDIR}${DOCSDIR}
> +       ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
> +       @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> +       ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/examples/|} ${STAGEDIR}${EXAMPLESDIR}
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/p5-Spoon/Makefile
> ==============================================================================
> --- head/devel/p5-Spoon/Makefile        Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/p5-Spoon/Makefile        Thu Jul  3 23:57:07 2014        (r360487)
> @@ -21,12 +21,12 @@ RUN_DEPENDS:=       ${BUILD_DEPENDS}
>  USES=          perl5
>  USE_PERL5=     configure
>
> -.if !defined(NOPORTDOCS)
> +OPTIONS_DEFINE=        DOCS
> +
>  PORTDOCS=      Changes README
>
>  post-install:
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/p5-Test-Tester/Makefile
> ==============================================================================
> --- head/devel/p5-Test-Tester/Makefile  Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/p5-Test-Tester/Makefile  Thu Jul  3 23:57:07 2014        (r360487)
> @@ -16,12 +16,12 @@ USES=               perl5
>  USE_PERL5=     configure
>  INSTALL_TARGET=        pure_install
>
> -.if !defined(NOPORTDOCS)
> +OPTIONS_DEFINE=        DOCS
> +
>  PORTDOCS=      CHANGES
>
>  post-install:
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/p5-TheSchwartz/Makefile
> ==============================================================================
> --- head/devel/p5-TheSchwartz/Makefile  Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/p5-TheSchwartz/Makefile  Thu Jul  3 23:57:07 2014        (r360487)
> @@ -19,12 +19,12 @@ USES=               perl5 shebangfix
>  USE_PERL5=     configure
>  SHEBANG_FILES= extras/check_schwartz extras/thetop
>
> +OPTIONS_DEFINE=        DOCS
> +
>  post-install:
>         ${INSTALL_SCRIPT} ${WRKSRC}/extras/check_schwartz ${STAGEDIR}${PREFIX}/bin/
>         ${INSTALL_SCRIPT} ${WRKSRC}/extras/thetop ${STAGEDIR}${PREFIX}/bin/
> -.if !defined(NOPORTDOCS)
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         ${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}/
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/pcsc-lite/Makefile
> ==============================================================================
> --- head/devel/pcsc-lite/Makefile       Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/pcsc-lite/Makefile       Thu Jul  3 23:57:07 2014        (r360487)
> @@ -25,6 +25,8 @@ CONFIGURE_ARGS=       --enable-usbdropdir=${PR
>
>  PKGMESSAGE=    ${WRKDIR}/pkg-message
>
> +OPTIONS_DEFINE=        DOCS EXAMPLES
> +
>  .include <bsd.port.pre.mk>
>
>  .if ${OSVERSION} < 1000000
> @@ -47,7 +49,7 @@ post-patch:
>                 s,libusb_strerror(ret),ret," ${WRKSRC}/configure \
>                         ${WRKSRC}/src/hotplug_libusb.c
>         ${REINPLACE_CMD} -e "s,-ldl,," ${WRKSRC}/src/spy/Makefile.in
> -.if defined(NOPORTDOCS)
> +.if ${PORT_OPTIONS:MDOCS}
>         ${REINPLACE_CMD} -e '/^install-data-am: / s|install-docDATA||' ${WRKSRC}/doc/Makefile.in
>  .endif
>
>
> Modified: head/devel/py-akismet/Makefile
> ==============================================================================
> --- head/devel/py-akismet/Makefile      Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/py-akismet/Makefile      Thu Jul  3 23:57:07 2014        (r360487)
> @@ -21,10 +21,10 @@ PYDISTUTILS_PKGNAME=        akismet
>
>  DOCSDIR=       ${PREFIX}/share/doc/py-${PORTNAME}
>
> +OPTIONS_DEFINE=        DOCS
> +
>  post-install:
> -.if !defined(NOPORTDOCS)
>         ${MKDIR} ${STAGEDIR}${DOCSDIR}
>         @(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/py-coil/Makefile
> ==============================================================================
> --- head/devel/py-coil/Makefile Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/py-coil/Makefile Thu Jul  3 23:57:07 2014        (r360487)
> @@ -19,14 +19,14 @@ USE_PYDISTUTILS=    yes
>  PORTDOCS=      README.txt \
>                 TODO.txt
>
> +OPTIONS_DEFINE=        DOCS
> +
>  post-install:
>  # docs
> -.ifndef(NOPORTDOCS)
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>  .for file in ${PORTDOCS}
>         @${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
>  .endfor
> -.endif
>
>  # permission safeness
>         @${CHMOD} -R ${SHAREMODE} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/coil/*
>
> Modified: head/devel/py-cxx/Makefile
> ==============================================================================
> --- head/devel/py-cxx/Makefile  Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/py-cxx/Makefile  Thu Jul  3 23:57:07 2014        (r360487)
> @@ -20,11 +20,11 @@ PYDISTUTILS_PKGVERSION=     5.3
>  DOCSDIR=       ${PREFIX}/share/doc/py-${PORTNAME}
>  PORTDOCS=      *
>
> -.if !defined(NOPORTDOCS)
> +OPTIONS_DEFINE=        DOCS
> +
>  post-install:
> -               @${MKDIR} ${STAGEDIR}${DOCSDIR}
> -               ${INSTALL_DATA} ${WRKSRC}/Doc/PyCXX.html ${STAGEDIR}${DOCSDIR}
> -.endif
> +       @${MKDIR} ${STAGEDIR}${DOCSDIR}
> +       ${INSTALL_DATA} ${WRKSRC}/Doc/PyCXX.html ${STAGEDIR}${DOCSDIR}
>
>  post-patch:
>         @${REINPLACE_CMD} \
>
> Modified: head/devel/py-interface/Makefile
> ==============================================================================
> --- head/devel/py-interface/Makefile    Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/py-interface/Makefile    Thu Jul  3 23:57:07 2014        (r360487)
> @@ -19,15 +19,13 @@ PYDISTUTILS_PKGNAME=        py_${PORTNAME}
>  DOCSDIR=       ${PREFIX}/share/doc/py_${PORTNAME}
>  EXAMPLESDIR=   ${PREFIX}/share/examples/py_${PORTNAME}
>
> +OPTIONS_DEFINE=        DOCS EXAMPLES
> +
>  post-install:
>         @${TRUE}
> -.if !defined(NOPORTDOCS)
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}
> -.endif
> -.if !defined(NOPORTEXAMPLES)
>         @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>         cd ${WRKSRC}/examples && ${INSTALL_DATA} * ${STAGEDIR}${EXAMPLESDIR}
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/py-log4py/Makefile
> ==============================================================================
> --- head/devel/py-log4py/Makefile       Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/py-log4py/Makefile       Thu Jul  3 23:57:07 2014        (r360487)
> @@ -15,10 +15,10 @@ LICENSE=    MIT
>  USE_PYTHON=    yes
>  USE_PYDISTUTILS=       yes
>
> -.if !defined(NOPORTDOCS)
> +OPTIONS_DEFINE=        DOCS
> +
>  post-install:
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         ${CP} -R ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/py-notifier/Makefile
> ==============================================================================
> --- head/devel/py-notifier/Makefile     Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/py-notifier/Makefile     Thu Jul  3 23:57:07 2014        (r360487)
> @@ -21,10 +21,10 @@ EXAMPLESDIR=        ${PREFIX}/share/examples/py
>
>  WRKSRC=                ${WRKDIR}/py${PORTNAME}-${PORTVERSION}
>
> -.if !defined(NOPORTEXAMPLES)
> +OPTIONS_DEFINE=        EXAMPLES
> +
>  post-install:
>         ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>         ${CP} ${WRKSRC}/examples/*.py ${STAGEDIR}${EXAMPLESDIR}
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/py-pycallgraph/Makefile
> ==============================================================================
> --- head/devel/py-pycallgraph/Makefile  Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/py-pycallgraph/Makefile  Thu Jul  3 23:57:07 2014        (r360487)
> @@ -19,20 +19,15 @@ RUN_DEPENDS+=       dot:${PORTSDIR}/graphics/g
>  USE_PYTHON=    yes
>  USE_PYDISTUTILS=       yes
>
> -.if !defined(NO_INSTALL_MANPAGES)
> -MAN1=  pycallgraph.1
> -.endif
> -
>  EXAMPLESDIR=   ${PREFIX}/share/examples/py-${PORTNAME}
>
> +OPTIONS_DEFINE=        EXAMPLES
> +
> +
>  post-install:
> -.if !defined(NO_INSTALL_MANPAGES)
>         ${INSTALL_MAN} ${WRKSRC}/man/pycallgraph.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
> -.endif
>
> -.if !defined(NOPORTEXAMPLES)
>         ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>         (cd ${WRKSRC}/examples/ && ${COPYTREE_BIN} \* ${STAGEDIR}${EXAMPLESDIR})
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/py-pyke/Makefile
> ==============================================================================
> --- head/devel/py-pyke/Makefile Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/py-pyke/Makefile Thu Jul  3 23:57:07 2014        (r360487)
> @@ -18,11 +18,11 @@ USES=               zip
>  USE_PYTHON=    yes
>  USE_PYDISTUTILS=       yes
>
> +OPTIONS_DEFINE=        DOCS
> +
>  post-install:
> -.if !defined(NOPORTDOCS)
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         @${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}
>         @${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/py-pyshapelib/Makefile
> ==============================================================================
> --- head/devel/py-pyshapelib/Makefile   Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/py-pyshapelib/Makefile   Thu Jul  3 23:57:07 2014        (r360487)
> @@ -23,22 +23,20 @@ USE_LDCONFIG=       yes
>  PORTDOCS=      NEWS README
>  PORTEXAMPLES=  pytest.py
>
> +OPTIONS_DEFINE=        DOCS EXAMPLES
> +
>  post-extract:
>         ${LN} -s ${WRKDIR}/${SHAPELIB} ${WRKDIR}/shapelib
>
>  post-install:
> -.if !defined(NOPORTDOCS)
>         ${MKDIR} ${STAGEDIR}${DOCSDIR}
>  .for f in ${PORTDOCS}
>         ${INSTALL_MAN} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
>  .endfor
> -.endif
>
> -.if !defined(NOPORTEXAMPLES)
>         ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>  .for f in ${PORTEXAMPLES}
>         ${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${EXAMPLESDIR}
>  .endfor
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/py-pytemplate/Makefile
> ==============================================================================
> --- head/devel/py-pytemplate/Makefile   Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/py-pytemplate/Makefile   Thu Jul  3 23:57:07 2014        (r360487)
> @@ -20,12 +20,12 @@ EXAMPLESDIR=        ${PREFIX}/share/examples/py
>
>  EXAMPLES=      daemonexample.py example.py threadexample.py
>
> +OPTIONS_DEFINE=        EXAMPLES
> +
>  post-install:
> -.if !defined(NOPORTEXAMPLES)
>         @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>  .for f in ${EXAMPLES}
>         @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${EXAMPLESDIR}
>  .endfor
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/radare2/Makefile
> ==============================================================================
> --- head/devel/radare2/Makefile Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/radare2/Makefile Thu Jul  3 23:57:07 2014        (r360487)
> @@ -21,11 +21,15 @@ CONFIGURE_ARGS+=--without-ewf --without-
>  MAKE_ENV+=     HOST_CC=${CC}
>  PLIST_SUB+=    PORTVERSION="${PORTVERSION}"
>
> +OPTIONS_DEFINE=        DOCS
> +
> +.include <bsd.port.options.mk>
> +
>  post-patch:
>         @${REINPLACE_CMD} -e 's|..LIBDIR./pkgconfig|libdata/pkgconfig|g' ${WRKSRC}/Makefile
>         @${REINPLACE_CMD} -e 's|..LFX./pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|g' \
>                 ${WRKSRC}/libr/Makefile
> -.if defined(NOPORTDOCS)
> +.if empty(PORT_OPTIONS:MDOCS)
>         @${REINPLACE_CMD} -e 's| install-doc install-man||g' ${WRKSRC}/Makefile
>  .endif
>
>
> Modified: head/devel/scalatest/Makefile
> ==============================================================================
> --- head/devel/scalatest/Makefile       Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/scalatest/Makefile       Thu Jul  3 23:57:07 2014        (r360487)
> @@ -19,14 +19,12 @@ USES=               zip
>  USE_JAVA=      yes
>  NO_BUILD=      yes
>
> -.include <bsd.port.pre.mk>
> -
> -.if !defined(NOPORTDOCS)
>  PORTDOCS=      LICENSE NOTICE README.txt doc
> -.endif
>
>  SCALA_HOME=    share/scala
>
> +OPTIONS_DEFINE=        DOCS
> +
>  do-install:
>         ${MKDIR} ${STAGEDIR}${PREFIX}/${SCALA_HOME}/lib
>         ${INSTALL_DATA} ${INSTALL_WRKSRC}/scalatest-${PORTVERSION}.jar ${STAGEDIR}${PREFIX}/${SCALA_HOME}/lib/scalatest.jar
> @@ -34,10 +32,8 @@ do-install:
>         cd ${INSTALL_WRKSRC}/src/examples \
>           && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/\{} \; \
>           && ${FIND} . -type f -exec ${INSTALL_DATA} \{} ${STAGEDIR}${EXAMPLESDIR}/\{} \;
> -.if !defined(NOPORTDOCS)
>         cd ${INSTALL_WRKSRC} \
>           && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/\{} \; \
>           && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} \{} ${STAGEDIR}${DOCSDIR}/\{} \;
> -.endif
>
> -.include <bsd.port.post.mk>
> +.include <bsd.port.mk>
>
> Modified: head/devel/skalibs/Makefile
> ==============================================================================
> --- head/devel/skalibs/Makefile Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/skalibs/Makefile Thu Jul  3 23:57:07 2014        (r360487)
> @@ -18,6 +18,8 @@ WRKSRC=               ${WRKDIR}/prog/${DISTNAME}
>
>  DOCS=          package/CHANGES package/README package/THANKS doc/*.html
>
> +OPTIONS_DEFINE=        DOCS
> +
>  do-configure:
>         ${ECHO_CMD} "${CC} ${CFLAGS}"   > ${WRKSRC}/conf-compile/conf-cc
>         ${ECHO_CMD} "${CC} ${LDFLAGS}"  > ${WRKSRC}/conf-compile/conf-ld
> @@ -32,9 +34,7 @@ do-install:
>         ${INSTALL_DATA} ${WRKSRC}/include/* ${STAGEDIR}${PREFIX}/include/${PORTNAME}
>         @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
>         ${INSTALL_DATA} ${WRKSRC}/library/* ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
> -.if !defined(NOPORTDOCS)
>         @${MKDIR} ${STAGEDIR}${DOCSDIR}
>         cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
> -.endif
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/xmltooling/Makefile
> ==============================================================================
> --- head/devel/xmltooling/Makefile      Thu Jul  3 23:30:04 2014        (r360486)
> +++ head/devel/xmltooling/Makefile      Thu Jul  3 23:57:07 2014        (r360487)
> @@ -25,13 +25,17 @@ USE_OPENSSL=        yes
>
>  PORTDOCS=      *
>
> +OPTIONS_DEFINE=        DOCS
> +
> +.include <bsd.port.options.mk>
> +
>  post-patch:
>         @${REINPLACE_CMD} -e 's,^pkgdocdir.*=.*,pkgdocdir = ${DOCSDIR},' \
>                 ${WRKSRC}/doc/Makefile.in
>         @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
>         ${WRKSRC}/configure
>
> -.if defined(NOPORTDOCS)
> +.if empty(PORT_OPTIONS:MDOCS)
>         @${REINPLACE_CMD} -e '/^SUBDIRS/s,doc ,,' ${WRKSRC}/Makefile.in
>  .endif
>
>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAALwa8k5WujiRV5GTfyuYqXM7cX4iPxP=9=8NQQ2NQ68kBMXZA>