xmall fixes

5 files changed, 15 insertions, 57 deletions

diff --git a/net-libs/nss_ldap/ChangeLog b/net-libs/nss_ldap/ChangeLog
index 5f89d9ef75cb..13a5400dc229 100644
--- a/net-libs/nss_ldap/ChangeLog
+++ b/net-libs/nss_ldap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/nss_ldap
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nss_ldap/ChangeLog,v 1.2 2002/04/18 16:30:27 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nss_ldap/ChangeLog,v 1.3 2002/06/17 06:11:34 seemant Exp $
+
+*nss_ldap-174-r2 (16 Jun 2002)
+
+  16 Jun 2002; Seemant Kulleen <seemant@gentoo.org> nss_ldap-r2.ebuild
+  files/digest-nss_ldap-r2 :
+
+  Added two configure options, thanks to: Ssrit@larvalstage.net (Jerry
+  Haltom) in bug #3427
 
 *nss_ldap-174-r1 (18 Apr 2002)
 
diff --git a/net-libs/nss_ldap/files/digest-nss_ldap-123 b/net-libs/nss_ldap/files/digest-nss_ldap-123
deleted file mode 100644
index 1b1cf9c1e82a..000000000000
--- a/net-libs/nss_ldap/files/digest-nss_ldap-123
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b33dbfbdee22d1d6dd29888431ff4304 nss_ldap-123.tar.gz 98875
diff --git a/net-libs/nss_ldap/files/digest-nss_ldap-174 b/net-libs/nss_ldap/files/digest-nss_ldap-174-r2
index bb031d4bf49d..bb031d4bf49d 100644
--- a/net-libs/nss_ldap/files/digest-nss_ldap-174
+++ b/net-libs/nss_ldap/files/digest-nss_ldap-174-r2
diff --git a/net-libs/nss_ldap/nss_ldap-123.ebuild b/net-libs/nss_ldap/nss_ldap-123.ebuild
deleted file mode 100644
index 46746b01ed6f..000000000000
--- a/net-libs/nss_ldap/nss_ldap-123.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nss_ldap/nss_ldap-123.ebuild,v 1.1 2000/11/26 20:54:19 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/nss_ldap.html"
-SRC_URI="ftp://ftp.padl.com/pub/"${A}
-
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=net-nds/openldap-1.2.11"
-
-src_unpack() {
-  unpack ${A}
-  cd ${S}
-  sed -e "s/^NSFLAGS/#NSFLAGS/" \
-      -e "s/-lsasl//" \
-      -e "s/-O/${CFLAGS}/" Makefile.linux.openldap2 > Makefile
-}
-
-src_compile() {                           
-  cd ${S}
-  try make
-}
-
-src_install() {                               
-  cd ${S}
-  into /
-  dolib.so libnss_ldap-2.*.so
-  preplib /
-  into /usr
-  doman *.1
-  insinto /etc
-  doins nsswitch.ldap
-  insinto /usr/bin
-  insopts -m755
-  doins ldaptest.pl
-  dodoc ldap.conf ANNOUNCE BUGS ChangeLog CONTRIBUTORS COPYING.LIB
-  dodoc CVSVersionInfo.txt README rfc*.txt nsswitch.test
-}
-
-
-
-
-
-
diff --git a/net-libs/nss_ldap/nss_ldap-174.ebuild b/net-libs/nss_ldap/nss_ldap-174-r2.ebuild
index 1ca2f58db82c..742695351281 100644
--- a/net-libs/nss_ldap/nss_ldap-174.ebuild
+++ b/net-libs/nss_ldap/nss_ldap-174-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Authors Achim Gottinger <achim@gentoo.org>, Joshua Pollak <pardsbane@offthehill.org>
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nss_ldap/nss_ldap-174.ebuild,v 1.1 2001/12/02 12:54:54 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nss_ldap/nss_ldap-174-r2.ebuild,v 1.1 2002/06/17 06:11:34 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="NSS LDAP Module"
@@ -20,6 +20,8 @@ src_compile() {
 		--infodir=/usr/share/info \
 		--sysconfdir=/etc \
 		--localstatedir=/var/lib \
+		--enable-schema-mapping \
+		--enable-rfc2307bi \
 		--enable-extra-optimization || die
 
 	emake UNIX_CAN_BUILD_STATIC=0 \
@@ -31,11 +33,8 @@ src_install() {
 	mkdir ${D}/usr
 	mkdir ${D}/usr/lib
 
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
+	make \
+		DESTDIR=${D} \
 		install || die
 
 	rm ${D}/etc/ldap.conf