diff options
author | jlam <jlam> | 2002-09-20 21:32:05 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-09-20 21:32:05 +0000 |
commit | 848e06de235bfb4623a77e25027d1be799fdffdf (patch) | |
tree | f2eda00f6a965260892a71f487becd046ddae0d1 /databases | |
parent | b95ad5ebf4124ab752109f3826a1da9f1632b93f (diff) | |
download | pkgsrc-848e06de235bfb4623a77e25027d1be799fdffdf.tar.gz |
buildlink1 -> buildlink2
Diffstat (limited to 'databases')
-rw-r--r-- | databases/unixodbc-DataManager/Makefile | 25 | ||||
-rw-r--r-- | databases/unixodbc-ODBCConfig/Makefile | 25 |
2 files changed, 26 insertions, 24 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" |