diff options
| author | joerg <joerg@pkgsrc.org> | 2007-02-19 18:22:58 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-02-19 18:22:58 +0000 |
| commit | c076f840bdcc8b8a6793be40be8c486db1379e37 (patch) | |
| tree | 9ad1188673dc8b0fc472e84494b611ebe7b8489d /net/kismet | |
| parent | 7193cafcfc4756a5f6894b5188117d89bd8896aa (diff) | |
| download | pkgsrc-c076f840bdcc8b8a6793be40be8c486db1379e37.tar.gz | |
Improve pthread test and handle modular Xorg.
Diffstat (limited to 'net/kismet')
| -rw-r--r-- | net/kismet/distinfo | 4 | ||||
| -rw-r--r-- | net/kismet/options.mk | 4 | ||||
| -rw-r--r-- | net/kismet/patches/patch-aa | 32 |
3 files changed, 33 insertions, 7 deletions
diff --git a/net/kismet/distinfo b/net/kismet/distinfo index bf638d390a1..455bde7cc04 100644 --- a/net/kismet/distinfo +++ b/net/kismet/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2006/10/14 01:27:43 rillig Exp $ +$NetBSD: distinfo,v 1.4 2007/02/19 18:22:58 joerg Exp $ SHA1 (kismet-2006-04-R1.tar.gz) = e48ce08e96328bfdac98152df6b5759c27ed9169 RMD160 (kismet-2006-04-R1.tar.gz) = b709256198820d5ac650ce40dea637716427a8b7 Size (kismet-2006-04-R1.tar.gz) = 1005068 bytes -SHA1 (patch-aa) = b8544ebae5378fbcd787c619174fc7887b1f83f7 +SHA1 (patch-aa) = 5284efe0cb7e2a10c21d5235dae3a1faffff4809 SHA1 (patch-ab) = a77adf2212909b18f7afb65cdfb19539ee3b2f0b SHA1 (patch-ac) = cb02c5d97b22a49e8c59ae2d62537a6cbdd899da SHA1 (patch-ad) = 6442e2f571cb266560eaa8dc5e6500ff1b9db4fb diff --git a/net/kismet/options.mk b/net/kismet/options.mk index 23a1496cf8c..c9ad46680f1 100644 --- a/net/kismet/options.mk +++ b/net/kismet/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1.1.1 2006/08/03 15:09:49 salo Exp $ +# $NetBSD: options.mk,v 1.2 2007/02/19 18:22:58 joerg Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.kismet @@ -13,5 +13,5 @@ DEPENDS+= wget>=1.9.1:../../net/wget .include "../../devel/gmp/buildlink3.mk" .include "../../graphics/ImageMagick/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" -.include "../../mk/x11.buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .endif diff --git a/net/kismet/patches/patch-aa b/net/kismet/patches/patch-aa index be027797844..2d9798aaf96 100644 --- a/net/kismet/patches/patch-aa +++ b/net/kismet/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2006/10/14 01:27:44 rillig Exp $ +$NetBSD: patch-aa,v 1.3 2007/02/19 18:22:59 joerg Exp $ ---- configure.orig 2006-01-04 16:53:37.000000000 +0100 -+++ configure 2006-10-14 03:22:26.000000000 +0200 +--- configure.orig 2006-01-04 15:53:37.000000000 +0000 ++++ configure @@ -5689,7 +5689,7 @@ fi @@ -28,3 +28,29 @@ $NetBSD: patch-aa,v 1.2 2006/10/14 01:27:44 rillig Exp $ #include <sys/socket.h> #include <net/if.h> #include <net/if_media.h> +@@ -8540,13 +8541,13 @@ echo "${ECHO_T}$ac_cv_header_pthread_h" + + fi + if test $ac_cv_header_pthread_h = yes; then +- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 ++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6 + if test "${ac_cv_lib_pthread_pthread_create+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 +@@ -8625,7 +8626,7 @@ fi + echo "$as_me: WARNING: *** GPSMap will be built without pthread support. ***" >&2;}; + threadlib="" + else +- threadlib="-lpthread" ++ threadlib="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" + fi + + # Update the companion to this... |