diff options
| author | dmcmahill <dmcmahill> | 2000-04-14 21:13:57 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2000-04-14 21:13:57 +0000 |
| commit | 93d1b3dd93418c424218d8a775c2c27db0a55db5 (patch) | |
| tree | 577931e98116edb26a01e9aef63f0c3e189b953d /games/nethack-qt | |
| parent | 568b7a427c1c421e7472330ccc362536ada3ee0a (diff) | |
| download | pkgsrc-93d1b3dd93418c424218d8a775c2c27db0a55db5.tar.gz | |
- sync with qt-2.0.2 path
- remove the BROKEN! Thanks to pooka@netbsd.org who fixed the remaining
broken stuff.
Diffstat (limited to 'games/nethack-qt')
| -rw-r--r-- | games/nethack-qt/Makefile | 7 | ||||
| -rw-r--r-- | games/nethack-qt/files/patch-sum | 4 | ||||
| -rw-r--r-- | games/nethack-qt/patches/patch-ac | 6 |
3 files changed, 8 insertions, 9 deletions
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile index a74664bee60..9d8708e853c 100644 --- a/games/nethack-qt/Makefile +++ b/games/nethack-qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2000/04/14 17:30:31 pooka Exp $ +# $NetBSD: Makefile,v 1.14 2000/04/14 21:13:57 dmcmahill Exp $ # DISTNAME= nethack-3.3.0 @@ -21,6 +21,7 @@ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ./sys/unix/setup.sh ALL_TARGET= x11tiles nethack INSTALL_TARGET= binfiles +PATH= ${X11BASE}/bin/qt2:$$PATH MAKE_ENV+= GTYPE=-qt QTDIR=${X11BASE} PATCHFILES+= ${PKGSRCDIR}/games/nethack-lib/patches/patch-* @@ -28,8 +29,6 @@ ALLFILES= ${DISTFILES} # don't checksum shared patches MD5_FILE= ${.CURDIR}/../nethack-lib/files/md5 -BROKEN= 'qt2 lossage' - post-extract: @${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh @@ -39,7 +38,7 @@ post-patch: @${RM} -f ${WRKSRC}/foo post-install: - @${MV} ${WRKSRC}/dat/x11tiles ${WRKSRC}/dat/tiles.xpm + @${CP} -f ${WRKSRC}/dat/x11tiles ${WRKSRC}/dat/tiles.xpm @${INSTALL_DATA} ${WRKSRC}/dat/tiles.xpm ${PREFIX}/share/nethackdir .include "../../mk/bsd.pkg.mk" diff --git a/games/nethack-qt/files/patch-sum b/games/nethack-qt/files/patch-sum index 6a16bfb68c2..016fe3ec6dd 100644 --- a/games/nethack-qt/files/patch-sum +++ b/games/nethack-qt/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.5 2000/04/14 17:30:32 pooka Exp $ +$NetBSD: patch-sum,v 1.6 2000/04/14 21:13:58 dmcmahill Exp $ MD5 (patch-aa) = a009a4ece6a091f6c1055708aac55ace MD5 (patch-ab) = 329300bb675c34e2d95099b7452b39fc -MD5 (patch-ac) = 8bb844b0b002799e0b33b0ad23aec61d +MD5 (patch-ac) = 593f34b0723cd70ca07dbb838e7a1527 MD5 (patch-ad) = 2dc6f7ee1e0d58c0207d648258a30d85 diff --git a/games/nethack-qt/patches/patch-ac b/games/nethack-qt/patches/patch-ac index cf0888e910d..72a24054b73 100644 --- a/games/nethack-qt/patches/patch-ac +++ b/games/nethack-qt/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.3 2000/04/06 18:00:14 dmcmahill Exp $ +$NetBSD: patch-ac,v 1.4 2000/04/14 21:13:58 dmcmahill Exp $ --- sys/unix/Makefile.src.orig Sat Dec 11 00:21:05 1999 +++ sys/unix/Makefile.src Thu Apr 6 11:54:15 2000 @@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.3 2000/04/06 18:00:14 dmcmahill Exp $ # Only used for Qt interface (other interfaces are standard C) -CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include -+CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include/qt ++CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include/qt2 # Qt is C++, so define the compiler and linker thus required: #CXX=g++ @@ -166,6 +166,6 @@ @@ -28,7 +28,7 @@ $NetBSD: patch-ac,v 1.3 2000/04/06 18:00:14 dmcmahill 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 = -Wl,-R$(QTDIR)/lib/qt2 -L$(QTDIR)/lib/qt2 -lqt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext # # libraries for KDE (with Qt) @@ -200,5 +200,5 @@ |