Update pfstat to 2.5.

while here,
* set LICENSE=2-clause-bsd
* swith to USE_BSD_MAKEFILE.
* honor PKG_SYSCONFDIR.

4 files changed, 29 insertions, 20 deletions

diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile
index f4bd3c4566d..c6a0e88efe2 100644
--- a/sysutils/pfstat/Makefile
+++ b/sysutils/pfstat/Makefile
@@ -1,37 +1,31 @@
-# $NetBSD: Makefile,v 1.17 2011/01/13 13:39:25 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2011/04/15 11:27:04 obache Exp $
 
-DISTNAME=	pfstat-2.3
-PKGREVISION=	4
+DISTNAME=	pfstat-2.5
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://www.benzedrine.cx/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.benzedrine.cx/pfstat.html
 COMMENT=	Utility to render graphical statistics for PF
+LICENSE=	2-clause-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-NO_CONFIGURE=	yes
+USE_BSD_MAKEFILE=	yes
+USE_TOOLS+=		yacc
+
 MAKE_ENV+=	PF_VERSION=${PF_VERSION:S/.//} NOGCCERROR=yes
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8 share/examples/pfstat
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8 ${PKGMANDIR}/cat8 share/examples/pfstat
 
 SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	post-patch
 SUBST_FILES.conf=	pfstat.8 pfstat.c pfstat.conf.example
-SUBST_SED.conf=		-e "s|/etc/pfstat.conf|${PREFIX}/etc/pfstat.conf|g"
+SUBST_SED.conf=		-e "s|/etc/pfstat.conf|${PKG_SYSCONFDIR}/pfstat.conf|g"
 SUBST_MESSAGE.conf=	Fixing configuration file paths.
 
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE}
-	cd ${WRKSRC}/pfstatd && ${SETENV} ${MAKE_ENV} ${MAKE}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pfstat ${DESTDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/pfstat.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+post-install:
 	${INSTALL_DATA} ${WRKSRC}/pfstat.conf.example ${DESTDIR}${PREFIX}/share/examples/pfstat
-	${INSTALL_PROGRAM} ${WRKSRC}/pfstatd/pfstatd ${DESTDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/pfstatd/pfstatd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../mk/pf.buildlink3.mk"
diff --git a/sysutils/pfstat/PLIST b/sysutils/pfstat/PLIST
index 4e5821dc2cb..de26f0c64bf 100644
--- a/sysutils/pfstat/PLIST
+++ b/sysutils/pfstat/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:16:12 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/04/15 11:27:04 obache Exp $
 bin/pfstat
 bin/pfstatd
+man/cat8/pfstat.0
+man/cat8/pfstatd.0
 man/man8/pfstat.8
 man/man8/pfstatd.8
 share/examples/pfstat/pfstat.conf.example
diff --git a/sysutils/pfstat/distinfo b/sysutils/pfstat/distinfo
index 625de06fc5c..dfe7747b4de 100644
--- a/sysutils/pfstat/distinfo
+++ b/sysutils/pfstat/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.5 2010/06/13 14:55:45 wiz Exp $
+$NetBSD: distinfo,v 1.6 2011/04/15 11:27:04 obache Exp $
 
-SHA1 (pfstat-2.3.tar.gz) = 83be99fd5a7c997fc89c0858d27d471f7f9126c7
-RMD160 (pfstat-2.3.tar.gz) = 0048005aa114d49a8e1adefc8789c7aeb704f7ad
-Size (pfstat-2.3.tar.gz) = 18332 bytes
+SHA1 (pfstat-2.5.tar.gz) = fdc6acae98ac2c102dedd2c82104c66d1c0af3ee
+RMD160 (pfstat-2.5.tar.gz) = bba652d4f27b41554422410e924a421a1a0fe2a0
+Size (pfstat-2.5.tar.gz) = 19166 bytes
+SHA1 (patch-Makefile) = 9852c2af6f0891a7696bb81c0c284725cb653595
 SHA1 (patch-aa) = 72bf1f5806846833b20cacaec368744f25899e94
 SHA1 (patch-ab) = 24ab0271e0302e03f3b00feb9e4b20f97f932435
 SHA1 (patch-ac) = 451e8a66d108dab39277f7d8d93150150f822879
diff --git a/sysutils/pfstat/patches/patch-Makefile b/sysutils/pfstat/patches/patch-Makefile
new file mode 100644
index 00000000000..66d299f9e20
--- /dev/null
+++ b/sysutils/pfstat/patches/patch-Makefile
@@ -0,0 +1,12 @@
+$NetBSD: patch-Makefile,v 1.1 2011/04/15 11:27:04 obache Exp $
+
+* match to mk-files from pkgsrc.
+
+--- Makefile.orig	2007-08-21 10:17:36.000000000 +0000
++++ Makefile
+@@ -9,4 +9,5 @@ CFLAGS+=	-I${LOCALBASE}/include -I${.CUR
+ LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
+ LDFLAGS+=	-lgd -lm -lpng -lz -ljpeg
+ 
++.include <bsd.subdir.mk>
+ .include <bsd.prog.mk>