Update to version 0.7

PR: 50347
Submitted by: MAINTAINER

8 files changed, 58 insertions, 10 deletions

diff --git a/net-mgmt/aguri/Makefile b/net-mgmt/aguri/Makefile
index 15d4a365c97c..9cb54c095f9d 100644
--- a/net-mgmt/aguri/Makefile
+++ b/net-mgmt/aguri/Makefile
@@ -6,28 +6,35 @@
 #
 
 PORTNAME=	aguri
-PORTVERSION=	0.5
+PORTVERSION=	0.7
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.csl.sony.co.jp/pub/kjc/
 
 MAINTAINER=	yb@sainte-barbe.org
-COMMENT=	"An Aggregation-based Traffic Profiler"
+COMMENT=	An Aggregation-based Traffic Profiler
 
+.if defined(WITH_X11)
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile
 USE_XLIB=	yes
+.endif
 
 MAN1=		aguri.1
 
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/aguri ${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/aguri.1 ${MANPREFIX}/man/man1
+
 post-install:
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for FILES in INSTALL README
+.for FILES in CHANGES INSTALL README
 	@${INSTALL_DATA} ${WRKSRC}/${FILES} ${DOCSDIR}
 .endfor
 .endif
 	@${MKDIR} ${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/scripts/README ${DATADIR}
-.for SCRIPTS in agurify.pl density.pl makeplot.pl
+.for SCRIPTS in agurify.pl density.pl makeimages.pl makeplot.pl
 	@${INSTALL_SCRIPT} ${WRKSRC}/scripts/${SCRIPTS} \
 	${DATADIR}
 .endfor
diff --git a/net-mgmt/aguri/distinfo b/net-mgmt/aguri/distinfo
index a9299e5d8ca9..0a7c65a1276a 100644
--- a/net-mgmt/aguri/distinfo
+++ b/net-mgmt/aguri/distinfo
@@ -1 +1 @@
-MD5 (aguri-0.5.tar.gz) = ae25dec143a29e92be3b314dd5af2991
+MD5 (aguri-0.7.tar.gz) = b15586e62763a5d5a2295f115c42df29
diff --git a/net-mgmt/aguri/files/extra-patch-Makefile b/net-mgmt/aguri/files/extra-patch-Makefile
new file mode 100644
index 000000000000..11180c8fc7ac
--- /dev/null
+++ b/net-mgmt/aguri/files/extra-patch-Makefile
@@ -0,0 +1,15 @@
+--- Makefile.aguri.orig	Thu Mar 27 11:53:26 2003
++++ Makefile	Thu Mar 27 13:43:46 2003
+@@ -11,9 +11,9 @@
+ 	scripts/makeimages.pl scripts/density.pl
+ 
+ CFLAGS=		-O2 -Wall -DNDEBUG
+-DEFINES=	-DINET6 -DAGURI_STATS $(SYS_DEFINES) # -DXTREE
+-INCLUDES=	-I. $(COMPAT_INCLUDES) $(SYS_INCLUDES) # -I/usr/X11R6/include
+-LIBS=		$(SYS_LIBS) -lpcap # -R/usr/X11R6/lib -L/usr/X11R6/lib -lX11 
++DEFINES=	-DINET6 -DAGURI_STATS $(SYS_DEFINES) -DXTREE
++INCLUDES=	-I. $(COMPAT_INCLUDES) $(SYS_INCLUDES) -I/usr/X11R6/include
++LIBS=		$(SYS_LIBS) -lpcap -R/usr/X11R6/lib -L/usr/X11R6/lib -lX11 
+ 
+ all: $(PROG)
+ 
diff --git a/net-mgmt/aguri/pkg-plist b/net-mgmt/aguri/pkg-plist
index 20ae09c5079d..514144ed9c7a 100644
--- a/net-mgmt/aguri/pkg-plist
+++ b/net-mgmt/aguri/pkg-plist
@@ -1,9 +1,11 @@
 bin/aguri
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%DATADIR%%/README
 %%DATADIR%%/agurify.pl
 %%DATADIR%%/density.pl
+%%DATADIR%%/makeimages.pl
 %%DATADIR%%/makeplot.pl
 @dirrm %%DATADIR%%
diff --git a/net/aguri/Makefile b/net/aguri/Makefile
index 15d4a365c97c..9cb54c095f9d 100644
--- a/net/aguri/Makefile
+++ b/net/aguri/Makefile
@@ -6,28 +6,35 @@
 #
 
 PORTNAME=	aguri
-PORTVERSION=	0.5
+PORTVERSION=	0.7
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.csl.sony.co.jp/pub/kjc/
 
 MAINTAINER=	yb@sainte-barbe.org
-COMMENT=	"An Aggregation-based Traffic Profiler"
+COMMENT=	An Aggregation-based Traffic Profiler
 
+.if defined(WITH_X11)
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile
 USE_XLIB=	yes
+.endif
 
 MAN1=		aguri.1
 
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/aguri ${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/aguri.1 ${MANPREFIX}/man/man1
+
 post-install:
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for FILES in INSTALL README
+.for FILES in CHANGES INSTALL README
 	@${INSTALL_DATA} ${WRKSRC}/${FILES} ${DOCSDIR}
 .endfor
 .endif
 	@${MKDIR} ${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/scripts/README ${DATADIR}
-.for SCRIPTS in agurify.pl density.pl makeplot.pl
+.for SCRIPTS in agurify.pl density.pl makeimages.pl makeplot.pl
 	@${INSTALL_SCRIPT} ${WRKSRC}/scripts/${SCRIPTS} \
 	${DATADIR}
 .endfor
diff --git a/net/aguri/distinfo b/net/aguri/distinfo
index a9299e5d8ca9..0a7c65a1276a 100644
--- a/net/aguri/distinfo
+++ b/net/aguri/distinfo
@@ -1 +1 @@
-MD5 (aguri-0.5.tar.gz) = ae25dec143a29e92be3b314dd5af2991
+MD5 (aguri-0.7.tar.gz) = b15586e62763a5d5a2295f115c42df29
diff --git a/net/aguri/files/extra-patch-Makefile b/net/aguri/files/extra-patch-Makefile
new file mode 100644
index 000000000000..11180c8fc7ac
--- /dev/null
+++ b/net/aguri/files/extra-patch-Makefile
@@ -0,0 +1,15 @@
+--- Makefile.aguri.orig	Thu Mar 27 11:53:26 2003
++++ Makefile	Thu Mar 27 13:43:46 2003
+@@ -11,9 +11,9 @@
+ 	scripts/makeimages.pl scripts/density.pl
+ 
+ CFLAGS=		-O2 -Wall -DNDEBUG
+-DEFINES=	-DINET6 -DAGURI_STATS $(SYS_DEFINES) # -DXTREE
+-INCLUDES=	-I. $(COMPAT_INCLUDES) $(SYS_INCLUDES) # -I/usr/X11R6/include
+-LIBS=		$(SYS_LIBS) -lpcap # -R/usr/X11R6/lib -L/usr/X11R6/lib -lX11 
++DEFINES=	-DINET6 -DAGURI_STATS $(SYS_DEFINES) -DXTREE
++INCLUDES=	-I. $(COMPAT_INCLUDES) $(SYS_INCLUDES) -I/usr/X11R6/include
++LIBS=		$(SYS_LIBS) -lpcap -R/usr/X11R6/lib -L/usr/X11R6/lib -lX11 
+ 
+ all: $(PROG)
+ 
diff --git a/net/aguri/pkg-plist b/net/aguri/pkg-plist
index 20ae09c5079d..514144ed9c7a 100644
--- a/net/aguri/pkg-plist
+++ b/net/aguri/pkg-plist
@@ -1,9 +1,11 @@
 bin/aguri
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%DATADIR%%/README
 %%DATADIR%%/agurify.pl
 %%DATADIR%%/density.pl
+%%DATADIR%%/makeimages.pl
 %%DATADIR%%/makeplot.pl
 @dirrm %%DATADIR%%