ports/62915: net/ldapdiff -- USE_OPENLDAP

[Matthew Seaman]

>Number:         62915
>Category:       ports
>Synopsis:       net/ldapdiff -- USE_OPENLDAP
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 16 07:10:13 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Matthew Seaman
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 4.9-STABLE FreeBSD 4.9-STABLE #55: Sat Feb 14 12:42:08 GMT 2004 root at happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386


>Description:

As per Oliver Eikemeier's recent post:

  http://lists.freebsd.org/pipermail/freebsd-ports/2004-February/009261.html

to freebsd-ports at ... and the impending removal of OpenLDAP 2.0 from
ports, here's an update to net/ldapdiff:

Changes:

      USE_OPENLDAP
      USE_ICONV
      use %%DOCSDIR%% in pkg-plist
      update to ldapdiff-1.0.0

>How-To-Repeat:

>Fix:


--- ldapdiff.diff begins here ---
diff -Nur /usr/ports/net/ldapdiff/Makefile ldapdiff/Makefile
--- /usr/ports/net/ldapdiff/Makefile	Thu Aug 14 22:26:41 2003
+++ ldapdiff/Makefile	Mon Feb 16 14:47:54 2004
@@ -6,26 +6,19 @@
 #
 
 PORTNAME=	ldapdiff
-PORTVERSION=	0.9.0
+PORTVERSION=	1.0.0
 CATEGORIES=	net
-MASTER_SITES=	http://webtomware.rhoen.de/ \
-		http://unixpages.org/distfiles/
+MASTER_SITES=	http://webtomware.rhoen.de/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A utility for patching LDAP directories using LDIF files
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-.if defined(WITH_OPENLDAP1)
-LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12
-.else
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/${LDAP_PORT}
-.endif
-
+USE_ICONV=	yes
+USE_OPENLDAP=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-ldap-dir=${PREFIX} \
 		--with-iconv-dir=${PREFIX}
-LDAP_PORT?=	net/openldap20-client
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ldapdiff ${PREFIX}/bin
diff -Nur /usr/ports/net/ldapdiff/distinfo ldapdiff/distinfo
--- /usr/ports/net/ldapdiff/distinfo	Fri Jan 30 11:14:52 2004
+++ ldapdiff/distinfo	Mon Feb 16 14:39:22 2004
@@ -1,2 +1,2 @@
-MD5 (ldapdiff-0.9.0.tar.gz) = 0099467bf05e8063ee005527fe0e6d8a
-SIZE (ldapdiff-0.9.0.tar.gz) = 160363
+MD5 (ldapdiff-1.0.0.tar.gz) = b79bdde774057a9a4674563b577aeea7
+SIZE (ldapdiff-1.0.0.tar.gz) = 165710
diff -Nur /usr/ports/net/ldapdiff/pkg-plist ldapdiff/pkg-plist
--- /usr/ports/net/ldapdiff/pkg-plist	Fri Jul 12 22:31:55 2002
+++ ldapdiff/pkg-plist	Mon Feb 16 14:51:27 2004
@@ -7,8 +7,8 @@
 @dirrm share/ldapdiff/plugins
 @dirrm share/ldapdiff/samples
 @dirrm share/ldapdiff
-%%PORTDOCS%%share/doc/ldapdiff/CHANGES
-%%PORTDOCS%%share/doc/ldapdiff/ChangeLog
-%%PORTDOCS%%share/doc/ldapdiff/README
-%%PORTDOCS%%share/doc/ldapdiff/TODO
-%%PORTDOCS%%@dirrm share/doc/ldapdiff
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- ldapdiff.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: