Convert to buildlink3. Also fix build with gcc3.

6 files changed, 51 insertions, 34 deletions

diff --git a/net/liblive/Makefile b/net/liblive/Makefile
index 12bd992b956..0f9485d8e2f 100644
--- a/net/liblive/Makefile
+++ b/net/liblive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:22:19 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/12 21:39:41 snj Exp $
 #
 
 DISTNAME=	live.2003.04.04
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.live.com/liveMedia/
 COMMENT=	Set of C++ libraries for multimedia streaming
 
 WRKSRC=		${WRKDIR}/live
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 
 do-configure:
diff --git a/net/liblive/buildlink2.mk b/net/liblive/buildlink2.mk
deleted file mode 100644
index 6870dce9405..00000000000
--- a/net/liblive/buildlink2.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/04/04 22:37:34 rh Exp $
-#
-# This Makefile fragment is included by packages that use liblive.
-#
-# This file was created automatically using createbuildlink 2.5.
-#
-
-.if !defined(LIBLIVE_BUILDLINK2_MK)
-LIBLIVE_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			liblive
-BUILDLINK_DEPENDS.liblive?=		liblive>=2003.04.04
-BUILDLINK_PKGSRCDIR.liblive?=		../../net/liblive
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.liblive=liblive
-BUILDLINK_PREFIX.liblive_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.liblive+=	include/liblive/BasicUsageEnvironment/*.hh
-BUILDLINK_FILES.liblive+=	include/liblive/UsageEnvironment/*.hh
-BUILDLINK_FILES.liblive+=	include/liblive/groupsock/*.h
-BUILDLINK_FILES.liblive+=	include/liblive/groupsock/*.hh
-BUILDLINK_FILES.liblive+=	include/liblive/liveMedia/*.hh
-BUILDLINK_FILES.liblive+=	lib/libBasicUsageEnvironment.*
-BUILDLINK_FILES.liblive+=	lib/libUsageEnvironment.*
-BUILDLINK_FILES.liblive+=	lib/libgroupsock.*
-BUILDLINK_FILES.liblive+=	lib/libliveMedia.*
-
-BUILDLINK_TARGETS+=	liblive-buildlink
-
-liblive-buildlink: _BUILDLINK_USE
-
-.endif	# LIBLIVE_BUILDLINK2_MK
diff --git a/net/liblive/buildlink3.mk b/net/liblive/buildlink3.mk
new file mode 100644
index 00000000000..a0543511456
--- /dev/null
+++ b/net/liblive/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/12 21:39:41 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBLIVE_BUILDLINK3_MK:=	${LIBLIVE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	liblive
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nliblive}
+BUILDLINK_PACKAGES+=	liblive
+
+.if !empty(LIBLIVE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.liblive+=	liblive>=2003.04.04
+BUILDLINK_PKGSRCDIR.liblive?=	../../net/liblive
+.endif	# LIBLIVE_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/liblive/distinfo b/net/liblive/distinfo
index 242f6526df3..f6ee775b188 100644
--- a/net/liblive/distinfo
+++ b/net/liblive/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/04/04 22:37:33 rh Exp $
+$NetBSD: distinfo,v 1.2 2004/04/12 21:39:41 snj Exp $
 
 SHA1 (live.2003.04.04.tar.gz) = f5c7cffd92f5811c004c30e2b1f889f817539afb
 Size (live.2003.04.04.tar.gz) = 276978 bytes
 SHA1 (patch-aa) = dd4a99f255200d89b3bc9c6e709c53d8e4817e5c
+SHA1 (patch-ab) = c1db6185f37f61bf1645d122fbd480c2f9502c79
+SHA1 (patch-ac) = 61b890142c0d8870a245de0d50a3762266419e8c
diff --git a/net/liblive/patches/patch-ab b/net/liblive/patches/patch-ab
new file mode 100644
index 00000000000..fd7a98b7acd
--- /dev/null
+++ b/net/liblive/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2004/04/12 21:39:41 snj Exp $
+
+--- groupsock/Groupsock.cpp.orig	2004-04-12 14:32:16.000000000 -0700
++++ groupsock/Groupsock.cpp	2004-04-12 14:35:25.000000000 -0700
+@@ -26,7 +26,8 @@ along with this library; if not, write t
+ #if defined(__WIN32__) || defined(_WIN32)
+ #include <strstrea.h>
+ #else
+-#include <strstream.h>
++using namespace::std;
++#include <strstream>
+ #endif
+ #include <stdio.h>
+ 
diff --git a/net/liblive/patches/patch-ac b/net/liblive/patches/patch-ac
new file mode 100644
index 00000000000..0349d13374c
--- /dev/null
+++ b/net/liblive/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2004/04/12 21:39:41 snj Exp $
+
+--- groupsock/NetInterface.cpp.orig	2004-04-12 14:35:56.000000000 -0700
++++ groupsock/NetInterface.cpp	2004-04-12 14:36:08.000000000 -0700
+@@ -25,7 +25,8 @@ along with this library; if not, write t
+ #include <strstrea.h>
+ #define _close closesocket
+ #else
+-#include <strstream.h>
++using namespace::std;
++#include <strstream>
+ #define _close close
+ #endif
+