[pkgsrc/trunk]: pkgsrc/security/dirmngr Problem: Dirmngr depends on pth. With...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7b2696adf64d
branches:  trunk
changeset: 490044:7b2696adf64d
user:      shannonjr <shannonjr%pkgsrc.org@localhost>
date:      Wed Mar 02 14:59:35 2005 +0000

description:
Problem: Dirmngr depends on pth. With an explicit buildlink to pth, the
package builds and works correctly. This approach was taken prior to
this change. The is a problem because  pth installs pthread.h in
${LOCALBASE}/include. This causes problems for things like Ada tasking
that depend on native pthreads when also linking against libraries in
pkgsrc (eg., gmp).

This change solve the problem by building a static pth library locally
and linking against it.

diffstat:

 security/dirmngr/Makefile |  13 ++++++++++---
 security/dirmngr/distinfo |   5 ++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diffs (60 lines):

diff -r e6e99b4ab708 -r 7b2696adf64d security/dirmngr/Makefile
--- a/security/dirmngr/Makefile Wed Mar 02 14:38:18 2005 +0000
+++ b/security/dirmngr/Makefile Wed Mar 02 14:59:35 2005 +0000
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2005/01/04 13:40:38 shannonjr Exp $
+# $NetBSD: Makefile,v 1.5 2005/03/02 14:59:35 shannonjr Exp $
 #
 
 DISTNAME=              dirmngr-0.9.0
-#PKGREVISION=          1
+PKGREVISION=           1
 CATEGORIES=            security
 MASTER_SITES=          ftp://ftp.gnupg.org/gcrypt/alpha/dirmngr/
+DISTFILES=             ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=            pth-2.0.3.tar.gz
+SITES_pth-2.0.3.tar.gz=        ${MASTER_SITE_GNU:=pth/}
 
 MAINTAINER=            shannonjr%NetBSD.org@localhost
 HOMEPAGE=              http://www.gnupg.org/aegypten2
@@ -24,6 +27,7 @@
 CONFIGURE_ARGS+=       --localstatedir="${VARBASE}"
 CONFIGURE_ARGS+=       --sharedstatedir="${VARBASE}"
 CONFIGURE_ENV+=                BUILDLINK_PREFIX_openldap=${BUILDLINK_PREFIX.openldap}
+CONFIGURE_ARGS+=       --with-pth-prefix=${WRKDIR}/pth
 
 SUBST_FILES+=          VARBASE=${VARBASE}
 SUBST_FILES+=          PREFIX=${PREFIX}
@@ -31,6 +35,10 @@
 SUBST_FILES+=          DIRMNGR_USER=${DIRMNGR_USER}
 SUBST_FILES+=          DIRMNGR_PATH=${DIRMNGR_PATH}
 
+# We are building a static pth library and linking against it
+pre-configure:
+       cd  ${WRKDIR}/pth-2.0.3 && ./configure --prefix=${WRKDIR}/pth --enable-pthread --enable-static --disable-shared && ${MAKE} install
+
 pre-build:
        ${CP} ${FILESDIR}/runDirmngr.c ${WRKDIR}/runDirmngr.c
 
@@ -53,7 +61,6 @@
 
 INFO_FILES=            dirmngr.info
 
-.include "../../devel/pth/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/openldap/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff -r e6e99b4ab708 -r 7b2696adf64d security/dirmngr/distinfo
--- a/security/dirmngr/distinfo Wed Mar 02 14:38:18 2005 +0000
+++ b/security/dirmngr/distinfo Wed Mar 02 14:59:35 2005 +0000
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 13:10:05 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/03/02 14:59:35 shannonjr Exp $
 
 SHA1 (dirmngr-0.9.0.tar.gz) = 46dc0704abb5320465c9176d0dcc5eeafc0880fe
 RMD160 (dirmngr-0.9.0.tar.gz) = 61d74dea2836ce3370e5bc9892a5b29257638c6d
 Size (dirmngr-0.9.0.tar.gz) = 568366 bytes
+SHA1 (pth-2.0.3.tar.gz) = c2445bcf24ce3615cfbfbd58b79bbab36542617d
+RMD160 (pth-2.0.3.tar.gz) = 27b56055897a653fe5cea1aac53d9361ffd1acc5
+Size (pth-2.0.3.tar.gz) = 639243 bytes
 SHA1 (patch-aa) = f3b4c18afa24ba7838876e46c0084502c7656f4b