diff --git a/net/c3270/Makefile b/net/c3270/Makefile index 5b4ec0ce1e0d..1543a828237e 100644 --- a/net/c3270/Makefile +++ b/net/c3270/Makefile @@ -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 diff --git a/net/cvsupchk/Makefile b/net/cvsupchk/Makefile index 9b54afad684e..249735ffb14c 100644 --- a/net/cvsupchk/Makefile +++ b/net/cvsupchk/Makefile @@ -19,6 +19,8 @@ PORTDOCS= * USE_PYTHON= yes NO_BUILD= yes +OPTIONS_DEFINE= DOCS + .include get_src= ${MAKE} -C ${PORTSDIR}/net/cvsup-without-gui -V WRKSRC diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile index c407cef62756..a20c9a4e8b4b 100644 --- a/net/freeradius2/Makefile +++ b/net/freeradius2/Makefile @@ -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) diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile index 0e6b56f994e1..0e9a6ec7c46e 100644 --- a/net/freeradius3/Makefile +++ b/net/freeradius3/Makefile @@ -45,7 +45,7 @@ PLIST_SUB= PORTVERSION=${DISTVERSION} LIBVER=0${PORTVERSION:C/\./0/g} 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 diff --git a/net/ntp-rc/Makefile.inc b/net/ntp-rc/Makefile.inc index ba67661ed9bc..e91171bb07bf 100644 --- a/net/ntp-rc/Makefile.inc +++ b/net/ntp-rc/Makefile.inc @@ -15,7 +15,9 @@ OPTIONS_DEFINE= NTPSNMPD \ CHU \ AUDIO_CHU \ DATUM \ + DOCS \ DUMBCLOCK \ + EXAMPLES \ FG \ HEATH \ HOPFSERIAL \ diff --git a/net/ntp-rc/pkg-plist b/net/ntp-rc/pkg-plist index 91e715a6fb13..b3f44d32a492 100644 --- a/net/ntp-rc/pkg-plist +++ b/net/ntp-rc/pkg-plist @@ -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%% diff --git a/net/ptpd2-devel/Makefile b/net/ptpd2-devel/Makefile index 8b409d0b37fc..ac65374b1a26 100644 --- a/net/ptpd2-devel/Makefile +++ b/net/ptpd2-devel/Makefile @@ -21,6 +21,8 @@ PORTDOCS= * USE_RC_SUBR= ptpd2 +OPTIONS_DEFINE= DOCS + .include do-install:: diff --git a/net/py-pcs/Makefile b/net/py-pcs/Makefile index ab54bacad4f4..04eeefddc624 100644 --- a/net/py-pcs/Makefile +++ b/net/py-pcs/Makefile @@ -21,8 +21,9 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes USE_PYTHON_PREFIX= yes +OPTIONS_DEFINE= DOCS EXAMPLES + .include -.include post-install: .if ${PORT_OPTIONS:MDOCS} @@ -35,4 +36,4 @@ post-install: cd ${WRKSRC}/scripts && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .endif -.include +.include diff --git a/net/py-s3cmd/Makefile b/net/py-s3cmd/Makefile index 289aadb4618b..4e80fa9b3a56 100644 --- a/net/py-s3cmd/Makefile +++ b/net/py-s3cmd/Makefile @@ -14,6 +14,8 @@ COMMENT= Unix-like tools to manipulate stored files from the command line USE_PYDISTUTILS= yes USE_PYTHON= 2 +OPTIONS_DEFINE= DOCS + .include post-patch: diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile index 5b9c4971d7ef..233456e76e58 100644 --- a/net/radiusd-cistron/Makefile +++ b/net/radiusd-cistron/Makefile @@ -22,7 +22,7 @@ DOCFILES= COPYRIGHT INSTALL doc/ChangeLog doc/README doc/README.Y2K \ 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 diff --git a/net/sixxs-aiccu/Makefile b/net/sixxs-aiccu/Makefile index 38061e6e9345..6b2bcc5bf4cd 100644 --- a/net/sixxs-aiccu/Makefile +++ b/net/sixxs-aiccu/Makefile @@ -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 diff --git a/net/sixxs-aiccu/pkg-plist b/net/sixxs-aiccu/pkg-plist index b13005b06d12..c8824a91256f 100644 --- a/net/sixxs-aiccu/pkg-plist +++ b/net/sixxs-aiccu/pkg-plist @@ -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 diff --git a/net/turnserver/Makefile b/net/turnserver/Makefile index 95cab0b01a86..530511e0408a 100644 --- a/net/turnserver/Makefile +++ b/net/turnserver/Makefile @@ -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 diff --git a/net/udt/Makefile b/net/udt/Makefile index 570eeaa3f0bd..673ecad173e9 100644 --- a/net/udt/Makefile +++ b/net/udt/Makefile @@ -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} diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile index 66ef513ea584..6fb327d5e46b 100644 --- a/net/vinagre/Makefile +++ b/net/vinagre/Makefile @@ -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 diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile index 249cddaa42d1..21d7412fc3ef 100644 --- a/net/x11vnc/Makefile +++ b/net/x11vnc/Makefile @@ -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