update to 1.1.0

changes:
-bugfixes
-Make use of libassuan 2.0 which is available as a DSO

3 files changed, 10 insertions, 43 deletions

diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 129ab8ce319..0468c7dcb4d 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -1,15 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2010/01/17 12:02:40 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/09/01 16:40:53 drochner Exp $
 #
 
-DISTNAME=		dirmngr-1.0.3
-PKGREVISION=		1
+DISTNAME=		dirmngr-1.1.0
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/dirmngr/
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+=		pth-2.0.7.tar.gz
-SITES.pth-2.0.7.tar.gz=	${MASTER_SITE_GNU:=pth/}
-DISTFILES+=		libassuan-1.0.5.tar.bz2
-SITES.libassuan-1.0.5.tar.bz2=	ftp://ftp.gnupg.org/gcrypt/libassuan/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		shannonjr@NetBSD.org
@@ -43,8 +37,6 @@ CONFIGURE_ARGS+=	--sharedstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/libdata
 CONFIGURE_ENV+=		BUILDLINK_PREFIX_openldap-client=${BUILDLINK_PREFIX.openldap-client}
-CONFIGURE_ARGS+=	--with-pth-prefix=${WRKDIR}/pth
-CONFIGURE_ARGS+=	--with-libassuan-prefix=${WRKDIR}/libassuan
 
 FILES_SUBST+=		VARBASE=${VARBASE:Q}
 FILES_SUBST+=		PREFIX=${PREFIX:Q}
@@ -65,16 +57,6 @@ OWN_DIRS_PERMS+=	${PREFIX}/libdata/dirmngr/extra-certs ${DIRMNGR_PERMS}
 INSTALLATION_DIRS=	sbin
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-# We are building a static pth library and linking against it
-# We are also building libassuan here to get libassuan-pth.
-pre-configure:
-	cd  ${WRKDIR}/pth-2.0.7 && ./configure --prefix=${WRKDIR}/pth --enable-pthread --enable-static --disable-shared && ${MAKE} install
-	cd  ${WRKDIR}/libassuan-1.0.5 && \
-	${SETENV} ${CONFIGURE_ENV} ./autogen.sh && \
-	${SETENV} ${CONFIGURE_ENV} ./configure --enable-maintainer-mode --prefix=${WRKDIR}/libassuan --with-pth-prefix=${WRKDIR}/pth && \
-	${SETENV} ${PKGSRC_MAKE_ENV} ${MAKE} install
-	cd  ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh
-
 pre-build:
 	${CP} ${FILESDIR}/runDirmngr.c ${WRKDIR}/runDirmngr.c
 
@@ -92,4 +74,8 @@ post-install:
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../security/libksba/buildlink3.mk"
+# previous pth versions have a bug which breaks CRL fetch on NetBSD
+BUILDLINK_ABI_DEPENDS.pth+= pth>=2.0.7nb1
+.include "../../devel/pth/buildlink3.mk"
+.include "../../security/libassuan2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/dirmngr/distinfo b/security/dirmngr/distinfo
index 62239d15e67..d06c6d7efe8 100644
--- a/security/dirmngr/distinfo
+++ b/security/dirmngr/distinfo
@@ -1,16 +1,9 @@
-$NetBSD: distinfo,v 1.15 2009/12/15 19:43:16 drochner Exp $
+$NetBSD: distinfo,v 1.16 2010/09/01 16:40:53 drochner Exp $
 
-SHA1 (dirmngr-1.0.3.tar.bz2) = 437d381c937b1f1d0699d1ed37cf50f14bfbcd32
-RMD160 (dirmngr-1.0.3.tar.bz2) = 208a078e11df1d850dfe50a6e74bde8c2640b1e4
-Size (dirmngr-1.0.3.tar.bz2) = 556184 bytes
-SHA1 (libassuan-1.0.5.tar.bz2) = f6c36e9d99736883a8ce5b80b0a51d854cbbbc70
-RMD160 (libassuan-1.0.5.tar.bz2) = 7c4a75c71a3117cf140ea66ca89765349f39218e
-Size (libassuan-1.0.5.tar.bz2) = 297786 bytes
-SHA1 (pth-2.0.7.tar.gz) = 9a71915c89ff2414de69fe104ae1016d513afeee
-RMD160 (pth-2.0.7.tar.gz) = 80bc66777ba20d9648b7aaf3f58d593be6416910
-Size (pth-2.0.7.tar.gz) = 652640 bytes
+SHA1 (dirmngr-1.1.0.tar.bz2) = a7a7d1432db9edad2783ea1bce761a8106464165
+RMD160 (dirmngr-1.1.0.tar.bz2) = 2f67ad8668cf4aa4a2ec2c1fa857d9225ec01a65
+Size (dirmngr-1.1.0.tar.bz2) = 556406 bytes
 SHA1 (patch-aa) = bbc030ab815f6fbbcc440768c3a73ab0f74ba2f0
-SHA1 (patch-ab) = 908fd76d67f837367121e493d239f8b377eb1c3f
 SHA1 (patch-ac) = 1f611619771e9c5258037e2f97855e9a9513a135
 SHA1 (patch-ad) = 94c789bd308208c147a24f05b371602ec74185f4
 SHA1 (patch-ae) = 3d77aff4b2ee779106dee329f3a6cd5b8f332e26
diff --git a/security/dirmngr/patches/patch-ab b/security/dirmngr/patches/patch-ab
deleted file mode 100644
index 8c555597045..00000000000
--- a/security/dirmngr/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2009/12/15 19:43:16 drochner Exp $
-
---- ../libassuan-1.0.5/src/Makefile.am.orig	2006-11-21 11:17:18.000000000 -0700
-+++ ../libassuan-1.0.5/src/Makefile.am
-@@ -26,6 +26,7 @@ MOSTLYCLEANFILES = assuan-errors.c
- 
- if HAVE_PTH
- libassuan_pth = libassuan-pth.a
-+AM_CFLAGS=$(PTH_CFLAGS)
- else
- libassuan_pth = 
- endif