Date: Tue, 15 Jul 2014 16:36:19 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361967 - in head/net: c3270 cvsupchk freeradius2 freeradius3 ntp-rc ptpd2-devel py-pcs py-s3cmd radiusd-cistron sixxs-aiccu turnserver udt vinagre x11vnc Message-ID: <201407151636.s6FGaJG5066001@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Tue Jul 15 16:36:19 2014 New Revision: 361967 URL: http://svnweb.freebsd.org/changeset/ports/361967 QAT: https://qat.redports.org/buildarchive/r361967/ Log: Add DOCS to OPTIONS_DEFINE to ports that check for PORT_OPTIONS:MDOCS. Modified: head/net/c3270/Makefile head/net/cvsupchk/Makefile head/net/freeradius2/Makefile head/net/freeradius3/Makefile head/net/ntp-rc/Makefile.inc head/net/ntp-rc/pkg-plist head/net/ptpd2-devel/Makefile head/net/py-pcs/Makefile head/net/py-s3cmd/Makefile head/net/radiusd-cistron/Makefile head/net/sixxs-aiccu/Makefile head/net/sixxs-aiccu/pkg-plist head/net/turnserver/Makefile head/net/udt/Makefile head/net/vinagre/Makefile head/net/x11vnc/Makefile Modified: head/net/c3270/Makefile ============================================================================== --- head/net/c3270/Makefile Tue Jul 15 16:36:12 2014 (r361966) +++ head/net/c3270/Makefile Tue Jul 15 16:36:19 2014 (r361967) @@ -26,7 +26,7 @@ LIBS+= -L${LOCALBASE}/lib # Within it all options except DBCS are enabled by default. OPTIONS_DEFINE= OPENSSL READLINE PR3287 ANSI APL DBCS FT LOCAL_PROCESS \ - PRINTER SCRIPT TN3270E TRACE + PRINTER SCRIPT TN3270E TRACE DOCS OPTIONS_DEFAULT= OPENSSL READLINE PR3287 ANSI APL FT LOCAL_PROCESS \ PRINTER SCRIPT TN3270E TRACE PR3287_DESC= Build pr3287 component Modified: head/net/cvsupchk/Makefile ============================================================================== --- head/net/cvsupchk/Makefile Tue Jul 15 16:36:12 2014 (r361966) +++ head/net/cvsupchk/Makefile Tue Jul 15 16:36:19 2014 (r361967) @@ -19,6 +19,8 @@ PORTDOCS= * USE_PYTHON= yes NO_BUILD= yes +OPTIONS_DEFINE= DOCS + .include <bsd.port.pre.mk> get_src= ${MAKE} -C ${PORTSDIR}/net/cvsup-without-gui -V WRKSRC Modified: head/net/freeradius2/Makefile ============================================================================== --- head/net/freeradius2/Makefile Tue Jul 15 16:36:12 2014 (r361966) +++ head/net/freeradius2/Makefile Tue Jul 15 16:36:19 2014 (r361967) @@ -81,7 +81,7 @@ _REQUIRE= NETWORKING SERVERS OPTIONS_DEFINE= USER KERBEROS HEIMDAL HEIMDAL_PORT LDAP MYSQL \ PGSQL UNIXODBC FIREBIRD PERL PYTHON OCI8 RUBY DHCP \ - EXPERIMENTAL UDPFROMTO DEVELOPER EDIR SSL_PORT + EXPERIMENTAL UDPFROMTO DEVELOPER EDIR SSL_PORT DOCS OPTIONS_DEFAULT=USER PERL PYTHON DHCP_DESC= With DHCP support (EXPERIMENTAL) Modified: head/net/freeradius3/Makefile ============================================================================== --- head/net/freeradius3/Makefile Tue Jul 15 16:36:12 2014 (r361966) +++ head/net/freeradius3/Makefile Tue Jul 15 16:36:19 2014 (r361967) @@ -45,7 +45,7 @@ PLIST_SUB= PORTVERSION=${DISTVERSION} LI OPTIONS_DEFINE= USER KERBEROS HEIMDAL HEIMDAL_PORT LDAP MYSQL \ PGSQL UNIXODBC FIREBIRD REDIS PYTHON RUBY \ EXPERIMENTAL UDPFROMTO DEVELOPER EDIR PERL REST \ - FREETDS IDN SSL_PORT + FREETDS IDN SSL_PORT DOCS OPTIONS_DEFAULT=USER PERL USER_DESC= Run as user freeradius, group freeradius Modified: head/net/ntp-rc/Makefile.inc ============================================================================== --- head/net/ntp-rc/Makefile.inc Tue Jul 15 16:36:12 2014 (r361966) +++ head/net/ntp-rc/Makefile.inc Tue Jul 15 16:36:19 2014 (r361967) @@ -15,7 +15,9 @@ OPTIONS_DEFINE= NTPSNMPD \ CHU \ AUDIO_CHU \ DATUM \ + DOCS \ DUMBCLOCK \ + EXAMPLES \ FG \ HEATH \ HOPFSERIAL \ Modified: head/net/ntp-rc/pkg-plist ============================================================================== --- head/net/ntp-rc/pkg-plist Tue Jul 15 16:36:12 2014 (r361966) +++ head/net/ntp-rc/pkg-plist Tue Jul 15 16:36:19 2014 (r361967) @@ -213,13 +213,13 @@ man/man1/ntp-keygen.1.gz %%PORTDOCS%%%%DOCSDIR%%/sntp.html %%PORTDOCS%%%%DOCSDIR%%/tickadj.html %%PORTDOCS%%%%DOCSDIR%%/xleave.html -%%EXAMPLESDIR%%/README -%%EXAMPLESDIR%%/baldwin.conf -%%EXAMPLESDIR%%/beauregard.conf -%%EXAMPLESDIR%%/grundoon.conf -%%EXAMPLESDIR%%/malarky.conf -%%EXAMPLESDIR%%/pogo.conf -%%EXAMPLESDIR%%/rackety.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/baldwin.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beauregard.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grundoon.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/malarky.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pogo.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rackety.conf %%PORTDOCS%%@dirrm %%DOCSDIR%%/scripts %%PORTDOCS%%@dirrm %%DOCSDIR%%/pic %%PORTDOCS%%@dirrm %%DOCSDIR%%/icons @@ -229,4 +229,4 @@ man/man1/ntp-keygen.1.gz %%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers %%PORTDOCS%%@dirrm %%DOCSDIR%%/description_files %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% Modified: head/net/ptpd2-devel/Makefile ============================================================================== --- head/net/ptpd2-devel/Makefile Tue Jul 15 16:36:12 2014 (r361966) +++ head/net/ptpd2-devel/Makefile Tue Jul 15 16:36:19 2014 (r361967) @@ -21,6 +21,8 @@ PORTDOCS= * USE_RC_SUBR= ptpd2 +OPTIONS_DEFINE= DOCS + .include <bsd.port.options.mk> do-install:: Modified: head/net/py-pcs/Makefile ============================================================================== --- head/net/py-pcs/Makefile Tue Jul 15 16:36:12 2014 (r361966) +++ head/net/py-pcs/Makefile Tue Jul 15 16:36:19 2014 (r361967) @@ -21,8 +21,9 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes USE_PYTHON_PREFIX= yes +OPTIONS_DEFINE= DOCS EXAMPLES + .include <bsd.port.options.mk> -.include <bsd.port.pre.mk> post-install: .if ${PORT_OPTIONS:MDOCS} @@ -35,4 +36,4 @@ post-install: cd ${WRKSRC}/scripts && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net/py-s3cmd/Makefile ============================================================================== --- head/net/py-s3cmd/Makefile Tue Jul 15 16:36:12 2014 (r361966) +++ head/net/py-s3cmd/Makefile Tue Jul 15 16:36:19 2014 (r361967) @@ -14,6 +14,8 @@ COMMENT= Unix-like tools to manipulate s USE_PYDISTUTILS= yes USE_PYTHON= 2 +OPTIONS_DEFINE= DOCS + .include <bsd.port.options.mk> post-patch: Modified: head/net/radiusd-cistron/Makefile ============================================================================== --- head/net/radiusd-cistron/Makefile Tue Jul 15 16:36:12 2014 (r361966) +++ head/net/radiusd-cistron/Makefile Tue Jul 15 16:36:19 2014 (r361967) @@ -22,7 +22,7 @@ DOCFILES= COPYRIGHT INSTALL doc/ChangeLo doc/README.cisco doc/README.pam doc/README.proxy \ doc/README.simul doc/README.usersfile -OPTIONS_DEFINE= PAM +OPTIONS_DEFINE= PAM DOCS OPTIONS_DEFAULT=PAM OPTIONS_SUB= yes @@ -31,16 +31,14 @@ OPTIONS_SUB= yes PLIST_SUB+= PAMBASE="/usr/local/etc" do-build: - cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} + ${DO_MAKE_BUILD} -C ${WRKSRC}/src do-install: .if ${PORT_OPTIONS:MPAM} ${MKDIR} ${STAGEDIR}/etc/pam.d .endif - cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} install -.if ${PORT_OPTIONS:MDOCS} + ${DO_MAKE_BUILD} -C ${WRKSRC}/src install ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ -.endif + ${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/net/sixxs-aiccu/Makefile ============================================================================== --- head/net/sixxs-aiccu/Makefile Tue Jul 15 16:36:12 2014 (r361966) +++ head/net/sixxs-aiccu/Makefile Tue Jul 15 16:36:19 2014 (r361967) @@ -27,8 +27,8 @@ WRKSRC= ${WRKDIR}/aiccu BUILD_WRKSRC= ${WRKDIR}/aiccu/unix-console PORTDOCS= README -OPTIONS_DEFINE= LOG_DAEMON -LOG_DAEMON_DESC= log to LOG_DAEMON instead to LOG_LOCAL7 +OPTIONS_DEFINE= LOG_DAEMON DOCS +LOG_DAEMON_DESC=Log to LOG_DAEMON instead to LOG_LOCAL7 post-patch: @${REINPLACE_CMD} \ @@ -51,10 +51,8 @@ do-configure: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/unix-console/aiccu ${STAGEDIR}${PREFIX}/sbin/sixxs-aiccu -.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/README ${STAGEDIR}${DOCSDIR}/ -.endif + ${INSTALL_DATA} ${WRKSRC}/doc/README ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/aiccu.conf ${STAGEDIR}${PREFIX}/etc/aiccu.conf.sample .include <bsd.port.mk> Modified: head/net/sixxs-aiccu/pkg-plist ============================================================================== --- head/net/sixxs-aiccu/pkg-plist Tue Jul 15 16:36:12 2014 (r361966) +++ head/net/sixxs-aiccu/pkg-plist Tue Jul 15 16:36:19 2014 (r361967) @@ -1,4 +1,2 @@ -@unexec if cmp -s %D/etc/aiccu.conf %D/etc/aiccu.conf.sample; then rm -f %D/etc/aiccu.conf; fi -etc/aiccu.conf.sample -@exec [ -f %B/aiccu.conf ] || install -m 0644 %B/%f %B/aiccu.conf +@sample etc/aiccu.conf.sample sbin/sixxs-aiccu Modified: head/net/turnserver/Makefile ============================================================================== --- head/net/turnserver/Makefile Tue Jul 15 16:36:12 2014 (r361966) +++ head/net/turnserver/Makefile Tue Jul 15 16:36:19 2014 (r361967) @@ -27,7 +27,7 @@ USE_RC_SUBR= turnserver HAS_CONFIGURE= YES -OPTIONS_DEFINE= MYSQL PGSQL REDIS +OPTIONS_DEFINE= MYSQL PGSQL REDIS DOCS EXAMPLES SHEBANG_FILES= examples/scripts/restapi/shared_secret_maintainer.pl USES= perl5 shebangfix Modified: head/net/udt/Makefile ============================================================================== --- head/net/udt/Makefile Tue Jul 15 16:36:12 2014 (r361966) +++ head/net/udt/Makefile Tue Jul 15 16:36:19 2014 (r361967) @@ -20,6 +20,8 @@ USE_LDCONFIG= yes UDT_APPS= appclient appserver recvfile sendfile test USES= uidfix +OPTIONS_DEFINE= DOCS + post-build: # Building sample applications: .for a in ${UDT_APPS} Modified: head/net/vinagre/Makefile ============================================================================== --- head/net/vinagre/Makefile Tue Jul 15 16:36:12 2014 (r361966) +++ head/net/vinagre/Makefile Tue Jul 15 16:36:19 2014 (r361967) @@ -32,7 +32,7 @@ LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= vinagre.schemas -OPTIONS_DEFINE= TELEPATHY +OPTIONS_DEFINE= TELEPATHY DOCS OPTIONS_DEFAULT=TELEPATHY OPTIONS_SUB= yes TELEPATHY_DESC= Telepathy integration Modified: head/net/x11vnc/Makefile ============================================================================== --- head/net/x11vnc/Makefile Tue Jul 15 16:36:12 2014 (r361966) +++ head/net/x11vnc/Makefile Tue Jul 15 16:36:19 2014 (r361967) @@ -27,7 +27,7 @@ CPPFLAGS+= -I${LOCALBASE}/include PORTDOCS= AUTHORS COPYING ChangeLog NEWS README README.LibVNCServer TODO -OPTIONS_DEFINE=NLS AVAHI +OPTIONS_DEFINE= NLS AVAHI DOCS OPTIONS_DEFAULT=NLS AVAHI NO_OPTIONS_SORT=yes NLS_USES= gettext
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407151636.s6FGaJG5066001>