diff options
| author | jlam <jlam@pkgsrc.org> | 2001-08-29 22:41:00 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-08-29 22:41:00 +0000 |
| commit | 63fc151cb9f15f8bcc66bbeca21050fea30c29d3 (patch) | |
| tree | 0943c3791afa0b712d3818b69672014acfe55e03 /games/nethack-qt | |
| parent | 70004632b203c88d357d29ec8f217d1caa85f9c7 (diff) | |
| download | pkgsrc-63fc151cb9f15f8bcc66bbeca21050fea30c29d3.tar.gz | |
Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references
to ${X11BASE} in the header and library search paths into references to
${LOCALBASE}/share/x11-links. These packages should now be strongly-
buildlinked regardless of whether xpkgwedge is installed.
Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
Diffstat (limited to 'games/nethack-qt')
| -rw-r--r-- | games/nethack-qt/Makefile | 4 | ||||
| -rw-r--r-- | games/nethack-qt/distinfo | 4 | ||||
| -rw-r--r-- | games/nethack-qt/patches/patch-ac | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile index 4e03022e925..768166779b0 100644 --- a/games/nethack-qt/Makefile +++ b/games/nethack-qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2001/06/26 19:10:37 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2001/08/29 22:41:12 jlam Exp $ # .include "../nethack-lib/Makefile.common" @@ -10,7 +10,6 @@ COMMENT= The QT-Enhanced X11 version of NetHack DEPENDS+= nethack-lib-${NETHACK_VERSION}:../nethack-lib -USE_X11= YES USE_BUILDLINK_ONLY= YES ALL_TARGET= x11tiles nethack @@ -26,4 +25,5 @@ post-install: .include "../../graphics/xpm/buildlink.mk" .include "../../x11/qt2-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/nethack-qt/distinfo b/games/nethack-qt/distinfo index ac9bc5f0845..85e97b17d2a 100644 --- a/games/nethack-qt/distinfo +++ b/games/nethack-qt/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2001/06/26 19:10:18 jlam Exp $ +$NetBSD: distinfo,v 1.5 2001/08/29 22:41:13 jlam Exp $ SHA1 (nethack-331.tgz) = e3d07efc81c9aeb85fadc268d1d4976ab3a0f7e9 Size (nethack-331.tgz) = 3061094 bytes SHA1 (patch-aa) = d8ec9c209bf28abda1f78159e9d240895e38db30 -SHA1 (patch-ac) = 55d083ade87986ff236994144e6d5931daaf8f2b +SHA1 (patch-ac) = f3fb0576ad1bffa88fa1fdb6c1c134536a522e19 SHA1 (patch-ad) = 580a75c7ebc55b099a702ad21ce12d960f2805ff diff --git a/games/nethack-qt/patches/patch-ac b/games/nethack-qt/patches/patch-ac index 246754ca8db..4d8ec04648c 100644 --- a/games/nethack-qt/patches/patch-ac +++ b/games/nethack-qt/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.8 2001/06/26 19:10:18 jlam Exp $ +$NetBSD: patch-ac,v 1.9 2001/08/29 22:41:13 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-ac,v 1.8 2001/06/26 19:10:18 jlam Exp $ -CFLAGS = -O -I../include -LFLAGS = -+CFLAGS += -I../include -I${X11BASE}/include ++CFLAGS += -I../include -I${BUILDLINK_X11_DIR}/include +LFLAGS = ${LDFLAGS} # The Qt and Be window systems are written in C++, while the rest of @@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.8 2001/06/26 19:10:18 jlam Exp $ # # libraries for Qt -WINQTLIB = -L$(QTDIR)/lib -lqt -+WINQTLIB = -Wl,-R$(QTDIR)/lib -L$(QTDIR)/lib -lqt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext ++WINQTLIB = -L$(QTDIR)/lib -lqt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext # # libraries for KDE (with Qt) WINKDELIB = -lkdecore -lkdeui -lXext |