summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/urban/Makefile3
-rw-r--r--games/urban/distinfo3
-rw-r--r--games/urban/patches/patch-ah31
3 files changed, 35 insertions, 2 deletions
diff --git a/games/urban/Makefile b/games/urban/Makefile
index 62f6bc9c2fc..ada1b3d921e 100644
--- a/games/urban/Makefile
+++ b/games/urban/Makefile
@@ -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 @@ MAINTAINER= pkgsrc-users@NetBSD.org
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 --git a/games/urban/distinfo b/games/urban/distinfo
index f9f179aaabf..548810703b0 100644
--- a/games/urban/distinfo
+++ b/games/urban/distinfo
@@ -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-ad) = 6b877d79f6f5d2c26f8072979a5d0285f1448ff5
SHA1 (patch-ae) = 637883461b08a002fc75bb49ae18298f1d35bd79
SHA1 (patch-af) = c1aad1d42792113e56e60a6a2a572d33aad1000b
SHA1 (patch-ag) = 181df221bf1f8ba7ee649315257d47e832b19b1a
+SHA1 (patch-ah) = e11a947ef03677dec035e30dfb06dcf24eb03cf6
diff --git a/games/urban/patches/patch-ah b/games/urban/patches/patch-ah
new file mode 100644
index 00000000000..ce382d0ef48
--- /dev/null
+++ b/games/urban/patches/patch-ah
@@ -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; }