diff options
| -rw-r--r-- | databases/unixodbc/Makefile | 5 | ||||
| -rw-r--r-- | databases/unixodbc/Makefile.common | 11 | ||||
| -rw-r--r-- | games/nethack-qt/Makefile | 11 | ||||
| -rw-r--r-- | games/nethack-qt/distinfo | 4 | ||||
| -rw-r--r-- | games/nethack-qt/patches/patch-ah | 4 | ||||
| -rw-r--r-- | wm/bbconf/Makefile | 8 | ||||
| -rw-r--r-- | wm/bbconf/distinfo | 4 | ||||
| -rw-r--r-- | wm/bbconf/patches/patch-af | 4 |
8 files changed, 27 insertions, 24 deletions
diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile index f6ad5c16ed6..3c1ee8a0e3b 100644 --- a/databases/unixodbc/Makefile +++ b/databases/unixodbc/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2002/08/25 19:22:12 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2002/09/20 21:26:30 jlam Exp $ PKGNAME= unixodbc-${ODBC_BASE_VERS} PKGREVISION= 1 COMMENT= ODBC 2.x/3.x driver manager CONFLICTS+= iodbc-[0-9]* -USE_BUILDLINK_ONLY= YES .include "../../databases/unixodbc/Makefile.common" @@ -30,6 +29,6 @@ post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKDIR}/odbcinst.ini ${EGDIR}/odbcinst.ini -.include "../../devel/readline/buildlink.mk" +.include "../../devel/readline/buildlink2.mk" .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/unixodbc/Makefile.common b/databases/unixodbc/Makefile.common index 98ac647daf4..3cee36531fb 100644 --- a/databases/unixodbc/Makefile.common +++ b/databases/unixodbc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2002/08/25 19:22:13 jlam Exp $ +# $NetBSD: Makefile.common,v 1.8 2002/09/20 21:26:30 jlam Exp $ DISTNAME= unixODBC-${ODBC_DIST_VERS} CATEGORIES= databases @@ -15,6 +15,7 @@ HOMEPAGE?= http://www.unixodbc.org/ ODBC_DIST_VERS= 2.0.11 ODBC_BASE_VERS= ${ODBC_DIST_VERS} +USE_BUILDLINK2= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool @@ -30,7 +31,7 @@ PTHREAD_OPTS+= require # libfl.a isn't needed. # MAKE_FLAGS+= LIBLTDL="-lltdl" -MAKE_FLAGS+= INCLTDL="-I${BUILDLINK_DIR}/include" +MAKE_FLAGS+= INCLTDL="-I${BUILDLINK_PREFIX.ltdl}/include" MAKE_FLAGS+= LEXLIB="" MAKE_ENV+= AM_MAKEFLAGS="${MAKE_FLAGS}" @@ -57,10 +58,10 @@ fix-ltdl-and-lexlib: ${MV} -f $${file}.fixed $${file}; \ done -.include "../../devel/libtool/buildlink.mk" -.include "../../mk/pthread.buildlink.mk" +.include "../../devel/libtool/buildlink2.mk" +.include "../../mk/pthread.buildlink2.mk" .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") CONFIGURE_ARGS+= --enable-gnuthreads -CONFIGURE_ARGS+= --with-pth=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-pth=${PTHREADBASE} .endif diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile index 19adfb6d266..0a857accb42 100644 --- a/games/nethack-qt/Makefile +++ b/games/nethack-qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2002/03/25 20:32:26 pooka Exp $ +# $NetBSD: Makefile,v 1.34 2002/09/20 21:24:48 jlam Exp $ # .include "../nethack-lib/Makefile.common" @@ -10,7 +10,8 @@ COMMENT= The QT-Enhanced X11 version of NetHack DEPENDS+= nethack-lib-${NETHACK_VERSION}:../nethack-lib -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= # defined +USE_X11= # defined ALL_TARGET= x11tiles nethack INSTALL_TARGET= binfiles @@ -23,7 +24,7 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/dat/tiles.xpm \ ${PREFIX}/share/nethackdir${NETHACK_DISTVER} -.include "../../graphics/xpm/buildlink.mk" -.include "../../x11/qt2-libs/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../x11/qt2-libs/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/games/nethack-qt/distinfo b/games/nethack-qt/distinfo index 091a7100638..b1a4a3d35c2 100644 --- a/games/nethack-qt/distinfo +++ b/games/nethack-qt/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2002/03/25 20:32:27 pooka Exp $ +$NetBSD: distinfo,v 1.8 2002/09/20 21:24:48 jlam Exp $ SHA1 (nethack-340.tgz) = db480f5bf94372a8f87ee4d081f83efd99b31523 Size (nethack-340.tgz) = 3270905 bytes @@ -8,5 +8,5 @@ SHA1 (patch-ac) = 3a88954c950854350938fbec1fef195baaacb2cf SHA1 (patch-ae) = b6d0cca1e3d781a2a1f1d4b244e944eaedfec716 SHA1 (patch-af) = 20c37fd62b05121d834d3c42cf3aa48b018b362d SHA1 (patch-ag) = 6aeae6bde079b9c9081f6e32523687010c9bc674 -SHA1 (patch-ah) = f3fb0576ad1bffa88fa1fdb6c1c134536a522e19 +SHA1 (patch-ah) = f9d4a9d7e4e536a1c221a4b12b0d204f63410543 SHA1 (patch-ai) = 580a75c7ebc55b099a702ad21ce12d960f2805ff diff --git a/games/nethack-qt/patches/patch-ah b/games/nethack-qt/patches/patch-ah index 6eb78b8e61c..28e8f99bb28 100644 --- a/games/nethack-qt/patches/patch-ah +++ b/games/nethack-qt/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.1 2002/03/22 17:26:27 pooka Exp $ +$NetBSD: patch-ah,v 1.2 2002/09/20 21:24:49 jlam Exp $ --- sys/unix/Makefile.src.orig Sat Aug 5 13:52:57 2000 +++ sys/unix/Makefile.src Thu Aug 10 20:03:19 2000 @@ -8,7 +8,7 @@ $NetBSD: patch-ah,v 1.1 2002/03/22 17:26:27 pooka Exp $ -CFLAGS = -O -I../include -LFLAGS = -+CFLAGS += -I../include -I${BUILDLINK_X11_DIR}/include ++CFLAGS += -I../include -I${X11BASE}/include +LFLAGS = ${LDFLAGS} # The Qt and Be window systems are written in C++, while the rest of diff --git a/wm/bbconf/Makefile b/wm/bbconf/Makefile index 23d1184ab80..19938a5b0a4 100644 --- a/wm/bbconf/Makefile +++ b/wm/bbconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/03/18 23:02:30 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/20 21:27:15 jlam Exp $ # DISTNAME= bbconf-1.4 @@ -9,10 +9,12 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://bbconf.sourceforge.net/ COMMENT= configuration tool for the blackbox window manager +USE_BUILDLINK2= YES +USE_X11= YES + GNU_CONFIGURE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/admin/ltconfig -.include "../../x11/qt2-libs/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../x11/qt2-libs/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/bbconf/distinfo b/wm/bbconf/distinfo index c6d78549585..02ff81643a4 100644 --- a/wm/bbconf/distinfo +++ b/wm/bbconf/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/03/18 23:02:30 wiz Exp $ +$NetBSD: distinfo,v 1.2 2002/09/20 21:27:15 jlam Exp $ SHA1 (bbconf-1.4.tar.gz) = 4985200f90ac57f8aa1441c3fc5ceecd8f018d79 Size (bbconf-1.4.tar.gz) = 536665 bytes @@ -7,4 +7,4 @@ SHA1 (patch-ab) = bbcd8da80bb79e50a82198026912bd7e185b765a SHA1 (patch-ac) = 46e9330f58fe92ae248380971d07f4f752773a73 SHA1 (patch-ad) = a876ad35dc892084cd0d297506ab6150b27a006a SHA1 (patch-ae) = 65553e7f805656ea9d5fdcfcb14b72704b195a2b -SHA1 (patch-af) = fcdd335b43be380e457dc2b82faab2435620e861 +SHA1 (patch-af) = 57c5ce4feecf3865fcd8d8024dfb1a719c22db71 diff --git a/wm/bbconf/patches/patch-af b/wm/bbconf/patches/patch-af index 5ba14910af8..81199d62b3b 100644 --- a/wm/bbconf/patches/patch-af +++ b/wm/bbconf/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/03/18 23:02:30 wiz Exp $ +$NetBSD: patch-af,v 1.2 2002/09/20 21:27:16 jlam Exp $ --- configure.orig Sat Jan 19 03:07:04 2002 +++ configure @@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/03/18 23:02:30 wiz Exp $ -jpeg_incdirs="/usr/include /usr/local/include $kde_extra_includes" -+jpeg_incdirs="/usr/include ${BUILDLINK_DIR}/include $kde_extra_includes" ++jpeg_incdirs="/usr/include ${LOCALBASE}/include $kde_extra_includes" jpeg_incdir=NO for i in $jpeg_incdirs; |