Index: head/net/radiusd-cistron/Makefile =================================================================== --- head/net/radiusd-cistron/Makefile (revision 369211) +++ head/net/radiusd-cistron/Makefile (revision 369212) @@ -1,44 +1,39 @@ # Created by: john@nlc.net.au # $FreeBSD$ PORTNAME= radiusd-cistron PORTVERSION= 1.6.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= ftp://ftp.radius.cistron.nl/pub/radius/ MAINTAINER= ports@FreeBSD.org COMMENT= RADIUS-compliant remote authentication and accounting server CONFLICTS?= freeradius-0.* gnu-radius-1.* openradius-0.* +USES= shebangfix +SHEBANG_FILES= src/checkrad.pl MAKEFILE= Makefile.BSD RADIUS_DIR= ${PREFIX}/etc/raddb MAKE_ENV+= RADIUS_DIR="${RADIUS_DIR}" DESTROOT="${STAGEDIR}" WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +BUILD_WRKSRC= ${WRKSRC}/src +INSTALL_WRKSRC= ${WRKSRC}/src +MAKE_JOBS_UNSAFE= yes USE_RC_SUBR= radiusd-cistron radrelay-cistron 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 DOCS OPTIONS_DEFAULT=PAM OPTIONS_SUB= yes -.include - -PLIST_SUB+= PAMBASE="/usr/local/etc" - -do-build: - ${DO_MAKE_BUILD} -C ${WRKSRC}/src - -do-install: -.if ${PORT_OPTIONS:MPAM} - ${MKDIR} ${STAGEDIR}/etc/pam.d -.endif - ${DO_MAKE_BUILD} -C ${WRKSRC}/src install +post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}/var/log/radacct .include Index: head/net/radiusd-cistron/files/patch-Make.inc =================================================================== --- head/net/radiusd-cistron/files/patch-Make.inc (revision 369211) +++ head/net/radiusd-cistron/files/patch-Make.inc (revision 369212) @@ -1,65 +1,66 @@ ---- src/Make.inc.orig 2003-04-10 12:51:47.000000000 +0200 -+++ src/Make.inc 2013-11-17 09:08:44.000000000 +0100 +--- src/Make.inc.orig 2003-04-10 10:51:47 UTC ++++ src/Make.inc @@ -4,7 +4,7 @@ # # -RADIUS_DIR = /etc/raddb +RADIUS_DIR = ${PREFIX}/etc/raddb SERVER_OBJS = radiusd.o files.o acct.o pam.o version.o proxy.o \ exec.o auth.o timestr.o cache.o readusers.o @@ -115,35 +115,35 @@ install: # Install the binaries - $(DINSTALL) $(SBINDIR) - $(DINSTALL) $(BINDIR) - $(DINSTALL) $(RADIUS_DIR) - $(INSTALL) -m 755 -s radiusd $(SBINDIR)/radiusd - $(INSTALL) -m 755 -s radrelay $(SBINDIR)/radrelay - $(INSTALL) -m 755 -s radwho $(BINDIR) - $(INSTALL) -m 755 -s radzap $(BINDIR) - $(INSTALL) -m 755 -s radclient $(BINDIR) - test -z "$(DBM)" || $(INSTALL) -m 755 -s builddbm $(BINDIR) - $(INSTALL) -m 755 checkrad.pl $(SBINDIR)/checkrad - $(INSTALL) -m 755 radlast $(BINDIR) - $(INSTALL) -m 755 radtest $(BINDIR) + $(DINSTALL) $(DESTROOT)$(SBINDIR) + $(DINSTALL) $(DESTROOT)$(BINDIR) + $(DINSTALL) $(DESTROOT)$(RADIUS_DIR) + $(INSTALL) -m 755 -s radiusd $(DESTROOT)$(SBINDIR)/radiusd + $(INSTALL) -m 755 -s radrelay $(DESTROOT)$(SBINDIR)/radrelay + $(INSTALL) -m 755 -s radwho $(DESTROOT)$(BINDIR) + $(INSTALL) -m 755 -s radzap $(DESTROOT)$(BINDIR) + $(INSTALL) -m 755 -s radclient $(DESTROOT)$(BINDIR) + test -z "$(DBM)" || $(INSTALL) -m 755 -s builddbm $(DESTROOT)$(BINDIR) + $(INSTALL) -m 755 checkrad.pl $(DESTROOT)$(SBINDIR)/checkrad + $(INSTALL) -m 755 radlast $(DESTROOT)$(BINDIR) + $(INSTALL) -m 755 radtest $(DESTROOT)$(BINDIR) # Install the man pages @for section in 1 5 8; do \ - $(DINSTALL) $(MANDIR)/man$$section; \ +- $(DINSTALL) $(MANDIR)/man$$section; \ ++ $(DINSTALL) $(DESTROOT)$(MANDIR)/man$$section; \ for manfile in ../doc/*.$$section*; do \ - echo $(INSTALL) -m 644 $$manfile $(MANDIR)/man$$section; \ - $(INSTALL) -m 644 $$manfile $(MANDIR)/man$$section; \ + echo $(INSTALL) -m 644 $$manfile $(DESTROOT)$(MANDIR)/man$$section; \ + $(INSTALL) -m 644 $$manfile $(DESTROOT)$(MANDIR)/man$$section; \ done ; \ done - test -n "$(DBM)" || rm -f $(MANDIR)/man8/builddbm.8rad - @if [ -d /etc/pam.d/ ] && [ ! -f /etc/pam.d/radius ]; then \ - $(INSTALL) -m 644 ../redhat/radiusd-pam /etc/pam.d/radius;\ + test -n "$(DBM)" || rm -f $(DESTROOT)$(MANDIR)/man8/builddbm.8rad + @if [ -d $(DESTROOT)${PREFIX}/etc/pam.d/ ] && [ ! -f $(DESTROOT)${PREFIX}/etc/pam.d/radius ]; then \ + $(INSTALL) -m 644 ../redhat/radiusd-pam $(DESTROOT)${PREFIX}/etc/pam.d/radius;\ fi @# Install the config files @echo; echo "Creating/updating files in $(RADIUS_DIR)"; \ cd ../raddb; \ for i in [a-c]* [e-z]*; do \ - [ ! -f $(RADIUS_DIR)/$$i ] && cp $$i $(RADIUS_DIR)/$$i; \ + [ ! -f $(RADIUS_DIR)/$$i ] && cp $$i $(DESTROOT)$(RADIUS_DIR)/$$i.sample; \ done; true @# Install the dictionary files @sh dict-install.sh ../raddb $(RADIUS_DIR) $(SHAREDIR) Index: head/net/radiusd-cistron/pkg-plist =================================================================== --- head/net/radiusd-cistron/pkg-plist (revision 369211) +++ head/net/radiusd-cistron/pkg-plist (revision 369212) @@ -1,56 +1,52 @@ bin/radclient bin/radlast bin/radtest bin/radwho bin/radzap %%PAM%%etc/pam.d/radius etc/raddb/clients.sample etc/raddb/dictionary etc/raddb/hints.sample etc/raddb/huntgroups.sample etc/raddb/naslist.sample etc/raddb/naspasswd.sample etc/raddb/realms.sample etc/raddb/users.sample man/man1/radclient.1.gz man/man1/radlast.1.gz man/man1/radtest.1.gz man/man1/radwho.1.gz man/man1/radzap.1.gz man/man5/clients.5rad.gz man/man5/naslist.5rad.gz man/man8/radiusd.8.gz man/man8/radrelay.8.gz man/man8/radwatch.8.gz sbin/checkrad sbin/radiusd sbin/radrelay share/radius/dictionary.ascend share/radius/dictionary.bay share/radius/dictionary.cisco share/radius/dictionary.cistron share/radius/dictionary.compat share/radius/dictionary.erx share/radius/dictionary.livingston share/radius/dictionary.redback share/radius/dictionary.shiva share/radius/dictionary.standard share/radius/dictionary.tunnel share/radius/dictionary.usr share/radius/dictionary.versanet %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.Y2K %%PORTDOCS%%%%DOCSDIR%%/README.cisco %%PORTDOCS%%%%DOCSDIR%%/README.pam %%PORTDOCS%%%%DOCSDIR%%/README.proxy %%PORTDOCS%%%%DOCSDIR%%/README.simul %%PORTDOCS%%%%DOCSDIR%%/README.usersfile -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm etc/raddb -@dirrm share/radius -@exec mkdir -m 700 /var/log/radacct || true -@unexec rmdir /var/log/radacct || true +@dir(,,700) /var/log/radacct @unexec echo "Leaving /var/run/radutmp, /var/log/radwtmp and /var/log/radacct alone."