summaryrefslogtreecommitdiff
path: root/games/nethack-qt
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-06-26 18:52:09 +0000
committerjlam <jlam@pkgsrc.org>2001-06-26 18:52:09 +0000
commitcb8fe8b5a5e59a16ae0b3339b858fd3e06f38100 (patch)
tree666f0b14cfb52118a6a7435ba59d96a8e1f84372 /games/nethack-qt
parent1cad5c3536015f2bb7fc48ccfba7d2c8ad85692d (diff)
downloadpkgsrc-cb8fe8b5a5e59a16ae0b3339b858fd3e06f38100.tar.gz
Convert to use buildlink.mk files.
Diffstat (limited to 'games/nethack-qt')
-rw-r--r--games/nethack-qt/Makefile10
-rw-r--r--games/nethack-qt/distinfo4
-rw-r--r--games/nethack-qt/patches/patch-ac6
3 files changed, 9 insertions, 11 deletions
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 8bad6846622..59e49e5e1bd 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2001/02/16 15:10:54 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2001/06/26 18:52:09 jlam Exp $
#
.include "../nethack-lib/Makefile.common"
@@ -9,16 +9,12 @@ CATEGORIES+= x11
COMMENT= The QT-Enhanced X11 version of NetHack
DEPENDS+= nethack-lib-${NETHACK_VERSION}:../nethack-lib
-DEPENDS+= qt2-libs-*:../../x11/qt2-libs
USE_X11= YES
-USE_XPM= YES
ALL_TARGET= x11tiles nethack
INSTALL_TARGET= binfiles
-EVAL_PREFIX+= QT2DIR=qt2-libs
-PATH= ${QT2DIR}/qt2/bin:$$PATH
-MAKE_ENV+= GTYPE=-qt QTDIR=${QT2DIR}/qt2
+MAKE_ENV+= GTYPE=-qt
PATCHFILES+= ${PKGSRCDIR}/games/nethack-lib/patches/patch-*
ALLFILES= ${DISTFILES} # don't checksum shared patches
@@ -27,4 +23,6 @@ post-install:
@${CP} -f ${WRKSRC}/dat/x11tiles ${WRKSRC}/dat/tiles.xpm
@${INSTALL_DATA} ${WRKSRC}/dat/tiles.xpm ${PREFIX}/share/nethackdir
+.include "../../graphics/xpm/buildlink.mk"
+.include "../../x11/qt2-libs/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/nethack-qt/distinfo b/games/nethack-qt/distinfo
index 45de105aa33..9d051f2952c 100644
--- a/games/nethack-qt/distinfo
+++ b/games/nethack-qt/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:31 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/06/26 18:52:09 jlam Exp $
SHA1 (nethack-331.tgz) = e3d07efc81c9aeb85fadc268d1d4976ab3a0f7e9
Size (nethack-331.tgz) = 3061094 bytes
SHA1 (patch-aa) = d8ec9c209bf28abda1f78159e9d240895e38db30
-SHA1 (patch-ac) = f00726fecab10384884ad80bfb72401233c890d8
+SHA1 (patch-ac) = e1398e6874365c58790a978962233886339ed82a
SHA1 (patch-ad) = 580a75c7ebc55b099a702ad21ce12d960f2805ff
diff --git a/games/nethack-qt/patches/patch-ac b/games/nethack-qt/patches/patch-ac
index 540493101eb..362b90e90eb 100644
--- a/games/nethack-qt/patches/patch-ac
+++ b/games/nethack-qt/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.6 2000/08/10 17:50:13 pooka Exp $
+$NetBSD: patch-ac,v 1.7 2001/06/26 18:52:09 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,8 +8,8 @@ $NetBSD: patch-ac,v 1.6 2000/08/10 17:50:13 pooka Exp $
-CFLAGS = -O -I../include
-LFLAGS =
-+CFLAGS = -O -I../include -I${X11BASE}/include
-+LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
++CFLAGS += -O -I../include -I${X11BASE}/include
++LFLAGS = ${LDFLAGS}
# The Qt and Be window systems are written in C++, while the rest of
# NetHack is standard C. If using Qt, uncomment the LD line here to get