[pkgsrc/trunk]: pkgsrc/security/gpgme Don't hard-wire -lpthread into gpgme-co...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/20a370d7d0c3
branches:  trunk
changeset: 507918:20a370d7d0c3
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Feb 11 14:11:07 2006 +0000

description:
Don't hard-wire -lpthread into gpgme-config, it breaks e.g. mail/balsa2
on DragonFly. Bump revision.

diffstat:

 security/gpgme/Makefile         |  10 ++++++++--
 security/gpgme/distinfo         |   4 ++--
 security/gpgme/patches/patch-aa |  15 +++++++++++++--
 3 files changed, 23 insertions(+), 6 deletions(-)

diffs (67 lines):

diff -r d2255d2022f6 -r 20a370d7d0c3 security/gpgme/Makefile
--- a/security/gpgme/Makefile   Sat Feb 11 13:24:30 2006 +0000
+++ b/security/gpgme/Makefile   Sat Feb 11 14:11:07 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2006/02/11 14:11:07 joerg Exp $
 #
 
 DISTNAME=      gpgme-1.0.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/gpgme/ \
                ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/
@@ -17,6 +17,12 @@
 GNU_CONFIGURE=         YES
 PTHREAD_OPTS+=         require
 
+SUBST_CLASSES+=                pthread
+SUBST_FILES.pthread=   gpgme/gpgme-config.in
+SUBST_SED.pthread+=    -e 's,@PTHREAD_LIBS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g'
+SUBST_SED.pthread+=    -e 's,@PTHREAD_CFLAGS@,${PTHREAD_CFLAGS},g'
+SUBST_STAGE.pthread=   post-patch
+
 PKG_OPTIONS_VAR=        PKG_OPTIONS.gpgme
 PKG_SUPPORTED_OPTIONS= gpgsm
 .include "../../mk/bsd.options.mk"
diff -r d2255d2022f6 -r 20a370d7d0c3 security/gpgme/distinfo
--- a/security/gpgme/distinfo   Sat Feb 11 13:24:30 2006 +0000
+++ b/security/gpgme/distinfo   Sat Feb 11 14:11:07 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.20 2005/11/04 17:16:34 joerg Exp $
+$NetBSD: distinfo,v 1.21 2006/02/11 14:11:07 joerg Exp $
 
 SHA1 (gpgme-1.0.3.tar.gz) = 632436ff5c66405d9704983411aa031f29006dce
 RMD160 (gpgme-1.0.3.tar.gz) = cc8dc465c733eea8d7f0297127f9f97dd0876a53
 Size (gpgme-1.0.3.tar.gz) = 837866 bytes
-SHA1 (patch-aa) = 27f98c23d89a0a030398e1e5cfefff84b23d2658
+SHA1 (patch-aa) = 3a9d2d9de847b2c763ab23d0af32064dee9d20c5
 SHA1 (patch-ab) = c47b732622deaa2eb3269d7ae753ab553c4fa54e
 SHA1 (patch-ac) = 1f27efa0a5c109c7a8b4f4e346487a5d2f8b26f2
 SHA1 (patch-ae) = 88d215ad657730349ffa19462799b64238a30426
diff -r d2255d2022f6 -r 20a370d7d0c3 security/gpgme/patches/patch-aa
--- a/security/gpgme/patches/patch-aa   Sat Feb 11 13:24:30 2006 +0000
+++ b/security/gpgme/patches/patch-aa   Sat Feb 11 14:11:07 2006 +0000
@@ -1,8 +1,19 @@
-$NetBSD: patch-aa,v 1.5 2004/08/22 17:52:26 recht Exp $
+$NetBSD: patch-aa,v 1.6 2006/02/11 14:11:07 joerg Exp $
 
 --- gpgme/gpgme-config.in.orig 2004-05-21 21:49:29.000000000 +0200
 +++ gpgme/gpgme-config.in      2004-08-22 17:25:14.000000000 +0200
-@@ -98,7 +98,7 @@
+@@ -26,8 +26,8 @@ libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
+ cflags_pth="@PTH_CFLAGS@"
+ 
+ @HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread"
+-libs_pthread="-lpthread"
+-cflags_pthread=""
++libs_pthread="@PTHREAD_LIBS@"
++cflags_pthread="@PTHREAD_CFLAGS@"
+ 
+ output=""
+ 
+@@ -98,7 +98,7 @@ while test $# -gt 0; do
            ;;
        --libs)
            if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then