diff options
author | hasso <hasso> | 2009-06-04 07:54:26 +0000 |
---|---|---|
committer | hasso <hasso> | 2009-06-04 07:54:26 +0000 |
commit | dae4546acb3867f50b3cd6e9311cce53d4c83a80 (patch) | |
tree | 8e4d8c4217d814f7e063a9962555b03a74062763 /net | |
parent | 0fd58bac94ff869fab89e2be581276a06c1b2ce7 (diff) | |
download | pkgsrc-dae4546acb3867f50b3cd6e9311cce53d4c83a80.tar.gz |
Make it build on DragonFly.
Diffstat (limited to 'net')
-rw-r--r-- | net/miniupnpd/distinfo | 6 | ||||
-rw-r--r-- | net/miniupnpd/options.mk | 4 | ||||
-rw-r--r-- | net/miniupnpd/patches/patch-aa | 15 | ||||
-rw-r--r-- | net/miniupnpd/patches/patch-ad | 21 | ||||
-rw-r--r-- | net/miniupnpd/patches/patch-ae | 29 |
5 files changed, 67 insertions, 8 deletions
diff --git a/net/miniupnpd/distinfo b/net/miniupnpd/distinfo index 2aeff1ae906..db60d3210ae 100644 --- a/net/miniupnpd/distinfo +++ b/net/miniupnpd/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.2 2009/01/06 23:39:53 jmcneill Exp $ +$NetBSD: distinfo,v 1.3 2009/06/04 07:54:26 hasso Exp $ SHA1 (miniupnpd-20081009.tar.gz) = 9006d433053c237ccb6628e1856b7cd99a79d989 RMD160 (miniupnpd-20081009.tar.gz) = 16c36151d7f7058c2579dbba33e92b417304453c Size (miniupnpd-20081009.tar.gz) = 81732 bytes -SHA1 (patch-aa) = 9c65d3459f2435c9318ed163cc2b664ca2f49475 +SHA1 (patch-aa) = 2e4d6a8b3ab975657d3c857167601b77e3d84883 SHA1 (patch-ab) = fa9c272f80629da6ed50a6acaca7e0dd92283f9e SHA1 (patch-ac) = b92d83113f55b1e1b5f9c88f52bebba45f7d746f +SHA1 (patch-ad) = aa9ffe0963026c52b2bc17b899f1a5d042a86f55 +SHA1 (patch-ae) = 59dfed6777874a545fdfe63bc9e8263d1776be76 diff --git a/net/miniupnpd/options.mk b/net/miniupnpd/options.mk index c3af732d3a4..551d1515162 100644 --- a/net/miniupnpd/options.mk +++ b/net/miniupnpd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2009/04/29 12:34:42 sborrill Exp $ +# $NetBSD: options.mk,v 1.4 2009/06/04 07:54:26 hasso Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.miniupnpd PKG_OPTIONS_REQUIRED_GROUPS= miniupnpd-fw @@ -7,7 +7,7 @@ PKG_OPTIONS_GROUP.miniupnpd-fw= pf ipfilter .if ${OPSYS} == "NetBSD" PKG_SUGGESTED_OPTIONS+= ipfilter .else -. if exists(/usr/include/net/pfvar.h) +. if exists(/usr/include/net/pfvar.h) || exists(/usr/include/net/pf/pfvar.h) PKG_SUGGESTED_OPTIONS+= pf . else PKG_SUGGESTED_OPTIONS+= ipfilter diff --git a/net/miniupnpd/patches/patch-aa b/net/miniupnpd/patches/patch-aa index 35306c040c5..f7668799368 100644 --- a/net/miniupnpd/patches/patch-aa +++ b/net/miniupnpd/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2009/01/06 03:56:45 jmcneill Exp $ +$NetBSD: patch-aa,v 1.2 2009/06/04 07:54:26 hasso Exp $ ---- genconfig.sh.orig 2008-10-01 08:49:26.000000000 -0400 -+++ genconfig.sh -@@ -96,12 +96,18 @@ case $OS_NAME in +--- genconfig.sh.orig 2008-10-01 15:49:26 +0300 ++++ genconfig.sh 2009-05-07 11:23:34 +0300 +@@ -96,14 +96,25 @@ case $OS_NAME in ;; NetBSD) OS_URL=http://www.netbsd.org/ @@ -25,4 +25,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/01/06 03:56:45 jmcneill Exp $ + fi fi ;; ++ DragonFly) ++ OS_URL=http://www.dragonflybsd.org/ ++ echo "#define USE_PF 1" >> ${CONFIGFILE} ++ FW=pf ++ ;; SunOS) + echo "#define USE_IPF 1" >> ${CONFIGFILE} + FW=ipf diff --git a/net/miniupnpd/patches/patch-ad b/net/miniupnpd/patches/patch-ad new file mode 100644 index 00000000000..5eefa1397a4 --- /dev/null +++ b/net/miniupnpd/patches/patch-ad @@ -0,0 +1,21 @@ +$NetBSD: patch-ad,v 1.1 2009/06/04 07:54:26 hasso Exp $ + +--- pf/obsdrdr.c.orig 2008-08-24 22:54:57 +0300 ++++ pf/obsdrdr.c 2009-06-04 10:35:24 +0300 +@@ -7,11 +7,16 @@ + + #include <sys/types.h> + #include <sys/socket.h> ++#include <sys/param.h> + #include <net/if.h> + #include <netinet/in.h> + #include <netinet/tcp.h> + #include <arpa/inet.h> ++#ifdef __DragonFly__ ++#include <net/pf/pfvar.h> ++#else + #include <net/pfvar.h> ++#endif + #include <fcntl.h> + #include <sys/ioctl.h> + #include <unistd.h> diff --git a/net/miniupnpd/patches/patch-ae b/net/miniupnpd/patches/patch-ae new file mode 100644 index 00000000000..fee692e03df --- /dev/null +++ b/net/miniupnpd/patches/patch-ae @@ -0,0 +1,29 @@ +$NetBSD: patch-ae,v 1.1 2009/06/04 07:54:26 hasso Exp $ + +--- bsd/getifstats.c.orig 2009-05-07 11:38:00 +0300 ++++ bsd/getifstats.c 2009-05-07 11:40:14 +0300 +@@ -11,10 +11,14 @@ + #include <net/if.h> + #include <arpa/inet.h> + #include <netinet/in.h> +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__DragonFly__) + #include <net/if_var.h> + #endif ++#if defined(__DragonFly__) ++#include <net/pf/pfvar.h> ++#else + #include <net/pfvar.h> ++#endif + #include <kvm.h> + #include <fcntl.h> + #include <nlist.h> +@@ -34,7 +38,7 @@ struct nlist list[] = { + int + getifstats(const char * ifname, struct ifdata * data) + { +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__DragonFly__) + struct ifnethead ifh; + #elif defined(__OpenBSD__) || defined(__NetBSD__) + struct ifnet_head ifh; |