4 files changed, 94 insertions, 39 deletions

diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index 72894104ff49..d8562b621c7e 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -11,51 +11,36 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A RADIUS-compliant remote authentication and accounting server
 
 CONFLICTS?=	freeradius-0.* gnu-radius-1.* openradius-0.*
-NO_STAGE=	yes
 
 MAKEFILE=	Makefile.BSD
 RADIUS_DIR=	${PREFIX}/etc/raddb
-MAKE_ENV+=	RADIUS_DIR="${RADIUS_DIR}"
+MAKE_ENV+=	RADIUS_DIR="${RADIUS_DIR}" DESTROOT="${STAGEDIR}"
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-PAMBASE?=	etc
 
 USE_RC_SUBR=	radiusd-cistron radrelay-cistron
-MAN1=		radclient.1 radlast.1 radtest.1 radwho.1 radzap.1
-MAN5=		clients.5rad naslist.5rad
-MAN8=		radiusd.8 radrelay.8 radwatch.8
 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_DEFAULT=PAM
+OPTIONS_SUB=	yes
+
+.include <bsd.port.options.mk>
+
+PLIST_SUB+=	PAMBASE="/usr/local/etc"
+
 do-build:
 	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE}
 
 do-install:
-	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} install
-	@${MKDIR} -m 700 /var/log/radacct
-	${INSTALL_MAN} ${WRKSRC}/doc/radlast.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/radtest.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/radwho.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/radzap.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/clients.5rad ${MANPREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/doc/naslist.5rad ${MANPREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/doc/radiusd.8 ${MANPREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/doc/radwatch.8 ${MANPREFIX}/man/man8
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
-.endfor
+.if ${PORT_OPTIONS:MPAM}
+	${MKDIR} ${STAGEDIR}/etc/pam.d
 .endif
-
-.if exists(${DESTDIR}/etc/pam.d)
-PLIST_SUB+=	WITH_PAMD=""
-.else
-PLIST_SUB+=	WITH_PAMD="@comment "
+	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} install
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 .endif
-PLIST_SUB+=	PAMBASE="/${PAMBASE}"
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net/radiusd-cistron/files/patch-Make.inc b/net/radiusd-cistron/files/patch-Make.inc
index d4bbc8468358..1ebb37a62874 100644
--- a/net/radiusd-cistron/files/patch-Make.inc
+++ b/net/radiusd-cistron/files/patch-Make.inc
@@ -1,5 +1,5 @@
---- src/Make.inc.orig	Thu Apr 10 12:51:47 2003
-+++ src/Make.inc	Wed Jun 25 17:24:21 2003
+--- src/Make.inc.orig	2003-04-10 12:51:47.000000000 +0200
++++ src/Make.inc	2013-11-17 09:08:44.000000000 +0100
 @@ -4,7 +4,7 @@
  #
  #
@@ -9,12 +9,59 @@
  
  SERVER_OBJS   = radiusd.o files.o acct.o pam.o version.o proxy.o \
  			exec.o auth.o timestr.o cache.o readusers.o
-@@ -143,7 +143,7 @@
+@@ -115,36 +115,36 @@
+ 
+ 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; \
+ 		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 $(RADIUS_DIR)/$$i.sample; \
++		[ ! -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)
+-	@sh dict-install.sh ../raddb $(RADIUS_DIR) $(SHAREDIR)
++	@sh dict-install.sh ../raddb $(RADIUS_DIR) $(DESTROOT)$(SHAREDIR)
+ 
diff --git a/net/radiusd-cistron/files/patch-dict-install.sh b/net/radiusd-cistron/files/patch-dict-install.sh
new file mode 100644
index 000000000000..3426910e407d
--- /dev/null
+++ b/net/radiusd-cistron/files/patch-dict-install.sh
@@ -0,0 +1,14 @@
+--- src/dict-install.sh.orig	2003-04-10 16:17:11.000000000 +0200
++++ src/dict-install.sh	2013-11-17 09:11:22.000000000 +0100
+@@ -41,9 +41,9 @@
+ 	mkdir -p $DESTDIR
+ fi
+ 
+-if [ $NEWTYPE ] && [ ! -f $RADDBDIR/dictionary ]
++if [ $NEWTYPE ] && [ ! -f $DESTROOT$RADDBDIR/dictionary ]
+ then
+-	sed -e "s!SHAREDIR!$SHAREDIR!" < dictionary > $RADDBDIR/dictionary
++	sed -e "s!SHAREDIR!$SHAREDIR!" < dictionary > $DESTROOT$RADDBDIR/dictionary
+ fi
+ 
+ echo "Creating/updating dictionary files in $DESTDIR"
diff --git a/net/radiusd-cistron/pkg-plist b/net/radiusd-cistron/pkg-plist
index eb31301c2df4..fb83f0b328f4 100644
--- a/net/radiusd-cistron/pkg-plist
+++ b/net/radiusd-cistron/pkg-plist
@@ -3,6 +3,7 @@ bin/radlast
 bin/radtest
 bin/radwho
 bin/radzap
+%%PAM%%etc/pam.d/radius
 etc/raddb/clients.sample
 etc/raddb/dictionary
 etc/raddb/hints.sample
@@ -11,6 +12,16 @@ 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
@@ -40,8 +51,6 @@ share/radius/dictionary.versanet
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm etc/raddb
 @dirrm share/radius
-@unexec rm -f /var/log/radius.log
-@unexec rm -f /var/run/radiusd.pid
+@exec mkdir -m 700 /var/log/radacct || true
+@unexec rmdir /var/log/radacct || true
 @unexec echo "Leaving /var/run/radutmp, /var/log/radwtmp and /var/log/radacct alone."
-%%WITH_PAMD%%@cwd %%PAMBASE%%
-%%WITH_PAMD%%pam.d/radius