fixed to compile with USE ldap.

7 files changed, 83 insertions, 183 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 26f5d1427822..b6f201e02fe9 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.2 2002/03/18 17:52:44 woodchip Exp $
+
+*proftpd-1.2.4-r7 (18 March 2002)
+
+  18 March 2002; Donny Davies <woodchip@gentoo.org> proftpd-1.2.4-r7.ebuild :
+
+  Fix compilation with USE ldap.  Closes #722, thanks goto rectrix@rectrix.cx (Tim Hobbs)
+  for report and suggested resolution.
 
 *proftpd-1.2.4-r6 (1 Feb 2002)
 
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.4-r6 b/net-ftp/proftpd/files/digest-proftpd-1.2.4-r6
deleted file mode 100644
index 1d6ea18c8e8b..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.4-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 98570c48e3187ddaac385e33e0765c74 proftpd-1.2.4.tar.bz2 488433
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.4 b/net-ftp/proftpd/files/digest-proftpd-1.2.4-r7
index 1d6ea18c8e8b..1d6ea18c8e8b 100644
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.4
+++ b/net-ftp/proftpd/files/digest-proftpd-1.2.4-r7
diff --git a/net-ftp/proftpd/files/proftpd.rc5 b/net-ftp/proftpd/files/proftpd.rc5
deleted file mode 100644
index fcbc7bfa441b..000000000000
--- a/net-ftp/proftpd/files/proftpd.rc5
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#RCUPDATE:2 3 4:78:This line is required for script management
-
-. /etc/rc.d/config/functions
-
-SERVICE=proftpd
-opts="start stop restart"
-
-PIDFILE=/var/run/proftpd.pid
-EXE=/usr/sbin/proftpd
-
-start() {
-    ebegin "Starting $SERVICE..."
-    start-stop-daemon --start --quiet --exec $EXE -- -d -p $PIDFILE
-    eend $? "Started $SERVICE." "Error Starting $SERVICE."
-}
-
-stop() {
-    ebegin "Stopping $SERVICE..."
-    start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $EXE
-    eend $? "Stopped $SERVICE." "Error Stopping $SERVICE."
-}
-
-restart() {
-    stop
-    start
-}
-
-doservice ${@}
diff --git a/net-ftp/proftpd/proftpd-1.2.4-r6.ebuild b/net-ftp/proftpd/proftpd-1.2.4-r6.ebuild
deleted file mode 100644
index e078f9d9fa54..000000000000
--- a/net-ftp/proftpd/proftpd-1.2.4-r6.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.4-r6.ebuild,v 1.1 2001/10/20 14:38:12 woodchip Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An advanced and very configurable FTP server"
-SRC_URI="ftp://www.linuxceptional.com/proftpd/distrib/source/${P}.tar.bz2"
-HOMEPAGE="http://www.proftpd.net/"
-
-DEPEND="virtual/glibc
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1 )"
-
-src_compile() {
-
-	local modules myconf
-	modules="mod_ratio:mod_readme:mod_linuxprivs"
-
-	use pam && modules="$modules:mod_pam"
-	use ldap && modules="$modules:mod_ldap"
-
-	if [ "`use mysql`" ]; then
-		modules="$modules:mod_sql:mod_sql_mysql"
-	elif [ "`use postgres`" ]; then
-		modules="$modules:mod_sql:mod_sql_postgres"
-		myconf="${myconf} --with-includes=/usr/include/postgresql"
-	fi
-
-	./configure \
-	--host=${CHOST} \
-	--prefix=/usr \
-	--sbindir=/usr/sbin \
-	--sysconfdir=/etc/proftpd \
-	--localstatedir=/var/run \
-	--mandir=/usr/share/man \
-	--with-modules=${modules} \
-	--disable-sendfile \
-	--enable-shadow \
-	--enable-autoshadow \
-	${myconf}
-	assert "bad configure"
-
-	make || die "compile problem"
-}
-
-src_install() {                               
-
-	make \
-	sysconfdir=${D}/etc/proftpd \
-	localstatedir=${D}/var/run \
-	mandir=${D}/usr/share/man \
-	sbindir=${D}/usr/sbin \
-	prefix=${D}/usr \
-	install || die "install problem"
-
-	dobin contrib/genuser.pl
-	dodir /home/ftp
-
-	dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf
-	dodoc COPYING CREDITS ChangeLog NEWS README*
-	cd doc ; dodoc API Changes* license.txt GetConf
-	dodoc ShowUndocumented Undocumented.txt development.notes
-	docinto html ; dodoc *.html
-	docinto rfc ; dodoc rfc/*.txt
-
-	cd ${D}/etc/proftpd
-	mv proftpd.conf proftpd.conf.distrib
-
-	insinto /etc/proftpd
-	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd
-}
diff --git a/net-ftp/proftpd/proftpd-1.2.4-r7.ebuild b/net-ftp/proftpd/proftpd-1.2.4-r7.ebuild
new file mode 100644
index 000000000000..ad80b26ddfe0
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.2.4-r7.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.4-r7.ebuild,v 1.1 2002/03/18 17:52:44 woodchip Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="An advanced and very configurable FTP server"
+SRC_URI="ftp://www.linuxceptional.com/proftpd/distrib/source/${P}.tar.bz2"
+HOMEPAGE="http://www.proftpd.net/"
+
+DEPEND="virtual/glibc
+	pam? ( >=sys-libs/pam-0.75 )
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	postgres? ( >=dev-db/postgresql-7.1 )"
+
+src_compile() {
+	local modules myconf
+
+	modules="mod_ratio:mod_readme:mod_linuxprivs"
+	use pam && modules="${modules}:mod_pam"
+	use ldap && modules="${modules}:mod_ldap"
+
+	if [ "`use mysql`" ] ; then
+		modules="${modules}:mod_sql:mod_sql_mysql"
+	elif [ "`use postgres`" ] ; then
+		modules="${modules}:mod_sql:mod_sql_postgres"
+		myconf="--with-includes=/usr/include/postgresql"
+	fi
+
+	use ldap && export LDFLAGS="-lresolv"
+
+	./configure \
+		--prefix=/usr \
+		--sbindir=/usr/sbin \
+		--mandir=/usr/share/man \
+		--localstatedir=/var/run \
+		--sysconfdir=/etc/proftpd \
+		--enable-shadow \
+		--disable-sendfile \
+		--enable-autoshadow \
+		--with-modules=${modules} \
+		--host=${CHOST} ${myconf} || die "bad ./configure"
+
+	make || die "compile problem"
+}
+
+src_install() {
+	make \
+		prefix=${D}/usr \
+		sbindir=${D}/usr/sbin \
+		mandir=${D}/usr/share/man \
+		localstatedir=${D}/var/run \
+		sysconfdir=${D}/etc/proftpd \
+		install || die
+
+	dobin contrib/genuser.pl
+	dodir /home/ftp
+
+	dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf \
+		COPYING CREDITS ChangeLog NEWS README* \
+		doc/{API,Changes*,license.txt,GetConf} \
+		doc/{ShowUndocumented,Undocumented.txt} \
+		doc/development.notes
+	dohtml *.html
+	docinto rfc
+	dodoc rfc/*.txt
+
+	cd ${D}/etc/proftpd
+	mv proftpd.conf proftpd.conf.distrib
+
+	insinto /etc/proftpd
+	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd
+}
diff --git a/net-ftp/proftpd/proftpd-1.2.4.ebuild b/net-ftp/proftpd/proftpd-1.2.4.ebuild
deleted file mode 100644
index ed0a916353cb..000000000000
--- a/net-ftp/proftpd/proftpd-1.2.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.4.ebuild,v 1.1 2001/10/20 14:38:12 woodchip Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An advanced and very configurable FTP server"
-SRC_URI="ftp://www.linuxceptional.com/proftpd/distrib/source/${P}.tar.bz2"
-HOMEPAGE="http://www.proftpd.net/"
-
-DEPEND="virtual/glibc
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1 )"
-
-src_compile() {
-
-	local modules myconf
-	modules="mod_ratio:mod_readme:mod_linuxprivs"
-
-	use pam && modules="$modules:mod_pam"
-	use ldap && modules="$modules:mod_ldap"
-
-	if [ "`use mysql`" ]; then
-		modules="$modules:mod_sql:mod_sql_mysql"
-	elif [ "`use postgres`" ]; then
-		modules="$modules:mod_sql:mod_sql_postgres"
-		myconf="${myconf} --with-includes=/usr/include/postgresql"
-	fi
-
-	./configure \
-	--host=${CHOST} \
-	--prefix=/usr \
-	--sbindir=/usr/sbin \
-	--sysconfdir=/etc/proftpd \
-	--localstatedir=/var/run \
-	--mandir=/usr/share/man \
-	--with-modules=${modules} \
-	--disable-sendfile \
-	--enable-shadow \
-	--enable-autoshadow \
-	${myconf}
-	assert "bad configure"
-
-	make || die "compile problem"
-}
-
-src_install() {                               
-
-	make \
-	sysconfdir=${D}/etc/proftpd \
-	localstatedir=${D}/var/run \
-	mandir=${D}/usr/share/man \
-	sbindir=${D}/usr/sbin \
-	prefix=${D}/usr \
-	install || die "install problem"
-
-	dobin contrib/genuser.pl
-	dodir /home/ftp
-
-	dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf
-	dodoc COPYING CREDITS ChangeLog NEWS README*
-	cd doc ; dodoc API Changes* license.txt GetConf
-	dodoc ShowUndocumented Undocumented.txt development.notes
-	docinto html ; dodoc *.html
-	docinto rfc ; dodoc rfc/*.txt
-
-	cd ${D}/etc/proftpd
-	mv proftpd.conf proftpd.conf.distrib
-
-	insinto /etc/proftpd
-	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
-
-	exeinto /etc/rc.d/init.d ; newexe ${FILESDIR}/proftpd.rc5 proftpd
-}