From 2e54c5d7cd4ff4c679db7200be292684b4e0277e Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Thu, 22 May 2008 19:31:09 +0000
Subject: [PATCH] - fix LIB_DEPENDS after pwlib FLAVORs merge -
 s/lpthread/pthread

---
 x11/gnome/ekiga/Makefile                | 7 ++++---
 x11/gnome/ekiga/patches/patch-configure | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/x11/gnome/ekiga/Makefile b/x11/gnome/ekiga/Makefile
index 369e3e8260e..153da1a6412 100644
--- a/x11/gnome/ekiga/Makefile
+++ b/x11/gnome/ekiga/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2008/05/21 14:15:29 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.2 2008/05/22 19:31:09 ajacoutot Exp $
 
 COMMENT=	SIP and H.323 compatible conferencing application
 
 GNOME_PROJECT=	ekiga
 GNOME_VERSION=	2.0.12
+PKGNAME=	${DISTNAME}p0
 
 CATEGORIES=	net multimedia
 
@@ -35,7 +36,7 @@ MODULES=	devel/gettext \
 BUILD_DEPENDS=	:scrollkeeper-*:textproc/scrollkeeper \
 		::x11/gnome/doc-utils
 RUN_DEPENDS=	:scrollkeeper-*:textproc/scrollkeeper
-LIB_DEPENDS=	pt.>=2:pwlib-*-ldap:devel/pwlib,ldap \
+LIB_DEPENDS=	pt.>=2::devel/pwlib \
 		gnomeui-2.>=2000::x11/gnome/libgnomeui \
 		opal::net/opal \
 		SDL.>=8::devel/sdl \
@@ -46,7 +47,7 @@ DESKTOP_FILES=	Yes
 MODGNOME_HELP_FILES=Yes
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -pthread"
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -pthread"
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--enable-dbus \
 		--disable-schemas-install \
diff --git a/x11/gnome/ekiga/patches/patch-configure b/x11/gnome/ekiga/patches/patch-configure
index 279318ecdf5..c4ea7370bbc 100644
--- a/x11/gnome/ekiga/patches/patch-configure
+++ b/x11/gnome/ekiga/patches/patch-configure
@@ -1,4 +1,4 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2008/05/21 14:15:29 ajacoutot Exp $
+$OpenBSD: patch-configure,v 1.2 2008/05/22 19:31:09 ajacoutot Exp $
 --- configure.orig	Mon Mar 10 11:31:22 2008
 +++ configure	Tue Apr 29 11:52:48 2008
 @@ -22060,8 +22060,8 @@ EKIGA_CFLAGS="$EKIGA_CFLAGS $EDS_CFLAGS"
@@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2008/05/21 14:15:29 ajacoutot Exp $
  
 +  OpenBSD* | openbsd* )
 +    ARCH_OPAL_CFLAGS="-DPTRACING -DNDEBUG"
-+    ARCH_OPAL_LIBS="-lpt -lopal -lpthread"
++    ARCH_OPAL_LIBS="-lpt -lopal -pthread"
 +    { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
 +    gm_platform="openbsd"