Convert to bl3.

8 files changed, 43 insertions, 21 deletions

diff --git a/multimedia/flashplayer/Makefile b/multimedia/flashplayer/Makefile
index 4e25096ae97..482d059338e 100644
--- a/multimedia/flashplayer/Makefile
+++ b/multimedia/flashplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/02/18 13:33:41 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2004/04/24 22:25:31 wiz Exp $
 #
 
 .include "../../multimedia/libflash/Makefile.common"
@@ -7,7 +7,7 @@ PKGNAME=	${DISTNAME:C/-/player-/}
 PKGREVISION=	2
 COMMENT=	Standalone open source Flash(tm) player
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 BUILD_DIRS=	${WRKSRC}/Player
 CPPFLAGS+=	-DDEV_DSP=\\\"${DEVOSSSOUND}\\\"
 
@@ -19,5 +19,5 @@ MAKE_ENV+=	LIBSTDCPP=-lstdc++
 MAKE_ENV+=	LIBSTDCPP=
 .endif
 
-.include "../../multimedia/libflash/buildlink2.mk"
+.include "../../multimedia/libflash/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libflash/Makefile b/multimedia/libflash/Makefile
index 795b6e40ece..d15cbbce286 100644
--- a/multimedia/libflash/Makefile
+++ b/multimedia/libflash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/26 13:34:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/24 22:25:31 wiz Exp $
 #
 
 .include "Makefile.common"
@@ -7,12 +7,12 @@ PKGNAME=	lib${DISTNAME}
 PKGREVISION=	4
 COMMENT=	Open source Flash(tm) library
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_LIBTOOL=	yes
 BUILD_DIRS=	${WRKSRC}/Lib
 MAKE_ENV+=	LIBOSSAUDIO="${LIBOSSAUDIO}"
 MAKE_ENV+=	LIBSTDCPP=-lstdc++
 
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libflash/Makefile.common b/multimedia/libflash/Makefile.common
index 47aafd00a37..7564e75441c 100644
--- a/multimedia/libflash/Makefile.common
+++ b/multimedia/libflash/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/02/11 01:46:30 abs Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/04/24 22:25:31 wiz Exp $
 #
 
 DISTNAME=	flash-0.4.10
@@ -20,4 +20,4 @@ post-extract: remove-subpackages
 remove-subpackages:
 	${RM} -rf ${WRKSRC}/Jpeg ${WRKSRC}/Zlib
 
