Update to 0.5.6nb2:

- Refill the DESCR file.
- Remove BUILD_USES_MSGFMT; distfile ships with prebuilt .gmo files.
- Do not use GNU make as it's not needed.
- Use BUILDLINK_PREFIX.openldap instead of LOCALBASE to locate openldap.
- Register info file properly and fix a typo in its directory entry so
  that it can be accessed.
- Patch configure instead of configure.ac, so we can drop the build
  dependency on autoconf.
- Add missing dependencies on libiconv and gettext-lib.
- Sort USE_* and include sections alphabetically.
- Remove BUILDLINK_DEPENDS.* version overrides because the respective
  buildlink3.mk files already pull in a newer version.
- Drop all logic to detect the actual gettext-lib version.  This was wrong
  because it relied on the version currently installed (thus having a good
  chance to produce different results between systems), and because it's
  not the way to go.  Instead, simply include gettext-lib's buildlink3.mk
  file, and let the builtin.mk machinery decide what to do.
- Also add the locale files to the PLIST.

6 files changed, 57 insertions, 66 deletions

diff --git a/security/dirmngr/DESCR b/security/dirmngr/DESCR
index e31adaf6a11..6f7c365473a 100644
--- a/security/dirmngr/DESCR
+++ b/security/dirmngr/DESCR
@@ -1,6 +1,4 @@
-DirMngr is a server for managing and downloading
-certificate revocation lists (CRLs) for X.509
-certificates and for downloading the certificates
-themselves. DirMngr also handles OCSP requests as
-an alternative to CRLs. DirMngr is usually invoked
-by gpgsm and in general not used directly. 
+DirMngr is a server for managing and downloading certificate revocation
+lists (CRLs) for X.509 certificates and for downloading the certificates
+themselves.  DirMngr also handles OCSP requests as an alternative to CRLs.
+DirMngr is usually invoked by gpgsm and in general not used directly.
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 1f5b602298c..d37287ed3d3 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/11/04 20:20:22 shannonjr Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 22:12:17 jmmv Exp $
 #
 
 DISTNAME=		dirmngr-0.5.6
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/alpha/dirmngr/
 
@@ -10,41 +10,21 @@ MAINTAINER=		shannonjr@NetBSD.org
 HOMEPAGE=		http://www.gnupg.org/aegypten2
 COMMENT=		X509 certificate and CRL downloader
 
-BUILD_USES_MSGFMT=	yes
-
-.include "../../mk/bsd.prefs.mk"
-
-INFO_FILES=		dirmngr.info
-USE_BUILDLINK3=		yes
-USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=         make
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		awk
-AUTOCONF_REQD=		2.52
-CONFIGURE_ENV+=		LOCALBASE="${LOCALBASE}"
-
-# gettext Version 0.12.1 or newer is required for NLS support
-.include "../../devel/gettext-lib/buildlink3.mk"
-GETTEXT_IS_TOO_OLD!=if ${PKG_ADMIN} pmatch 'gettext-lib < 0.12.1' gettext-lib ; then \
-		${ECHO} "yes";  \
-	else    \
-		${ECHO} "no";   \
-	fi
+USE_PKGLOCALEDIR=	yes
 
-.if GETTEXT_IS_TOO_OLD
-CONFIGURE_ARGS+=	--disable-nls
-.endif
+CONFIGURE_ENV+=		BUILDLINK_PREFIX_openldap=${BUILDLINK_PREFIX.openldap}
 
-pre-configure:
-			cd ${WRKSRC} && ${AUTOCONF}
+INFO_FILES=		dirmngr.info
 
-.include "../../security/libgpg-error/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/openldap/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libgetopt/buildlink3.mk"
+.include "../../security/libassuan/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
-BUILDLINK_DEPENDS.libksb+=	libksba>=0.9.6
+.include "../../security/libgpg-error/buildlink3.mk"
 .include "../../security/libksba/buildlink3.mk"
-BUILDLINK_DEPENDS.libassuan+=	libassuan>=0.6.5
-.include "../../security/libassuan/buildlink3.mk"
-.include "../../devel/libgetopt/buildlink3.mk"
-.include "../../databases/openldap/buildlink3.mk"
-.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/dirmngr/PLIST b/security/dirmngr/PLIST
index 2ee6967623e..2fc142f63bf 100644
--- a/security/dirmngr/PLIST
+++ b/security/dirmngr/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2004/10/23 14:41:53 shannonjr Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/11/05 22:12:17 jmmv Exp $
 bin/dirmngr
