-look in the right place for Qt includes.

-add some extra libs during linking for ELF

3 files changed, 17 insertions, 21 deletions

diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index ac23ea79d20..e034a776300 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/03/29 00:29:51 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.12 2000/04/06 18:00:13 dmcmahill Exp $
 #
 
 DISTNAME=		nethack-3.3.0
@@ -21,8 +21,7 @@ HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./sys/unix/setup.sh
 ALL_TARGET=		nethack
 INSTALL_TARGET=		binfiles
-PATH=			${X11BASE}/qt2/bin:$$PATH
-MAKE_ENV+=		GTYPE=-qt QTDIR=${X11BASE}/qt2
+MAKE_ENV+=		GTYPE=-qt QTDIR=${X11BASE}
 
 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 f634ab2e1a9..766a7553419 100644
--- a/games/nethack-qt/files/patch-sum
+++ b/games/nethack-qt/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.3 2000/03/29 00:29:53 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.4 2000/04/06 18:00:14 dmcmahill Exp $
 
 MD5 (patch-aa) = a009a4ece6a091f6c1055708aac55ace
 MD5 (patch-ab) = 329300bb675c34e2d95099b7452b39fc
-MD5 (patch-ac) = 466fc6a3110e4cac0eb0f2557b626ee4
+MD5 (patch-ac) = 8bb844b0b002799e0b33b0ad23aec61d
diff --git a/games/nethack-qt/patches/patch-ac b/games/nethack-qt/patches/patch-ac
index 010e9d3ac60..cf0888e910d 100644
--- a/games/nethack-qt/patches/patch-ac
+++ b/games/nethack-qt/patches/patch-ac
@@ -1,20 +1,21 @@
-$NetBSD: patch-ac,v 1.2 2000/03/29 00:29:53 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.3 2000/04/06 18:00:14 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
-@@ -132,8 +132,8 @@
- # flags for debugging:
+--- 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 @@
  # CFLAGS = -g -I../include
  
 -CFLAGS = -O -I../include
 -LFLAGS = 
 +CFLAGS = -O -I../include -I${X11BASE}/include
-+LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib
++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
-@@ -165,8 +165,8 @@
- 
+-CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include
++CXXFLAGS = -g $(CFLAGS) -I. -I$(QTDIR)/include/qt
+ # Qt is C++, so define the compiler and linker thus required:
+ #CXX=g++
+@@ -166,6 +166,6 @@
  #
  # 
 -WINSRC = $(WINTTYSRC)
@@ -23,21 +24,17 @@ $NetBSD: patch-ac,v 1.2 2000/03/29 00:29:53 dmcmahill Exp $
 +WINOBJ = $(WINQTOBJ)
  
  # on some systems the termcap library is in -ltermcap or -lcurses
- # 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
+@@ -193,5 +193,5 @@
  #
  # libraries for Qt
 -WINQTLIB = -L$(QTDIR)/lib -lqt
-+WINQTLIB = -Wl,-R$(QTDIR)/lib -L$(QTDIR)/lib -lqt -lXpm -lX11
++WINQTLIB = -Wl,-R$(QTDIR)/lib -L$(QTDIR)/lib -lqt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext
  #
  # libraries for KDE (with Qt)
- WINKDELIB = -lkdecore -lkdeui -lXext
- #
+@@ -200,5 +200,5 @@
  #
  
 -WINLIB = $(WINTTYLIB)
 +WINLIB = $(WINQTLIB)
  
  # any other strange libraries your system needs (for Sysunix only -- the more
- # specialized targets should already be right)