diff options
| author | jlam <jlam> | 2001-08-29 22:41:00 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-08-29 22:41:00 +0000 |
| commit | b1cf2d6a0d781b36b3e41c1761bd09b0d1e714ae (patch) | |
| tree | 0943c3791afa0b712d3818b69672014acfe55e03 /games/nethack-x11 | |
| parent | 68d93d0286e46619b54c9d917dbf553bc889a6e5 (diff) | |
| download | pkgsrc-b1cf2d6a0d781b36b3e41c1761bd09b0d1e714ae.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-x11')
| -rw-r--r-- | games/nethack-x11/Makefile | 5 | ||||
| -rw-r--r-- | games/nethack-x11/distinfo | 4 | ||||
| -rw-r--r-- | games/nethack-x11/patches/patch-ab | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile index 8f660affe47..70c014114ae 100644 --- a/games/nethack-x11/Makefile +++ b/games/nethack-x11/Makefile @@ -1,17 +1,15 @@ -# $NetBSD: Makefile,v 1.12 2001/06/26 19:11:04 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2001/08/29 22:41:13 jlam Exp $ # .include "../nethack-lib/Makefile.common" PKGNAME= nethack-x11-${NETHACK_VERSION} - COMMENT= the X11 version of NetHack CATEGORIES+= x11 DEPENDS+= nethack-lib-${NETHACK_VERSION}:../nethack-lib -USE_X11= YES USE_BUILDLINK_ONLY= YES ALL_TARGET= x11tiles nethack @@ -25,4 +23,5 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/dat/x11tiles ${PREFIX}/share/nethackdir .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/nethack-x11/distinfo b/games/nethack-x11/distinfo index b77efdc2e19..4b4cf5de34a 100644 --- a/games/nethack-x11/distinfo +++ b/games/nethack-x11/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/06/26 19:11:04 jlam Exp $ +$NetBSD: distinfo,v 1.4 2001/08/29 22:41:13 jlam Exp $ SHA1 (nethack-331.tgz) = e3d07efc81c9aeb85fadc268d1d4976ab3a0f7e9 Size (nethack-331.tgz) = 3061094 bytes SHA1 (patch-aa) = 27b14831057da6ca2863f75d0910e0479c9c6b99 -SHA1 (patch-ab) = 9cb29ef166fefa5672cad337e00fc960b46140eb +SHA1 (patch-ab) = dc195cd1fa7dbae59904847c357b9a6c7796d7fa diff --git a/games/nethack-x11/patches/patch-ab b/games/nethack-x11/patches/patch-ab index 8f915a05c82..8d213557190 100644 --- a/games/nethack-x11/patches/patch-ab +++ b/games/nethack-x11/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.5 2001/06/26 19:11:04 jlam Exp $ +$NetBSD: patch-ab,v 1.6 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 19:28:31 2000 @@ -8,7 +8,7 @@ $NetBSD: patch-ab,v 1.5 2001/06/26 19:11:04 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 |