diff options
| author | markd <markd@pkgsrc.org> | 2004-09-11 13:38:46 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2004-09-11 13:38:46 +0000 |
| commit | f274a8266d3118f65fd9ced33fe8a6deb97b5b45 (patch) | |
| tree | ffc9fde2037984be5604d236d2e5b540879a133e /games | |
| parent | 952177ae1a92840c41bb7cbf10c1054b46a6cee4 (diff) | |
| download | pkgsrc-f274a8266d3118f65fd9ced33fe8a6deb97b5b45.tar.gz | |
Fix problems building nethack-qt seen in the bulkbuilds by switching
from qt2 to qt3.
Bump PKGREVISION.
Diffstat (limited to 'games')
| -rw-r--r-- | games/nethack-qt/Makefile | 5 | ||||
| -rw-r--r-- | games/nethack-qt/distinfo | 4 | ||||
| -rw-r--r-- | games/nethack-qt/patches/patch-ah | 4 | ||||
| -rw-r--r-- | games/nethack/Makefile | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile index a77ec16d4ef..477ca05621e 100644 --- a/games/nethack-qt/Makefile +++ b/games/nethack-qt/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.37 2004/04/11 22:57:11 snj Exp $ +# $NetBSD: Makefile,v 1.38 2004/09/11 13:38:46 markd Exp $ # .include "../nethack-lib/Makefile.common" PKGNAME= nethack-qt-${NETHACK_VERSION} +PKGREVISION= 1 CATEGORIES+= x11 COMMENT= The QT-Enhanced X11 version of NetHack @@ -25,6 +26,6 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/dat/tiles.xpm ${PREFIX}/share/${NETHACK_DIR} .include "../../graphics/xpm/buildlink3.mk" -.include "../../x11/qt2-libs/buildlink3.mk" +.include "../../x11/qt3-libs/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/nethack-qt/distinfo b/games/nethack-qt/distinfo index f9c8e3c9a05..d8d9a2f18cf 100644 --- a/games/nethack-qt/distinfo +++ b/games/nethack-qt/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2004/03/05 15:21:01 pooka Exp $ +$NetBSD: distinfo,v 1.17 2004/09/11 13:38:47 markd Exp $ SHA1 (nethack-343-src.tgz) = c26537093c38152bc0fbcec20468d975b35f59fd Size (nethack-343-src.tgz) = 3497458 bytes @@ -8,5 +8,5 @@ SHA1 (patch-ac) = 4181ec1186abd65b72400a56a6062e04d1783f81 SHA1 (patch-ae) = a72da6e6bd1af3a8eaed97ecc1fdd1ed4198a5db SHA1 (patch-af) = 6e1acdc2ab68c4fe72819a75cf84c58ea382b29e SHA1 (patch-ag) = 6aeae6bde079b9c9081f6e32523687010c9bc674 -SHA1 (patch-ah) = 9ebeb33744c86f2d2dd2f6a09eae17a0c2d81c90 +SHA1 (patch-ah) = 947c0627470f655f8e7413239ff7bd33fdc4b46c SHA1 (patch-ai) = 6c3b678a5b8123fe902cce1cbe8cce61ff4cf821 diff --git a/games/nethack-qt/patches/patch-ah b/games/nethack-qt/patches/patch-ah index 27e082c6be6..8f6e4c0aa10 100644 --- a/games/nethack-qt/patches/patch-ah +++ b/games/nethack-qt/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.4 2003/09/02 00:30:55 pooka Exp $ +$NetBSD: patch-ah,v 1.5 2004/09/11 13:38:47 markd Exp $ --- sys/unix/Makefile.src.orig 2003-08-30 03:08:04.000000000 +0300 +++ sys/unix/Makefile.src 2003-09-02 03:17:23.000000000 +0300 @@ -29,7 +29,7 @@ $NetBSD: patch-ah,v 1.4 2003/09/02 00:30:55 pooka Exp $ # # libraries for Qt -WINQTLIB = -L$(QTDIR)/lib -lqt -+WINQTLIB = -L$(QTDIR)/lib -lqt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext ++WINQTLIB = -L$(QTDIR)/lib -lqt-mt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext # # libraries for KDE (with Qt) WINKDELIB = -lkdecore -lkdeui -lXext diff --git a/games/nethack/Makefile b/games/nethack/Makefile index 00e6910afaa..07ca2468905 100644 --- a/games/nethack/Makefile +++ b/games/nethack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2003/04/24 22:14:37 jmc Exp $ +# $NetBSD: Makefile,v 1.14 2004/09/11 13:38:46 markd Exp $ # Needed so configure/patch rules don't get pulled in NO_BUILD= yes @@ -15,7 +15,7 @@ COMMENT= Meta-package for NetHack with x11, qt and tty versions DEPENDS+= nethack-tty-${NETHACK_VERSION}:../nethack-tty DEPENDS+= nethack-x11-${NETHACK_VERSION}:../nethack-x11 -DEPENDS+= nethack-qt-${NETHACK_VERSION}:../nethack-qt +DEPENDS+= nethack-qt-${NETHACK_VERSION}nb1:../nethack-qt USE_X11= yes EXTRACT_ONLY= # empty |