-.include "../../mk/ossaudio.buildlink2.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
diff --git a/multimedia/libflash/buildlink3.mk b/multimedia/libflash/buildlink3.mk
new file mode 100644
index 00000000000..6eec154cc46
--- /dev/null
+++ b/multimedia/libflash/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/24 22:25:31 wiz Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+LIBFLASH_BUILDLINK3_MK:=	${LIBFLASH_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libflash
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibflash}
+BUILDLINK_PACKAGES+=	libflash
+
+.if !empty(LIBFLASH_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libflash+=	libflash>=0.4.10nb4
+BUILDLINK_PKGSRCDIR.libflash?=	../../multimedia/libflash
+.endif	# LIBFLASH_BUILDLINK3_MK
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/libflash/distinfo b/multimedia/libflash/distinfo
index 14ba5dc01bf..920a9e84011 100644
--- a/multimedia/libflash/distinfo
+++ b/multimedia/libflash/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/01/26 13:34:45 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2004/04/24 22:25:31 wiz Exp $
 
 SHA1 (flash-0.4.10.tgz) = 41f2b8bba3e551e611913069e6e650bc4c8ab420
 Size (flash-0.4.10.tgz) = 358995 bytes
 SHA1 (patch-ab) = 29afb4393acc2c44e622d398dba05749fb5c581d
 SHA1 (patch-ac) = ce803268d7c85e0317c61dbd63c56028eaba82a8
 SHA1 (patch-ad) = a67db33d60bc5ce23241e5f445aabb9bdb1864c2
-SHA1 (patch-af) = b55169832b1475f41c7e7ecaf1abe1f7d4c93037
+SHA1 (patch-af) = f0c7f279ac3295b5bef7de8d5405b04de33260c0
 SHA1 (patch-ag) = cc6277a63c4bfa54a35b74a1a66dea5923ae8637
-SHA1 (patch-ah) = ff644dd1c53b54a029adc870f69e128213e50635
+SHA1 (patch-ah) = d4406e8e672762b8ec474acf4923ded2301ad5a9
 SHA1 (patch-ai) = a4f927b4698e7de7b46f2496b57c83a30a57fecb
 SHA1 (patch-aj) = d37351360b7e703747b4742e0378f89c528bdef7
diff --git a/multimedia/libflash/patches/patch-af b/multimedia/libflash/patches/patch-af
index 3a03559fc4d..f81eadddc01 100644
--- a/multimedia/libflash/patches/patch-af
+++ b/multimedia/libflash/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/01/26 13:34:46 jmmv Exp $
+$NetBSD: patch-af,v 1.2 2004/04/24 22:25:31 wiz Exp $
 
---- Player/Makefile.orig	Wed Jun  7 11:19:50 2000
+--- Player/Makefile.orig	2000-06-07 20:19:50.000000000 +0200
 +++ Player/Makefile
-@@ -1,14 +1,12 @@
+@@ -1,14 +1,13 @@
 -FLASH=../Lib
 -CPPFLAGS=-I$(FLASH)
 -CFLAGS=-O3
@@ -10,6 +10,7 @@ $NetBSD: patch-af,v 1.1.1.1 2004/01/26 13:34:46 jmmv Exp $
 -CC=gcc
 -LDFLAGS=
 +LIBS = -lflash -ljpeg -lz ${LIBOSSAUDIO} -lX11 -lXext -lm $(LIBSTDCPP)
++CFLAGS+= -I${PREFIX}/include/flash
  
 -swfplayer: main.o $(FLASH)/libflash.a ../Zlib/libz.a ../Jpeg/libjpeg.a
 +all: swfplayer
diff --git a/multimedia/libflash/patches/patch-ah b/multimedia/libflash/patches/patch-ah
index 7dcdf0d19e8..eb371f50b3b 100644
--- a/multimedia/libflash/patches/patch-ah
+++ b/multimedia/libflash/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.1.1.1 2004/01/26 13:34:46 jmmv Exp $
+$NetBSD: patch-ah,v 1.2 2004/04/24 22:25:31 wiz Exp $
 
---- Plugin/Makefile.orig	Tue Sep 28 05:13:38 1999
+--- Plugin/Makefile.orig	1999-09-28 14:13:38.000000000 +0200
 +++ Plugin/Makefile
 @@ -21,34 +21,30 @@
  
@@ -22,7 +22,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2004/01/26 13:34:46 jmmv Exp $
 -
 -CFLAGS=  $(OPTIMIZER) $(PLUGIN_DEFINES) -I$(FLASH) -I/usr/X11R6/include
 -LDFLAGS= $(FLASH)/libflash.a $(LIBCXX) ../Jpeg/libjpeg.a ../Zlib/libz.a
-+CFLAGS+=  $(OPTIMIZER) $(PLUGIN_DEFINES) $(CPPFLAGS)
++CFLAGS+=  $(OPTIMIZER) $(PLUGIN_DEFINES) $(CPPFLAGS) -I${PREFIX}/include/flash
 +LIBS= -lflash $(LIBSTDCPP) -ljpeg -lz $(LIBOSSAUDIO) -lX11 -lXt
  
  SRC= plugin.c npunix.c
diff --git a/multimedia/moz-flash/Makefile b/multimedia/moz-flash/Makefile
index e7a56348dc3..81e720da67d 100644
--- a/multimedia/moz-flash/Makefile
+++ b/multimedia/moz-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/02/12 13:40:42 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/24 22:25:31 wiz Exp $
 #
 
 .include "../../multimedia/libflash/Makefile.common"
@@ -12,7 +12,7 @@ COMMENT=	Mozilla open source Flash(tm) plugin
 
 DEPENDS+=	mozilla>=0.9.9:../../www/mozilla
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_X11=	YES
 USE_LIBTOOL=	YES
 
@@ -28,6 +28,6 @@ do-install:
 	cd ${WRKSRC}/Plugin && \
 		${INSTALL_PROGRAM} .libs/npflash.so ${MOZ_PLUGDIR}
 
-.include "../../multimedia/libflash/buildlink2.mk"
+.include "../../multimedia/libflash/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"