Fix for the "annotated bulk failures" mail discussion.

(ok dholland)

5 files changed, 58 insertions, 4 deletions

diff --git a/mbone/beacon/Makefile b/mbone/beacon/Makefile
index dedb8973822..4403acc218c 100644
--- a/mbone/beacon/Makefile
+++ b/mbone/beacon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2010/08/21 16:35:15 seb Exp $
+# $NetBSD: Makefile,v 1.15 2010/09/24 00:16:24 pettai Exp $
 #
 
 DISTNAME=	beacon-1.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mbone
 MASTER_SITES=	${MASTER_SITE_FREEBSD}
 
@@ -16,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/share/examples/beacon
 
-USE_TOOLS+=	perl
+USE_TOOLS+=	tar patch perl
 
 PERL5_CONFIGURE=	NO
 PERL5_PACKLIST=		auto/Net/Multicast/Beacon/.packlist
@@ -29,5 +29,15 @@ SUBST_SED.conf=		-e s,@prefix@/etc,${PKG_SYSCONFDIR},
 CONF_FILES+=	${PREFIX}/share/examples/beacon/beacon.conf \
 		${PKG_SYSCONFDIR}/beacon.conf
 
+.if ${MACHINE_ARCH} == "amd64"
+CFLAGS+= -fPIC
+.endif
+
+post-extract:
+	cd ${WRKSRC} && ${TAR} -zxvf common-1.2.16.tar.gz
+
+pre-patch:
+	cd ${WRKSRC} && ${PATCH} -p0 < common-beacon.patch
+
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mbone/beacon/distinfo b/mbone/beacon/distinfo
index 0d65cd56d27..fbd1b61094e 100644
--- a/mbone/beacon/distinfo
+++ b/mbone/beacon/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.5 2010/03/14 10:59:14 pettai Exp $
+$NetBSD: distinfo,v 1.6 2010/09/24 00:16:24 pettai Exp $
 
 SHA1 (beacon-1.3.tar.gz) = 3c899161df370f8858d6a2ca499ab2b783c6892d
 RMD160 (beacon-1.3.tar.gz) = 10e9d0810fa6080175f6226b1d265a1cc6594a68
 Size (beacon-1.3.tar.gz) = 411823 bytes
 SHA1 (patch-aa) = b0dfa5326e1ff37e8221c16a1237971944e70b4f
 SHA1 (patch-ad) = 5ea95045071112d5b70745edd335c6fa82233b48
+SHA1 (patch-ae) = f11c5b1fd945ab972f43c504ba3ebe5275472b76
+SHA1 (patch-af) = de98aa3e0312edc07f3a9c3de121d63f53cde360
+SHA1 (patch-ag) = 0698f36c567d323aa494fdf19aefc39349b032e8
diff --git a/mbone/beacon/patches/patch-ae b/mbone/beacon/patches/patch-ae
new file mode 100644
index 00000000000..9acd203a87a
--- /dev/null
+++ b/mbone/beacon/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2010/09/24 00:16:25 pettai Exp $
+
+--- configure.orig	2005-08-26 22:22:42.000000000 +0200
++++ configure	2010-03-18 21:27:08.000000000 +0100
+@@ -6604,8 +6604,8 @@
+ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
+-tar -zxvf $srcdir/common-1.2.16.tar.gz
+-                       patch -p0 < common-beacon.patch
++#tar -zxvf $srcdir/common-1.2.16.tar.gz
++#                       patch -p0 < common-beacon.patch
+ 	               cd common
+ 	               ./configure
+ 		       cd ../
diff --git a/mbone/beacon/patches/patch-af b/mbone/beacon/patches/patch-af
new file mode 100644
index 00000000000..09454aa16f6
--- /dev/null
+++ b/mbone/beacon/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 2010/09/24 00:16:25 pettai Exp $
+
+--- Makefile.in.orig	2010-03-19 23:06:39.000000000 +0100
++++ Makefile.in	2010-03-19 23:06:58.000000000 +0100
+@@ -46,6 +46,7 @@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
++AM_CFLAGS=	-fPIC
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
diff --git a/mbone/beacon/patches/patch-ag b/mbone/beacon/patches/patch-ag
new file mode 100644
index 00000000000..9aeb2af7f88
--- /dev/null
+++ b/mbone/beacon/patches/patch-ag
@@ -0,0 +1,14 @@
+$NetBSD: patch-ag,v 1.1 2010/09/24 00:16:25 pettai Exp $
+
+--- common/src/config.h.in.orig	2010-03-19 15:06:37.000000000 +0100
++++ common/src/config.h.in	2010-03-19 15:06:15.000000000 +0100
+@@ -48,6 +48,9 @@
+ #undef NEED_INET_PTON
+ #undef NEED_INET_NTOP
+ 
++#undef HAVE_INET_PTON
++#undef HAVE_INET_NTOP
++
+ /*
+  * If you don't have these types in <inttypes.h>, #define these to be
+  * the types you do have.