Fix errno and pthread detection.

6 files changed, 130 insertions, 7 deletions

diff --git a/games/genecys-client/distinfo b/games/genecys-client/distinfo
index 26f783c9e32..e3456ad4341 100644
--- a/games/genecys-client/distinfo
+++ b/games/genecys-client/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.4 2005/06/07 16:24:27 garbled Exp $
+$NetBSD: distinfo,v 1.5 2006/05/06 12:45:32 joerg Exp $
 
 SHA1 (genecys-0.2.tar.gz) = 0140f91e1469237a385437ac7b2e6030902de110
 RMD160 (genecys-0.2.tar.gz) = 0039088028aae5f993a77d50c6d1c856ee61967d
 Size (genecys-0.2.tar.gz) = 786136 bytes
-SHA1 (patch-aa) = acce1d6620c0c2755c88b8751fec07eccc70970f
+SHA1 (patch-aa) = db825cb0ae83091babe798be06623a8067d59d7f
+SHA1 (patch-ab) = 6a9b73b9d45779bdc57061bed9baf058a3433c1f
+SHA1 (patch-ac) = d178b0adbb8ace283e248afa1c1d946b7c439c22
+SHA1 (patch-ad) = d5ba82edcfe988022d073d73bd780e77e2a8672e
+SHA1 (patch-ae) = 2d5f2c04bccc4854796490ff3aa4982e2253f677
diff --git a/games/genecys-client/patches/patch-aa b/games/genecys-client/patches/patch-aa
index cbb77127cf7..7aa85558d88 100644
--- a/games/genecys-client/patches/patch-aa
+++ b/games/genecys-client/patches/patch-aa
@@ -1,7 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2005/06/07 16:24:27 garbled Exp $
---- client/configure.orig	2005-06-07 08:34:46.000000000 -0700
-+++ client/configure	2005-06-07 08:38:22.000000000 -0700
-@@ -3088,7 +3088,7 @@
+$NetBSD: patch-aa,v 1.2 2006/05/06 12:45:32 joerg Exp $
+
+--- client/configure.orig	2004-04-05 10:58:32.000000000 +0000
++++ client/configure
+@@ -3088,7 +3088,7 @@ if test $ac_cv_lib_X11_XFreePixmap = yes
  #define HAVE_LIBX11 1
  _ACEOF
  
@@ -10,7 +11,7 @@ $NetBSD: patch-aa,v 1.1 2005/06/07 16:24:27 garbled Exp $
  
  else
    { echo "$as_me:$LINENO: WARNING: \"cannot find required X11 library.\"" >&5
-@@ -3102,7 +3102,7 @@
+@@ -3102,7 +3102,7 @@ if test "${ac_cv_lib_GL_glBegin+set}" = 
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -19,3 +20,38 @@ $NetBSD: patch-aa,v 1.1 2005/06/07 16:24:27 garbled Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
+@@ -3648,7 +3648,7 @@ if test "${ac_cv_lib_rm_rmInit+set}" = s
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lrm -lpthread $LIBS"
++LIBS="-lrm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -3720,13 +3720,13 @@ echo "$as_me: error: \"Unable to find li
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for pthread_mutex_lock in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_mutex_lock in -lpthread... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for pthread_mutex_lock in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_mutex_lock in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -3789,7 +3789,7 @@ if test $ac_cv_lib_pthread_pthread_mutex
+ #define HAVE_LIBPTHREAD 1
+ _ACEOF
+ 
+-  LIBS="-lpthread $LIBS"
++  LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ 
+ else
+   { { echo "$as_me:$LINENO: error: \"Unable to find pthread library\"" >&5
diff --git a/games/genecys-client/patches/patch-ab b/games/genecys-client/patches/patch-ab
new file mode 100644
index 00000000000..7cab102f1cf
--- /dev/null
+++ b/games/genecys-client/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.1 2006/05/06 12:45:32 joerg Exp $
+
+--- server/configure.orig	2006-05-06 12:01:42.000000000 +0000
++++ server/configure
+@@ -3156,13 +3156,13 @@ echo "$as_me: error: \"Unable to find li
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for pthread_mutex_lock in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_mutex_lock in -lpthread... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for pthread_mutex_lock in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_mutex_lock in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -3225,7 +3225,7 @@ if test $ac_cv_lib_pthread_pthread_mutex
+ #define HAVE_LIBPTHREAD 1
+ _ACEOF
+ 
+-  LIBS="-lpthread $LIBS"
++  LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ 
+ else
+   { { echo "$as_me:$LINENO: error: \"Unable to find pthread library\"" >&5
diff --git a/games/genecys-client/patches/patch-ac b/games/genecys-client/patches/patch-ac
new file mode 100644
index 00000000000..f2c4d3a5465
--- /dev/null
+++ b/games/genecys-client/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2006/05/06 12:45:32 joerg Exp $
+
+--- genmdlviewer/configure.orig	2006-05-06 12:01:58.000000000 +0000
++++ genmdlviewer/configure
+@@ -3446,7 +3446,7 @@ if test "${ac_cv_lib_rm_rmInit+set}" = s
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lrm -lpthread $LIBS"
++LIBS="-lrm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -3524,7 +3524,7 @@ if test "${ac_cv_lib_rmaux_rmauxSetGeomT
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lrmaux -lpthread -lrm $LIBS"
++LIBS="-lrmaux ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -lrm $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
diff --git a/games/genecys-client/patches/patch-ad b/games/genecys-client/patches/patch-ad
new file mode 100644
index 00000000000..c25ab172ad0
--- /dev/null
+++ b/games/genecys-client/patches/patch-ad
@@ -0,0 +1,19 @@
+$NetBSD: patch-ad,v 1.1 2006/05/06 12:45:32 joerg Exp $
+
+--- common/utils.c.orig	2006-05-06 12:11:07.000000000 +0000
++++ common/utils.c
+@@ -126,11 +126,10 @@ void LOG(int severity, const char *s, ..
+ */
+ void _bailout(char *file, int line)
+ {
+-    char *pname;
+-    extern int errno;
++    const char *pname = "";
+ 
+-#if defined(__NetBSD__)
+-    pname = (char *)getprogname();
++#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__)
++    pname = getprogname();
+ #elif defined(__linux__)
+     pname = program_invocation_name;
+ #endif
diff --git a/games/genecys-client/patches/patch-ae b/games/genecys-client/patches/patch-ae
new file mode 100644
index 00000000000..0e698ac5a54
--- /dev/null
+++ b/games/genecys-client/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2006/05/06 12:45:32 joerg Exp $
+
+--- client/net.c.orig	2006-05-06 12:27:42.000000000 +0000
++++ client/net.c
+@@ -86,7 +86,6 @@ parsefunc_t parsefunc[] = {
+ };
+ 
+ extern uniqid_t player_id;
+-extern int errno;
+ 
+ char	*in_buf;		/* Input buffer */
+ char	*out_buf;		/* Output buffer */