Convert to buildlink3.

4 files changed, 17 insertions, 20 deletions

diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
index 57938511036..3f46323f708 100644
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/20 12:07:43 agc Exp $
+# $NetBSD: Makefile,v 1.16 2004/10/28 12:20:39 wiz Exp $
 
 DISTNAME=	musicbox-1.01p2
 CATEGORIES=	audio
@@ -9,12 +9,11 @@ MAINTAINER=	rxg@ms25.url.com.tw
 COMMENT=	X11 front-interface for mpg123
 
 DEPENDS+=	mpg123>=0.59.18:../../audio/mpg123
-DEPENDS+=	qt1-1.44:../../x11/qt1
 
 WRKSRC=		${WRKDIR}/musicbox-1.01
+USE_BUILDLINK3=	YES
 USE_X11=	yes
 CFLAGS+=	-D${OPSYS}
-EVAL_PREFIX+=	QT1DIR=qt1
 MAKE_ENV+=	QT1DIR="${QT1DIR}"
 
 do-install:
@@ -22,4 +21,5 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/musicbox
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/musicbox/README
 
+.include "../../x11/qt1/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/musicbox/distinfo b/audio/musicbox/distinfo
index bc533631a46..86593e6784b 100644
--- a/audio/musicbox/distinfo
+++ b/audio/musicbox/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2004/01/02 11:30:03 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2004/10/28 12:20:39 wiz Exp $
 
 SHA1 (musicbox-1.01p2.tgz) = 7dd8b192349783746918b0d3074bec11f3aaf9d8
 Size (musicbox-1.01p2.tgz) = 44119 bytes
-SHA1 (patch-aa) = f73afd02f35fa1a3fd6e64b3af4c96ca724d0c42
+SHA1 (patch-aa) = 4dafbb3cace56e0364f938b1a6f046ffbe92be27
 SHA1 (patch-ab) = a59f798aebc8df7b61cfb3036add624c385a3884
 SHA1 (patch-ac) = 3341b7bb5f265f5df000e3593a2a0493d32edec1
 SHA1 (patch-ad) = 890faa63701b85766320cf654d1d858c03227a41
diff --git a/audio/musicbox/patches/patch-aa b/audio/musicbox/patches/patch-aa
index 8d652e86a26..d8854a16782 100644
--- a/audio/musicbox/patches/patch-aa
+++ b/audio/musicbox/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2001/09/14 03:34:45 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2004/10/28 12:20:39 wiz Exp $
 
 --- Makefile.orig	Wed Nov 12 14:01:58 1997
 +++ Makefile	Thu Sep 13 23:26:26 2001
@@ -8,9 +8,9 @@ $NetBSD: patch-aa,v 1.5 2001/09/14 03:34:45 jlam Exp $
 -LIB = /usr/X11R6/lib
 -MOC = moc
 +#INC = /usr/X11R6/include/X11/qt
-+INC = -I${X11BASE}/include -I${QT1DIR}/qt1/include
-+LIB = -L${QT1DIR}/qt1/lib -Wl,-R${QT1DIR}/qt1/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
-+MOC = ${QT1DIR}/qt1/bin/moc
++INC = -I${X11BASE}/include -I${QT1DIR}/include
++LIB = -L${QT1DIR}/lib -Wl,-R${QT1DIR}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
++MOC = ${QT1DIR}/bin/moc
  
  # if you use freebsd
 -CFLAGS = -DFreeBSD
diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile
index 91b5dbbe678..1cd31c41023 100644
--- a/x11/qwspritefield/Makefile
+++ b/x11/qwspritefield/Makefile
@@ -1,36 +1,33 @@
-# $NetBSD: Makefile,v 1.21 2004/10/28 12:08:06 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2004/10/28 12:27:08 wiz Exp $
 
 DISTNAME=	QwSpriteField1.6
 PKGNAME=	qwspritefield-1.6
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 graphics
 MASTER_SITES=	ftp://ftp.troll.no/contrib/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Efficiently redrawn sprites in the Qt GUI Toolkit
 
-DEPENDS+=	qt1>=1.44:../../x11/qt1
-
 CONFLICTS=	kdesupport-1.0
 
 WRKSRC=		${WRKDIR}/QwSpriteField
-USE_X11BASE=	yes
+USE_BUILDLINK3=	YES
+USE_X11=	yes
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 
 QW_INCLUDES=	Pix.h QwCluster.h QwPublicList.h QwSpriteField.h
 
-EVAL_PREFIX+=	QT1DIR=qt1
-PATH:=		${QT1DIR}/qt1/bin:${PATH}
-
-MAKE_ENV+=	CXX="${CXX}" "QTDIR=${QT1DIR}/qt1"
+MAKE_ENV+=	CXX=${CXX:Q} QTDIR=${QT1DIR:Q}
 
 do-install:
-	@${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libQwSpriteField.la \
+	@${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libQwSpriteField.la \
 	  ${PREFIX}/lib
 	@QT1DIR=${QT1DIR};		\
 	for FILE in ${QW_INCLUDES}; do					\
-		${INSTALL_DATA} ${WRKSRC}/$$FILE $$QT1DIR/qt1/include;	\
+		${INSTALL_DATA} ${WRKSRC}/$$FILE $$QT1DIR/include;	\
 	done
 
+.include "../../x11/qt1/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"