buildlink1 -> buildlink2

4 files changed, 34 insertions, 36 deletions

diff --git a/databases/unixodbc-DataManager/Makefile b/databases/unixodbc-DataManager/Makefile
index 9e4711766cc..d5538425c5a 100644
--- a/databases/unixodbc-DataManager/Makefile
+++ b/databases/unixodbc-DataManager/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:45 fredb Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/20 21:32:05 jlam Exp $
 
 PKGNAME=		unixodbc-DataManager-${ODBC_BASE_VERS}
 PKGREVISION=		1
 COMMENT=		GUI tool for unixODBC data source management
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 
 .include "../../databases/unixodbc/Makefile.common"
 
 CONFIGURE_ARGS+=	--enable-gui
-CONFIGURE_ARGS+=	--with-qt-dir="${BUILDLINK_QTDIR}"
+CONFIGURE_ARGS+=	--with-qt-dir="${QTDIR}"
 CONFIGURE_ARGS+=	--with-extra-includes="${_EXTRA_INCLUDES}"
 CONFIGURE_ARGS+=	--with-extra-libs="${_EXTRA_LIBS}"
 CONFIGURE_ARGS+=	--disable-rpath
@@ -21,14 +22,14 @@ CONFIGURE_ENV+=		ac_cv_have_qt="${_AC_CV_HAVE_QT}"
 
 MAKE_FLAGS+=		DataManager_DEPENDENCIES=""
 
-_EXTRA_INCLUDES?=	${BUILDLINK_DIR}/include:${BUILDLINK_X11_DIR}/include
-_EXTRA_LIBS?=		${BUILDLINK_DIR}/lib:${BUILDLINK_X11_DIR}/lib
+_EXTRA_INCLUDES?=	${LOCALBASE}/include:${X11BASE}/include
+_EXTRA_LIBS?=		${LOCALBASE}/lib:${X11BASE}/lib
 _AC_CV_HAVE_X?=		have_x=yes					\
-			kde_x_includes=${BUILDLINK_DIR}/include		\
-			ac_x_libraries=${BUILDLINK_DIR}/lib
+			kde_x_includes=${X11BASE}/include		\
+			ac_x_libraries=${X11BASE}/lib
 _AC_CV_HAVE_QT?=	have_qt=yes					\
-			ac_qt_includes=${BUILDLINK_QTDIR}/include	\
-			ac_qt_libraries=${BUILDLINK_QTDIR}/lib
+			ac_qt_includes=${QTDIR}/include			\
+			ac_qt_libraries=${QTDIR}/lib
 
 do-build:
 	cd ${WRKSRC}/DataManager; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}	\
@@ -37,7 +38,7 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/DataManager/DataManager ${PREFIX}/bin
 
-.include "../../databases/unixodbc/buildlink.mk"
-.include "../../x11/qt2-libs/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../databases/unixodbc/buildlink2.mk"
+.include "../../x11/qt2-libs/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/unixodbc-ODBCConfig/Makefile b/databases/unixodbc-ODBCConfig/Makefile
index fde95f6bfe2..de303c513d0 100644
--- a/databases/unixodbc-ODBCConfig/Makefile
+++ b/databases/unixodbc-ODBCConfig/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:46 fredb Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/20 21:36:11 jlam Exp $
 
 PKGNAME=		unixodbc-ODBCConfig-${ODBC_BASE_VERS}
 PKGREVISION=		1
 COMMENT=		GUI tool for unixODBC driver configuration
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 
 .include "../../databases/unixodbc/Makefile.common"
 
 CONFIGURE_ARGS+=	--enable-gui
-CONFIGURE_ARGS+=	--with-qt-dir="${BUILDLINK_QTDIR}"
+CONFIGURE_ARGS+=	--with-qt-dir="${QTDIR}"
 CONFIGURE_ARGS+=	--with-extra-includes="${_EXTRA_INCLUDES}"
 CONFIGURE_ARGS+=	--with-extra-libs="${_EXTRA_LIBS}"
 CONFIGURE_ARGS+=	--disable-rpath
@@ -21,14 +22,14 @@ CONFIGURE_ENV+=		ac_cv_have_qt="${_AC_CV_HAVE_QT}"
 
 MAKE_FLAGS+=		ODBCConfig_DEPENDENCIES=""
 
-_EXTRA_INCLUDES?=	${BUILDLINK_DIR}/include:${BUILDLINK_X11_DIR}/include
-_EXTRA_LIBS?=		${BUILDLINK_DIR}/lib:${BUILDLINK_X11_DIR}/lib
+_EXTRA_INCLUDES?=	${LOCALBASE}/include:${X11BASE}/include
+_EXTRA_LIBS?=		${LOCALBASE}/lib:${X11BASE}/lib
 _AC_CV_HAVE_X?=		have_x=yes					\
-			kde_x_includes=${BUILDLINK_DIR}/include		\
-			ac_x_libraries=${BUILDLINK_DIR}/lib
+			kde_x_includes=${LOCALBASE}/include		\
+			ac_x_libraries=${LOCALBASE}/lib
 _AC_CV_HAVE_QT?=	have_qt=yes					\
-			ac_qt_includes=${BUILDLINK_QTDIR}/include	\
-			ac_qt_libraries=${BUILDLINK_QTDIR}/lib
+			ac_qt_includes=${QTDIR}/include			\
+			ac_qt_libraries=${QTDIR}/lib
 
 post-patch: fix-driver-installation
 
@@ -39,7 +40,7 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ODBCConfig/ODBCConfig ${PREFIX}/bin
 
-.include "../../databases/unixodbc/buildlink.mk"
-.include "../../x11/qt2-libs/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../databases/unixodbc/buildlink2.mk"
+.include "../../x11/qt2-libs/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index c96bb68b4f5..f575146cd4f 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/04/15 12:13:38 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/20 21:40:35 jlam Exp $
 #
 
 DISTNAME=	Python-2.2.1
@@ -11,7 +11,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.python.org/
 COMMENT=	Interpreted, interactive, object-oriented programming language
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-threads
 
@@ -20,7 +20,7 @@ INSTALL_TARGET=	altinstall
 post-extract:
 	${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc2.2
 
-.include "../../devel/zlib/buildlink.mk"
+.include "../../devel/zlib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # This comes after bsd.pkg.mk so that the LDFLAGS here overrides the one
diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile
index 3ad088b0405..6bed5c804c9 100644
--- a/x11/qtarch/Makefile
+++ b/x11/qtarch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/03/17 15:32:00 fredb Exp $
+# $NetBSD: Makefile,v 1.17 2002/09/20 21:39:22 jlam Exp $
 #
 
 DISTNAME=	qtarch-2.1-1
@@ -12,17 +12,10 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://qtarch.sourceforge.net/
 COMMENT=	Graphical dialog editor for the Qt widget set
 
-DEPENDS+=	qt2-libs-2.3.1nb2:../../x11/qt2-libs
-DEPENDS+=	png>=1.2.1:../../graphics/png
-
+USE_BUILDLINK2=	yes
 USE_X11=	yes
 USE_GMAKE=	yes
 
-EVAL_PREFIX+=	QT2DIR=qt2-libs
-QTDIR=		${QT2DIR}/qt2
-MAKE_ENV=	QTDIR=${QTDIR}
-PATH=		${QTDIR}/bin:$$PATH
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/qtarch ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/qtarch
@@ -31,4 +24,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/qtarch/doc
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/qtarch/doc
 
+.include "../../graphics/png/buildlink2.mk"
+.include "../../x11/qt2-libs/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"