13 files changed, 17 insertions, 184 deletions

diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index e9af4effc172..68e589bfae14 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -6,45 +6,25 @@
 #
 
 PORTNAME=	dirmngr
-PORTVERSION=	0.4.5
-PORTREVISION=	3
+PORTVERSION=	0.5.3
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_GNUPG} \
-		http://tigress.com/lofi/:lofi/
-MASTER_SITE_SUBDIR=	alpha/aegypten
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
-		common.tar.gz:lofi
+MASTER_SITES=	${MASTER_SITE_GNUPG}
+MASTER_SITE_SUBDIR=	alpha/dirmngr
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	lofi@freebsd.org
 COMMENT=	A client for managing and downloading certificate revocation lists
 
-LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2 \
-		gcrypt.6:${PORTSDIR}/security/libgcrypt \
-		ksba.7:${PORTSDIR}/security/libksba
+BUILD_DEPENDS=	${LOCALBASE}/lib/libassuan.a:${PORTSDIR}/security/libassuan
+LIB_DEPENDS=	gcrypt.12:${PORTSDIR}/security/libgcrypt \
+		gpg-error:${PORTSDIR}/security/libgpg-error \
+		ksba.11:${PORTSDIR}/security/libksba
 
 USE_OPENLDAP=	yes
 USE_GETOPT_LONG=yes
-USE_AUTOMAKE_VER=	15
 USE_LIBTOOL_VER=13
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
-USE_REINPLACE=	yes
-CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
-LDFLAGS+=	-L${LOCALBASE}/lib
-CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
-CONFIGURE_ARGS+=--with-included-gettext=no
+USE_GETTEXT=	yes
 INFO=		dirmngr
-PLIST_FILES=	bin/dirmngr
 
