Update to 6.0.7

PR:		161651
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

4 files changed, 58 insertions, 74 deletions

diff --git a/net/ldapsdk/Makefile b/net/ldapsdk/Makefile
index 741e83d1dfee..8dcdde5226d3 100644
--- a/net/ldapsdk/Makefile
+++ b/net/ldapsdk/Makefile
@@ -6,71 +6,34 @@
 #
 
 PORTNAME=	ldapsdk
-PORTVERSION=	1998.12.31
-PORTREVISION=	1
+PORTVERSION=	6.0.7
+PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	directory/c-sdk/ancient
-DISTNAME=	ldapsdk_12311998
+MASTER_SITES=	MOZILLA/directory/c-sdk/releases/v${PORTVERSION}/src
+DISTNAME=	mozldap-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mozilla LDAP sdk
 
-WRKSRC=			${WRKDIR}/mozilla
-MAKEFILE=	${WRKSRC}/directory/ldapsdk.mk
-USE_GMAKE=	yes
-USE_LDCONFIG=	yes
-USE_PERL5=	yes
+LIB_DEPENDS=	nspr4.1:${PORTSDIR}/devel/nspr
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/c-sdk
 
-MAKE_ENV+=	MOZILLA_CLIENT=1 NO_MDUPDATE=1 MOZ_LDAP_SDK=1
-ALL_TARGET=		build
+USE_PERL5=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-optimize \
+		--with-dist-prefix=${WRKDIR}/fakeroot \
+		--with-nspr-inc=${LOCALBASE}/include/nspr \
+		--with-nspr-lib=${LOCALBASE}/lib
+MAKE_JOBS_SAFE=	yes
 
-OBJDIR=	${WRKSRC}/dist/${OPSYS}${OSREL}_DBG.OBJ
-INSTALL_DIR= ${PREFIX}/mozilla/directory
+post-extract:
+	@${MKDIR} ${WRKDIR}/fakeroot
 
 do-install:
-	${MKDIR} ${INSTALL_DIR}/etc
-	${MKDIR} ${INSTALL_DIR}/include
-	${MKDIR} ${INSTALL_DIR}/lib
-	${INSTALL_DATA} ${OBJDIR}/bin/liblber.so.1.0 \
-						${PREFIX}/lib/libmozlber.so.1
-	-(cd ${PREFIX}/lib; ${LN} -s libmozlber.so.1 libmozlber.so)
-	${INSTALL_DATA} ${OBJDIR}/bin/libldap.so.1.0 \
-						${PREFIX}/lib/libmozldap.so.1
-	-(cd ${PREFIX}/lib; ${LN} -s libmozldap.so.1 libmozldap.so)
-	${INSTALL_DATA} ${OBJDIR}/lib/liblber.a ${PREFIX}/lib/libmozlber.a
-	${INSTALL_DATA} ${OBJDIR}/lib/libldap.a ${PREFIX}/lib/libmozldap.a
-	cd ${OBJDIR}/etc && ${TAR} -chf - * | \
-		${TAR} -xf - -C ${INSTALL_DIR}/etc
-	cd ${OBJDIR}/include && ${TAR} -chf - * | \
-		${TAR} -xf - -C ${INSTALL_DIR}/include
-	cd ${INSTALL_DIR}/include \
-		&& [ -f lber.h ] \
-		&& ( cat lber.h | sed -e 's/ldap\.h/mozldap\.h/' > mozlber.h ) \
-		&& rm lber.h \
-		&& [ -f ldap.h ] \
-		&& ( cat ldap.h | sed -e 's/lber\.h/mozlber\.h/' > mozldap.h ) \
-		&& rm ldap.h
-	${LN} -sf ${INSTALL_DIR}/include/mozlber.h ${PREFIX}/include
-	${LN} -sf ${INSTALL_DIR}/include/mozldap.h ${PREFIX}/include
-
-post-install:
-	@echo
-	@echo 'PLEASE NOTE (2000/8/23):'
-	@echo '     The mozilla lber and ldap libraries now are installed'
-	@echo '     with the names mozlber and mozldap.'
-	@echo
-	@echo '     This has been done to resolve a library naming conflict with '
-	@echo '     the openldap port.  Also, these libraries and related'
-	@echo '     header files are now installed by default in the standard'
-	@echo '     directories /usr/local/lib and /usr/local/include.'
-	@echo
-	@echo '     The complete set of mozilla ldapsdk header files'
-	@echo '     has been installed in /usr/local/mozilla/directory/include,'
-	@echo '     should you require one of the more esoteric ones.'
-	@echo
-	@echo '     Also, please note that the PerLDAP port (../perldap) has'
-	@echo '     been updated to link appropriately to these new library names.'
-	@echo
+	@${MKDIR} ${PREFIX}/mozilla/directory
+	@(cd ${WRKDIR}/fakeroot \
+		&& ${COPYTREE_SHARE} . ${PREFIX}/mozilla/directory)
 
 .include <bsd.port.mk>
