[pkgsrc/trunk]: pkgsrc/games/urban Fix pthread detection and linkage.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7af42eecc351
branches:  trunk
changeset: 510394:7af42eecc351
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Mar 29 22:41:01 2006 +0000

description:
Fix pthread detection and linkage.

diffstat:

 games/urban/Makefile         |   3 ++-
 games/urban/distinfo         |   3 ++-
 games/urban/patches/patch-ah |  31 +++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)

diffs (66 lines):

diff -r eff2b67c8dc8 -r 7af42eecc351 games/urban/Makefile
--- a/games/urban/Makefile      Wed Mar 29 22:39:49 2006 +0000
+++ b/games/urban/Makefile      Wed Mar 29 22:41:01 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:44 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/29 22:41:01 joerg Exp $
 #
 
 DISTNAME=      urban-1.5.3
@@ -11,6 +11,7 @@
 HOMEPAGE=      http://urban.bengburken.net/eng/
 COMMENT=       U.R.B.A.N The Cyborg Project
 
+PTHREAD_AUTO_VARS=     yes
 GNU_CONFIGURE=         yes
 WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
 
diff -r eff2b67c8dc8 -r 7af42eecc351 games/urban/distinfo
--- a/games/urban/distinfo      Wed Mar 29 22:39:49 2006 +0000
+++ b/games/urban/distinfo      Wed Mar 29 22:41:01 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/03/25 03:10:23 wiz Exp $
+$NetBSD: distinfo,v 1.7 2006/03/29 22:41:01 joerg Exp $
 
 SHA1 (urban-1.5.3.tar.gz) = 3450988a83fa969df0148e4cdce179c033fa0868
 RMD160 (urban-1.5.3.tar.gz) = 55c3aab336f16936139601f50dda4854470f38fb
@@ -13,3 +13,4 @@
 SHA1 (patch-ae) = 637883461b08a002fc75bb49ae18298f1d35bd79
 SHA1 (patch-af) = c1aad1d42792113e56e60a6a2a572d33aad1000b
 SHA1 (patch-ag) = 181df221bf1f8ba7ee649315257d47e832b19b1a
+SHA1 (patch-ah) = e11a947ef03677dec035e30dfb06dcf24eb03cf6
diff -r eff2b67c8dc8 -r 7af42eecc351 games/urban/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/urban/patches/patch-ah      Wed Mar 29 22:41:01 2006 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-ah,v 1.3 2006/03/29 22:41:01 joerg Exp $
+
+--- configure.orig     2006-03-29 20:51:26.000000000 +0000
++++ configure
+@@ -1501,14 +1501,14 @@ else
+ fi
+ done
+ 
+-echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6
+-echo "configure:1506: checking for pthread_mutex_init in -lpthread" >&5
++echo $ac_n "checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}""... $ac_c" 1>&6
++echo "configure:1506: checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
+ ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lpthread  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 1514 "configure"
+ #include "confdefs.h"
+@@ -1536,7 +1536,7 @@ LIBS="$ac_save_LIBS"
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  PTHREAD_LIBS="-lpthread"
++  PTHREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+ else
+   echo "$ac_t""no" 1>&6
+ { echo "configure: error: "Urban needs pthreads"" 1>&2; exit 1; }