[pkgsrc/trunk]: pkgsrc/multimedia Convert to bl3.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/multimedia Convert to bl3.
From: wiz <wiz%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:58:19 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/d5c22815e9c0
branches:  trunk
changeset: 473822:d5c22815e9c0
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Apr 24 22:25:31 2004 +0000

description:
Convert to bl3.

diffstat:

 multimedia/flashplayer/Makefile      |   6 +++---
 multimedia/libflash/Makefile         |   8 ++++----
 multimedia/libflash/Makefile.common  |   4 ++--
 multimedia/libflash/buildlink3.mk    |  21 +++++++++++++++++++++
 multimedia/libflash/distinfo         |   6 +++---
 multimedia/libflash/patches/patch-af |   7 ++++---
 multimedia/libflash/patches/patch-ah |   6 +++---
 multimedia/moz-flash/Makefile        |   6 +++---
 8 files changed, 43 insertions(+), 21 deletions(-)

diffs (179 lines):

diff -r 65cf3427ee57 -r d5c22815e9c0 multimedia/flashplayer/Makefile
--- a/multimedia/flashplayer/Makefile   Sat Apr 24 22:21:39 2004 +0000
+++ b/multimedia/flashplayer/Makefile   Sat Apr 24 22:25:31 2004 +0000
@@ -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 @@
 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=
 .endif
 
-.include "../../multimedia/libflash/buildlink2.mk"
+.include "../../multimedia/libflash/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 65cf3427ee57 -r d5c22815e9c0 multimedia/libflash/Makefile
--- a/multimedia/libflash/Makefile      Sat Apr 24 22:21:39 2004 +0000
+++ b/multimedia/libflash/Makefile      Sat Apr 24 22:25:31 2004 +0000
@@ -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 @@
 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 -r 65cf3427ee57 -r d5c22815e9c0 multimedia/libflash/Makefile.common
--- a/multimedia/libflash/Makefile.common       Sat Apr 24 22:21:39 2004 +0000
+++ b/multimedia/libflash/Makefile.common       Sat Apr 24 22:25:31 2004 +0000
@@ -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 @@
 remove-subpackages:
        ${RM} -rf ${WRKSRC}/Jpeg ${WRKSRC}/Zlib
 
-.include "../../mk/ossaudio.buildlink2.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
diff -r 65cf3427ee57 -r d5c22815e9c0 multimedia/libflash/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/libflash/buildlink3.mk Sat Apr 24 22:25:31 2004 +0000
@@ -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 -r 65cf3427ee57 -r d5c22815e9c0 multimedia/libflash/distinfo
--- a/multimedia/libflash/distinfo      Sat Apr 24 22:21:39 2004 +0000
+++ b/multimedia/libflash/distinfo      Sat Apr 24 22:25:31 2004 +0000
@@ -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 -r 65cf3427ee57 -r d5c22815e9c0 multimedia/libflash/patches/patch-af
--- a/multimedia/libflash/patches/patch-af      Sat Apr 24 22:21:39 2004 +0000
+++ b/multimedia/libflash/patches/patch-af      Sat Apr 24 22:25:31 2004 +0000
@@ -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 @@
 -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 -r 65cf3427ee57 -r d5c22815e9c0 multimedia/libflash/patches/patch-ah
--- a/multimedia/libflash/patches/patch-ah      Sat Apr 24 22:21:39 2004 +0000
+++ b/multimedia/libflash/patches/patch-ah      Sat Apr 24 22:25:31 2004 +0000
@@ -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 @@
 -
 -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 -r 65cf3427ee57 -r d5c22815e9c0 multimedia/moz-flash/Makefile
--- a/multimedia/moz-flash/Makefile     Sat Apr 24 22:21:39 2004 +0000
+++ b/multimedia/moz-flash/Makefile     Sat Apr 24 22:25:31 2004 +0000
@@ -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 @@
 
 DEPENDS+=      mozilla>=0.9.9:../../www/mozilla
 
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 USE_X11=       YES
 USE_LIBTOOL=   YES
 
@@ -28,6 +28,6 @@
        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"
Prev by Date: [pkgsrc/trunk]: pkgsrc/lang/gcc3 Allow GCC_PREFIX to the in the rpath for bin...
Next by Date: [pkgsrc/trunk]: pkgsrc/parallel/openpbs Convert to bl3.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang/gcc3 Allow GCC_PREFIX to the in the rpath for bin...
Next by Thread: [pkgsrc/trunk]: pkgsrc/parallel/openpbs Convert to bl3.
Indexes:
Home | Main Index | Thread Index | Old Index