From 468e86366b85e83534b19ec8ee59bd3d3e4e4740 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sat, 1 Jun 2013 14:18:40 +0000
Subject: [PATCH] Remove pthread patches.

---
 net/amsn/Makefile                         |  4 +-
 net/amsn/patches/patch-configure          | 28 +---------
 net/cadaver/Makefile                      |  4 +-
 net/cadaver/patches/patch-configure       | 57 --------------------
 net/flvstreamer/Makefile                  |  3 +-
 net/flvstreamer/patches/patch-Makefile    | 11 +---
 net/mktorrent/Makefile                    |  3 +-
 net/mktorrent/patches/patch-BSDmakefile   | 12 -----
 net/nagios/nagios/Makefile                |  3 +-
 net/nagios/nagios/patches/patch-configure | 60 +--------------------
 net/pmacct/Makefile                       |  4 +-
 net/pmacct/patches/patch-configure        | 11 +---
 net/spectrum-tools/Makefile               |  7 ++-
 net/xchat/Makefile                        |  4 +-
 net/xchat/patches/patch-configure         | 66 -----------------------
 net/yersinia/Makefile                     |  4 +-
 net/yersinia/patches/patch-configure      | 20 +------
 17 files changed, 24 insertions(+), 277 deletions(-)
 delete mode 100644 net/cadaver/patches/patch-configure
 delete mode 100644 net/mktorrent/patches/patch-BSDmakefile
 delete mode 100644 net/xchat/patches/patch-configure

