svn commit: r333558 - in head/security/dirmngr: . files

[Tijl Coosemans]

Author: tijl
Date: Tue Nov 12 10:06:18 2013
New Revision: 333558
URL: http://svnweb.freebsd.org/changeset/ports/333558

Log:
  - Patch configure script to fix detection of LDAP libraries.  Both libldap
    and liblber are needed.
  - New LIB_DEPENDS syntax, USES=gmake, staging, option helpers.
  
  PR:		ports/181230
  Approved by:	maintainer timeout (2 weeks)

Added:
  head/security/dirmngr/files/
  head/security/dirmngr/files/patch-configure   (contents, props changed)
Modified:
  head/security/dirmngr/Makefile
  head/security/dirmngr/pkg-plist   (contents, props changed)
Directory Properties:
  head/security/dirmngr/distinfo   (props changed)
  head/security/dirmngr/pkg-descr   (props changed)

Modified: head/security/dirmngr/Makefile
==============================================================================
--- head/security/dirmngr/Makefile	Tue Nov 12 10:00:08 2013	(r333557)
+++ head/security/dirmngr/Makefile	Tue Nov 12 10:06:18 2013	(r333558)
@@ -13,35 +13,26 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	umq at ueo.co.jp
 COMMENT=	Client for managing and downloading certificate revocation lists
 
-LIB_DEPENDS=	assuan.0:${PORTSDIR}/security/libassuan \
-		gcrypt:${PORTSDIR}/security/libgcrypt \
-		gpg-error.0:${PORTSDIR}/security/libgpg-error \
-		ksba.19:${PORTSDIR}/security/libksba \
-		pth:${PORTSDIR}/devel/pth
+LIB_DEPENDS=	libassuan.so:${PORTSDIR}/security/libassuan \
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
+		libgpg-error.so:${PORTSDIR}/security/libgpg-error \
+		libksba.so:${PORTSDIR}/security/libksba \
+		libpth.so:${PORTSDIR}/devel/pth
 
+USES=		gmake iconv
 USE_BZIP2=	yes
-USES=		iconv
 USE_OPENLDAP=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 INFO=		dirmngr
-MAN1=		dirmngr-client.1 dirmngr.1
 
 CONFIGURE_ARGS+=	--docdir=${DOCSDIR}
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=	gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext
 
 verify: checksum
 	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig

Added: head/security/dirmngr/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/dirmngr/files/patch-configure	Tue Nov 12 10:06:18 2013	(r333558)
@@ -0,0 +1,11 @@
+--- configure.orig	2010-06-14 09:44:03.000000000 +0200
++++ configure	2013-10-28 17:10:59.000000000 +0100
+@@ -8627,6 +8627,8 @@
+ int
+ main ()
+ {
++BerElement *berctx = NULL;
++ber_free(berctx, 0);
+ ldap_open("foobar",1234);
+   ;
+   return 0;

Modified: head/security/dirmngr/pkg-plist
==============================================================================
--- head/security/dirmngr/pkg-plist	Tue Nov 12 10:00:08 2013	(r333557)
+++ head/security/dirmngr/pkg-plist	Tue Nov 12 10:06:18 2013	(r333558)
@@ -1,6 +1,8 @@
 bin/dirmngr
 bin/dirmngr-client
 libexec/dirmngr_ldap
+man/man1/dirmngr-client.1.gz
+man/man1/dirmngr.1.gz
 %%DOCSDIR%%/examples/README
 %%DOCSDIR%%/examples/bnetza-10r-ocsp.signer
 %%DOCSDIR%%/examples/dirmngr.conf