diff options
-rw-r--r-- | net/ipa/Makefile | 8 | ||||
-rw-r--r-- | net/ipa/distinfo | 5 | ||||
-rw-r--r-- | net/ipa/patches/patch-aa | 41 | ||||
-rw-r--r-- | net/ipa/patches/patch-ag | 16 |
4 files changed, 59 insertions, 11 deletions
diff --git a/net/ipa/Makefile b/net/ipa/Makefile index b54ea41cf9c..4aec4aae242 100644 --- a/net/ipa/Makefile +++ b/net/ipa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/04/22 09:22:12 rillig Exp $ +# $NetBSD: Makefile,v 1.25 2006/06/04 22:21:27 joerg Exp $ # DISTNAME= ipa-1.3.6 @@ -33,12 +33,16 @@ OWN_DIRS_PERMS= /var/ipa ${ROOT_USER} ${ROOT_GROUP} 0555 RCD_SCRIPTS= ipa -.if ${OPSYS} == "NetBSD" +.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" RCD_SCRIPT_SRC.ipa= ${FILESDIR}/ipa.sh .else RCD_SCRIPT_SRC.ipa= ${FILESDIR}/ipa.generic .endif +.if ${OPSYS} == "DragonFly" +MAKE_ENV+= WITH_PF=1 WITHOUT_IP6FW=1 WITHOUT_IPFW=1 +.endif + SUBST_CLASSES+= paths SUBST_FILES.paths= man/ipa.5 man/ipa.8 man/ipa.conf.5 man/ipastat.8 SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' diff --git a/net/ipa/distinfo b/net/ipa/distinfo index 5e612ea786f..d97e215503b 100644 --- a/net/ipa/distinfo +++ b/net/ipa/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.16 2005/02/24 12:13:50 agc Exp $ +$NetBSD: distinfo,v 1.17 2006/06/04 22:21:27 joerg Exp $ SHA1 (ipa-1.3.6.tar.gz) = dcf5ebbf14600da0afba6a735f16a8b8ac84185e RMD160 (ipa-1.3.6.tar.gz) = d122d2f8c1b8bbdabb89f1fd1ccf9aa7f2867133 Size (ipa-1.3.6.tar.gz) = 137156 bytes -SHA1 (patch-aa) = 5599f55b657edc3ecb7f66378601d92e956a0983 +SHA1 (patch-aa) = db61ec179fdeb8ce5ef9ca4f7d287acb24a7faf4 SHA1 (patch-ab) = edce3d9d03ee7456c440ce4179e1e8c39bb516f2 SHA1 (patch-ac) = 0baab6507d335479379e78582c727fad72259b61 SHA1 (patch-ad) = fe03afb555f2a6817dfddd7ab4edb7e41f49c03a SHA1 (patch-ae) = 8ed23f771ba11ae357b141ac62c2d4db9c3957e9 SHA1 (patch-af) = d604d1bab7d51feb7e5ebd75b816c691db229957 +SHA1 (patch-ag) = 886e3e3fe00f4b4b6cd6ad4ae5d9ac356fe3704c diff --git a/net/ipa/patches/patch-aa b/net/ipa/patches/patch-aa index 85800ed05df..f4d1efe9486 100644 --- a/net/ipa/patches/patch-aa +++ b/net/ipa/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.9 2003/05/30 11:53:17 salo Exp $ +$NetBSD: patch-aa,v 1.10 2006/06/04 22:21:27 joerg Exp $ ---- Makefile.orig 2003-04-08 21:18:15.000000000 +0200 -+++ Makefile 2003-05-30 13:15:24.000000000 +0200 -@@ -38,7 +38,7 @@ +--- Makefile.orig 2003-11-11 10:24:34.000000000 +0000 ++++ Makefile +@@ -38,7 +38,7 @@ CC?= /usr/bin/cc # -Ox - optimize; # -g - produce debugging information. # @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.9 2003/05/30 11:53:17 salo Exp $ # # PREFIX - prefix for all below listed paths -@@ -58,7 +58,7 @@ +@@ -58,7 +58,7 @@ DST_MAN_DIR= ${PREFIX}/man # # DST_ETC_DIR - where to install template configuration # @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.9 2003/05/30 11:53:17 salo Exp $ # # DST_RC_DIR - where to install sample rc-script -@@ -81,10 +81,10 @@ +@@ -81,10 +81,10 @@ MKDIR?= /bin/mkdir # # INSTALL_* variables # @@ -35,7 +35,34 @@ $NetBSD: patch-aa,v 1.9 2003/05/30 11:53:17 salo Exp $ INSTALL_MAN_DIR= ${INSTALL} -d -m 0555 -g wheel -o root INSTALL_DATA_DIR= ${INSTALL} -d -m 0555 -g wheel -o root -@@ -207,21 +207,8 @@ +@@ -98,7 +98,7 @@ IPASTAT= ipastat.o common.o + .MAIN: checkos ${OS} + + checkos: +-.if ${OS} != "FreeBSD" && ${OS} != "NetBSD" && ${OS} != "OpenBSD" ++.if ${OS} != "FreeBSD" && ${OS} != "NetBSD" && ${OS} != "OpenBSD" && ${OS} != "DragonFly" + @${ECHO} + @${ECHO} ">> IPA-`${CAT} Version` is designed for FreeBSD, NetBSD and OpenBSD." + @${ECHO} ">> Your operating system is ${OS}." +@@ -139,7 +139,7 @@ CFLAGS+= -I${PF_INCLUDE_DIR} + .endif + .endif + +-.ifmake FreeBSD ++.if make(FreeBSD) || make(DragonFly) + IPA+= kipfw.o kip6fw.o + .endif + +@@ -147,7 +147,7 @@ IPA+= kipfw.o kip6fw.o + IPA+= kpf.o + .endif + +-FreeBSD NetBSD OpenBSD: ipa ipastat ++DragonFly FreeBSD NetBSD OpenBSD: ipa ipastat + + ipa: ${IPA} + ${CC} -o ${.TARGET} ${IPA} +@@ -214,21 +214,8 @@ install: ${INSTALL_PROGRAM} ipa ipastat ${DST_BIN_DIR} ${INSTALL_MAN} man/ipa.5 man/ipa.conf.5 ${DST_MAN_DIR}/man5 ${INSTALL_MAN} man/ipa.8 man/ipastat.8 ${DST_MAN_DIR}/man8 diff --git a/net/ipa/patches/patch-ag b/net/ipa/patches/patch-ag new file mode 100644 index 00000000000..3e418c7091d --- /dev/null +++ b/net/ipa/patches/patch-ag @@ -0,0 +1,16 @@ +$NetBSD: patch-ag,v 1.1 2006/06/04 22:21:27 joerg Exp $ + +--- kpf.c.orig 2006-06-04 22:08:28.000000000 +0000 ++++ kpf.c +@@ -46,7 +46,11 @@ static const char rcsid[] = + #include <sys/socket.h> + #include <net/if.h> + #include <netinet/in.h> ++#if defined(__DragonFly__) ++#include <net/pf/pfvar.h> ++#else + #include <net/pfvar.h> ++#endif + + #include "debug.h" + |