Use libtool13 as libtool15 doesn't work with this port (dynamic modules

load fails).
Do not remove config files, install -dist versions instead.

Approved by:		perky (mentor)
Special thanks to:	Anton Yuzhaninov <citrin@citrin.ru>

5 files changed, 91 insertions, 20 deletions

diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index 0eee57c28287..23f2c8c6790b 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	gnu-radius
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	radius
@@ -19,13 +20,14 @@ USE_RC_SUBR=	yes
 USE_SUBMAKE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=	15
+USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 USE_GETTEXT=	yes
 USE_LIBLTDL=	yes
 CONFIGURE_TARGET=	# empty
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
+SUB_FILES=	radiusd.sh
 DATADIR=	${PREFIX}/share/radius
 
 INFO=		radius
@@ -47,6 +49,12 @@ OPTIONS=	CLIENT "Enable build client" off \
 		NOTIFY "Enable TTL notification" off \
 		EMACS "Enable emacs dotfiles install" off
 
+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
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SNMP)
@@ -104,11 +112,17 @@ CONFIGURE_ARGS+=	--without-lispdir
 PLIST_SUB+=	EMACS="@comment "
 .endif
 
-post-patch:
-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%RC_SUBR%%|${RC_SUBR}|g" \
-		< ${FILESDIR}/radiusd.sh > ${WRKDIR}/radiusd.sh
-
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/radiusd.sh ${PREFIX}/etc/rc.d/radiusd.sh
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${EXAMPLESDIR}
+. for ex_file in ${EXAMPLE_FILES}
+	${INSTALL_DATA} ${WRKSRC}/examples/${ex_file} ${EXAMPLESDIR}
+. endfor
+.endif
+.for conf_file in ${CONFIG_FILES}
+	@test -f ${PREFIX}/etc/raddb/${conf_file} || ${CP} -p \
+	${PREFIX}/etc/raddb/${conf_file}-dist ${PREFIX}/etc/raddb/${conf_file}
+.endfor
 
 .include <bsd.port.post.mk>
diff --git a/net/gnu-radius/files/patch-configure b/net/gnu-radius/files/patch-configure
index 12894ea48a62..aac499a3243c 100644
--- a/net/gnu-radius/files/patch-configure
+++ b/net/gnu-radius/files/patch-configure
@@ -1,5 +1,14 @@
---- configure.orig	Sun Jun 26 00:02:58 2005
-+++ configure	Sun Jun 26 00:20:51 2005
+--- configure.orig	Sat Nov 20 21:39:50 2004
++++ configure	Wed Jul 27 23:13:31 2005
+@@ -9662,7 +9662,7 @@
+ #define USE_SERVER_GUILE 1
+ _ACEOF
+ 
+-				RADIUSD_LDADD_LIST="$RADIUSD_LDADD_LIST -L../radscm -lradscm ../radscm/libservscm.a $GUILE_LIBS"
++				RADIUSD_LDADD_LIST="$RADIUSD_LDADD_LIST -L../radscm/.libs -lradscm ../radscm/libservscm.a $GUILE_LIBS"
+ 			 fi
+ else
+   USE_GUILE=no
 @@ -22804,7 +22804,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
diff --git a/net/gnu-radius/files/patch-raddb_Makefile.in b/net/gnu-radius/files/patch-raddb_Makefile.in
new file mode 100644
index 000000000000..f0537dc37a3e
--- /dev/null
+++ b/net/gnu-radius/files/patch-raddb_Makefile.in
@@ -0,0 +1,15 @@
+--- raddb/Makefile.in.orig	Wed Jul 27 21:46:31 2005
++++ raddb/Makefile.in	Wed Jul 27 21:52:38 2005
+@@ -556,10 +556,10 @@
+ 		echo '================================================================='; \
+ 	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; \
+ 		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; \
+ 		done; \
+ 	        for file in $(dictionaries); do \
+ 		        ${INSTALL} -m 644 $(top_srcdir)/raddb/$$file $(DESTDIR)$(raddbdir)/$$file; \
diff --git a/net/gnu-radius/files/radiusd.sh b/net/gnu-radius/files/radiusd.sh.in
index 70411d5b8596..70411d5b8596 100644
--- a/net/gnu-radius/files/radiusd.sh
+++ b/net/gnu-radius/files/radiusd.sh.in
diff --git a/net/gnu-radius/pkg-plist b/net/gnu-radius/pkg-plist
index c9b8654d14c0..f8abae2cb945 100644
--- a/net/gnu-radius/pkg-plist
+++ b/net/gnu-radius/pkg-plist
@@ -9,10 +9,14 @@ bin/radzap
 sbin/radauth
 sbin/radctl
 sbin/radiusd
