3 files changed, 21 insertions, 43 deletions

diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index a8bc15b703fe..6ad0f27b5f43 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnu-radius
 PORTVERSION=	1.6.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	radius
@@ -13,11 +13,12 @@ MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	GNU RADIUS server
 
 CONFLICTS=	freeradius-0.* openradius-0.* radiusd-cistron-1.*
-USES=		gmake
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+USES=		gmake libtool
 USE_RC_SUBR=	radiusd
 USE_SUBMAKE=	yes
-USE_AUTOTOOLS=	libltdl libtool
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libltdl
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
@@ -36,9 +37,6 @@ OPTIONS_DEFAULT=MYSQL
 CLIENT_DESC=	Build client
 EMACS_DESC=	Install Emacs dotfiles
 
-CONFIG_FILES=	access.deny client.conf clients config dictionary \
-		hints huntgroups naslist nastypes realms \
-		sqlserver users
 EXAMPLE_FILES=	README ascend.rw c3620.rw cisco.rw comos.rw config.syntax \
 		filter.rw hints-0.96 jetstream.rw nt.rw pam.conf radius.php
 
@@ -114,7 +112,6 @@ post-patch:
 		${WRKSRC}/include/radiusd.h
 	${REINPLACE_CMD} -e 's|int getline|ssize_t getline|' \
 	    ${WRKSRC}/radtest/input.l ${WRKSRC}/radtest/input.c
-	${REINPLACE_CMD}  -e '889s,], || 1 ],' ${WRKSRC}/raddb/Makefile.in
 
 post-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
@@ -123,9 +120,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/${ex_file} ${STAGEDIR}${EXAMPLESDIR}
 . endfor
 .endif
-.for conf_file in ${CONFIG_FILES}
-	@test -f ${PREFIX}/etc/raddb/${conf_file} || ${CP} -p \
-	${STAGEDIR}${PREFIX}/etc/raddb/${conf_file}-dist ${STAGEDIR}${PREFIX}/etc/raddb/${conf_file}
-.endfor
 
 .include <bsd.port.mk>
diff --git a/net/gnu-radius/files/patch-raddb_Makefile.in b/net/gnu-radius/files/patch-raddb_Makefile.in
index f0537dc37a3e..b8682409adb5 100644
--- a/net/gnu-radius/files/patch-raddb_Makefile.in
+++ b/net/gnu-radius/files/patch-raddb_Makefile.in
@@ -5,11 +5,11 @@
  	else \
  		for file in $(raddb_files_644); do \
 -			${INSTALL} -m 644 $(top_srcdir)/raddb/$$file $(DESTDIR)$(raddbdir)/$$file; \
-+			${INSTALL} -m 644 $(top_srcdir)/raddb/$$file $(DESTDIR)$(raddbdir)/$${file}-dist; \
++			${INSTALL} -m 644 $(top_srcdir)/raddb/$$file $(DESTDIR)$(raddbdir)/$${file}.sample; \
  		done; \
  		for file in $(raddb_files_600); do \
 -			${INSTALL} -m 600 $(top_srcdir)/raddb/$$file $(DESTDIR)$(raddbdir)/$$file; \
-+			${INSTALL} -m 600 $(top_srcdir)/raddb/$$file $(DESTDIR)$(raddbdir)/$${file}-dist; \
++			${INSTALL} -m 600 $(top_srcdir)/raddb/$$file $(DESTDIR)$(raddbdir)/$${file}.sample; \
  		done; \
  	        for file in $(dictionaries); do \
  		        ${INSTALL} -m 644 $(top_srcdir)/raddb/$$file $(DESTDIR)$(raddbdir)/$$file; \
diff --git a/net/gnu-radius/pkg-plist b/net/gnu-radius/pkg-plist
index b078f73e6bb5..ccbbcbeea414 100644
--- a/net/gnu-radius/pkg-plist
+++ b/net/gnu-radius/pkg-plist
@@ -17,14 +17,10 @@ bin/radzap
 sbin/radauth
 sbin/radctl
 sbin/radiusd
-@unexec if cmp -s %D/etc/raddb/access.deny %D/etc/raddb/access.deny-dist; then rm -f %D/etc/raddb/access.deny; fi
-etc/raddb/access.deny-dist
-@unexec if cmp -s %D/etc/raddb/client.conf %D/etc/raddb/client.conf-dist; then rm -f %D/etc/raddb/client.conf; fi
-etc/raddb/client.conf-dist
-@unexec if cmp -s %D/etc/raddb/clients %D/etc/raddb/clients-dist; then rm -f %D/etc/raddb/clients; fi
-etc/raddb/clients-dist
-@unexec if cmp -s %D/etc/raddb/config %D/etc/raddb/config-dist; then rm -f %D/etc/raddb/config; fi
-etc/raddb/config-dist
+@sample etc/raddb/access.deny.sample
+@sample etc/raddb/client.conf.sample
+@sample etc/raddb/clients.sample
+@sample etc/raddb/config.sample
 etc/raddb/dict/ascend
 etc/raddb/dict/ascend.vs
 etc/raddb/dict/cisco
