update to 2.2, ok sturm@

net/pfstat/Makefile

@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2005/10/24 05:09:59 fgsch Exp $
+# $OpenBSD: Makefile,v 1.12 2006/05/24 15:15:41 dhartmei Exp $
 
 COMMENT=	"packet filter statistics visualization"
+COMMENT-daemon=	"pfstat daemon"
 
-DISTNAME=	pfstat-1.7
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	pfstat-2.2
+
+PKGNAME-daemon=	${PKGNAME:S/-/d-/}
 CATEGORIES=	net
 MASTER_SITES=	http://www.benzedrine.cx/
 
@@ -11,18 +13,40 @@ HOMEPAGE=	http://www.benzedrine.cx/pfstat.html
 
 MAINTAINER=	Daniel Hartmeier <dhartmei@openbsd.org>
 
+# BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c jpeg m png z 
 
-MODULES=	converters/libiconv
+MULTI_PACKAGES=		-daemon
+SUBPACKAGE?=
 
-LIB_DEPENDS=	gd.18::graphics/gd
+WANTLIB=		c
+
+BUILD_DEPENDS=		::graphics/gd
+
+.if defined(PACKAGING)
+. if ${SUBPACKAGE} != "-daemon"
+WANTLIB+=		jpeg m png z
+
+MODULES=		converters/libiconv
+
+LIB_DEPENDS=		gd.20::graphics/gd
+. endif
+.endif
+
+pre-configure:
+	@perl -pi -e "s,/etc,${SYSCONFDIR}," ${WRKSRC}/pfstat.c \
+		${WRKSRC}/pfstat.8
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pfstat ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/pfstat.8 ${PREFIX}/man/man8
+	${INSTALL_PROGRAM} ${WRKSRC}/pfstatd/pfstatd ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/pfstatd/pfstatd.8 ${PREFIX}/man/man8
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pfstat
+	$(INSTALL_DATA) ${WRKSRC}/pfstat.conf.example	\
+			${PREFIX}/share/examples/pfstat/pfstat.conf
 
 .include <bsd.port.mk>

net/pfstat/distinfo

@@ -1,4 +1,4 @@
-MD5 (pfstat-1.7.tar.gz) = bd58864b56774aa10aa763258de8b625
-RMD160 (pfstat-1.7.tar.gz) = d15ebd14a42ddbdacf326b4ad59c2fcf4f7d8b07
-SHA1 (pfstat-1.7.tar.gz) = 7bd125039c130a56a4dda3040d309d0f445d88b5
-SIZE (pfstat-1.7.tar.gz) = 9610
+MD5 (pfstat-2.2.tar.gz) = c3e0c37ec9017c2544c102c5dba6d7aa
+RMD160 (pfstat-2.2.tar.gz) = 27dd001e769153935ee238ab294516fff2b7a281
+SHA1 (pfstat-2.2.tar.gz) = e3712bd2cdcb1eb6fd0bbe1f8491f6907d00ddda
+SIZE (pfstat-2.2.tar.gz) = 18784

net/pfstat/patches/patch-Makefile

@@ -1,14 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.2 2005/10/24 05:09:59 fgsch Exp $
---- Makefile.orig	Thu Sep 22 03:21:48 2005
-+++ Makefile	Thu Sep 22 03:22:00 2005
-@@ -4,8 +4,8 @@ PROG=	pfstat
- SRCS=	pfstat.c parse.y
- CFLAGS+=	-Wall
- CFLAGS+=	-I${LOCALBASE}/include
--LDFLAGS+=	-L${LOCALBASE}/lib
--LDFLAGS+=	-lgd -lm -lpng -lz -ljpeg -lttf
-+LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
-+LDFLAGS+=	-lgd -lm -lpng -lz -ljpeg -liconv
- NOMAN=	1
- 
- .include <bsd.prog.mk>

net/pfstat/pkg/DESCR-daemon

@@ -0,0 +1 @@
+pfstatd is a daemon for remote access to pf statistics using pfstat.

net/pfstat/pkg/PLIST

@@ -1,3 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:17:44 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2006/05/24 15:15:41 dhartmei Exp $
 bin/pfstat
 @man man/man8/pfstat.8
+share/examples/pfstat/
+share/examples/pfstat/pfstat.conf
+@sample ${SYSCONFDIR}/pfstat.conf

net/pfstat/pkg/PLIST-daemon

@@ -0,0 +1,3 @@
+@comment $OpenBSD: PLIST-daemon,v 1.1 2006/05/24 15:15:40 dhartmei Exp $
+bin/pfstatd
+@man man/man8/pfstatd.8