diff --git a/net/ldapsdk/distinfo b/net/ldapsdk/distinfo
index fd475c067d46..827dfca04651 100644
--- a/net/ldapsdk/distinfo
+++ b/net/ldapsdk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ldapsdk_12311998.tar.gz) = e6e11d0e203ebee71706886dd9d3f2169212eb778efcfbdc49ec39cdf25bbb05
-SIZE (ldapsdk_12311998.tar.gz) = 1375703
+SHA256 (mozldap-6.0.7.tar.gz) = ec9884b56b31961d287190323764af7f3b00ad2658d5f3005fa8dc71c637e54c
+SIZE (mozldap-6.0.7.tar.gz) = 674789
diff --git a/net/ldapsdk/pkg-descr b/net/ldapsdk/pkg-descr
index 0f4a49b0032d..1d29c294a057 100644
--- a/net/ldapsdk/pkg-descr
+++ b/net/ldapsdk/pkg-descr
@@ -1 +1,3 @@
 Mozilla LDAP sdk
+
+WWW: https://wiki.mozilla.org/LDAP_C_SDK
diff --git a/net/ldapsdk/pkg-plist b/net/ldapsdk/pkg-plist
index b6c0af498448..6f420fe6c292 100644
--- a/net/ldapsdk/pkg-plist
+++ b/net/ldapsdk/pkg-plist
@@ -1,21 +1,40 @@
-include/mozlber.h
-include/mozldap.h
+mozilla/directory/bin/libldap60.so
+mozilla/directory/bin/libldif60.so
+mozilla/directory/bin/libprldap60.so
 mozilla/directory/etc/ldapfilter.conf
-mozilla/directory/etc/ldapsearchprefs.conf
 mozilla/directory/etc/ldapfriendly
+mozilla/directory/etc/ldapsearchprefs.conf
 mozilla/directory/etc/ldaptemplates.conf
+mozilla/directory/lib/libiutil60.a
+mozilla/directory/lib/liblber60.a
+mozilla/directory/lib/libldap60.a
+mozilla/directory/lib/libldap60.so
+mozilla/directory/lib/libldif60.a
+mozilla/directory/lib/libldif60.so
+mozilla/directory/lib/libprldap60.so
+mozilla/directory/public/ldap/disptmpl.h
+mozilla/directory/public/ldap/iutil.h
+mozilla/directory/public/ldap/lber.h
+mozilla/directory/public/ldap/ldap-deprecated.h
+mozilla/directory/public/ldap/ldap-extension.h
+mozilla/directory/public/ldap/ldap-platform.h
+mozilla/directory/public/ldap/ldap-standard.h
+mozilla/directory/public/ldap/ldap-to-be-deprecated.h
+mozilla/directory/public/ldap/ldap.h
+mozilla/directory/public/ldap/ldap_ssl.h
+mozilla/directory/public/ldap/ldappr.h
+mozilla/directory/public/ldap/ldif.h
+mozilla/directory/public/ldap/srchpref.h
+mozilla/directory/public/ldap-private/lber-int.h
+mozilla/directory/public/ldap-private/ldap-int.h
+mozilla/directory/public/ldap-private/ldaplog.h
+mozilla/directory/public/ldap-private/ldaprot.h
+mozilla/directory/public/ldap-private/portable.h
+@dirrm mozilla/directory/public/ldap-private
+@dirrm mozilla/directory/public/ldap
+@dirrm mozilla/directory/public
+@dirrm mozilla/directory/lib
 @dirrm mozilla/directory/etc
-mozilla/directory/include/disptmpl.h
-mozilla/directory/include/mozlber.h
-mozilla/directory/include/mozldap.h
-mozilla/directory/include/srchpref.h
-@dirrm mozilla/directory/include
-@dirrmtry mozilla/directory/lib
+@dirrm mozilla/directory/bin
 @dirrm mozilla/directory
 @dirrm mozilla
-lib/libmozlber.so.1
-lib/libmozlber.so
-lib/libmozldap.so.1
-lib/libmozldap.so
-lib/libmozlber.a
-lib/libmozldap.a