summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2002-10-21 13:43:36 +0000
committerwiz <wiz@pkgsrc.org>2002-10-21 13:43:36 +0000
commit56d92b93932316d55e289f3abea037f9d887776d (patch)
treece110c440ca03764d75e487df979b74bf17985f9
parenta461bb81c08e6dc060afb6c872cbae9ea38e5130 (diff)
downloadpkgsrc-56d92b93932316d55e289f3abea037f9d887776d.tar.gz
Convert to buildlink2.
-rw-r--r--games/xpuyopuyo/Makefile10
-rw-r--r--x11/khostchooser/Makefile17
2 files changed, 12 insertions, 15 deletions
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 484a4d2e9d3..28b6af44029 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/10/03 00:30:17 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2002/10/21 13:43:36 wiz Exp $
DISTNAME= xpuyopuyo-0.9.1
CATEGORIES= games x11
@@ -9,13 +9,10 @@ MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://chaos2.org/xpuyopuyo/
COMMENT= Tetris-like puzzle game
-DEPENDS+= gtk+-1.2.*:../../x11/gtk
-DEPENDS+= libmikmod>=3.1.9:../../audio/libmikmod
-
AUTOMAKE_REQD= 1.4
+USE_BUILDLINK2= YES
USE_GMAKE= YES
USE_X11BASE= YES
-USE_XPM= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
@@ -32,5 +29,8 @@ pre-configure:
> ${GNOME_CONFIG}
${CHMOD} +x ${GNOME_CONFIG}
+.include "../../audio/libmikmod/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
.include "../../mk/automake.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile
index d9d238e9a68..5bef956de2c 100644
--- a/x11/khostchooser/Makefile
+++ b/x11/khostchooser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/03/13 17:37:59 fredb Exp $
+# $NetBSD: Makefile,v 1.18 2002/10/21 13:48:54 wiz Exp $
#
DISTNAME= khostchooser-0.3
@@ -11,25 +11,22 @@ MAINTAINER= root@garbled.net
COMMENT= KDE Chooser replacement for X
BUILD_USES_MSGFMT= yes
-DEPENDS+= kdelibs-1.1.2nb1:../../x11/kdelibs
-DEPENDS+= libungif-[0-9]*:../../graphics/libungif
WRKSRC= ${WRKDIR}/khostchooser
+USE_BUILDLINK2= YES
USE_X11BASE= YES
-USE_XPM= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
-EVAL_PREFIX+= QT1DIR=qt1
-CONFIGURE_ARGS= --datadir=${PREFIX}/share/kde \
- --with-qt-dir=${QT1DIR}/qt1
CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -Wl,-R${QT1DIR}/qt1/lib
+CONFIGURE_ARGS= --datadir=${PREFIX}/share/kde \
+ --with-qt-dir=${QTDIR}
CONFIGURE_ENV= KDEDIR=${PREFIX} \
- QTDIR=${QT1DIR}/qt1 \
- MOC=${QT1DIR}/qt1/bin/moc \
CXXFLAGS="${CFLAGS}" \
all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib"
+.include "../../graphics/libungif/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../x11/kdelibs/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"