Update to version 1.0.4.

Approved by:	lesi

8 files changed, 48 insertions, 60 deletions

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index d5c531e..83f90f0 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	freeradius
-PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTVERSION=	1.0.4
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
 		ftp://ftp.Awfulhak.org/pub/radius/
@@ -113,21 +112,22 @@ INSTALLS_SHLIB=	yes
 
 MAN1=		radclient.1 radeapclient.1 radlast.1 radtest.1 radwho.1 \
 		radzap.1
-MAN5=		acct_users.5 clients.5 dictionary.5 naslist.5 radiusd.conf.5 \
-		rlm_acct_unique.5 rlm_always.5 rlm_attr_filter.5 \
-		rlm_attr_rewrite.5 rlm_chap.5 rlm_counter.5 rlm_detail.5 \
-		rlm_expr.5 rlm_files.5 rlm_mschap.5 rlm_pap.5 rlm_passwd.5 \
-		rlm_realm.5 rlm_sql.5 rlm_unix.5 users.5
+MAN5=		acct_users.5 clients.5 clients.conf.5 dictionary.5 naslist.5 \
+		radiusd.conf.5 rlm_acct_unique.5 rlm_always.5 \
+		rlm_attr_filter.5 rlm_attr_rewrite.5 rlm_chap.5 rlm_counter.5 \
+		rlm_detail.5 rlm_expr.5 rlm_files.5 rlm_mschap.5 rlm_pap.5 \
+		rlm_passwd.5 rlm_realm.5 rlm_sql.5 rlm_unix.5 users.5
 MAN8=		radiusd.8 radrelay.8 radwatch.8 rlm_ippool_tool.8
 
-DICTS=		dictionary.3com dictionary.3gpp dictionary.3gpp2 dictionary.acc \
-		dictionary.alcatel dictionary.alteon dictionary.altiga \
-		dictionary.aptis dictionary.ascend dictionary.bay \
-		dictionary.bristol dictionary.cisco dictionary.cisco.bbsm \
-		dictionary.cisco.vpn3000 dictionary.cisco.vpn5000 \
-		dictionary.colubris dictionary.columbia_university \
-	       	dictionary.compat dictionary.erx dictionary.foundry \
-	       	dictionary.freeradius dictionary.gandalf dictionary.garderos \
+DICTS=		dictionary.3com dictionary.3gpp dictionary.3gpp2 \
+		dictionary.acc dictionary.alcatel dictionary.alteon \
+		dictionary.altiga dictionary.aptis dictionary.ascend \
+		dictionary.bay dictionary.bristol dictionary.cisco \
+		dictionary.cisco.bbsm dictionary.cisco.vpn3000 \
+		dictionary.cisco.vpn5000 dictionary.colubris \
+		dictionary.columbia_university dictionary.compat \
+		dictionary.erx dictionary.foundry dictionary.freeradius \
+		dictionary.gandalf dictionary.garderos dictionary.gemtek \
 		dictionary.juniper dictionary.karlnet dictionary.livingston \
 		dictionary.localweb dictionary.merit dictionary.microsoft \
 		dictionary.mikrotik dictionary.navini dictionary.nomadix \
diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo
index 404fed4..72ccc05 100644
--- a/net/freeradius/distinfo
+++ b/net/freeradius/distinfo
@@ -1,2 +1,2 @@
-MD5 (freeradius-1.0.2.tar.gz) = f5dfce4efbb03bbc47ceae08270a875e
-SIZE (freeradius-1.0.2.tar.gz) = 2208884
+MD5 (freeradius-1.0.4.tar.gz) = edb5c3af6fabeff7b8e1131b6fa33e24
+SIZE (freeradius-1.0.4.tar.gz) = 2209057
diff --git a/net/freeradius/files/patch-src-main-Makefile.in b/net/freeradius/files/patch-src-main-Makefile.in
index 2c5e8d3..0b318ac 100644
--- a/net/freeradius/files/patch-src-main-Makefile.in
+++ b/net/freeradius/files/patch-src-main-Makefile.in
@@ -1,5 +1,5 @@
---- src/main/Makefile.in.orig	Wed Jun  2 20:17:06 2004
-+++ src/main/Makefile.in	Wed May 11 13:18:27 2005
+--- src/main/Makefile.in.orig	Fri Jun 10 04:35:36 2005
++++ src/main/Makefile.in	Sat Jun 18 11:06:37 2005
 @@ -14,7 +14,7 @@
  CFLAGS		+= -DHOSTINFO=\"${HOSTINFO}\"
  CFLAGS          += -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\"