diff --git a/net/amsn/Makefile b/net/amsn/Makefile
index 648e3884721..eab29816cf2 100644
--- a/net/amsn/Makefile
+++ b/net/amsn/Makefile
@@ -1,11 +1,11 @@
-#$OpenBSD: Makefile,v 1.26 2013/03/11 11:35:45 espie Exp $
+#$OpenBSD: Makefile,v 1.27 2013/06/01 14:18:40 ajacoutot Exp $
 
 COMMENT=	open source MSN Messenger clone
 
 V=		0.98.9
 DISTNAME=	amsn-$V-src
 PKGNAME=	${DISTNAME:S/-src//}
-REVISION=	2
+REVISION=	3
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.amsn-project.net/
diff --git a/net/amsn/patches/patch-configure b/net/amsn/patches/patch-configure
index 2f961accebd..6a4b6f7a8a0 100644
--- a/net/amsn/patches/patch-configure
+++ b/net/amsn/patches/patch-configure
@@ -1,4 +1,4 @@
-$OpenBSD: patch-configure,v 1.7 2012/08/12 17:33:04 jasper Exp $
+$OpenBSD: patch-configure,v 1.8 2013/06/01 14:18:40 ajacoutot Exp $
 --- configure.orig	Wed May 23 22:28:25 2012
 +++ configure	Sun Jul  8 18:18:32 2012
 @@ -2305,8 +2305,8 @@ case `uname -s` in
@@ -83,29 +83,3 @@ $OpenBSD: patch-configure,v 1.7 2012/08/12 17:33:04 jasper Exp $
  
  
  		for i in $dirs ; do
-@@ -4946,13 +4929,13 @@ fi
- done
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
--$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -pthread" >&5
-+$as_echo_n "checking for pthread_create in -pthread... " >&6; }
- if ${ac_cv_lib_pthread_pthread_create+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -4983,7 +4966,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
- $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
- if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
--  LIBPTHREAD="-lpthread"
-+  LIBPTHREAD="-pthread"
- fi
- 
- if test "$LIBPTHREAD" = ""; then
diff --git a/net/cadaver/Makefile b/net/cadaver/Makefile
index f9c5d9c1d59..cf80ae32864 100644
--- a/net/cadaver/Makefile
+++ b/net/cadaver/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2013/03/11 11:35:45 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2013/06/01 14:18:40 ajacoutot Exp $
 
 COMMENT=		command-line WebDAV client
 
 DISTNAME=		cadaver-0.23.3
-REVISION=		0
+REVISION=		1
 CATEGORIES=		net www
 
 HOMEPAGE=		http://www.webdav.org/cadaver/
diff --git a/net/cadaver/patches/patch-configure b/net/cadaver/patches/patch-configure
deleted file mode 100644
index 0944f154083..00000000000
--- a/net/cadaver/patches/patch-configure
+++ /dev/null
@@ -1,57 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2010/04/30 09:41:20 jasper Exp $
---- configure.orig	Tue Dec 15 23:36:26 2009
-+++ configure	Fri Apr 30 11:39:15 2010
-@@ -24397,13 +24397,13 @@ rm -f core conftest.err conftest.$ac_objext conftest_i
-         if test -n "$gl_have_pthread"; then
-           # The program links fine without libpthread. But it may actually
-           # need to link with libpthread in order to create multiple threads.
--          { $as_echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5
--$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
-+          { $as_echo "$as_me:$LINENO: checking for pthread_kill in -pthread" >&5
-+$as_echo_n "checking for pthread_kill in -pthread... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24463,7 +24463,7 @@ fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_kill" >&5
- $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
- if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then
--  LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
-+  LIBMULTITHREAD=-pthread LTLIBMULTITHREAD=-pthread
-              # On Solaris and HP-UX, most pthread functions exist also in libc.
-              # Therefore pthread_in_use() needs to actually try to create a
-              # thread: pthread_create from libc will fail, whereas
-@@ -24481,13 +24481,13 @@ fi
- 
-         else
-           # Some library is needed. Try libpthread and libc_r.
--          { $as_echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5
--$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
-+          { $as_echo "$as_me:$LINENO: checking for pthread_kill in -pthread" >&5
-+$as_echo_n "checking for pthread_kill in -pthread... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24548,8 +24548,8 @@ fi
- $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
- if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then
-   gl_have_pthread=yes
--             LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
--             LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
-+             LIBTHREAD=-pthread LTLIBTHREAD=-pthread
-+             LIBMULTITHREAD=-pthread LTLIBMULTITHREAD=-pthread
- fi
- 
-           if test -z "$gl_have_pthread"; then
diff --git a/net/flvstreamer/Makefile b/net/flvstreamer/Makefile
index 6ac5c0679b5..7fed5401e93 100644
--- a/net/flvstreamer/Makefile
+++ b/net/flvstreamer/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2013/03/11 11:35:46 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2013/06/01 14:18:40 ajacoutot Exp $
 
 COMMENT =		dump unencrypted RTMP media streams
 
 DISTNAME =		flvstreamer-2.1c1
 WRKDIST =		${WRKDIR}/flvstreamer
+REVISION =		0
 
 CATEGORIES =		net
 
diff --git a/net/flvstreamer/patches/patch-Makefile b/net/flvstreamer/patches/patch-Makefile
index 05aaca8fb83..af46ca9e9d1 100644
--- a/net/flvstreamer/patches/patch-Makefile
+++ b/net/flvstreamer/patches/patch-Makefile
@@ -1,15 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.5 2010/02/26 18:46:52 sthen Exp $
+$OpenBSD: patch-Makefile,v 1.6 2013/06/01 14:18:40 ajacoutot Exp $
 --- Makefile.orig	Mon Feb 15 01:06:20 2010
 +++ Makefile	Tue Feb 23 21:38:08 2010
-@@ -6,7 +6,7 @@ OPT=-O2
- CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
- LDFLAGS=-Wall $(XLDFLAGS)
- LIBS=
--THREADLIB=-lpthread
-+THREADLIB=-pthread
- SLIBS=$(THREADLIB) $(LIBS)
- 
- EXT=
 @@ -34,16 +34,16 @@ clean:
  	rm -f *.o flvstreamer$(EXT) streams$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT)
  
diff --git a/net/mktorrent/Makefile b/net/mktorrent/Makefile
index 8592bde1ffa..27f7fe53ddc 100644
--- a/net/mktorrent/Makefile
+++ b/net/mktorrent/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2013/03/11 11:35:49 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2013/06/01 14:18:40 ajacoutot Exp $
 
 COMMENT =	command-line .torrent file creator
 
 DISTNAME =	mktorrent-1.0
 CATEGORIES =	net
 HOMEPAGE =	http://mktorrent.sourceforge.net/
+REVISION =	0
 
 MAINTAINER =	Gonzalo L. R. <gonzalo@openbsd.org>
 
diff --git a/net/mktorrent/patches/patch-BSDmakefile b/net/mktorrent/patches/patch-BSDmakefile
deleted file mode 100644
index f3ea33d252e..00000000000
--- a/net/mktorrent/patches/patch-BSDmakefile
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-BSDmakefile,v 1.1 2012/07/08 21:23:24 gonzalo Exp $
---- BSDmakefile.orig	Tue Aug 25 15:53:22 2009
-+++ BSDmakefile	Tue Jun 26 10:57:51 2012
-@@ -25,7 +25,7 @@ PREFIX  ?= /usr/local
- .ifdef USE_PTHREADS
- DEFINES += -DUSE_PTHREADS
- SRCS := $(SRCS:hash.c=hash_pthreads.c)
--LIBS += -lpthread
-+LIBS += -pthread
- .endif
- 
- .ifdef USE_OPENSSL
diff --git a/net/nagios/nagios/Makefile b/net/nagios/nagios/Makefile
index d8ceb4b1667..2a330726784 100644
--- a/net/nagios/nagios/Makefile
+++ b/net/nagios/nagios/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.58 2013/05/05 22:13:48 rpe Exp $
+# $OpenBSD: Makefile,v 1.59 2013/06/01 14:18:40 ajacoutot Exp $
 
 COMMENT-main=	host and service monitor
 COMMENT-web=	cgis and webpages for nagios
@@ -9,6 +9,7 @@ PKGNAME-main=	nagios-$V
 PKGNAME-web=	nagios-web-$V
 WRKDIST=	${WRKDIR}/nagios
 CATEGORIES=	net
+REVISION-main=	0
 
 HOMEPAGE=	http://www.nagios.org/
 
diff --git a/net/nagios/nagios/patches/patch-configure b/net/nagios/nagios/patches/patch-configure
index eeb63d3bef6..23ba3553f79 100644
--- a/net/nagios/nagios/patches/patch-configure
+++ b/net/nagios/nagios/patches/patch-configure
@@ -1,4 +1,4 @@
-$OpenBSD: patch-configure,v 1.13 2013/05/05 22:13:48 rpe Exp $
+$OpenBSD: patch-configure,v 1.14 2013/06/01 14:18:40 ajacoutot Exp $
 --- configure.orig	Fri Mar 15 12:14:02 2013
 +++ configure	Mon May  6 00:05:06 2013
 @@ -572,7 +572,7 @@ do
@@ -10,64 +10,6 @@ $OpenBSD: patch-configure,v 1.13 2013/05/05 22:13:48 rpe Exp $
  
    -target | --target | --targe | --targ | --tar | --ta | --t)
      ac_prev=target_alias ;;
-@@ -5132,20 +5132,20 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_cma_pthread_create" >&5
- echo "${ECHO_T}$ac_cv_lib_cma_pthread_create" >&6
- if test $ac_cv_lib_cma_pthread_create = yes; then
--  THREADLIBS="$THREADLIBS -lpthread"
-+  THREADLIBS="$THREADLIBS -pthread"
- fi
- 
- if test $ac_cv_lib_cma_pthread_create = yes; then
- 	have_pthreads="yes"
- fi
- 
--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" >&5
-+echo $ECHO_N "checking for pthread_create in -pthread... $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  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5204,19 +5204,19 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
- if test $ac_cv_lib_pthread_pthread_create = yes; then
--  THREADLIBS="$THREADLIBS -lpthread"
-+  THREADLIBS="$THREADLIBS -pthread"
- fi
- 
- if test $ac_cv_lib_pthread_pthread_create = yes; then
- 	have_pthreads="yes"
- else
--		echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
--echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6
-+		echo "$as_me:$LINENO: checking for pthread_mutex_init in -pthread" >&5
-+echo $ECHO_N "checking for pthread_mutex_init in -pthread... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5275,7 +5275,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_init" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_init" >&6
- if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then
--  THREADLIBS="$THREADLIBS -lpthread"
-+  THREADLIBS="$THREADLIBS -pthread"
- fi
- 
- 	if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then
 @@ -5666,7 +5666,7 @@ cat >>confdefs.h <<_ACEOF
  #define DEFAULT_NAGIOS_GROUP "$nagios_grp"
  _ACEOF
diff --git a/net/pmacct/Makefile b/net/pmacct/Makefile
index 85cf21bb6d4..430da417274 100644
--- a/net/pmacct/Makefile
+++ b/net/pmacct/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2013/05/25 00:33:10 brad Exp $
+# $OpenBSD: Makefile,v 1.16 2013/06/01 14:18:40 ajacoutot Exp $
 
 COMMENT=	IP accounting software
 
 DISTNAME=	pmacct-0.12.5
-REVISION=	2
+REVISION=	3
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.pmacct.net/
diff --git a/net/pmacct/patches/patch-configure b/net/pmacct/patches/patch-configure
index 7bcec29db7a..89e7eff16d3 100644
--- a/net/pmacct/patches/patch-configure
+++ b/net/pmacct/patches/patch-configure
@@ -1,4 +1,4 @@
-$OpenBSD: patch-configure,v 1.3 2010/04/15 09:15:06 sthen Exp $
+$OpenBSD: patch-configure,v 1.4 2013/06/01 14:18:40 ajacoutot Exp $
 --- configure.orig	Wed Apr  7 07:35:51 2010
 +++ configure	Wed Apr  7 10:02:07 2010
 @@ -1083,7 +1083,7 @@ fi
@@ -10,12 +10,3 @@ $OpenBSD: patch-configure,v 1.3 2010/04/15 09:15:06 sthen Exp $
    case "$host_os" in
      IRIX*)
        CFLAGS="-mabi=n32 -fno-builtins ${CFLAGS}"
-@@ -3466,7 +3466,7 @@ EOF
- 	  
- 
- 
--	  LIBS="${LIBS} -lpthread"
-+	  LIBS="${LIBS} -pthread"
- 	  THREADS_SOURCES="thread_pool.c"
- 	else
-           echo "$ac_t""no" 1>&6
diff --git a/net/spectrum-tools/Makefile b/net/spectrum-tools/Makefile
index 6e482629d65..d80cb5e68cc 100644
--- a/net/spectrum-tools/Makefile
+++ b/net/spectrum-tools/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2013/03/11 11:35:56 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2013/06/01 14:18:40 ajacoutot Exp $
 
 COMMENT-main =	graphical tools for the MetaGeek Wi-spy spectrum analyser
 COMMENT-utils =	tools for the MetaGeek Wi-spy spectrum analyser
@@ -10,6 +10,8 @@ PKGNAME =	spectrum-tools-$V
 FULLPKGNAME-main =  spectrum-tools-${V:S/-//g}
 FULLPKGNAME-utils = spectrum-tools-utils-${V:S/-//g}
 
+REVISION-main=	0
+
 CATEGORIES =	net
 
 MASTER_SITES =	http://www.kismetwireless.net/code/
@@ -53,9 +55,6 @@ USE_GMAKE =		Yes
 
 NO_TEST =		Yes
 
-pre-configure:
-	perl -pi -e 's,-lpthread,-pthread,g' ${WRKSRC}/configure
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/spectrum-tools
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/spectrum-tools
diff --git a/net/xchat/Makefile b/net/xchat/Makefile
index c55e5565dce..b2339e2a379 100644
--- a/net/xchat/Makefile
+++ b/net/xchat/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.85 2013/03/21 08:46:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.86 2013/06/01 14:18:40 ajacoutot Exp $
 
 COMMENT=	GTK+2 IRC client
 
 MAJOR=		2.8
 VERSION=	${MAJOR}.8
 DISTNAME=	xchat-${VERSION}
-REVISION=	2
+REVISION=	3
 
 CATEGORIES=	net x11
 
diff --git a/net/xchat/patches/patch-configure b/net/xchat/patches/patch-configure
deleted file mode 100644
index 6359471e9fe..00000000000
--- a/net/xchat/patches/patch-configure
+++ /dev/null
@@ -1,66 +0,0 @@
-$OpenBSD: patch-configure,v 1.6 2010/09/23 09:27:21 dcoppa Exp $
---- configure.orig	Mon Sep 20 10:02:51 2010
-+++ configure	Mon Sep 20 10:08:38 2010
-@@ -12694,13 +12694,13 @@ rm -f core conftest.err conftest.$ac_objext \
-         if test -n "$gl_have_pthread"; then
-           # The program links fine without libpthread. But it may actually
-           # need to link with libpthread in order to create multiple threads.
--          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
--$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
-+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -pthread" >&5
-+$as_echo_n "checking for pthread_kill in -pthread... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -12731,7 +12731,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
- $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
- if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then :
--  LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
-+  LIBMULTITHREAD=-pthread LTLIBMULTITHREAD=-pthread
-              # On Solaris and HP-UX, most pthread functions exist also in libc.
-              # Therefore pthread_in_use() needs to actually try to create a
-              # thread: pthread_create from libc will fail, whereas
-@@ -12747,13 +12747,13 @@ fi
- 
-         else
-           # Some library is needed. Try libpthread and libc_r.
--          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
--$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
-+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -pthread" >&5
-+$as_echo_n "checking for pthread_kill in -pthread... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -12785,8 +12785,8 @@ fi
- $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
- if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then :
-   gl_have_pthread=yes
--             LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
--             LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
-+             LIBTHREAD=-pthread LTLIBTHREAD=-pthread
-+             LIBMULTITHREAD=-pthread LTLIBMULTITHREAD=-pthread
- fi
- 
-           if test -z "$gl_have_pthread"; then
-@@ -17414,7 +17414,7 @@ $as_echo_n "checking Python compile flags... " >&6; }
-                         PY_PREFIX=`$pythonpath -c 'import sys; print sys.prefix'`
-                         PY_EXEC_PREFIX=`$pythonpath -c 'import sys; print sys.exec_prefix'`
-                         if test -f $PY_INC/Python.h; then
--                                PY_LIBS="-L$PY_LIB/config -lpython$PY_VER -lpthread -lutil"
-+                                PY_LIBS="-L$PY_LIB/config -lpython$PY_VER -pthread -lutil"
-                                 PY_CFLAGS="-I$PY_INC"
-                                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
- $as_echo "ok" >&6; }
diff --git a/net/yersinia/Makefile b/net/yersinia/Makefile
index 93ef2676a44..b96ccc62e53 100644
--- a/net/yersinia/Makefile
+++ b/net/yersinia/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2013/03/11 11:35:58 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2013/06/01 14:18:40 ajacoutot Exp $
 
 COMMENT =	framework for analysis of layer 2 network protocols
 
 DISTNAME =	yersinia-0.7.1
 CATEGORIES =	net security
-REVISION =	2
+REVISION =	3
 
 HOMEPAGE =	http://www.yersinia.net/
 
diff --git a/net/yersinia/patches/patch-configure b/net/yersinia/patches/patch-configure
index e09b23cbe5b..29c8c59960f 100644
--- a/net/yersinia/patches/patch-configure
+++ b/net/yersinia/patches/patch-configure
@@ -1,4 +1,4 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2010/10/25 23:12:02 steven Exp $
+$OpenBSD: patch-configure,v 1.2 2013/06/01 14:18:40 ajacoutot Exp $
 --- configure.orig	Fri Jan 26 20:22:30 2007
 +++ configure	Tue Sep 23 14:13:54 2008
 @@ -3470,7 +3470,7 @@ fi
@@ -19,21 +19,3 @@ $OpenBSD: patch-configure,v 1.1.1.1 2010/10/25 23:12:02 steven Exp $
  
  
  
-@@ -6676,7 +6676,7 @@ if test "${ac_cv_lib_pthread_pthread_create+set}" = se
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -6736,7 +6736,7 @@ if test $ac_cv_lib_pthread_pthread_create = yes; then
- #define HAVE_LIBPTHREAD 1
- _ACEOF
- 
--  LIBS="-lpthread $LIBS"
-+  LIBS="-pthread $LIBS"
- 
- else
-