buildlink1 -> buildlink2

5 files changed, 37 insertions, 31 deletions

diff --git a/graphics/gmplayer/Makefile b/graphics/gmplayer/Makefile
index 14ffddf4fa8..c1e77de6224 100644
--- a/graphics/gmplayer/Makefile
+++ b/graphics/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/06/08 23:41:55 veego Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/28 07:00:45 jlam Exp $
 
 .include "../../graphics/mplayer-share/Makefile.common"
 
@@ -32,14 +32,15 @@ SKINS +=	default${EXTRACT_SUFX}				\
 		hwswskin${EXTRACT_SUFX}
 
 .if !defined(SITES_default.tar.bz2)
-.for skin in ${SKINS}
+.  for skin in ${SKINS}
 SITES_${skin}= ${SKIN_SITES}
-.endfor
+.  endfor
 .endif
 
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=	${SKINS}
 
+USE_BUILDLINK2=		# defined
 CONFIGURE_ARGS+=	--enable-gui
 CONFIGURE_ARGS+=	--disable-mencoder
 
@@ -54,7 +55,9 @@ do-install:
 	@${CHMOD} -R a+r ${PREFIX}/share/mplayer/Skin
 	@${CHMOD} a+rx ${PREFIX}/share/mplayer/Skin/*
 
-.include "../../audio/nas/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
 .include "../../graphics/mplayer-share/Makefile.depends"
+
+.include "../../audio/nas/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mencoder/Makefile b/graphics/mencoder/Makefile
index e9895bd9d1c..12855948690 100644
--- a/graphics/mencoder/Makefile
+++ b/graphics/mencoder/Makefile
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.2 2002/06/08 23:41:56 veego Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/28 07:00:46 jlam Exp $
 
 .include "../../graphics/mplayer-share/Makefile.common"
 
 PKGNAME=	mencoder-${MPLAYER_PKG_VERSION}
 COMMENT=	Simple movie encoder for MPlayer-playable movies
 
-CONFIGURE_ARGS+= --disable-nas
+USE_BUILDLINK2=		# defined
+CONFIGURE_ARGS+=	--disable-nas
 
 ALL_TARGET=	mencoder
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${PREFIX}/bin
-	${LN} -s ${PREFIX}/man/man1/mplayer.1   ${PREFIX}/man/man1/mencoder.1
+	${LN} -s ${PREFIX}/man/man1/mplayer.1 ${PREFIX}/man/man1/mencoder.1
 
-.include "../../audio/lame/buildlink.mk"
 .include "../../graphics/mplayer-share/Makefile.depends"
+
+.include "../../audio/lame/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mplayer-share/Makefile.common b/graphics/mplayer-share/Makefile.common
index 513915142a1..f21ab9e42ed 100644
--- a/graphics/mplayer-share/Makefile.common
+++ b/graphics/mplayer-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2002/08/07 12:53:06 veego Exp $
+# $NetBSD: Makefile.common,v 1.8 2002/08/28 07:00:47 jlam Exp $
 
 MPLAYER_DIST_VERSION=	0.90pre6
 
@@ -35,16 +35,12 @@ HAS_CONFIGURE=		YES
 PTHREAD_OPTS+=		require
 
 CONFIGURE_ARGS+=	--prefix="${PREFIX}"
-CONFIGURE_ARGS+=	--with-extraincdir="${BUILDLINK_DIR}/include"
+CONFIGURE_ARGS+=	--with-extraincdir="${LOCALBASE}/include"
 CONFIGURE_ARGS+=	--with-extralibdir="${LOCALBASE}/lib"
 #CONFIGURE_ARGS+=	--enable-dvdread
 CONFIGURE_ARGS+=	--disable-mpdvdkit
 CONFIGURE_ARGS+=	--disable-ossaudio
 
-# Buildlink's ${CFLAGS} setting triggers configure's bozo switch, turning
-# off all the processor-specific optimizations.
-CONFIGURE_ENV+=		CFLAGS=""
-
 # The configure script attempts to test-execute compiled programs in /tmp,
 # but that directory may be mounted as noexec; work this around by setting
 # TMPDIR to ${WRKDIR}
diff --git a/graphics/mplayer-share/Makefile.depends b/graphics/mplayer-share/Makefile.depends
index 614cd721009..164085e9563 100644
--- a/graphics/mplayer-share/Makefile.depends
+++ b/graphics/mplayer-share/Makefile.depends
@@ -1,25 +1,28 @@
-# $NetBSD: Makefile.depends,v 1.3 2002/08/07 12:53:06 veego Exp $
+# $NetBSD: Makefile.depends,v 1.4 2002/08/28 07:00:48 jlam Exp $
 
 DEPENDS+=	mplayer-share-${MPLAYER_PKG_VERSION}${PKGREVISION:Dnb${PKGREVISION}}:../../graphics/mplayer-share
 
+.include "../../lang/gcc/Makefile.gcc"
+
 .if (${OPSYS} == "NetBSD")
-.include "../../devel/binutils/buildlink.mk"
+.  include "../../devel/binutils/buildlink2.mk"
 .endif
 
 .if ${MACHINE_ARCH} == "i386"
 DEPENDS+=	win32-codecs>=011227:../../graphics/win32-codecs
-.if ${MPLAYER_USE_REALMEDIA} == "YES"
+.  if ${MPLAYER_USE_REALMEDIA} == "YES"
 DEPENDS+=	realplayer>=8:../../audio/realplayer
-.endif
+.  endif
 .endif
 
-.include "../../audio/mad/buildlink.mk"
-.include "../../devel/SDL/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/libungif/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../lang/gcc/Makefile.gcc"
-.include "../../misc/libdvdread/buildlink.mk"
-.include "../../mk/ossaudio.buildlink.mk"
-.include "../../mk/pthread.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+USE_X11=	# defined
+
+.include "../../audio/mad/buildlink2.mk"
+.include "../../devel/SDL/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/libungif/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../misc/libdvdread/buildlink2.mk"
+
+.include "../../mk/ossaudio.buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
diff --git a/graphics/mplayer/Makefile b/graphics/mplayer/Makefile
index 33d3d9e45b1..05362c95b32 100644
--- a/graphics/mplayer/Makefile
+++ b/graphics/mplayer/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.26 2002/06/08 23:41:56 veego Exp $
+# $NetBSD: Makefile,v 1.27 2002/08/28 07:00:47 jlam Exp $
 
 .include "../../graphics/mplayer-share/Makefile.common"
 
 PKGNAME=	mplayer-${MPLAYER_PKG_VERSION}
 COMMENT=	Software only MPEG-1/2/4 video decoder
 
+USE_BUILDLINK2=		# defined
 CONFIGURE_ARGS+=	--disable-mencoder
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${PREFIX}/bin
 
-.include "../../audio/nas/buildlink.mk"
 .include "../../graphics/mplayer-share/Makefile.depends"
+
+.include "../../audio/nas/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"