-info/dirmngr.info
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/dirmngr.mo
diff --git a/security/dirmngr/distinfo b/security/dirmngr/distinfo
index e6c5bc93df8..9dc40625427 100644
--- a/security/dirmngr/distinfo
+++ b/security/dirmngr/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2004/11/04 20:20:22 shannonjr Exp $
+$NetBSD: distinfo,v 1.3 2004/11/05 22:12:17 jmmv Exp $
 
 SHA1 (dirmngr-0.5.6.tar.gz) = 584ee44d60b9385fcf0d0afa08f801fd05eba968
 Size (dirmngr-0.5.6.tar.gz) = 516196 bytes
-SHA1 (patch-aa) = 8f6ce061cd89cd34450e904d3a87e3508cf89847
+SHA1 (patch-aa) = 02dd8cf8224650a61d07b8353761fe51a70f5d47
 SHA1 (patch-ab) = 84b9266877b312aed33bd99fb1e509c92a73045b
+SHA1 (patch-ac) = ce9fd0eb7c095ff1494a00dd7606a039bb83928f
diff --git a/security/dirmngr/patches/patch-aa b/security/dirmngr/patches/patch-aa
index 90a6fd8f4af..00e556bc5be 100644
--- a/security/dirmngr/patches/patch-aa
+++ b/security/dirmngr/patches/patch-aa
@@ -1,32 +1,31 @@
-$NetBSD: patch-aa,v 1.1 2004/10/23 15:02:32 shannonjr Exp $
+$NetBSD: patch-aa,v 1.2 2004/11/05 22:12:17 jmmv Exp $
 
---- configure.ac.orig	2004-09-28 06:20:54.000000000 -0600
-+++ configure.ac
-@@ -201,7 +201,7 @@ AC_ARG_WITH(ldap,
- 
+--- configure.orig	2004-09-28 14:37:56.000000000 +0200
++++ configure
+@@ -10934,7 +10934,7 @@ else
+ fi;
  if test "x$with_ldap" = "xCHECK" ; then
    with_ldap=NOTFOUND
 -  search_incs="$kde_includes /usr/include /usr/local/include"
-+  search_incs="$kde_includes /usr/include $LOCALBASE/include"
-   AC_FIND_FILE(ldap.h, $search_incs, ldap_incdir)
-   if test -r $ldap_incdir/ldap.h ; then
-     test "x$ldap_incdir" != "x/usr/include" && LDAP_INCS="-I$ldap_incdir"
-@@ -210,7 +210,7 @@ if test "x$with_ldap" = "xCHECK" ; then
-   if test $with_ldap = FOUND ; then
-     with_ldap=NOTFOUND
++  search_incs="${BUILDLINK_PREFIX_openldap}/include"
+ 
+ ldap_incdir=NO
+ for i in $search_incs;
+@@ -10959,7 +10959,7 @@ done
      for ext in la so sl a ; do
--      AC_FIND_FILE(libldap.$ext, /usr/lib /usr/local/lib,
-+      AC_FIND_FILE(libldap.$ext, /usr/lib $LOCALBASE/lib,
-         ldap_libdir)
-       if test -r $ldap_libdir/libldap.$ext ; then
-         if test "x$ldap_libdir" != "x/usr/lib" ; then
-@@ -293,7 +293,8 @@ AC_SUBST(LDAP_SUBDIR)
  
- # Checks for header files.
- AC_HEADER_STDC
--AC_CHECK_HEADERS([string.h])
-+AC_CHECK_HEADERS([locale.h string.h])
-+
+ ldap_libdir=NO
+-for i in /usr/lib /usr/local/lib;
++for i in ${BUILDLINK_PREFIX_openldap}/lib
+ do
+   for j in libldap.$ext;
+   do
+@@ -11290,7 +11290,7 @@ _ACEOF
+ fi
  
  
- # Checks for typedefs, structures, and compiler characteristics.
+-for ac_header in string.h
++for ac_header in locale.h string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff --git a/security/dirmngr/patches/patch-ac b/security/dirmngr/patches/patch-ac
new file mode 100644
index 00000000000..aed6e8ca293
--- /dev/null
+++ b/security/dirmngr/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2004/11/05 22:12:17 jmmv Exp $
+
+--- doc/dirmngr.info.orig	2004-09-28 14:38:38.000000000 +0200
++++ doc/dirmngr.info
+@@ -3,7 +3,7 @@ dirmngr.texi.
+ 
+ INFO-DIR-SECTION GNU Utilities
+ START-INFO-DIR-ENTRY
+-* dirmngr: (gnupg). X.509 CRL and OCSP server.
++* dirmngr: (dirmngr). X.509 CRL and OCSP server.
+ END-INFO-DIR-ENTRY
+    This file documents the use of dirmngr.
+