Add DragonFly support. When linking with libqt-mt, explicitly link in

the thread libraries, this is needed for FreeBSD4-style -pthread.

4 files changed, 12 insertions, 12 deletions

diff --git a/games/nethack-qt/distinfo b/games/nethack-qt/distinfo
index 89238454ecc..0a429f141be 100644
--- a/games/nethack-qt/distinfo
+++ b/games/nethack-qt/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.20 2005/11/14 10:43:14 markd Exp $
+$NetBSD: distinfo,v 1.21 2005/12/19 19:45:02 joerg Exp $
 
 SHA1 (nethack-343-src.tgz) = c26537093c38152bc0fbcec20468d975b35f59fd
 RMD160 (nethack-343-src.tgz) = 42f600d24715a0b7e631b357c135761410b3ca95
 Size (nethack-343-src.tgz) = 3497458 bytes
-SHA1 (patch-aa) = 6439ddb86b4600aa39e6b52cabaf4f6696dd1023
+SHA1 (patch-aa) = dc4761a41a5851249e1c9e73b03dea423fc45571
 SHA1 (patch-ab) = 6c42d5c4c12e70651f14b08658169f6c00b420db
-SHA1 (patch-ac) = 4181ec1186abd65b72400a56a6062e04d1783f81
+SHA1 (patch-ac) = e5101c73a1b3ec0fb072ce4b401413a338465298
 SHA1 (patch-ae) = a72da6e6bd1af3a8eaed97ecc1fdd1ed4198a5db
 SHA1 (patch-af) = 4c63205d51ad264aec0406810206e7a1913b7c54
 SHA1 (patch-ag) = 6aeae6bde079b9c9081f6e32523687010c9bc674
-SHA1 (patch-ah) = 5cef58d8bd20f3199ffd3ecd2ba9c640f66bb42c
+SHA1 (patch-ah) = 238bd9d0284d7b43aa92ab558f9a6dd723722f05
 SHA1 (patch-ai) = 6c3b678a5b8123fe902cce1cbe8cce61ff4cf821
diff --git a/games/nethack-qt/patches/patch-aa b/games/nethack-qt/patches/patch-aa
index 029edf71a06..8d8011b19ac 100644
--- a/games/nethack-qt/patches/patch-aa
+++ b/games/nethack-qt/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.11 2004/03/05 15:21:01 pooka Exp $
+$NetBSD: patch-aa,v 1.12 2005/12/19 19:45:02 joerg Exp $
 
 --- include/config.h.old	2003-12-08 01:39:13.000000000 +0200
 +++ include/config.h	2004-03-05 17:00:59.000000000 +0200
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.11 2004/03/05 15:21:01 pooka Exp $
  # define DEFAULT_WC_TILED_MAP   /* Default to tiles if users doesn't say wc_ascii_map */
  # define USER_SOUNDS		/* Use sounds */
 -# ifndef __APPLE__
-+# if !(defined(__APPLE__) || defined(__NetBSD__))
++# if !(defined(__APPLE__) || defined(__NetBSD__) || defined(__DragonFly__))
  #  define USER_SOUNDS_REGEX
  # endif
  # define USE_XPM		/* Use XPM format for images (required) */
diff --git a/games/nethack-qt/patches/patch-ac b/games/nethack-qt/patches/patch-ac
index 7777fda289f..4aa02c1bbdb 100644
--- a/games/nethack-qt/patches/patch-ac
+++ b/games/nethack-qt/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.13 2003/09/02 00:30:55 pooka Exp $
+$NetBSD: patch-ac,v 1.14 2005/12/19 19:45:02 joerg Exp $
 
 --- include/system.h.orig	2003-08-30 03:07:23.000000000 +0300
 +++ include/system.h	2003-09-02 02:49:23.000000000 +0300
@@ -7,11 +7,11 @@ $NetBSD: patch-ac,v 1.13 2003/09/02 00:30:55 pooka Exp $
  E  long NDECL(random);
  # endif
 -# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
-+# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__)) || defined(RANDOM)
++# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__)) || defined(RANDOM)
  E void FDECL(srandom, (unsigned int));
  # else
 -#  if !defined(bsdi) && !defined(__FreeBSD__)
-+#  if !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__)
++#  if !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__)
  E int FDECL(srandom, (unsigned int));
  #  endif
  # endif
@@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.13 2003/09/02 00:30:55 pooka Exp $
  E unsigned int	FDECL(strlen, (char *));
  #  else
 -#   if !(defined(ULTRIX_PROTO) && defined(__GNUC__))
-+#   if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) && !defined(__NetBSD__)
++#   if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) && !defined(__NetBSD__) && !defined(__DragonFly__)
  E int	FDECL(strlen, (const char *));
  #   endif
  #  endif /* HPUX */
diff --git a/games/nethack-qt/patches/patch-ah b/games/nethack-qt/patches/patch-ah
index ca9ec4e2310..595bcfca55e 100644
--- a/games/nethack-qt/patches/patch-ah
+++ b/games/nethack-qt/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.6 2004/10/07 12:45:07 markd Exp $
+$NetBSD: patch-ah,v 1.7 2005/12/19 19:45:02 joerg Exp $
 
 --- sys/unix/Makefile.src.orig	2003-12-08 12:39:13.000000000 +1300
 +++ sys/unix/Makefile.src
@@ -38,7 +38,7 @@ $NetBSD: patch-ah,v 1.6 2004/10/07 12:45:07 markd Exp $
  #
  # libraries for Qt
 -WINQTLIB = -L$(QTDIR)/lib -lqt
-+WINQTLIB = -L$(QTDIR)/lib -lqt-mt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext
++WINQTLIB = -L$(QTDIR)/lib -lqt-mt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
  #
  # libraries for KDE (with Qt)
  WINKDELIB = -lkdecore -lkdeui -lXext