@@ -35,23 +31,15 @@ etc/raddb/dict/standard
 etc/raddb/dict/tunnel
 etc/raddb/dict/usr
 etc/raddb/dict/voip
-@unexec if cmp -s %D/etc/raddb/dictionary %D/etc/raddb/dictionary-dist; then rm -f %D/etc/raddb/dictionary; fi
-etc/raddb/dictionary-dist
-@unexec if cmp -s %D/etc/raddb/hints %D/etc/raddb/hints-dist; then rm -f %D/etc/raddb/hints; fi
-etc/raddb/hints-dist
-@unexec if cmp -s %D/etc/raddb/huntgroups %D/etc/raddb/huntgroups-dist; then rm -f %D/etc/raddb/huntgroups; fi
-etc/raddb/huntgroups-dist
+@sample etc/raddb/dictionary.sample
+@sample etc/raddb/hints.sample
+@sample etc/raddb/huntgroups.sample
 etc/raddb/nas.rc
-@unexec if cmp -s %D/etc/raddb/naslist %D/etc/raddb/naslist-dist; then rm -f %D/etc/raddb/naslist; fi
-etc/raddb/naslist-dist
-@unexec if cmp -s %D/etc/raddb/nastypes %D/etc/raddb/nastypes-dist; then rm -f %D/etc/raddb/nastypes; fi
-etc/raddb/nastypes-dist
-@unexec if cmp -s %D/etc/raddb/realms %D/etc/raddb/realms-dist; then rm -f %D/etc/raddb/realms; fi
-etc/raddb/realms-dist
-@unexec if cmp -s %D/etc/raddb/sqlserver %D/etc/raddb/sqlserver-dist; then rm -f %D/etc/raddb/sqlserver; fi
-etc/raddb/sqlserver-dist
-@unexec if cmp -s %D/etc/raddb/users %D/etc/raddb/users-dist; then rm -f %D/etc/raddb/users; fi
-etc/raddb/users-dist
+@sample etc/raddb/naslist.sample
+@sample etc/raddb/nastypes.sample
+@sample etc/raddb/realms.sample
+@sample etc/raddb/sqlserver.sample
+@sample etc/raddb/users.sample
 include/radius/argcv.h
 include/radius/debug.h
 include/radius/dictionary.h
@@ -70,18 +58,17 @@ include/radius/symtab.h
 include/radius/types.h
 lib/libgnuradius.a
 lib/libgnuradius.so
-lib/libgnuradius.la
 lib/libgnuradius.so.0
+lib/libgnuradius.so.0.0.0
 share/aclocal/radius.m4
 %%CLIENT%%bin/radsession
 %%CLIENT%%lib/libguile-gnuradius-v-%%PORTVERSION%%.so
 %%CLIENT%%lib/libradscm.a
-%%CLIENT%%lib/libradscm.la
 %%CLIENT%%lib/libradscm.so
 %%CLIENT%%lib/libradscm.so.1
+%%CLIENT%%lib/libradscm.so.1.0.0
 %%CLIENT%%lib/libservscm.a
 %%CLIENT%%lib/security/pam_radius.a
-%%CLIENT%%lib/security/pam_radius.la
 %%CLIENT%%lib/security/pam_radius.so
 %%CLIENT%%libexec/nas.scm
 %%NLS%%share/locale/ca/LC_MESSAGES/radius.mo
@@ -102,10 +89,8 @@ share/aclocal/radius.m4
 %%DATADIR%%/%%PORTVERSION%%/rewrite/log-hook.rw
 %%DATADIR%%/%%PORTVERSION%%/rewrite/nas-ip.rw
 %%MYSQL%%lib/radius/%%PORTVERSION%%/modules/mysql.a
-%%MYSQL%%lib/radius/%%PORTVERSION%%/modules/mysql.la
 %%MYSQL%%lib/radius/%%PORTVERSION%%/modules/mysql.so
 %%PGSQL%%lib/radius/%%PORTVERSION%%/modules/postgres.a
-%%PGSQL%%lib/radius/%%PORTVERSION%%/modules/postgres.la
 %%PGSQL%%lib/radius/%%PORTVERSION%%/modules/postgres.so
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/radconf-mode.el
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/radius-mode.el