update for new qt2 layout

3 files changed, 21 insertions, 18 deletions

diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 9d8708e853c..c062a2ebf80 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/04/14 21:13:57 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.15 2000/04/28 10:12:43 drochner 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-2.0.2:../../x11/qt
+DEPENDS+=		qt2-2.0.2:../../x11/qt
 
 WRKSRC=			${WRKDIR}/nethack-3.3.0
 
@@ -21,8 +21,8 @@ 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}
+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
diff --git a/games/nethack-qt/files/patch-sum b/games/nethack-qt/files/patch-sum
index 016fe3ec6dd..2b957f9dac0 100644
--- a/games/nethack-qt/files/patch-sum
+++ b/games/nethack-qt/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.6 2000/04/14 21:13:58 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.7 2000/04/28 10:12:43 drochner Exp $
 
 MD5 (patch-aa) = a009a4ece6a091f6c1055708aac55ace
 MD5 (patch-ab) = 329300bb675c34e2d95099b7452b39fc
-MD5 (patch-ac) = 593f34b0723cd70ca07dbb838e7a1527
+MD5 (patch-ac) = c4b1ccf2bc98708940b3b46dfd35c453
 MD5 (patch-ad) = 2dc6f7ee1e0d58c0207d648258a30d85
diff --git a/games/nethack-qt/patches/patch-ac b/games/nethack-qt/patches/patch-ac
index 72a24054b73..ad9fdc80fd4 100644
--- a/games/nethack-qt/patches/patch-ac
+++ b/games/nethack-qt/patches/patch-ac
@@ -1,8 +1,9 @@
-$NetBSD: patch-ac,v 1.4 2000/04/14 21:13:58 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.5 2000/04/28 10:12:44 drochner Exp $
 
---- sys/unix/Makefile.src.orig	Sat Dec 11 00:21:05 1999
-+++ sys/unix/Makefile.src	Thu Apr  6 11:54:15 2000
-@@ -133,9 +133,9 @@
+--- sys/unix/Makefile.src.orig	Sat Dec 11 06:21:05 1999
++++ sys/unix/Makefile.src	Fri Apr 28 11:50:01 2000
+@@ -132,8 +132,8 @@
+ # flags for debugging:
  # CFLAGS = -g -I../include
  
 -CFLAGS = -O -I../include
@@ -11,11 +12,9 @@ $NetBSD: patch-ac,v 1.4 2000/04/14 21:13:58 dmcmahill Exp $
 +LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib  -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
  
  # Only used for Qt interface (other interfaces are standard C)
--CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include
-+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 @@
+ CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include
+@@ -165,8 +165,8 @@
+ 
  #
  # 
 -WINSRC = $(WINTTYSRC)
@@ -24,17 +23,21 @@ $NetBSD: patch-ac,v 1.4 2000/04/14 21:13:58 dmcmahill Exp $
 +WINOBJ = $(WINQTOBJ)
  
  # on some systems the termcap library is in -ltermcap or -lcurses
-@@ -193,5 +193,5 @@
+ # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
+@@ -192,14 +192,14 @@
+ # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
  #
  # libraries for Qt
 -WINQTLIB = -L$(QTDIR)/lib -lqt
-+WINQTLIB = -Wl,-R$(QTDIR)/lib/qt2 -L$(QTDIR)/lib/qt2 -lqt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext
++WINQTLIB = -Wl,-R$(QTDIR)/lib -L$(QTDIR)/lib -lqt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext
  #
  # libraries for KDE (with Qt)
-@@ -200,5 +200,5 @@
+ WINKDELIB = -lkdecore -lkdeui -lXext
+ #
  #
  
 -WINLIB = $(WINTTYLIB)
 +WINLIB = $(WINQTLIB)
  
  # any other strange libraries your system needs (for Sysunix only -- the more
+ # specialized targets should already be right)