diff options
| author | peter <peter> | 2006-03-06 23:02:07 +0000 |
|---|---|---|
| committer | peter <peter> | 2006-03-06 23:02:07 +0000 |
| commit | 4f21cd47eca1f0f2cbfa021481b7946b61892842 (patch) | |
| tree | 90f140230d1743be7fab63985b0ca704ad9b0c01 /sysutils/pfstat | |
| parent | 1e0401c37b4efd1b58de6adebf438977a3be62b3 (diff) | |
| download | pkgsrc-4f21cd47eca1f0f2cbfa021481b7946b61892842.tar.gz | |
The previous commit to fix the include path didn't worked so well on
NetBSD 2 + pflkm, because the path was substituted by "__nonexistent__".
So to fix this properly, add a patch with CPP conditional which fixes
the path for __DragonFly__.
Diffstat (limited to 'sysutils/pfstat')
| -rw-r--r-- | sysutils/pfstat/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/pfstat/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/pfstat/patches/patch-aa | 19 |
3 files changed, 19 insertions, 12 deletions
diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile index 46ad13217e3..942489de6f1 100644 --- a/sysutils/pfstat/Makefile +++ b/sysutils/pfstat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:10:56 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/03/06 23:02:07 peter Exp $ DISTNAME= pfstat-1.7 PKGREVISION= 1 @@ -13,12 +13,6 @@ NO_CONFIGURE= yes INSTALLATION_DIRS= bin man/man8 -SUBST_CLASSES+= path -SUBST_STAGE.path= post-patch -SUBST_FILES.path= pfstat.c -SUBST_SED.path= -e 's,net/pfvar.h,${H_PFLKM:S/\/usr\/include\///},g' -SUBST_MESSAGE.path= "Fixing include path." - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pfstat ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/pfstat.8 ${PREFIX}/man/man8 diff --git a/sysutils/pfstat/distinfo b/sysutils/pfstat/distinfo index 45449c8087d..67f082d6685 100644 --- a/sysutils/pfstat/distinfo +++ b/sysutils/pfstat/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 13:40:56 agc Exp $ +$NetBSD: distinfo,v 1.3 2006/03/06 23:02:07 peter Exp $ SHA1 (pfstat-1.7.tar.gz) = 7bd125039c130a56a4dda3040d309d0f445d88b5 RMD160 (pfstat-1.7.tar.gz) = d15ebd14a42ddbdacf326b4ad59c2fcf4f7d8b07 Size (pfstat-1.7.tar.gz) = 9610 bytes -SHA1 (patch-aa) = 3be95865766518c91520379c68a06c4e73e7c118 +SHA1 (patch-aa) = b1d244d9788cfaf33f3665108a419dc40ff68fea diff --git a/sysutils/pfstat/patches/patch-aa b/sysutils/pfstat/patches/patch-aa index 8f7f074d988..45fea1a4a5f 100644 --- a/sysutils/pfstat/patches/patch-aa +++ b/sysutils/pfstat/patches/patch-aa @@ -1,8 +1,21 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/11/05 15:07:15 peter Exp $ +$NetBSD: patch-aa,v 1.2 2006/03/06 23:02:07 peter Exp $ --- pfstat.c.orig 2003-09-10 19:45:27.000000000 +0200 -+++ pfstat.c 2004-06-08 13:36:51.000000000 +0200 -@@ -167,26 +167,26 @@ ++++ pfstat.c 2006-03-06 23:50:43.000000000 +0100 +@@ -37,7 +37,12 @@ + #include <sys/socket.h> + #include <netinet/in.h> + #include <net/if.h> ++#ifdef __DragonFly__ ++#include <net/pf/pfvar.h> ++#else + #include <net/pfvar.h> ++#endif ++ + #include <err.h> + #include <fcntl.h> + #include <stdio.h> +@@ -167,26 +172,26 @@ } close(dev); if (s.running) { |