Fix pthread detection. Fix compilation on DragonFly.

4 files changed, 49 insertions, 2 deletions

diff --git a/geography/gpsd/Makefile b/geography/gpsd/Makefile
index 5dd1cfe380a..be060a30f4a 100644
--- a/geography/gpsd/Makefile
+++ b/geography/gpsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/03/02 20:05:57 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2006/04/20 15:28:00 joerg Exp $
 
 DISTNAME=	gpsd-2.31
 CATEGORIES=	geography
@@ -14,4 +14,5 @@ USE_LIBTOOL=	yes
 INSTALLATION_DIRS=	sbin
 
 .include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/gpsd/distinfo b/geography/gpsd/distinfo
index 7a34028d2f3..01dfef213fc 100644
--- a/geography/gpsd/distinfo
+++ b/geography/gpsd/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2006/03/02 20:05:57 drochner Exp $
+$NetBSD: distinfo,v 1.4 2006/04/20 15:28:00 joerg Exp $
 
 SHA1 (gpsd-2.31.tar.gz) = c9f35d3b34023df1d3b4814f9c5fb4ed404fb898
 RMD160 (gpsd-2.31.tar.gz) = 00c2d41b7cf18842699203e1bb3b564d167db956
 Size (gpsd-2.31.tar.gz) = 620460 bytes
+SHA1 (patch-aa) = 801944a684e697a169e5bab927afa964613fbd4f
 SHA1 (patch-ab) = 0703e9da1e6f34bd575c6b61f891fc13a3598bb4
+SHA1 (patch-ac) = f8e15b9a409bc9cd8b32bebbf446cf71ba90475f
diff --git a/geography/gpsd/patches/patch-aa b/geography/gpsd/patches/patch-aa
new file mode 100644
index 00000000000..3e93cfb1358
--- /dev/null
+++ b/geography/gpsd/patches/patch-aa
@@ -0,0 +1,30 @@
+$NetBSD: patch-aa,v 1.3 2006/04/20 15:28:00 joerg Exp $
+
+--- configure.orig	2006-04-20 15:05:19.000000000 +0000
++++ configure
+@@ -22197,13 +22197,13 @@ if test $ac_cv_lib_c_open = yes; then
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for main in -lpthread" >&5
+-echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for main in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for main in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_main+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
+@@ -22256,7 +22256,7 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5
+ echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6
+ if test $ac_cv_lib_pthread_main = yes; then
+-  LIBPTHREAD="-lpthread"
++  LIBPTHREAD="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+ fi
+ 
+ 
diff --git a/geography/gpsd/patches/patch-ac b/geography/gpsd/patches/patch-ac
new file mode 100644
index 00000000000..e31dc8f6436
--- /dev/null
+++ b/geography/gpsd/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2006/04/20 15:28:00 joerg Exp $
+
+--- gpspipe.c.orig	2006-04-20 15:17:54.000000000 +0000
++++ gpspipe.c
+@@ -25,7 +25,8 @@
+  */
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <errno.h>
+ #include <stdio.h>
+-#include <sys/socket.h>
+ #include <unistd.h>
+ #include <string.h>