-etc/raddb/access.deny
-etc/raddb/client.conf
-etc/raddb/clients
-etc/raddb/config
+@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
 etc/raddb/dict/ascend
 etc/raddb/dict/ascend.vs
 etc/raddb/dict/cisco
@@ -23,15 +27,23 @@ etc/raddb/dict/standard
 etc/raddb/dict/tunnel
 etc/raddb/dict/usr
 etc/raddb/dict/voip
-etc/raddb/dictionary
-etc/raddb/hints
-etc/raddb/huntgroups
+@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
 etc/raddb/nas.rc
-etc/raddb/naslist
-etc/raddb/nastypes
-etc/raddb/realms
-etc/raddb/sqlserver
-etc/raddb/users
+@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
 etc/rc.d/radiusd.sh
 include/radius/argcv.h
 include/radius/argp.h
@@ -54,11 +66,17 @@ include/radius/symtab.h
 include/radius/types.h
 lib/libgnuradius.a
 lib/libgnuradius.so
+lib/libgnuradius.la
 lib/libgnuradius.so.0
 %%GUILE%%bin/radsession
 %%GUILE%%lib/libradscm.so
+%%GUILE%%lib/libradscm.la
 %%GUILE%%lib/libradscm.so.0
+%%GUILE%%lib/libguile-gnuradius-v-1.3.so
+%%GUILE%%lib/libradscm.a
+%%GUILE%%lib/libservscm.a
 %%CLIENT%%lib/security/pam_radius.so
+%%CLIENT%%lib/security/pam_radius.la
 %%CLIENT%%libexec/nas.scm
 share/locale/ca/LC_MESSAGES/radius.mo
 share/locale/es/LC_MESSAGES/radius.mo
@@ -73,13 +91,28 @@ share/locale/ru/LC_MESSAGES/radius.mo
 %%DATADIR%%/%%PORTVERSION%%/rewrite/log-hook.rw
 %%DATADIR%%/%%PORTVERSION%%/rewrite/nas-ip.rw
 %%MYSQL%%%%DATADIR%%/%%PORTVERSION%%/modules/mysql.so
+%%MYSQL%%%%DATADIR%%/%%PORTVERSION%%/modules/mysql.la
 %%PGSQL%%%%DATADIR%%/%%PORTVERSION%%/modules/postgres.so
+%%PGSQL%%%%DATADIR%%/%%PORTVERSION%%/modules/postgres.la
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/radconf-mode.el
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/radius-mode.el
 %%EMACS%%%%EMACS_SITE_LISPDIR%%/rewrite-mode.el
+%%PORTDOCS%%%%EXAMPLESDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/ascend.rw
+%%PORTDOCS%%%%EXAMPLESDIR%%/c3620.rw
+%%PORTDOCS%%%%EXAMPLESDIR%%/cisco.rw
+%%PORTDOCS%%%%EXAMPLESDIR%%/comos.rw
+%%PORTDOCS%%%%EXAMPLESDIR%%/config.syntax
+%%PORTDOCS%%%%EXAMPLESDIR%%/filter.rw
+%%PORTDOCS%%%%EXAMPLESDIR%%/hints-0.96
+%%PORTDOCS%%%%EXAMPLESDIR%%/jetstream.rw
+%%PORTDOCS%%%%EXAMPLESDIR%%/nt.rw
+%%PORTDOCS%%%%EXAMPLESDIR%%/pam.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/radius.php
 @dirrm etc/raddb/dict
-@dirrm etc/raddb
+@unexec rmdir %D/etc/raddb 2>/dev/null || true
 @dirrm include/radius
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%/%%PORTVERSION%%/scheme
 @dirrm %%DATADIR%%/%%PORTVERSION%%/rewrite
 @dirrm %%DATADIR%%/%%PORTVERSION%%/modules