Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Jul 2002 02:40:34 +0200 (CEST)
From:      Christian Brueffer <chris@unixpages.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/40437: [MAINTAINER UPDATE] net/ldapdiff 0.7.0 -> 0.8.2
Message-ID:  <20020711004034.5BFB3AB9F@milan.hitnet.rwth-aachen.de>

next in thread | raw e-mail | index | archive | help

>Number:         40437
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] net/ldapdiff 0.7.0 -> 0.8.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 10 17:50:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Christian Brueffer
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD milan.hitnet.rwth-aachen.de 4.6-STABLE FreeBSD 4.6-STABLE #2: Fri Jun 28 12:47:08 CEST 2002 chris@milan.hitnet.rwth-aachen.de:/usr/obj/usr/src/sys/LORIEN i386


	
>Description:
	Update port from 0.7.0 -> 0.8.2
	Add knob to choose either OpenLDAP 1 or 2
	Add additional mastersite
	General Makefile cleanups
>How-To-Repeat:
	
>Fix:

	

--- ldapdiff.update begins here ---
diff -ruN /usr/ports/net/ldapdiff/Makefile ldapdiff/Makefile
--- /usr/ports/net/ldapdiff/Makefile	Thu Jun 27 14:13:07 2002
+++ ldapdiff/Makefile	Thu Jul 11 00:34:19 2002
@@ -6,32 +6,43 @@
 #
 
 PORTNAME=       ldapdiff
-PORTVERSION=    0.7.0
+PORTVERSION=    0.8.2
 CATEGORIES=     net
-MASTER_SITES=   http://webtomware.rhoen.de/
+MASTER_SITES=   http://webtomware.rhoen.de/ \
+		http://unixpages.org/distfiles/
 
 MAINTAINER=     chris@unixpages.org
 
-LIB_DEPENDS=    ldap.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
-GNU_CONFIGURE=  yes
-CONFIGURE_ARGS= \
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	\
 				--prefix=${PREFIX} \
-				--with-ldap-dir=${PREFIX}
+				--with-ldap-dir=${PREFIX} \
+				--with-iconv-dir=${PREFIX}
+
+.if defined(WITH_OPENLDAP1)
+LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap
+.else
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
+.endif
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/ldapdiff ${PREFIX}/bin
 		${INSTALL_DATA} ${WRKSRC}/ldapdiff.conf \
 			${PREFIX}/etc/ldapdiff.conf.sample
+		${MKDIR} ${DATADIR}/samples
+.for i in addentry webtomware.init.ldif webtomware.user.ldif
+		${INSTALL_DATA} ${WRKSRC}/samples/${i}
+.endfor
 		${MKDIR} ${DATADIR}/plugins
 		${INSTALL_DATA} ${WRKSRC}/plugins/ldapskeleton.c ${DATADIR}/plugins
 
 .if !defined(NOPORTDOCS)
 		${MKDIR} ${DOCSDIR}
-		${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}
-		${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-		${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
-		${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
+.for i in CHANGES README TODO ChangeLog
+		${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
 .endif
 
 post-install:
diff -ruN /usr/ports/net/ldapdiff/distinfo ldapdiff/distinfo
--- /usr/ports/net/ldapdiff/distinfo	Thu Jun 27 14:13:07 2002
+++ ldapdiff/distinfo	Mon Jul  8 08:46:40 2002
@@ -1 +1 @@
-MD5 (ldapdiff-0.7.0.tar.gz) = 72c5e8091a9d8df09523f7f046819037
+MD5 (ldapdiff-0.8.2.tar.gz) = e58652727f647fac34ee0ff444771154
diff -ruN /usr/ports/net/ldapdiff/files/patch-base64.c ldapdiff/files/patch-base64.c
--- /usr/ports/net/ldapdiff/files/patch-base64.c	Thu Jan  1 00:00:00 1970
+++ ldapdiff/files/patch-base64.c	Sat Jul  6 10:25:08 2002
@@ -0,0 +1,10 @@
+--- base64.c.orig	Sat Jul  6 10:22:29 2002
++++ base64.c	Sat Jul  6 10:22:51 2002
+@@ -46,6 +46,7 @@
+ static const char rcsid[] = "$Id: base64.c,v 1.1 2001/02/22 07:22:08 mellon Exp $";
+ #endif /* not lint */
+ 
++#include <sys/types.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
diff -ruN /usr/ports/net/ldapdiff/files/patch-ldapparse.c ldapdiff/files/patch-ldapparse.c
--- /usr/ports/net/ldapdiff/files/patch-ldapparse.c	Thu Jan  1 00:00:00 1970
+++ ldapdiff/files/patch-ldapparse.c	Sat Jul  6 10:26:36 2002
@@ -0,0 +1,11 @@
+--- ldapparse.c.orig	Sat Jul  6 10:21:57 2002
++++ ldapparse.c	Sat Jul  6 10:23:34 2002
+@@ -25,6 +25,8 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ 
++#include <sys/types.h>
++
+ #include "ldapdiff.h"
+ #include "base64.h"
+ 
diff -ruN /usr/ports/net/ldapdiff/files/patch-ldapwrite.c ldapdiff/files/patch-ldapwrite.c
--- /usr/ports/net/ldapdiff/files/patch-ldapwrite.c	Thu Jan  1 00:00:00 1970
+++ ldapdiff/files/patch-ldapwrite.c	Sat Jul  6 10:28:07 2002
@@ -0,0 +1,11 @@
+--- ldapwrite.c.orig	Sat Jul  6 10:22:20 2002
++++ ldapwrite.c	Sat Jul  6 10:23:16 2002
+@@ -24,6 +24,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#include <sys/types.h>
++
+ #include "ldapdiff.h"
+ #include "base64.h"
+ 
diff -ruN /usr/ports/net/ldapdiff/pkg-plist ldapdiff/pkg-plist
--- /usr/ports/net/ldapdiff/pkg-plist	Thu Jun 27 14:13:07 2002
+++ ldapdiff/pkg-plist	Thu Jul 11 00:33:26 2002
@@ -1,10 +1,14 @@
 bin/ldapdiff
 etc/ldapdiff.conf.sample
 share/ldapdiff/plugins/ldapskeleton.c
+share/ldapdiff/samples/addentry
+share/ldapdiff/samples/webtomware.init.ldif
+share/ldapdiff/samples/webtomware.user.ldif
 %%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
 @dirrm share/ldapdiff/plugins
+@dirrm share/ldapdiff/samples
 @dirrm share/ldapdiff
--- ldapdiff.update ends here ---


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

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020711004034.5BFB3AB9F>