-.include <bsd.port.pre.mk>
-
-post-extract:
-	${MV} ${WRKDIR}/common ${WRKSRC}
-
-pre-configure:
-	${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" \
-		${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure
-	cd ${WRKSRC}; ./autogen.sh
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/dirmngr/distinfo b/security/dirmngr/distinfo
index 45d8efa8d75b..e2efeed26acb 100644
--- a/security/dirmngr/distinfo
+++ b/security/dirmngr/distinfo
@@ -1,4 +1,4 @@
-MD5 (dirmngr-0.4.5.tar.gz) = a6613347967f6679171c00808a17dfb2
-SIZE (dirmngr-0.4.5.tar.gz) = 271287
+MD5 (dirmngr-0.5.3.tar.gz) = 05ba1c4eb6f50f8a053ce67253becc1b
+SIZE (dirmngr-0.5.3.tar.gz) = 509930
 MD5 (common.tar.gz) = 4f5171946f83dfe64761344d7e86af05
 SIZE (common.tar.gz) = 18282
diff --git a/security/dirmngr/files/patch-Makefile.am b/security/dirmngr/files/patch-Makefile.am
deleted file mode 100644
index 61e3b58d358b..000000000000
--- a/security/dirmngr/files/patch-Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
---- Makefile.am.orig	Thu Feb  6 17:26:01 2003
-+++ Makefile.am	Thu Feb  6 17:26:38 2003
-@@ -21,4 +21,4 @@
- 
- EXTRA_DIST = README-alpha autogen.sh
- 
--SUBDIRS = jnlib assuan src doc tests
-+SUBDIRS = jnlib assuan common src doc tests
diff --git a/security/dirmngr/files/patch-assuan::assuan-handler.c b/security/dirmngr/files/patch-assuan::assuan-handler.c
deleted file mode 100644
index 3c73877a6b13..000000000000
--- a/security/dirmngr/files/patch-assuan::assuan-handler.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- assuan/assuan-handler.c.orig	Thu Jan 30 07:58:09 2003
-+++ assuan/assuan-handler.c	Thu Jan 30 07:58:27 2003
-@@ -29,6 +29,24 @@
- #define digitp(a) ((a) >= '0' && (a) <= '9')
- 
- 
-+#if !HAVE_FOPENCOOKIE
-+/* Provide structure for our dummy replacement function.  Usually this
-+   is defined in ../common/util.h but assuan should be self
-+   contained. */
-+/* Fixme: Remove fopencoookie :-(( */
-+typedef struct
-+{
-+  ssize_t (*read)(void*,char*,size_t);
-+  ssize_t (*write)(void*,const char*,size_t);
-+  int (*seek)(void*,off_t*,int);
-+  int (*close)(void*);
-+} _IO_cookie_io_functions_t;
-+typedef _IO_cookie_io_functions_t cookie_io_functions_t;
-+FILE *fopencookie (void *cookie, const char *opentype,
-+                   cookie_io_functions_t funclist);
-+#endif /*!HAVE_FOPENCOOKIE*/
-+
-+
- static int
- dummy_handler (ASSUAN_CONTEXT ctx, char *line)
- {
diff --git a/security/dirmngr/files/patch-assuan::assuan-socket-connect.c b/security/dirmngr/files/patch-assuan::assuan-socket-connect.c
deleted file mode 100644
index 74acc38ea626..000000000000
--- a/security/dirmngr/files/patch-assuan::assuan-socket-connect.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- assuan/assuan-socket-connect.c.orig	Wed Jan 29 15:30:12 2003
-+++ assuan/assuan-socket-connect.c	Wed Jan 29 15:30:28 2003
-@@ -23,6 +23,7 @@
- #include <stddef.h>
- #include <stdio.h>
- #include <errno.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <unistd.h>
diff --git a/security/dirmngr/files/patch-assuan::assuan-socket-server.c b/security/dirmngr/files/patch-assuan::assuan-socket-server.c
deleted file mode 100644
index af8a39751c34..000000000000
--- a/security/dirmngr/files/patch-assuan::assuan-socket-server.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- assuan/assuan-socket-server.c.orig	Wed Jan 29 15:27:13 2003
-+++ assuan/assuan-socket-server.c	Wed Jan 29 15:27:38 2003
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <errno.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <unistd.h>
diff --git a/security/dirmngr/files/patch-assuan::mkerrors b/security/dirmngr/files/patch-assuan::mkerrors
deleted file mode 100644
index f5d45193a0d6..000000000000
--- a/security/dirmngr/files/patch-assuan::mkerrors
+++ /dev/null
@@ -1,10 +0,0 @@
---- assuan/mkerrors.orig	Thu Jan 30 07:49:26 2003
-+++ assuan/mkerrors	Thu Jan 30 07:50:41 2003
-@@ -68,4 +68,5 @@
-   return s;
- }
- 
--EOF
-\ No newline at end of file
-+EOF
-+
diff --git a/security/dirmngr/files/patch-common::maperrors.c b/security/dirmngr/files/patch-common::maperrors.c
deleted file mode 100644
index 3e49c27521da..000000000000
--- a/security/dirmngr/files/patch-common::maperrors.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- common/maperror.c.orig	Thu Jan 30 08:00:00 2003
-+++ common/maperror.c	Thu Jan 30 08:00:15 2003
-@@ -210,7 +210,6 @@
-     case GNUPG_Certificate_Expired:
-       rc = ASSUAN_Bad_Certificate; 
-       break;
--    case GNUPG_Bad_Certificate_Chain: rc = ASSUAN_Bad_Certificate_Chain; break;
-     case GNUPG_Missing_Certificate: rc = ASSUAN_Missing_Certificate; break;
-     case GNUPG_No_Data:           rc = ASSUAN_No_Data_Available; break;
-     case GNUPG_Bad_Signature:     rc = ASSUAN_Bad_Signature; break;
diff --git a/security/dirmngr/files/patch-configure.ac b/security/dirmngr/files/patch-configure.ac
deleted file mode 100644
index 60c4f8ab71d7..000000000000
--- a/security/dirmngr/files/patch-configure.ac
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.ac.orig	Wed Nov 20 00:54:24 2002
-+++ configure.ac	Thu Feb  6 17:47:12 2003
-@@ -300,6 +300,17 @@
- 
- # These are needed by libjnlib - fixme: we should have a macros for them
- AC_CHECK_FUNCS(memicmp stpcpy strlwr strtoul memmove stricmp strtol)
-+AC_CHECK_FUNCS(getrusage setrlimit stat setlocale)
-+AC_CHECK_FUNCS(flockfile funlockfile)
-+
-+AC_CHECK_FUNCS(sigaction sigprocmask)
-+
-+AC_REPLACE_FUNCS(vasprintf)
-+AC_REPLACE_FUNCS(fopencookie)
-+# FIXME: Print a warning when fopencookie is not available.
-+AC_REPLACE_FUNCS(mkdtemp)
-+AC_REPLACE_FUNCS(fseeko ftello)
-+AC_REPLACE_FUNCS(isascii)
- 
- AC_CHECK_FUNCS(asprintf,,[
-     AC_MSG_ERROR([[
-@@ -307,13 +318,6 @@
- *** asprintf(3) is needed to build this package.
- *** We will provide an replacement in a later release.
- ***]])])
--AC_CHECK_FUNCS(fopencookie,,[
--    AC_MSG_ERROR([[
--***
--*** fopencookie(3) is needed to build this package.
--*** We will provide an replacement in a later release.
--***]])])
--
- 
- # We use jnlib, so tell other modules about it
- AC_DEFINE(HAVE_JNLIB_LOGGING, 1,
-@@ -324,6 +328,7 @@
- Makefile
- jnlib/Makefile
- assuan/Makefile
-+common/Makefile
- src/Makefile
- doc/Makefile
- tests/Makefile
diff --git a/security/dirmngr/files/patch-doc::dirmngr.info b/security/dirmngr/files/patch-doc::dirmngr.info
deleted file mode 100644
index 0dbaabbd9e42..000000000000
--- a/security/dirmngr/files/patch-doc::dirmngr.info
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/dirmngr.info.orig	Wed Apr 30 16:09:38 2003
-+++ doc/dirmngr.info	Wed Apr 30 16:10:07 2003
-@@ -3,7 +3,7 @@
- 
- INFO-DIR-SECTION GNU Utilities
- START-INFO-DIR-ENTRY
--* dirmngr: (gnupg). X509/LDAP certificate and revocation list client.
-+* dirmngr: (dirmngr). X509/LDAP certificate and revocation list client.
- END-INFO-DIR-ENTRY
-    This file documents the use of dirmngr.
- 
diff --git a/security/dirmngr/files/patch-src::Makefile.am b/security/dirmngr/files/patch-src::Makefile.am
deleted file mode 100644
index c8d10b3e2256..000000000000
--- a/security/dirmngr/files/patch-src::Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Makefile.am.orig	Thu Feb  6 18:00:41 2003
-+++ src/Makefile.am	Thu Feb  6 18:01:22 2003
-@@ -32,8 +32,6 @@
- dirmngr_LDFLAGS = $(LDAP_RPATH)
- 
- dirmngr_LDADD = ../jnlib/libjnlib.a ../assuan/libassuan.a  \
--		$(LIBGCRYPT_LIBS)  $(LIBKSBA_LIBS) $(LDAP_LIBS) $(DB_LIBS)
--
--
--
-+		../common/libcommon.a $(LIBGCRYPT_LIBS)  \
-+		$(LIBKSBA_LIBS) $(LDAP_LIBS) $(DB_LIBS)
- 
diff --git a/security/dirmngr/files/patch-tests::Makefile.am b/security/dirmngr/files/patch-tests::Makefile.am
deleted file mode 100644
index 36963c03a168..000000000000
--- a/security/dirmngr/files/patch-tests::Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/Makefile.am.orig	Thu Feb  6 18:02:43 2003
-+++ tests/Makefile.am	Thu Feb  6 18:02:59 2003
-@@ -10,7 +10,7 @@
- TESTS = 
- 
- noinst_PROGRAMS = test-dirmngr
--LDADD = ../jnlib/libjnlib.a ../assuan/libassuan.a $(LIBGCRYPT_LIBS) $(LIBKSBA_LIBS)
-+LDADD = ../jnlib/libjnlib.a ../assuan/libassuan.a ../common/libcommon.a $(LIBGCRYPT_LIBS) $(LIBKSBA_LIBS)
- 
- 
- 
diff --git a/security/dirmngr/pkg-plist b/security/dirmngr/pkg-plist
new file mode 100644
index 000000000000..84f95c267a2b
--- /dev/null
+++ b/security/dirmngr/pkg-plist
@@ -0,0 +1,5 @@
+bin/dirmngr
+share/locale/de/LC_MESSAGES/dirmngr.mo
+@dirrm share/locale/de/LC_MESSAGES
+@dirrm share/locale/de
+@dirrm share/locale