diff options
author | joerg <joerg> | 2006-02-24 20:08:32 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-02-24 20:08:32 +0000 |
commit | d7acaee71a651552fdde0a1ae576b8adfc79bf1b (patch) | |
tree | a5affdc27a2602e7e3ee596451c4066e98d11563 /net | |
parent | 1a8a7a1f5bd9ab9d85acba751a39096700744ac4 (diff) | |
download | pkgsrc-d7acaee71a651552fdde0a1ae576b8adfc79bf1b.tar.gz |
Add DragonFly support. Remove conditional Makefile code, which was
supposed to handle different bsd.prog.mk semantic. pkgsrc has always
the NetBSD behaviour.
Diffstat (limited to 'net')
-rw-r--r-- | net/pim6sd/distinfo | 7 | ||||
-rw-r--r-- | net/pim6sd/patches/patch-ab | 46 | ||||
-rw-r--r-- | net/pim6sd/patches/patch-ad | 13 | ||||
-rw-r--r-- | net/pim6sd/patches/patch-ae | 13 | ||||
-rw-r--r-- | net/pim6sd/patches/patch-af | 13 |
5 files changed, 84 insertions, 8 deletions
diff --git a/net/pim6sd/distinfo b/net/pim6sd/distinfo index d46f76de677..2733da24e2d 100644 --- a/net/pim6sd/distinfo +++ b/net/pim6sd/distinfo @@ -1,8 +1,11 @@ -$NetBSD: distinfo,v 1.7 2005/02/24 12:14:00 agc Exp $ +$NetBSD: distinfo,v 1.8 2006/02/24 20:08:32 joerg Exp $ SHA1 (pim6sd-20031021a.tar.gz) = 96334a3e765bebc3ad4789b47543eb0ddccf9c6e RMD160 (pim6sd-20031021a.tar.gz) = e285ec24eae1bf09460d20e7fff6089ed7515f3a Size (pim6sd-20031021a.tar.gz) = 171664 bytes SHA1 (patch-aa) = 8346bedaff00ed1b37226a5f53fb720890f19a68 -SHA1 (patch-ab) = d127ae4387d7be9a138b6f0e76922d645182f46f +SHA1 (patch-ab) = 6e1e04a24d678a9f874cf448976b3823eb90d85b SHA1 (patch-ac) = 4fa63aef0c7bf083774973a091fcc88324503c37 +SHA1 (patch-ad) = 8f5082c64fe20d8df41fb69fed366eb0cfcc0c01 +SHA1 (patch-ae) = bfa5245dd7c2c29d88e420559afbd13c5f9fe9a7 +SHA1 (patch-af) = 3936ade5af8b5e25cefd85810ac50b3663d0323a diff --git a/net/pim6sd/patches/patch-ab b/net/pim6sd/patches/patch-ab index 7b9cf3a5c62..5b972fb70ce 100644 --- a/net/pim6sd/patches/patch-ab +++ b/net/pim6sd/patches/patch-ab @@ -1,8 +1,44 @@ -$NetBSD: patch-ab,v 1.3 2003/06/06 07:40:41 itojun Exp $ +$NetBSD: patch-ab,v 1.4 2006/02/24 20:08:32 joerg Exp $ ---- Makefile.orig 2002-12-02 11:42:32.000000000 +0900 -+++ Makefile 2003-06-06 16:31:17.000000000 +0900 -@@ -127,6 +127,12 @@ +--- Makefile.orig 2003-09-23 11:09:10.000000000 +0000 ++++ Makefile +@@ -89,17 +89,7 @@ SRCS= mld6.c mld6_proto.c\ + cfparse.y cftoken.l + CLEANFILES+= lex.yy.c y.tab.c y.tab.h cfparse.h + +-.if (${OPSYS} == "BSD/OS") +-CC= gcc +-.endif +-.if (${OPSYS} != "NetBSD") +-CFLAGS+=-Wall +-.endif +-.if (${OPSYS} != "NetBSD") +-CFLAGS+=-DINET6 -DPIM -DIOCTL_OK_ON_RAW_SOCKET +-.else + CPPFLAGS+=-DINET6 -DPIM -DIOCTL_OK_ON_RAW_SOCKET +-.endif + CFLAGS+=-g + .if exists(/usr/local/v6/lib/libinet6.a) + LDADD+= -L${.OBJDIR}/../libinet6 -L${.OBJDIR}/../libinet6/obj \ +@@ -109,24 +99,18 @@ DPADD+= ${.OBJDIR}/../libinet6/libinet6. + /usr/local/v6/lib/libinet6.a + .endif + +-.if (${OPSYS} == "FreeBSD") +-SRCS+= y.tab.h +-.endif +-.if (${OPSYS} == "NetBSD") + YFLAGS+=-d +-.endif + + CLEANFILES+= y.tab.h cfparse.h + +-.if (${OPSYS} == "NetBSD") || (${OPSYS} == "OpenBSD") + MAN= pim6sd.8 pim6sd.conf.5 +-.else +-MAN5= pim6sd.conf.5 +-MAN8= pim6sd.8 +-.endif realinstall: install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ @@ -11,8 +47,6 @@ $NetBSD: patch-ab,v 1.3 2003/06/06 07:40:41 itojun Exp $ .include <bsd.prog.mk> + -+.if ${OPSYS} == "NetBSD" +.y.c: + ${YACC.y} ${.IMPSRC} + mv y.tab.c ${.TARGET} -+.endif diff --git a/net/pim6sd/patches/patch-ad b/net/pim6sd/patches/patch-ad new file mode 100644 index 00000000000..3e4a286d040 --- /dev/null +++ b/net/pim6sd/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2006/02/24 20:08:32 joerg Exp $ + +--- kern.c.orig 2006-02-24 19:58:22.000000000 +0000 ++++ kern.c +@@ -53,7 +53,7 @@ + #include <sys/ioctl.h> + #include <sys/queue.h> + #include <net/if.h> +-#if defined(__FreeBSD__) && __FreeBSD__ >= 3 ++#if defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD__ >= 3) + #include <net/if_var.h> + #endif + #include <net/route.h> diff --git a/net/pim6sd/patches/patch-ae b/net/pim6sd/patches/patch-ae new file mode 100644 index 00000000000..5ba9eb13920 --- /dev/null +++ b/net/pim6sd/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2006/02/24 20:08:32 joerg Exp $ + +--- config.c.orig 2006-02-24 19:59:04.000000000 +0000 ++++ config.c +@@ -62,7 +62,7 @@ + #include <sys/socket.h> + #include <sys/queue.h> + #include <net/if.h> +-#if defined(__FreeBSD__) && __FreeBSD__ >= 3 ++#if defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD__ >= 3) + #include <net/if_var.h> + #endif + #include <net/route.h> diff --git a/net/pim6sd/patches/patch-af b/net/pim6sd/patches/patch-af new file mode 100644 index 00000000000..af35a1a1159 --- /dev/null +++ b/net/pim6sd/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2006/02/24 20:08:32 joerg Exp $ + +--- trace.c.orig 2006-02-24 19:59:46.000000000 +0000 ++++ trace.c +@@ -74,7 +74,7 @@ + #include <sys/uio.h> + #include <sys/queue.h> + #include <net/if.h> +-#if defined(__FreeBSD__) && __FreeBSD__ >= 3 ++#if defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD__ >= 3) + #include <net/if_var.h> + #endif + #include <net/route.h> |