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/patches/patch-ac | |
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/patches/patch-ac')
-rw-r--r-- | games/nethack-qt/patches/patch-ac | 6 |
1 files changed, 3 insertions, 3 deletions
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 |