[pkgsrc/trunk]: pkgsrc/games/nethack-qt Use $CXX to do the link and take its ...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6696a91d000b
branches:  trunk
changeset: 481557:6696a91d000b
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Oct 07 12:45:07 2004 +0000

description:
Use $CXX to do the link and take its value from what pkgsrc passes it
rather than setting explicitly.

diffstat:

 games/nethack-qt/distinfo         |   4 ++--
 games/nethack-qt/patches/patch-ah |  23 ++++++++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diffs (68 lines):

diff -r 8ddb90dd5e70 -r 6696a91d000b games/nethack-qt/distinfo
--- a/games/nethack-qt/distinfo Thu Oct 07 12:22:16 2004 +0000
+++ b/games/nethack-qt/distinfo Thu Oct 07 12:45:07 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2004/09/11 13:38:47 markd Exp $
+$NetBSD: distinfo,v 1.18 2004/10/07 12:45:07 markd Exp $
 
 SHA1 (nethack-343-src.tgz) = c26537093c38152bc0fbcec20468d975b35f59fd
 Size (nethack-343-src.tgz) = 3497458 bytes
@@ -8,5 +8,5 @@
 SHA1 (patch-ae) = a72da6e6bd1af3a8eaed97ecc1fdd1ed4198a5db
 SHA1 (patch-af) = 6e1acdc2ab68c4fe72819a75cf84c58ea382b29e
 SHA1 (patch-ag) = 6aeae6bde079b9c9081f6e32523687010c9bc674
-SHA1 (patch-ah) = 947c0627470f655f8e7413239ff7bd33fdc4b46c
+SHA1 (patch-ah) = 5cef58d8bd20f3199ffd3ecd2ba9c640f66bb42c
 SHA1 (patch-ai) = 6c3b678a5b8123fe902cce1cbe8cce61ff4cf821
diff -r 8ddb90dd5e70 -r 6696a91d000b games/nethack-qt/patches/patch-ah
--- a/games/nethack-qt/patches/patch-ah Thu Oct 07 12:22:16 2004 +0000
+++ b/games/nethack-qt/patches/patch-ah Thu Oct 07 12:45:07 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.5 2004/09/11 13:38:47 markd Exp $
+$NetBSD: patch-ah,v 1.6 2004/10/07 12:45:07 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
-@@ -151,8 +151,8 @@
+--- sys/unix/Makefile.src.orig 2003-12-08 12:39:13.000000000 +1300
++++ sys/unix/Makefile.src
+@@ -151,15 +151,15 @@ GNOMEINC=-I/usr/lib/glib/include -I/usr/
  # flags for debugging:
  # CFLAGS = -g -I../include
  
@@ -13,7 +13,16 @@
  
  # The Qt and Be window systems are written in C++, while the rest of
  # NetHack is standard C.  If using Qt, uncomment the LINK line here to get
-@@ -214,8 +214,8 @@
+ # the C++ libraries linked in.
+ CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
+-CXX=g++
+-#LINK=g++
++#CXX=g++
++LINK=$(CXX)
+ #     For cross-compiling, eg. with gcc on Linux (see also CC further up):
+ #CXX=arm-linux-g++
+ #LINK=arm-linux-gcc
+@@ -214,8 +214,8 @@ WINBEOBJ =
  
  #
  #
@@ -24,7 +33,7 @@
  
  # on some systems the termcap library is in -ltermcap or -lcurses
  # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
-@@ -241,7 +241,7 @@
+@@ -241,7 +241,7 @@ WINX11LIB = -lXaw -lXmu -lXext -lXt -lX1
  # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
  #
  # libraries for Qt
@@ -33,7 +42,7 @@
  #
  # libraries for KDE (with Qt)
  WINKDELIB = -lkdecore -lkdeui -lXext
-@@ -255,7 +255,7 @@
+@@ -255,7 +255,7 @@ WINGEMLIB = -le_gem -lgem
  # libraries for BeOS 
  WINBELIB = -lbe