5 files changed, 28 insertions, 17 deletions

diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 19629962883d..641b3f5e772a 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freeradius
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
 		ftp://ftp.Awfulhak.org/pub/radius/
@@ -139,6 +139,7 @@ DICTS=		dictionary.3com dictionary.3gpp dictionary.3gpp2 \
 post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%RC_SUBR%%|${RC_SUBR}|g" \
 		< ${FILESDIR}/radiusd.sh > ${WRKDIR}/radiusd.sh
+	@${RM} ${WRKSRC}/doc/Makefile.orig
 
 post-install:
 	@${MKDIR} ${PREFIX}/etc/raddb ${DATADIR} ${EXAMPLESDIR}
diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo
index 72ccc05a0dda..10d1b8812e09 100644
--- a/net/freeradius2/distinfo
+++ b/net/freeradius2/distinfo
@@ -1,2 +1,2 @@
-MD5 (freeradius-1.0.4.tar.gz) = edb5c3af6fabeff7b8e1131b6fa33e24
-SIZE (freeradius-1.0.4.tar.gz) = 2209057
+MD5 (freeradius-1.0.5.tar.gz) = 00d06fc31e3b8279f6456d25401c81cb
+SIZE (freeradius-1.0.5.tar.gz) = 2294225
diff --git a/net/freeradius2/files/patch-doc::Makefile b/net/freeradius2/files/patch-doc::Makefile
index 52667f1d81e7..a465b2500691 100644
--- a/net/freeradius2/files/patch-doc::Makefile
+++ b/net/freeradius2/files/patch-doc::Makefile
@@ -1,16 +1,18 @@
---- doc/Makefile.orig	Tue Dec 24 16:49:34 2002
-+++ doc/Makefile	Wed Dec  3 13:56:45 2003
-@@ -20,12 +20,14 @@
- 	@rm -f include/*~ *~
+--- doc/Makefile.orig	Sat Aug 13 00:41:24 2005
++++ doc/Makefile	Wed Oct  5 10:57:06 2005
+@@ -17,14 +17,16 @@
+ 	@rm -f *~
  
  install:
 +ifndef NOPORTDOCS
- 	$(INSTALL) -d -m 755	$(R)$(datadir)/doc
--	$(INSTALL) -d -m 755	$(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION)
-+	$(INSTALL) -d -m 755	$(R)$(datadir)/doc/freeradius
- 	for i in $(DOCS) rlm_*; do \
--		$(INSTALL) -m 644 $$i $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION); \
-+		$(INSTALL) -m 644 $$i $(R)$(datadir)/doc/freeradius; \
+ 	$(INSTALL) -d -m 755 $(R)$(datadir)/doc
+-	$(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION)
++	$(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius
+ 	for file in *[!~]; do \
+ 		if [ -f $$file -a $$file != Makefile ]; then \
+-			$(INSTALL) -m 644 $$file $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION); \
++			$(INSTALL) -m 644 $$file $(R)$(datadir)/doc/freeradius; \
+ 		fi; \
  	done
  	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
 +endif
diff --git a/net/freeradius2/files/patch-src::modules::rules.mak b/net/freeradius2/files/patch-src::modules::rules.mak
index d1f99c6645ab..b4bb5e2e21d6 100644
--- a/net/freeradius2/files/patch-src::modules::rules.mak
+++ b/net/freeradius2/files/patch-src::modules::rules.mak
@@ -1,10 +1,10 @@
---- src/modules/rules.mak.orig	Sat Feb 19 14:43:30 2005
-+++ src/modules/rules.mak	Sat Feb 19 14:45:14 2005
-@@ -95,7 +95,7 @@
+--- src/modules/rules.mak.orig	Sun Jul 31 22:48:01 2005
++++ src/modules/rules.mak	Wed Oct  5 10:57:50 2005
+@@ -96,7 +96,7 @@
  
  $(TARGET).la: $(DYNAMIC_OBJS)
  	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
--	-module $(LINK_MODE) $(CFLAGS) $(RLM_CFLAGS) $(RLM_LDFLAGS) \
+-	-module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) \
 +	-module $(LINK_MODE) $(CFLAGS) $(RLM_CFLAGS) $(LDFLAGS) $(RLM_LDFLAGS) \
  	-o $@ -rpath $(libdir) $^ $(RLM_LIBS) $(LIBS)
  
diff --git a/net/freeradius2/pkg-plist b/net/freeradius2/pkg-plist
index 4fa5e49db55b..c57a81d2888d 100644
--- a/net/freeradius2/pkg-plist
+++ b/net/freeradius2/pkg-plist
@@ -299,13 +299,18 @@ sbin/radiusd
 sbin/radwatch
 sbin/rc.radiusd
 %%PORTDOCS%%%%DOCSDIR%%/Autz-Type
+%%PORTDOCS%%%%DOCSDIR%%/Acct-Type
+%%PORTDOCS%%%%DOCSDIR%%/CYGWIN
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/DIFFS
 %%PORTDOCS%%%%DOCSDIR%%/MACOSX
 %%PORTDOCS%%%%DOCSDIR%%/OS2
+%%PORTDOCS%%%%DOCSDIR%%/Post-Auth-Type
 %%PORTDOCS%%%%DOCSDIR%%/RADIUS-LDAP.schema
 %%PORTDOCS%%%%DOCSDIR%%/RADIUS-LDAPv3.schema
 %%PORTDOCS%%%%DOCSDIR%%/RADIUS-SQL.schema
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/Session-Type
 %%PORTDOCS%%%%DOCSDIR%%/Simultaneous-Use
 %%PORTDOCS%%%%DOCSDIR%%/aaa.txt
 %%PORTDOCS%%%%DOCSDIR%%/ascend
@@ -315,11 +320,14 @@ sbin/rc.radiusd
 %%PORTDOCS%%%%DOCSDIR%%/coding-methods.txt
 %%PORTDOCS%%%%DOCSDIR%%/configurable_failover
 %%PORTDOCS%%%%DOCSDIR%%/duplicate-users
+%%PORTDOCS%%%%DOCSDIR%%/ldap_howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/misc-nas
 %%PORTDOCS%%%%DOCSDIR%%/module_interface
 %%PORTDOCS%%%%DOCSDIR%%/performance-testing
 %%PORTDOCS%%%%DOCSDIR%%/processing_users_file
 %%PORTDOCS%%%%DOCSDIR%%/proxy
 %%PORTDOCS%%%%DOCSDIR%%/radrelay
+%%PORTDOCS%%%%DOCSDIR%%/release-method.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/attributes.html
 %%PORTDOCS%%%%DOCSDIR%%/rfc/draft-kamath-pppext-eap-mschapv2-00.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/draft-sterman-aaa-sip-00.txt