diff options
| -rw-r--r-- | net/openradius/Makefile | 83 | ||||
| -rw-r--r-- | net/openradius/files/openradius.in | 7 | ||||
| -rw-r--r-- | net/openradius/pkg-message | 2 | ||||
| -rw-r--r-- | net/opentracker/Makefile | 15 | ||||
| -rw-r--r-- | net/opentracker/pkg-plist | 5 | ||||
| -rw-r--r-- | net/ssltunnel-client/Makefile | 44 | ||||
| -rw-r--r-- | net/ssltunnel-client/pkg-plist | 3 | ||||
| -rw-r--r-- | net/ssltunnel-server/Makefile | 18 | ||||
| -rw-r--r-- | net/ssltunnel-server/files/pkg-message.in (renamed from net/ssltunnel-server/pkg-message) | 2 | ||||
| -rw-r--r-- | net/ssltunnel-server/files/ssltunnel.in | 26 | ||||
| -rw-r--r-- | net/ssltunnel-server/pkg-plist | 1 |
11 files changed, 105 insertions, 101 deletions
diff --git a/net/openradius/Makefile b/net/openradius/Makefile index 767910e37557..83d419504222 100644 --- a/net/openradius/Makefile +++ b/net/openradius/Makefile @@ -21,14 +21,14 @@ CONFLICTS= freeradius-[0-9]* gnu-radius-[0-9]* radiusd-cistron-[0-9]* \ CC?= gcc CXX?= g++ +MAKE_ENV= INST_PREFIX=${STAGEDIR} -USE_GMAKE= yes +USES= gmake USE_RC_SUBR= openradius SUB_LIST= LOGFILE="${LOGFILE}" OPTIONS_DEFINE= LDAP -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MLDAP} @@ -40,58 +40,51 @@ PLIST_SUB+= LDAP="@comment " .endif post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/doc/async-iface-notes ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/doc/language.html ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/doc/module-interface.html ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/doc/note-behaviourfile ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/doc/note-struct-ownership ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/doc/using-openradius.html ${DOCSDIR} -.endif - -.if !defined(NOPORTEXAMPLES) - ${MKDIR} ${EXAMPLESDIR}/accounts - ${INSTALL_MAN} ${WRKSRC}/examples/behaviour.sample-ldap ${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/examples/behaviour.sample-ldap-authbind ${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/examples/behaviour.sample-mysql ${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/examples/behaviour.sample-postgres ${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/examples/behaviour.sample-unixpass ${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/examples/behaviour.sample-usersfile ${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/examples/configuration.sample-ldap ${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/examples/configuration.sample-ldap-authbind ${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/examples/configuration.sample-mysql ${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/examples/configuration.sample-postgres ${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/examples/configuration.sample-unixpass ${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/examples/configuration.sample-usersfile ${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/examples/accounts/README ${EXAMPLESDIR}/accounts - ${INSTALL_MAN} ${WRKSRC}/examples/accounts/accounts.mysql ${EXAMPLESDIR}/accounts - ${INSTALL_MAN} ${WRKSRC}/examples/accounts/behaviour ${EXAMPLESDIR}/accounts - ${INSTALL_MAN} ${WRKSRC}/examples/accounts/configuration ${EXAMPLESDIR}/accounts -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/doc/async-iface-notes ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/doc/language.html ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/doc/module-interface.html ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/doc/note-behaviourfile ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/doc/note-struct-ownership ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/doc/using-openradius.html ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/accounts + ${INSTALL_MAN} ${WRKSRC}/examples/behaviour.sample-ldap ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_MAN} ${WRKSRC}/examples/behaviour.sample-ldap-authbind ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_MAN} ${WRKSRC}/examples/behaviour.sample-mysql ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_MAN} ${WRKSRC}/examples/behaviour.sample-postgres ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_MAN} ${WRKSRC}/examples/behaviour.sample-unixpass ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_MAN} ${WRKSRC}/examples/behaviour.sample-usersfile ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_MAN} ${WRKSRC}/examples/configuration.sample-ldap ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_MAN} ${WRKSRC}/examples/configuration.sample-ldap-authbind ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_MAN} ${WRKSRC}/examples/configuration.sample-mysql ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_MAN} ${WRKSRC}/examples/configuration.sample-postgres ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_MAN} ${WRKSRC}/examples/configuration.sample-unixpass ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_MAN} ${WRKSRC}/examples/configuration.sample-usersfile ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_MAN} ${WRKSRC}/examples/accounts/README ${STAGEDIR}${EXAMPLESDIR}/accounts + ${INSTALL_MAN} ${WRKSRC}/examples/accounts/accounts.mysql ${STAGEDIR}${EXAMPLESDIR}/accounts + ${INSTALL_MAN} ${WRKSRC}/examples/accounts/behaviour ${STAGEDIR}${EXAMPLESDIR}/accounts + ${INSTALL_MAN} ${WRKSRC}/examples/accounts/configuration ${STAGEDIR}${EXAMPLESDIR}/accounts # Configuration, copy over to sample files - ${MKDIR} ${ETCDIR} + ${MKDIR} ${STAGEDIR}${ETCDIR} .for FILE in dictionary - ${INSTALL_DATA} ${WRKSRC}/etc/${FILE} ${ETCDIR}/${FILE}.sample + ${INSTALL_DATA} ${WRKSRC}/etc/${FILE} \ + ${STAGEDIR}${ETCDIR}/${FILE}.sample .endfor # Copy over legacy config files to sample - ${MKDIR} ${ETCDIR}/legacy + ${MKDIR} ${STAGEDIR}${ETCDIR}/legacy .for FILE in clients nases realms users - ${INSTALL} -m 0600 ${WRKSRC}/etc/legacy/${FILE} ${ETCDIR}/legacy/${FILE}.sample + ${INSTALL} -m 0600 ${WRKSRC}/etc/legacy/${FILE} \ + ${STAGEDIR}${ETCDIR}/legacy/${FILE}.sample .endfor - - ${MKDIR} ${ETCDIR}/modules + ${MKDIR} ${STAGEDIR}${ETCDIR}/modules .for FILE in radldap.attrmap - ${INSTALL} -m 0600 ${WRKSRC}/etc/modules/${FILE} ${ETCDIR}/modules/${FILE}.sample + ${INSTALL} -m 0600 ${WRKSRC}/etc/modules/${FILE} \ + ${STAGEDIR}${ETCDIR}/modules/${FILE}.sample .endfor - - ${MKDIR} ${ETCDIR}/subdicts + ${MKDIR} ${STAGEDIR}${ETCDIR}/subdicts .for FILE in dict.* - ${INSTALL} -m 0600 ${WRKSRC}/etc/subdicts/${FILE} ${ETCDIR}/subdicts/ + ${INSTALL} -m 0600 ${WRKSRC}/etc/subdicts/${FILE} \ + ${STAGEDIR}${ETCDIR}/subdicts/ .endfor - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} - .include <bsd.port.mk> diff --git a/net/openradius/files/openradius.in b/net/openradius/files/openradius.in index a9559d558ec3..799a5371bfda 100644 --- a/net/openradius/files/openradius.in +++ b/net/openradius/files/openradius.in @@ -4,6 +4,7 @@ # # PROVIDE: openradius # REQUIRE: DAEMON +# KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable openradius: # @@ -15,13 +16,13 @@ . /etc/rc.subr -name="openradius" +name=openradius rcvar=openradius_enable load_rc_config ${name} -: ${openradius_enable="NO"} -: ${openradius_flags="-o %%LOGFILE%%"} +: ${openradius_enable:=no} +: ${openradius_flags=-o %%LOGFILE%%} command=%%PREFIX%%/sbin/radiusd diff --git a/net/openradius/pkg-message b/net/openradius/pkg-message index f478c4bfda26..21da2f198c66 100644 --- a/net/openradius/pkg-message +++ b/net/openradius/pkg-message @@ -1,4 +1,4 @@ -To enable startup script, please add openradius_enable="YES" +To enable startup script, please add openradius_enable=yes in your rc.conf. Configuration sample files were installed, you will need to copy diff --git a/net/opentracker/Makefile b/net/opentracker/Makefile index 3c0de05680ba..1689973837cd 100644 --- a/net/opentracker/Makefile +++ b/net/opentracker/Makefile @@ -1,4 +1,3 @@ -# Created by: utisoft@gmail.com # $FreeBSD$ PORTNAME= opentracker @@ -31,7 +30,6 @@ DEBUG_HTTPERROR_DESC= Verbose HTTPERRORs FULLSCRAPE_DESC= Can query tracker for all torrents RESTRICT_STATS_DESC= Limit stats access based on IP -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MACCESSLIST_BLACK} @@ -66,16 +64,9 @@ post-patch: @${FIND} ${WRKSRC} -name "*.orig" -delete do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${MKDIR} ${PREFIX}/etc/${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample \ - ${PREFIX}/etc/${PORTNAME}/${PORTNAME}.conf.sample - -post-install: - @if [ ! -f ${PREFIX}/etc/${PORTNAME}/${PORTNAME}.conf ]; then \ - ${CP} -p ${PREFIX}/etc/${PORTNAME}/${PORTNAME}.conf.sample \ - ${PREFIX}/etc/${PORTNAME}/${PORTNAME}.conf ; \ - fi - @${CAT} ${PKGMESSAGE} + ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample .include <bsd.port.mk> diff --git a/net/opentracker/pkg-plist b/net/opentracker/pkg-plist index 413e982399aa..006c798cccca 100644 --- a/net/opentracker/pkg-plist +++ b/net/opentracker/pkg-plist @@ -1,4 +1,5 @@ bin/opentracker -@unexec if cmp -s %D/etc/opentracker/opentracker.conf.sample %D/etc/opentracker/opentracker.conf; then rm -f %D/etc/opentracker/opentracker.conf; fi -etc/opentracker/opentracker.conf.sample +@unexec if cmp -s %D/%%ETCDIR%%/opentracker.conf.sample %D/%%ETCDIR%%/opentracker.conf; then rm -f %D/%%ETCDIR%%/opentracker.conf; fi +%%ETCDIR%%/opentracker.conf.sample +@exec cp -np %D/%F %B/opentracker.conf @dirrm etc/opentracker diff --git a/net/ssltunnel-client/Makefile b/net/ssltunnel-client/Makefile index 7d9b7639d77e..4946b129ce87 100644 --- a/net/ssltunnel-client/Makefile +++ b/net/ssltunnel-client/Makefile @@ -11,45 +11,37 @@ PKGNAMESUFFIX= -client MAINTAINER= crees@FreeBSD.org COMMENT= PPP over SSL virtual private networking (client part) -LICENSE= BSD +LICENSE= BSD3CLAUSE + +OPTIONS_DEFINE= GUI +GUI_DESC= GTK 1.2 graphical interface CONFIGURE_ARGS= --disable-server --with-iconv=${ICONV_PREFIX} GNU_CONFIGURE= yes USES= iconv -MAN1= pppclient.1 -MAN5= ssltunnelrc.5 - -WANT_GNOME= yes - -.if defined(PACKAGE_BUILDING) -WITHOUT_GNOME= yes -.endif - -NO_STAGE= yes -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if ${HAVE_GNOME:Mgtk12}!="" +.if ${PORT_OPTIONS:MGUI} USE_GNOME= gtk12 USES+= perl5 RUN_DEPENDS= p5-Gtk>=0:${PORTSDIR}/x11-toolkits/p5-Gtk MAN1+= gpppclient.1 -BUILD_PERLGTK= yes +PLIST_SUB+= PERLGTK="" +.else +PLIST_SUB+= PERLGTK="@comment " .endif post-patch: ${REINPLACE_CMD} -e 's|with_iconv|with-iconv|g' ${WRKSRC}/configure post-install: -.if defined(BUILD_PERLGTK) - ${ECHO_CMD} "bin/gpppclient" >> ${TMPPLIST} -.endif -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/LISEZ-MOI ${DOCSDIR}/client.LISEZ-MOI - ${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}/client.README -.endif - @${MKDIR} ${ETCDIR}/ - ${INSTALL_DATA} ${WRKSRC}/client/tunnel.conf ${ETCDIR}/client.conf.sample - -.include <bsd.port.post.mk> + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/LISEZ-MOI \ + ${STAGEDIR}${DOCSDIR}/client.LISEZ-MOI + ${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/client.README + ${MKDIR} ${STAGEDIR}${ETCDIR}/ + ${INSTALL_DATA} ${WRKSRC}/client/tunnel.conf \ + ${STAGEDIR}${ETCDIR}/client.conf.sample + +.include <bsd.port.mk> diff --git a/net/ssltunnel-client/pkg-plist b/net/ssltunnel-client/pkg-plist index f268d9ebd611..adfb35fea9ea 100644 --- a/net/ssltunnel-client/pkg-plist +++ b/net/ssltunnel-client/pkg-plist @@ -1,5 +1,8 @@ bin/pppclient +%%PERLGTK%%bin/gpppclient @unexec if cmp -s %D/%%ETCDIR%%/client.conf %D/%%ETCDIR%%/client.conf.sample; then rm -f %D/%%ETCDIR%%/client.conf; fi +man/man1/pppclient.1.gz +man/man5/ssltunnelrc.5.gz %%ETCDIR%%/client.conf.sample %%PORTDOCS%%%%DOCSDIR%%/client.LISEZ-MOI %%PORTDOCS%%%%DOCSDIR%%/client.README diff --git a/net/ssltunnel-server/Makefile b/net/ssltunnel-server/Makefile index 1d2ae2085965..e63e8706d26e 100644 --- a/net/ssltunnel-server/Makefile +++ b/net/ssltunnel-server/Makefile @@ -11,15 +11,17 @@ PKGNAMESUFFIX= -server MAINTAINER= crees@FreeBSD.org COMMENT= PPP over SSL virtual private networking (server part) -LICENSE= BSD +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE OPTIONS_DEFINE= TCPWRAPPERS TCPWRAPPERS_DESC= libwrap support +USE_RC_SUBR= ${PORTNAME} +SUB_FILES+= pkg-message GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-client -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MTCPWRAPPERS} @@ -36,13 +38,9 @@ post-patch: ${WRKSRC}/server/users > ${WRKSRC}/server/users.new post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}/server.README - ${INSTALL_MAN} ${WRKSRC}/LISEZ-MOI ${DOCSDIR}/server.LISEZ-MOI -.endif - ${INSTALL_SCRIPT} ${WRKSRC}/server/pppserver.sh ${PREFIX}/etc/rc.d/ssltunnel.sh.sample - ${INSTALL_DATA} ${WRKSRC}/server/users.new ${ETCDIR}/users.sample - @${CAT} ${PKGMESSAGE} | ${SED} "s|PREFIX|${PREFIX}|g" + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/server.README + ${INSTALL_MAN} ${WRKSRC}/LISEZ-MOI ${STAGEDIR}${DOCSDIR}/server.LISEZ-MOI + ${INSTALL_DATA} ${WRKSRC}/server/users.new ${STAGEDIR}${ETCDIR}/users.sample .include <bsd.port.mk> diff --git a/net/ssltunnel-server/pkg-message b/net/ssltunnel-server/files/pkg-message.in index cf637f41f7ff..6b0c2880bd5c 100644 --- a/net/ssltunnel-server/pkg-message +++ b/net/ssltunnel-server/files/pkg-message.in @@ -1,4 +1,4 @@ -All ppp parameters that were to go into PREFIX/etc/ssltunnel/users should +All ppp parameters that were to go into %%ETCDIR%%/users should go to /etc/ppp/ppp.conf for example: default: diff --git a/net/ssltunnel-server/files/ssltunnel.in b/net/ssltunnel-server/files/ssltunnel.in new file mode 100644 index 000000000000..4438846e54fd --- /dev/null +++ b/net/ssltunnel-server/files/ssltunnel.in @@ -0,0 +1,26 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# PROVIDE: ssltunnel +# REQUIRE: LOGIN +# KEYWORD: shutdown +# +# To enable ssltunnel, add the following line to rc.conf: +# ssltunnel_enable=yes + +. /etc/rc.subr + +name=ssltunnel +rcvar=ssltunnel_enable + +load_rc_config ssltunnel + +: ${ssltunnel_enable:=yes} + +command="%%PREFIX%%/libexec/pppserver" +command_args="%%ETCDIR%%/tunnel.conf" +required_files="%%ETCDIR%%/tunnel.conf" +pidfile=/var/run/pppserver.pid + +run_rc_command $1 diff --git a/net/ssltunnel-server/pkg-plist b/net/ssltunnel-server/pkg-plist index 91afc3d9fe34..5c94a1e7d78d 100644 --- a/net/ssltunnel-server/pkg-plist +++ b/net/ssltunnel-server/pkg-plist @@ -1,4 +1,3 @@ -etc/rc.d/ssltunnel.sh.sample @unexec if cmp -s %D/%%ETCDIR%%/tunnel.conf %D/%%ETCDIR%%/tunnel.conf.default; then rm -f %D/%%ETCDIR%%/tunnel.conf; fi @unexec if cmp -s %D/%%ETCDIR%%/users %D/%%ETCDIR%%/users.sample; then rm -f %D/%%ETCDIR%%/users; fi %%ETCDIR%%/tunnel.conf.default |