@@ -34,19 +34,12 @@
  
  radrelay.o: radrelay.c $(INCLUDES)
  	$(CC) $(CFLAGS) -c radrelay.c
-@@ -138,13 +138,13 @@
+@@ -138,7 +138,7 @@
  	$(CC) $(CFLAGS) -c radwho.c
  
- radwho: radwho.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o
--	$(CC) $(LDFLAGS) -o radwho radwho.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o $(LIBS)
-+	$(CC) $(LDFLAGS_MAIN) -o radwho radwho.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o $(LIBS)
- 
- radzap.o: radzap.c $(INCLUDES)
- 	$(CC) $(CFLAGS) -c radzap.c
- 
- radzap: radzap.o mainconfig.o util.o nas.o log.o client.o conffile.o files.o xlat.o
--	$(CC) $(CFLAGS) $(LDFLAGS) -o radzap radzap.o mainconfig.o util.o nas.o log.o client.o conffile.o files.o xlat.o $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS_MAIN) -o radzap radzap.o mainconfig.o util.o nas.o log.o client.o conffile.o files.o xlat.o $(LIBS)
+ radwho: radwho.o util.o log.o conffile.o ../lib/libradius.a
+-	$(CC) $(LDFLAGS) -o radwho radwho.o util.o log.o conffile.o $(LIBS) $(LCRYPT)
++	$(CC) $(LDFLAGS_MAIN) -o radwho radwho.o util.o log.o conffile.o $(LIBS) $(LCRYPT)
  
  clean:
  	rm -rf *.o *.so *~ $(BINARIES) .libs
diff --git a/net/freeradius/pkg-plist b/net/freeradius/pkg-plist
index 6b31df5..4fa5e49 100644
--- a/net/freeradius/pkg-plist
+++ b/net/freeradius/pkg-plist
@@ -401,6 +401,7 @@ sbin/rc.radiusd
 %%DATADIR%%/dictionary.freeradius
 %%DATADIR%%/dictionary.gandalf
 %%DATADIR%%/dictionary.garderos
+%%DATADIR%%/dictionary.gemtek
 %%DATADIR%%/dictionary.itk
 %%DATADIR%%/dictionary.juniper
 %%DATADIR%%/dictionary.karlnet
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index d5c531e..83f90f0 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	freeradius
-PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTVERSION=	1.0.4
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
 		ftp://ftp.Awfulhak.org/pub/radius/
@@ -113,21 +112,22 @@ INSTALLS_SHLIB=	yes
 
 MAN1=		radclient.1 radeapclient.1 radlast.1 radtest.1 radwho.1 \
 		radzap.1
-MAN5=		acct_users.5 clients.5 dictionary.5 naslist.5 radiusd.conf.5 \
-		rlm_acct_unique.5 rlm_always.5 rlm_attr_filter.5 \
-		rlm_attr_rewrite.5 rlm_chap.5 rlm_counter.5 rlm_detail.5 \
-		rlm_expr.5 rlm_files.5 rlm_mschap.5 rlm_pap.5 rlm_passwd.5 \
-		rlm_realm.5 rlm_sql.5 rlm_unix.5 users.5
+MAN5=		acct_users.5 clients.5 clients.conf.5 dictionary.5 naslist.5 \
+		radiusd.conf.5 rlm_acct_unique.5 rlm_always.5 \
+		rlm_attr_filter.5 rlm_attr_rewrite.5 rlm_chap.5 rlm_counter.5 \
+		rlm_detail.5 rlm_expr.5 rlm_files.5 rlm_mschap.5 rlm_pap.5 \
+		rlm_passwd.5 rlm_realm.5 rlm_sql.5 rlm_unix.5 users.5
 MAN8=		radiusd.8 radrelay.8 radwatch.8 rlm_ippool_tool.8
 
