- use pthread.buildlink3.mk instead of hardcoded '-lpthread' per

  discussion on tech-pkg.

4 files changed, 31 insertions, 2 deletions

diff --git a/www/libproxy/Makefile b/www/libproxy/Makefile
index c0a96f33f36..6eba6e29115 100644
--- a/www/libproxy/Makefile
+++ b/www/libproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/12/15 11:00:11 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/08/17 13:10:22 seanb Exp $
 #
 
 DISTNAME=	libproxy-0.3.0
@@ -27,4 +27,5 @@ PKGCONFIG_OVERRIDE+=	libproxy-1.0.pc.in
 
 #.include "../../lang/python/extension.mk"
 .include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/libproxy/distinfo b/www/libproxy/distinfo
index f968b9baf5c..6cdc50641b2 100644
--- a/www/libproxy/distinfo
+++ b/www/libproxy/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.5 2009/12/15 11:00:11 wiz Exp $
+$NetBSD: distinfo,v 1.6 2010/08/17 13:10:22 seanb Exp $
 
 SHA1 (libproxy-0.3.0.tar.gz) = 9d0d29b352a2cc4d9511d362bc02162eca91df59
 RMD160 (libproxy-0.3.0.tar.gz) = 270d216a1e9c1d174ffc1572d2bdaa30bb51d034
 Size (libproxy-0.3.0.tar.gz) = 367083 bytes
+SHA1 (patch-aa) = 08baf8aeab5a1060cc5a6fa0435199892c7a0ab6
+SHA1 (patch-ab) = b2bd350d3af3274fa028612dbe6e2cb8ddd3e8bd
diff --git a/www/libproxy/patches/patch-aa b/www/libproxy/patches/patch-aa
new file mode 100644
index 00000000000..9b40329aa47
--- /dev/null
+++ b/www/libproxy/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.6 2010/08/17 13:10:22 seanb Exp $
+
+--- src/lib/Makefile.am.orig	2009-08-14 19:00:32.000000000 +0000
++++ src/lib/Makefile.am
+@@ -11,7 +11,7 @@ libproxy_la_SOURCES = \
+ 						url.c url.h
+ 
+ libproxy_la_CFLAGS  = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L
+-libproxy_la_LDFLAGS = -lpthread -lm -no-undefined
++libproxy_la_LDFLAGS = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -lm -no-undefined
+ 
+ include_HEADERS     = proxy.h
+ 
diff --git a/www/libproxy/patches/patch-ab b/www/libproxy/patches/patch-ab
new file mode 100644
index 00000000000..cc63143aad4
--- /dev/null
+++ b/www/libproxy/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2010/08/17 13:10:22 seanb Exp $
+
+--- src/lib/Makefile.in.orig	2009-08-14 19:05:15.000000000 +0000
++++ src/lib/Makefile.in
+@@ -278,7 +278,7 @@ libproxy_la_SOURCES = \
+ 						url.c url.h
+ 
+ libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L
+-libproxy_la_LDFLAGS = -lpthread -lm -no-undefined
++libproxy_la_LDFLAGS = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -lm -no-undefined
+ include_HEADERS = proxy.h
+ all: all-am
+