update to point at qt-2.0.2. This pkg now compiles again (has been broken

for some time).  Leave marked as BROKEN because it complains of not finding
a "tiles.xpm" file at run time.
This commit is contained in:
dmcmahill 2000-03-29 00:29:51 +00:00
parent 6c2510b272
commit db2bcabb17
4 changed files with 12 additions and 18 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 2000/03/27 08:54:55 tron Exp $
# $NetBSD: Makefile,v 1.11 2000/03/29 00:29:51 dmcmahill Exp $
#
DISTNAME= nethack-3.3.0
@ -11,7 +11,7 @@ HOMEPAGE= http://trolls.troll.no/warwick/nethack/
DEPENDS+= nethack-lib-3.3.0:../nethack-lib
DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= qt-1.44:../../x11/qt
DEPENDS+= qt-2.0.2:../../x11/qt
WRKSRC= ${WRKDIR}/nethack-3.3.0
@ -19,19 +19,17 @@ USE_X11= yes
USE_GMAKE= yes
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ./sys/unix/setup.sh
ALL_TARGET= nethack tiles.xpm
ALL_TARGET= nethack
INSTALL_TARGET= binfiles
MAKE_ENV+= GTYPE=-qt QTDIR=${X11BASE}
PATH= ${X11BASE}/qt2/bin:$$PATH
MAKE_ENV+= GTYPE=-qt QTDIR=${X11BASE}/qt2
PATCHFILES+= ${PKGSRCDIR}/games/nethack-lib/patches/patch-*
ALLFILES= ${DISTFILES} # don't checksum shared patches
MD5_FILE= ${.CURDIR}/../nethack-lib/files/md5
BROKEN= requires qt 2.0 or greater
#post-extract:
# #@${LN} -sf ../../Qt ${WRKSRC}/win/Qt
BROKEN= 'complains about tiles.xmp at runtime and non-writable scores directory'
post-extract:
@${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh
@ -41,7 +39,4 @@ post-patch:
@${SED} -e 's@XXXPREFIXXXX@${PREFIX}@g' <${WRKSRC}/foo> ${WRKSRC}/include/config.h
@${RM} -f ${WRKSRC}/foo
post-install:
${INSTALL} -c -o bin -g games -m 0644 ${WRKSRC}/dat/tiles.xpm ${PREFIX}/share/nethackdir
.include "../../mk/bsd.pkg.mk"

View file

@ -1,5 +1,5 @@
$NetBSD: patch-sum,v 1.2 1999/12/24 22:30:03 pooka Exp $
$NetBSD: patch-sum,v 1.3 2000/03/29 00:29:53 dmcmahill Exp $
MD5 (patch-aa) = a009a4ece6a091f6c1055708aac55ace
MD5 (patch-ab) = 329300bb675c34e2d95099b7452b39fc
MD5 (patch-ac) = 1096876031d6467d32fcd00412eabdf1
MD5 (patch-ac) = 466fc6a3110e4cac0eb0f2557b626ee4

View file

@ -1,4 +1,4 @@
$NetBSD: patch-ac,v 1.1 1999/12/24 22:30:03 pooka Exp $
$NetBSD: patch-ac,v 1.2 2000/03/29 00:29:53 dmcmahill Exp $
--- sys/unix/Makefile.src.orig Sat Dec 11 07:21:05 1999
+++ sys/unix/Makefile.src Wed Dec 22 22:29:15 1999
@ -9,7 +9,7 @@ $NetBSD: patch-ac,v 1.1 1999/12/24 22:30:03 pooka Exp $
-CFLAGS = -O -I../include
-LFLAGS =
+CFLAGS = -O -I../include -I${X11BASE}/include
+LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE}
+LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib
# Only used for Qt interface (other interfaces are standard C)
CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include
@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.1 1999/12/24 22:30:03 pooka Exp $
#
# libraries for Qt
-WINQTLIB = -L$(QTDIR)/lib -lqt
+WINQTLIB = -L$(QTDIR)/lib -lqt -lXpm
+WINQTLIB = -Wl,-R$(QTDIR)/lib -L$(QTDIR)/lib -lqt -lXpm -lX11
#
# libraries for KDE (with Qt)
WINKDELIB = -lkdecore -lkdeui -lXext

View file

@ -1,3 +1,2 @@
@comment $NetBSD: PLIST,v 1.1 1998/08/27 13:06:51 garbled Exp $
@comment $NetBSD: PLIST,v 1.2 2000/03/29 00:29:54 dmcmahill Exp $
bin/nethack-qt
share/nethackdir/tiles.xpm