-DICTS=		dictionary.3com dictionary.3gpp dictionary.3gpp2 dictionary.acc \
-		dictionary.alcatel dictionary.alteon dictionary.altiga \
-		dictionary.aptis dictionary.ascend dictionary.bay \
-		dictionary.bristol dictionary.cisco dictionary.cisco.bbsm \
-		dictionary.cisco.vpn3000 dictionary.cisco.vpn5000 \
-		dictionary.colubris dictionary.columbia_university \
-	       	dictionary.compat dictionary.erx dictionary.foundry \
-	       	dictionary.freeradius dictionary.gandalf dictionary.garderos \
+DICTS=		dictionary.3com dictionary.3gpp dictionary.3gpp2 \
+		dictionary.acc dictionary.alcatel dictionary.alteon \
+		dictionary.altiga dictionary.aptis dictionary.ascend \
+		dictionary.bay dictionary.bristol dictionary.cisco \
+		dictionary.cisco.bbsm dictionary.cisco.vpn3000 \
+		dictionary.cisco.vpn5000 dictionary.colubris \
+		dictionary.columbia_university dictionary.compat \
+		dictionary.erx dictionary.foundry dictionary.freeradius \
+		dictionary.gandalf dictionary.garderos dictionary.gemtek \
 		dictionary.juniper dictionary.karlnet dictionary.livingston \
 		dictionary.localweb dictionary.merit dictionary.microsoft \
 		dictionary.mikrotik dictionary.navini dictionary.nomadix \
diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo
index 404fed4..72ccc05 100644
--- a/net/freeradius2/distinfo
+++ b/net/freeradius2/distinfo
@@ -1,2 +1,2 @@
-MD5 (freeradius-1.0.2.tar.gz) = f5dfce4efbb03bbc47ceae08270a875e
-SIZE (freeradius-1.0.2.tar.gz) = 2208884
+MD5 (freeradius-1.0.4.tar.gz) = edb5c3af6fabeff7b8e1131b6fa33e24
+SIZE (freeradius-1.0.4.tar.gz) = 2209057
diff --git a/net/freeradius2/files/patch-src-main-Makefile.in b/net/freeradius2/files/patch-src-main-Makefile.in
index 2c5e8d3..0b318ac 100644
--- a/net/freeradius2/files/patch-src-main-Makefile.in
+++ b/net/freeradius2/files/patch-src-main-Makefile.in
@@ -1,5 +1,5 @@
---- src/main/Makefile.in.orig	Wed Jun  2 20:17:06 2004
-+++ src/main/Makefile.in	Wed May 11 13:18:27 2005
+--- src/main/Makefile.in.orig	Fri Jun 10 04:35:36 2005
++++ src/main/Makefile.in	Sat Jun 18 11:06:37 2005
 @@ -14,7 +14,7 @@
  CFLAGS		+= -DHOSTINFO=\"${HOSTINFO}\"
  CFLAGS          += -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\"
@@ -34,19 +34,12 @@
  
  radrelay.o: radrelay.c $(INCLUDES)
  	$(CC) $(CFLAGS) -c radrelay.c
-@@ -138,13 +138,13 @@
+@@ -138,7 +138,7 @@
  	$(CC) $(CFLAGS) -c radwho.c
  
- radwho: radwho.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o
--	$(CC) $(LDFLAGS) -o radwho radwho.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o $(LIBS)
-+	$(CC) $(LDFLAGS_MAIN) -o radwho radwho.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o $(LIBS)
- 
- radzap.o: radzap.c $(INCLUDES)
- 	$(CC) $(CFLAGS) -c radzap.c
- 
- radzap: radzap.o mainconfig.o util.o nas.o log.o client.o conffile.o files.o xlat.o
--	$(CC) $(CFLAGS) $(LDFLAGS) -o radzap radzap.o mainconfig.o util.o nas.o log.o client.o conffile.o files.o xlat.o $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS_MAIN) -o radzap radzap.o mainconfig.o util.o nas.o log.o client.o conffile.o files.o xlat.o $(LIBS)
+ radwho: radwho.o util.o log.o conffile.o ../lib/libradius.a
+-	$(CC) $(LDFLAGS) -o radwho radwho.o util.o log.o conffile.o $(LIBS) $(LCRYPT)
++	$(CC) $(LDFLAGS_MAIN) -o radwho radwho.o util.o log.o conffile.o $(LIBS) $(LCRYPT)
  
  clean:
  	rm -rf *.o *.so *~ $(BINARIES) .libs
diff --git a/net/freeradius2/pkg-plist b/net/freeradius2/pkg-plist
index 6b31df5..4fa5e49 100644
--- a/net/freeradius2/pkg-plist
+++ b/net/freeradius2/pkg-plist
@@ -401,6 +401,7 @@ sbin/rc.radiusd
 %%DATADIR%%/dictionary.freeradius
 %%DATADIR%%/dictionary.gandalf
 %%DATADIR%%/dictionary.garderos
+%%DATADIR%%/dictionary.gemtek
 %%DATADIR%%/dictionary.itk
 %%DATADIR%%/dictionary.juniper
 %%DATADIR%%/dictionary.karlnet