From e928aadb182603e5fad9b32ee30ebc2ac1dd3c08 Mon Sep 17 00:00:00 2001
From: jakemsr <jakemsr@openbsd.org>
Date: Tue, 28 Mar 2006 10:25:09 +0000
Subject: [PATCH] use the right CFLAGS for pthread linkage

ok jolan@
---
 multimedia/libdvdnav/Makefile                 |  5 ++---
 .../libdvdnav/patches/patch-configure_ac      | 20 +++++++++++++++----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index 356e1f6eb26..0a028e474a8 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2005/12/28 15:28:28 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.7 2006/03/28 10:25:09 jakemsr Exp $
 
 COMMENT=	"DVD read/navigation library"
 DISTNAME=	libdvdnav-20051102
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	multimedia
 
 SHARED_LIBS=		dvdnav	5.0
@@ -23,7 +23,6 @@ AUTOCONF_VERSION=2.59
 USE_LIBTOOL=	Yes
 
 BUILD_DEPENDS=	${MODGNU_AUTOCONF_DEPENDS} ${MODGNU_AUTOMAKE_DEPENDS}
-WANTLIB=	pthread
 
 CONFIGURE_STYLE=gnu
 
diff --git a/multimedia/libdvdnav/patches/patch-configure_ac b/multimedia/libdvdnav/patches/patch-configure_ac
index bfa6791c374..bf5ce2379b3 100644
--- a/multimedia/libdvdnav/patches/patch-configure_ac
+++ b/multimedia/libdvdnav/patches/patch-configure_ac
@@ -1,7 +1,19 @@
-$OpenBSD: patch-configure_ac,v 1.1 2005/11/03 04:25:08 jolan Exp $
---- configure.ac.orig	Mon Jan  3 14:24:21 2005
-+++ configure.ac	Wed Nov  2 14:04:07 2005
-@@ -174,7 +174,7 @@ dnl ------------------------------------
+$OpenBSD: patch-configure_ac,v 1.2 2006/03/28 10:25:10 jakemsr Exp $
+--- configure.ac.orig	Sat Mar 25 18:00:02 2006
++++ configure.ac	Sat Mar 25 18:01:37 2006
+@@ -138,6 +138,11 @@ case $host in
+     THREAD_CFLAGS="-I/usr/local/include -D_THREAD_SAFE"
+     CFLAGS="$THREAD_CFLAGS $CFLAGS"
+     ;;
++  *-*-openbsd*)
++    THREAD_LIBS="-pthread"
++    THREAD_CFLAGS="-pthread"
++    CFLAGS="$CFLAGS $THREAD_CFLAGS"
++    ;;
+   *mingw32* | *cygwin*)
+     ;;
+   *)
+@@ -174,7 +179,7 @@ dnl ------------------------------------
  dnl cflags
  dnl ---------------------------------------------
  dnl Common cflags for all platforms