Enabled threads as recommended by developers.

5 files changed, 64 insertions, 8 deletions

diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index 6435d475126..62eb5a9b2ee 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2004/12/23 11:44:49 shannonjr Exp $
+# $NetBSD: Makefile,v 1.7 2005/01/04 13:52:01 shannonjr Exp $
 #
 
 DISTNAME=		gnupg-1.9.14
 PKGNAME=		${DISTNAME:S/gnupg/gnupg-devel/}
-#PKGREVISION=		1
+PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=		pth-2.0.0.tar.gz
+SITES_pth-2.0.0.tar.gz=	${MASTER_SITE_GNU:=pth/}
 
 MAINTAINER=		shannonjr@NetBSD.org
 HOMEPAGE=		ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/
@@ -21,6 +24,7 @@ USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+=	--with-static-rnd=auto
 CONFIGURE_ARGS+=	--without-included-gettext
+CONFIGURE_ARGS+=	--with-pth-prefix=${WRKDIR}/pth
 
 TEST_TARGET=		check
 
@@ -43,11 +47,10 @@ PLIST_SRC+=	${.CURDIR}/PLIST.gpgsm
 .  include "../../security/dirmngr/buildlink3.mk"
 .endif
 
-# This package will only build with pth
-.include "../../mk/pthread.buildlink3.mk"
-.if ${PTHREAD_TYPE} == "native"
-CONFIGURE_ARGS+=	--disable-threads
-.endif
+# We are building a static pth library and linking against it
+# While this is not very satisfying, gpgme hangs in it's gpgsm tests if we depend on the shared (pkgsrc) pth library
+pre-configure:
+	cd  ${WRKDIR}/pth-2.0.0 && ./configure --prefix=${WRKDIR}/pth --enable-pthread --enable-static --disable-shared && ${MAKE} install
 
 BUILDLINK_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
 
diff --git a/security/gnupg-devel/distinfo b/security/gnupg-devel/distinfo
index 2cc177b2b85..14383c07b40 100644
--- a/security/gnupg-devel/distinfo
+++ b/security/gnupg-devel/distinfo
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.4 2004/12/23 11:44:50 shannonjr Exp $
+$NetBSD: distinfo,v 1.5 2005/01/04 13:52:01 shannonjr Exp $
 
 SHA1 (gnupg-1.9.14.tar.gz) = 6e5a3b27a4eb6a781bc8d8ad9458ea3e99449b48
 Size (gnupg-1.9.14.tar.gz) = 1925582 bytes
+SHA1 (pth-2.0.0.tar.gz) = 91b7593e5435604090c3974a8584478877194533
+Size (pth-2.0.0.tar.gz) = 536605 bytes
 SHA1 (patch-aa) = 4fdedc1f98dbe717fd5a1229944703f19c3c10e5
+SHA1 (patch-ab) = 2bd1b553cc45ed66e3f95364058b227dfcc74be5
+SHA1 (patch-ac) = 82cae75a7fed505bf2e358d6471b85951513976c
+SHA1 (patch-ad) = 698e585fd554d3581792e0e613d43d20d2ffda77
diff --git a/security/gnupg-devel/patches/patch-ab b/security/gnupg-devel/patches/patch-ab
new file mode 100644
index 00000000000..9f14cbb73e5
--- /dev/null
+++ b/security/gnupg-devel/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2005/01/04 13:52:01 shannonjr Exp $
+
+--- common/Makefile.in.orig	2004-12-22 10:55:06.000000000 -0700
++++ common/Makefile.in
+@@ -307,7 +307,7 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ noinst_LIBRARIES = libcommon.a libsimple-pwquery.a
+-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
++AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(PTH_CFLAGS)
+ libcommon_a_SOURCES = \
+ 	util.h i18n.h \
+ 	errors.h \
diff --git a/security/gnupg-devel/patches/patch-ac b/security/gnupg-devel/patches/patch-ac
new file mode 100644
index 00000000000..90f99438c39
--- /dev/null
+++ b/security/gnupg-devel/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2005/01/04 13:52:01 shannonjr Exp $
+
+--- sm/Makefile.in.orig	2004-12-23 07:37:34.000000000 -0700
++++ sm/Makefile.in
+@@ -133,7 +133,7 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(t
+ depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(PTH_CFLAGS)
+ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(gpgsm_SOURCES)
+@@ -366,7 +366,7 @@ gpgsm_SOURCES = \
+ gpgsm_LDADD = ../jnlib/libjnlib.a ../kbx/libkeybox.a	\
+               ../common/libcommon.a \
+               $(LIBGCRYPT_LIBS)  $(KSBA_LIBS) $(LIBASSUAN_LIBS) -lgpg-error \
+-	      $(LIBINTL)
++	      $(LIBINTL) $(PTH_LIBS)
+ 
+ all: all-am
+ 
diff --git a/security/gnupg-devel/patches/patch-ad b/security/gnupg-devel/patches/patch-ad
new file mode 100644
index 00000000000..d85758a46f8
--- /dev/null
+++ b/security/gnupg-devel/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2005/01/04 13:52:01 shannonjr Exp $
+
+--- ./common/asshelp.c.orig	2004-12-18 02:35:31.000000000 -0700
++++ ./common/asshelp.c
+@@ -150,7 +150,7 @@ send_pinentry_environment (assuan_contex
+ #endif
+   if (opt_lc_messages || (dft_ttyname && dft_lc))
+     {
+-      err = send_one_option (ctx, errsource, "display", 
++      err = send_one_option (ctx, errsource, "lc-messages", 
+                              opt_lc_messages ? opt_lc_messages : dft_lc);
+     }
+ #if defined(HAVE_SETLOCALE) && defined(LC_MESSAGES)