6 files changed, 82 insertions, 63 deletions

diff --git a/net/NeTraMet/Makefile b/net/NeTraMet/Makefile
index 7c84b366362d..63a807cd0bd0 100644
--- a/net/NeTraMet/Makefile
+++ b/net/NeTraMet/Makefile
@@ -6,14 +6,21 @@
 #
 
 PORTNAME=	NeTraMet
-PORTVERSION=	4.3
+PORTVERSION=	4.4
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.gla.ac.uk/pub/software/NeTraMet/
-DISTNAME=	NeTraMet${PORTVERSION:S/.//}
+MASTER_SITES=	ftp://ftp.auckland.ac.nz/pub/iawg/NeTraMet/ \
+		http://www2.auckland.ac.nz/net/Accounting/
+DISTFILES+=	NeTraMet${PORTVERSION:S/.//}${EXTRACT_SUFX} \
+		${NETRAMET_DOCS}
+EXTRACT_ONLY=	NeTraMet${PORTVERSION:S/.//}${EXTRACT_SUFX}
+DIST_SUBDIR=	netramet
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Implementation of the Internet Accounting Architecture
 
+NETRAMET_DOCS=	usguide.pdf srlguide.pdf ntmref.pdf nm_rc.pdf \
+		nifty.pdf fdutil.pdf
+
 WRKSRC=		${WRKDIR}/NeTraMet${PORTVERSION:S/.//}
 
 USE_REINPLACE=	yes
@@ -31,4 +38,10 @@ PLIST_SUB=	MOTIF="@comment "
 post-patch:
 	@${REINPLACE_CMD} -e "s|"/etc/mib.txt"|${LOCALBASE}/share/NeTraMet/mibs/mib.txt|g;" ${WRKSRC}/src/snmplib/mib.c
 
+post-install:
+	@${MKDIR} ${DOCSDIR}
+.for FILE in ${NETRAMET_DOCS}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${FILE} ${DOCSDIR}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/net/NeTraMet/distinfo b/net/NeTraMet/distinfo
index c82a932e062a..62b53c80a1a2 100644
--- a/net/NeTraMet/distinfo
+++ b/net/NeTraMet/distinfo
@@ -1 +1,7 @@
-MD5 (NeTraMet43.tar.gz) = 5cf96e2828639d3421226333a0a904f3
+MD5 (netramet/NeTraMet44.tar.gz) = 22a883ac1e6ba83b0392c3b40f84b464
+MD5 (netramet/usguide.pdf) = 515333037143be70d8491744188db8b3
+MD5 (netramet/srlguide.pdf) = ee266612af69ee64651baa02503e92b7
+MD5 (netramet/ntmref.pdf) = 3fac8d138def55128c4c8fa3b21e394f
+MD5 (netramet/nm_rc.pdf) = 8acc4dd5cb06459e1f3b4548ce39d511
+MD5 (netramet/nifty.pdf) = 69a7cd99a1a6c6073cadbab8c335dd0c
+MD5 (netramet/fdutil.pdf) = dbb2146c27a7b2c87ef98c1b528bce30
diff --git a/net/NeTraMet/files/patch-aa b/net/NeTraMet/files/patch-aa
deleted file mode 100644
index de48744f381a..000000000000
--- a/net/NeTraMet/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/srl/srl.c.orig	Sun Oct  3 14:06:34 1999
-+++ src/srl/srl.c	Fri Jan 25 23:37:10 2002
-@@ -93,7 +93,9 @@
- #include <stdlib.h>
- #include <ctype.h>
- #include <string.h>
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <sys/time.h>
- 
- #define SRLEXT
diff --git a/net/NeTraMet/files/patch-ab b/net/NeTraMet/files/patch-ab
index 2e8a7d40164b..7e4937b77152 100644
--- a/net/NeTraMet/files/patch-ab
+++ b/net/NeTraMet/files/patch-ab
@@ -1,10 +1,13 @@
---- ./src/bgp/integrat/readbgp.c.orig	Fri Aug 23 12:46:49 2002
-+++ ./src/bgp/integrat/readbgp.c	Fri Aug 23 12:47:36 2002
-@@ -115,7 +115,6 @@
+
+$FreeBSD$
+
+--- src/bgp/integrat/readbgp.c.orig	Sun Mar 23 17:40:57 2003
++++ src/bgp/integrat/readbgp.c	Sun Mar 23 17:41:06 2003
+@@ -119,7 +119,6 @@
  #ifdef __unix__
  #define min(a,b)    (((a) < (b)) ? (a) : (b))
  #define _sys_errlist sys_errlist
 -int sys_nerr;
- #if !defined(ALPHA) && !defined(IRIX)
+ #if !defined(ALPHA) && !defined(IRIX) && !defined(NETBSD)
  extern const char *const sys_errlist[];
  #endif
diff --git a/net/NeTraMet/files/patch-ac b/net/NeTraMet/files/patch-ac
index a8d5023085f5..3f1dbf05a5fd 100644
--- a/net/NeTraMet/files/patch-ac
+++ b/net/NeTraMet/files/patch-ac
@@ -1,10 +1,13 @@
---- ./src/bgp/types/types.h.orig	Fri Aug 23 12:48:29 2002
-+++ ./src/bgp/types/types.h	Fri Aug 23 12:48:35 2002
-@@ -392,7 +392,6 @@
+
+$FreeBSD$
+
+--- src/bgp/types/types.h.orig	Sun Mar 23 17:41:15 2003
++++ src/bgp/types/types.h	Sun Mar 23 17:41:23 2003
+@@ -395,7 +395,6 @@
   * under UNIX
   */
  #define _sys_errlist    sys_errlist
 -extern int sys_nerr;
- #if !defined(ALPHA) && !defined(IRIX)
+ #if !defined(ALPHA) && !defined(IRIX) && !defined(NETBSD)
  extern const char *const sys_errlist[];
  #endif
diff --git a/net/NeTraMet/pkg-plist b/net/NeTraMet/pkg-plist
index cadcb6578620..4286b535fb89 100644
--- a/net/NeTraMet/pkg-plist
+++ b/net/NeTraMet/pkg-plist
@@ -9,42 +9,48 @@ bin/nm_rc
 bin/nm_rr
 bin/nm_st
 bin/srl
-share/NeTraMet/examples/rules/rules.broadcast
-share/NeTraMet/examples/rules/rules.default
-share/NeTraMet/examples/rules/rules.gateway
-share/NeTraMet/examples/rules/rules.ipport
-share/NeTraMet/examples/rules/rules.lan
-share/NeTraMet/examples/rules/rules.manage
-share/NeTraMet/examples/rules/rules.nifty
-share/NeTraMet/examples/rules/rules.other
-share/NeTraMet/examples/rules/rules.rc.ip
-share/NeTraMet/examples/rules/rules.rc.ip.new
-share/NeTraMet/examples/rules/rules.rc.ipx
-share/NeTraMet/examples/rules/rules.rc.ports
-share/NeTraMet/examples/rules/rules.rc.ports.new
-share/NeTraMet/examples/rules/rules.sample
-share/NeTraMet/examples/rules/rules.two-adj-routers
-share/NeTraMet/examples/rules/rules.two-ip-groups
-share/NeTraMet/examples/rules/rules.x_ip
-share/NeTraMet/examples/srl/2ip8.srl
-share/NeTraMet/examples/srl/broadcast.srl
-share/NeTraMet/examples/srl/cs2.srl
-share/NeTraMet/examples/srl/icmp.srl
-share/NeTraMet/examples/srl/k1.srl
-share/NeTraMet/examples/srl/k8.srl
-share/NeTraMet/examples/srl/n-ports.srl
-share/NeTraMet/examples/srl/nifty.srl
-share/NeTraMet/examples/srl/other.srl
-share/NeTraMet/examples/srl/pr+bc.srl
-share/NeTraMet/mibs/meter-mib-31.txt
-share/NeTraMet/mibs/meter-mib-32.txt
-share/NeTraMet/mibs/mib-1.txt
-share/NeTraMet/mibs/mib-41.txt
-share/NeTraMet/mibs/mib.auckland
-share/NeTraMet/mibs/mib.txt
-share/NeTraMet/mibs/rtm-text.txt
-@dirrm share/NeTraMet/examples/srl
-@dirrm share/NeTraMet/examples/rules
-@dirrm share/NeTraMet/mibs
-@dirrm share/NeTraMet/examples
-@dirrm share/NeTraMet
+%%DATADIR%%/examples/2ip8.srl
+%%DATADIR%%/examples/broadcast.srl
+%%DATADIR%%/examples/cs2.srl
+%%DATADIR%%/examples/icmp.srl
+%%DATADIR%%/examples/k1.srl
+%%DATADIR%%/examples/k8.srl
+%%DATADIR%%/examples/n-ports.srl
+%%DATADIR%%/examples/nifty.srl
+%%DATADIR%%/examples/non-srl/rules.broadcast
+%%DATADIR%%/examples/non-srl/rules.default
+%%DATADIR%%/examples/non-srl/rules.gateway
+%%DATADIR%%/examples/non-srl/rules.ipport
+%%DATADIR%%/examples/non-srl/rules.lan
+%%DATADIR%%/examples/non-srl/rules.manage
+%%DATADIR%%/examples/non-srl/rules.nifty
+%%DATADIR%%/examples/non-srl/rules.other
+%%DATADIR%%/examples/non-srl/rules.rc.ip
+%%DATADIR%%/examples/non-srl/rules.rc.ip.new
+%%DATADIR%%/examples/non-srl/rules.rc.ipx
+%%DATADIR%%/examples/non-srl/rules.rc.ports
+%%DATADIR%%/examples/non-srl/rules.rc.ports.new
+%%DATADIR%%/examples/non-srl/rules.sample
+%%DATADIR%%/examples/non-srl/rules.two-adj-routers
+%%DATADIR%%/examples/non-srl/rules.two-ip-groups
+%%DATADIR%%/examples/non-srl/rules.x_ip
+%%DATADIR%%/examples/other.srl
+%%DATADIR%%/examples/pr+bc.srl
+%%DATADIR%%/mibs/meter-mib-31.txt
+%%DATADIR%%/mibs/meter-mib-32.txt
+%%DATADIR%%/mibs/mib-1.txt
+%%DATADIR%%/mibs/mib-41.txt
+%%DATADIR%%/mibs/mib.auckland
+%%DATADIR%%/mibs/mib.txt
+%%DATADIR%%/mibs/rtm-text.txt
+%%DOCSDIR%%/fdutil.pdf
+%%DOCSDIR%%/nifty.pdf
+%%DOCSDIR%%/nm_rc.pdf
+%%DOCSDIR%%/ntmref.pdf
+%%DOCSDIR%%/srlguide.pdf
+%%DOCSDIR%%/usguide.pdf
+@dirrm %%DATADIR%%/mibs
+@dirrm %%DATADIR%%/examples/non-srl
+@dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%