Convert to bl3.

While here, add --mode options to libtool lines (in patch).

4 files changed, 26 insertions, 8 deletions

diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile
index 45f88cf3e7a..df83bb9075c 100644
--- a/graphics/mpeg-lib/Makefile
+++ b/graphics/mpeg-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/07/17 21:41:46 grant Exp $
+# $NetBSD: Makefile,v 1.21 2004/04/24 00:49:45 wiz Exp $
 #
 
 DISTNAME=	mpeg_lib-1.3.1
@@ -12,7 +12,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://starship.python.net/~gward/mpeglib/
 COMMENT=	Library for decoding MPEG movies
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/graphics/mpeg-lib/buildlink3.mk b/graphics/mpeg-lib/buildlink3.mk
new file mode 100644
index 00000000000..852c1e179d8
--- /dev/null
+++ b/graphics/mpeg-lib/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/24 00:49:45 wiz Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+MPEG_BUILDLINK3_MK:=	${MPEG_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	mpeg
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmpeg}
+BUILDLINK_PACKAGES+=	mpeg
+
+.if !empty(MPEG_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.mpeg+=	mpeg>=1.3.1
+BUILDLINK_PKGSRCDIR.mpeg?=	../../graphics/mpeg-lib
+.endif	# MPEG_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/mpeg-lib/distinfo b/graphics/mpeg-lib/distinfo
index 031bbba3b27..255c3ca71f9 100644
--- a/graphics/mpeg-lib/distinfo
+++ b/graphics/mpeg-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/10/04 15:54:39 danw Exp $
+$NetBSD: distinfo,v 1.7 2004/04/24 00:49:45 wiz Exp $
 
 SHA1 (mpeg_lib-1.3.1.tar.gz) = 0ea4f8b31e4f316d99c2034d76619988f75147dc
 Size (mpeg_lib-1.3.1.tar.gz) = 152092 bytes
@@ -17,4 +17,4 @@ SHA1 (patch-al) = f63df4035b3f33ac778e7bde1e478434826c34ba
 SHA1 (patch-am) = b2f7afdd74c28bd6345f1ac291577103bf8196f3
 SHA1 (patch-an) = 3b23f238fcdc1321d17d19be74c7e670b249c5fc
 SHA1 (patch-ao) = 84caaa6c7b9cb5eb7f7455323767aa6753e92ff7
-SHA1 (patch-ap) = 89ce52d7878966120638a1bce22666ee8b83fa7e
+SHA1 (patch-ap) = 2d7536517bcf3e9ed52fdc09ab5a5f721aab6c5d
diff --git a/graphics/mpeg-lib/patches/patch-ap b/graphics/mpeg-lib/patches/patch-ap
index 2b3706cb5ff..54257878b3c 100644
--- a/graphics/mpeg-lib/patches/patch-ap
+++ b/graphics/mpeg-lib/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.6 2001/08/06 15:00:31 tron Exp $
+$NetBSD: patch-ap,v 1.7 2004/04/24 00:49:45 wiz Exp $
 
 --- Makefile.in.orig	Thu Nov 26 17:03:29 1998
 +++ Makefile.in	Mon Aug  6 16:54:52 2001
@@ -24,7 +24,7 @@ $NetBSD: patch-ap,v 1.6 2001/08/06 15:00:31 tron Exp $
  # Implicit targets
  .c.o:
 -		$(CC) -c $(CFLAGS) $(CPPFLAGS) $<
-+		${LIBTOOL} $(CC) -c $(CFLAGS) $(CPPFLAGS) $<
++		${LIBTOOL} --mode=compile $(CC) -c $(CFLAGS) $(CPPFLAGS) $<
  
  
  # Library/cleanup targets: 
@@ -34,7 +34,7 @@ $NetBSD: patch-ap,v 1.6 2001/08/06 15:00:31 tron Exp $
  $(LIBRARY):	$(LIBOBJ)
 -		$(AR) $(ARFLAGS) $(LIBRARY) $(LIBOBJ)
 -		$(RANLIB) $(LIBRARY)
-+		${LIBTOOL} $(CC) -o $(LIBRARY) $(LIBOBJ:.o=.lo)		\
++		${LIBTOOL} --mode=link $(CC) -o $(LIBRARY) $(LIBOBJ:.o=.lo)		\
 +			-rpath ${PREFIX}/lib -version-info 1:3
 +
  
@@ -47,7 +47,7 @@ $NetBSD: patch-ap,v 1.6 2001/08/06 15:00:31 tron Exp $
 +		$(INSTALL) -d $(INSTALL_LIBRARY)
  		$(INSTALL) -m 0644 $(HEADER) $(INSTALL_INCLUDE)/$(HEADER)
 -		$(INSTALL) -m 0644 $(LIBRARY) $(INSTALL_LIBRARY)/$(LIBRARY)
-+		${LIBTOOL} $(INSTALL) -m 0644 $(LIBRARY) $(INSTALL_LIBRARY)/$(LIBRARY)
++		${LIBTOOL} --mode=install $(INSTALL) -m 0644 $(LIBRARY) $(INSTALL_LIBRARY)/$(LIBRARY)
  		@if test -f $(SHLIB) ; then echo "warning: $(SHLIB) *not* installed (installing shared libraries is too system-specific)" ; fi
  
  clean: