[23371] trunk/dports/databases/openldap

[source_changes at macosforge.org]

Revision: 23371
          http://trac.macosforge.org/projects/macports/changeset/23371
Author:   markd at macports.org
Date:     2007-03-29 21:53:38 -0700 (Thu, 29 Mar 2007)

Log Message:
-----------
Closes #11659.  Update to 2.3.34 and use startupitems.

Modified Paths:
--------------
    trunk/dports/databases/openldap/Portfile

Removed Paths:
-------------
    trunk/dports/databases/openldap/files/slapd.sh

Modified: trunk/dports/databases/openldap/Portfile
===================================================================
--- trunk/dports/databases/openldap/Portfile	2007-03-30 03:04:28 UTC (rev 23370)
+++ trunk/dports/databases/openldap/Portfile	2007-03-30 04:53:38 UTC (rev 23371)
@@ -2,48 +2,57 @@
 
 PortSystem 1.0
 name            openldap
-version         2.2.28
+version         2.3.34
 categories      databases
 maintainers     landonf at macports.org bchesneau at mac.com
 description     OpenLDAP Software 
 long_description	OpenLDAP Software is an open source implementation \
 			of the Lightweight Directory Access Protocol.  
 
-platforms       darwin freebsd
+platforms       darwin
 homepage	http://www.openldap.org/
 master_sites	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		http://www.openldap.org/software/download/OpenLDAP/openldap-release/ \
 		ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/
 distfiles	${name}-${version}.tgz
-checksums	md5 b51db7328430b9cbe527696da726f1fb
+checksums	md5 143eeb6e3c163e5f52d8e744b43a5960
 
 depends_lib	port:db4 \
 		port:perl5.8 \
 		port:cyrus-sasl2 \
 		port:openssl
 
-depends_run 	path:/Library/StartupItems/DarwinPortsStartup:DarwinPortsStartup
-
 patchfiles	patch-ltmain
 
 configure.env   LDFLAGS="-L${prefix}/lib" \
-		CPPFLAGS="-I${prefix}/include -I${prefix}/include/db4 -I/usr/include/openssl -DBIND_8_COMPAT" \
+		CPPFLAGS="-I${prefix}/include -I${prefix}/include/db4 -I${prefix}/include/openssl -DBIND_8_COMPAT" \
 		LANG=C
 
 configure.args	--mandir=${prefix}/share/man \
-		--localstatedir=${prefix}/var/run \
+		--localstatedir=${prefix}/var \
 		--with-cyrus-sasl \
 		--with-tls \
+		--enable-crypt \
 		--enable-wrappers
 
+startupitem.create      yes
+startupitem.name	slapd
+startupitem.init	"PID=${prefix}/var/run/slapd.pid"
+startupitem.start       "${prefix}/libexec/slapd -u ldap -f ${prefix}/etc/openldap/slapd.conf"
+startupitem.stop        "\[ -r \${PID} \] && kill \$(cat \${PID})"
+
 platform darwin 6 {
-        depends_lib-append      lib:libdl:dlcompat
+        depends_lib-append      port:dlcompat
 }
 
 variant ipv6 {
 	configure.args-append --enable-ipv6
 }
 
+variant aci {
+        configure.args-append --enable-aci
+}
+
 pre-configure {
 	if { ![variant_isset ipv6]} {
 		configure.args-append --disable-ipv6
@@ -66,11 +75,6 @@
 	xinstall -d -g ldap -m 700 -o ldap \
 		"${destroot}${prefix}/var/run/openldap-data"
 	#since post-deploy doesn't exist
-	xinstall -d -m 755 -o root "${destroot}${prefix}/etc/rc.d"
-	xinstall -m 755 -o root "${portpath}/files/slapd.sh" \
-		"${destroot}${prefix}/etc/rc.d"
-	reinplace "s|__PREFIX|${prefix}|g" \
-		${destroot}${prefix}/etc/rc.d/slapd.sh
 }
 
 test.run	yes

Deleted: trunk/dports/databases/openldap/files/slapd.sh
===================================================================
--- trunk/dports/databases/openldap/files/slapd.sh	2007-03-30 03:04:28 UTC (rev 23370)
+++ trunk/dports/databases/openldap/files/slapd.sh	2007-03-30 04:53:38 UTC (rev 23371)
@@ -1,24 +0,0 @@
-#!/bin/sh
-NAME=slapd
-PIDFILE=$NAME.pid
-CAT=/bin/cat
-KILL=/bin/kill
-
-case "$1" in
-
-start)
-  echo "starting slapd"
-  __PREFIX/libexec/slapd -f __PREFIX/etc/openldap/slapd.conf 
-  ;;
-
-stop)
-  echo "stopping slapd"
-  $KILL -15 `$CAT __PREFIX/var/run/$PIDFILE` 
-  ;;
-
-*)
-  echo "Usage: __PREFIX/etc/rc.d/$NAME {start|stop}"
-  exit 1
-  ;;
-
-esac

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070329/a698565c/attachment.html