[62920] trunk/dports/databases/openldap

[ryandesign at macports.org]

Revision: 62920
          http://trac.macports.org/changeset/62920
Author:   ryandesign at macports.org
Date:     2010-01-21 15:37:30 -0800 (Thu, 21 Jan 2010)
Log Message:
-----------
openldap:

 * update to 2.4.21 (#21279)
 * use muniversal portgroup to fix universal build (#23300, #21945)
 * use db46 instead of db44 (#15697)
 * add icu dependency since openldap uses it

Maintainer timeout.

Modified Paths:
--------------
    trunk/dports/databases/openldap/Portfile
    trunk/dports/databases/openldap/files/patch-ltmain

Modified: trunk/dports/databases/openldap/Portfile
===================================================================
--- trunk/dports/databases/openldap/Portfile	2010-01-21 23:13:58 UTC (rev 62919)
+++ trunk/dports/databases/openldap/Portfile	2010-01-21 23:37:30 UTC (rev 62920)
@@ -1,9 +1,10 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup muniversal 1.0
+
 name            openldap
-version         2.3.35
-revision        1
+version         2.4.21
 categories      databases
 maintainers     landonf
 description     OpenLDAP Software 
@@ -15,19 +16,22 @@
 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 91ae33b88bce17a48743da35a0aa04fd
+extract.suffix	.tgz
+checksums	md5     e7128c57b2bacd940e8906057c94ff26 \
+		sha1    cfcfff3df7804bab8eb0d9464d3712a3e32d677b \
+		rmd160  94f662e8fe1b009f5836cb9c19b095f1b159b1bd
 
 depends_lib	path:bin/perl:perl5 \
 		port:cyrus-sasl2 \
 		port:openssl \
-		port:db44
+		port:db46 \
+		port:icu
 
 patchfiles	patch-ltmain
 
 configure.env-append		LANG=C
-configure.cppflags-append	"-I${prefix}/include/db44 -I${prefix}/include/openssl -DBIND_8_COMPAT"
-configure.ldflags-append	-L${prefix}/lib/db44
+configure.cppflags-append	-I${prefix}/include/db46 -I${prefix}/include/openssl -DBIND_8_COMPAT
+configure.ldflags-append	-L${prefix}/lib/db46
 
 configure.args	--mandir=${prefix}/share/man \
 		--localstatedir=${prefix}/var \
@@ -49,8 +53,17 @@
 }
 
 pre-build {
-	system "cd ${workpath}/${worksrcdir} && \
-			make depend"
+    set dirs {}
+    if {[variant_isset universal]} {
+        foreach arch ${universal_archs_to_use} {
+            lappend dirs ${worksrcpath}-${arch}
+        }
+    } else {
+        lappend dirs ${worksrcpath}
+    }
+    foreach dir ${dirs} {
+        system "cd ${dir} && make depend"
+    }
 }
 
 pre-destroot {

Modified: trunk/dports/databases/openldap/files/patch-ltmain
===================================================================
--- trunk/dports/databases/openldap/files/patch-ltmain	2010-01-21 23:13:58 UTC (rev 62919)
+++ trunk/dports/databases/openldap/files/patch-ltmain	2010-01-21 23:37:30 UTC (rev 62920)
@@ -1,11 +1,11 @@
---- build/ltmain.sh.orig	Fri Apr 15 19:55:55 2005
-+++ build/ltmain.sh	Fri Apr 15 19:56:12 2005
-@@ -1773,7 +1773,7 @@
- 
+--- build/ltmain.sh.orig	2009-01-21 18:00:41.000000000 -0600
++++ build/ltmain.sh	2010-01-21 15:46:47.000000000 -0600
+@@ -2610,7 +2610,7 @@
+ 	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
  	  if test "$installed" = no; then
  	    notinst_deplibs="$notinst_deplibs $lib"
 -	    need_relink=yes
 +	    need_relink=no
  	  fi
+ 	  # This is a shared library
  
- 	  if test -n "$old_archive_from_expsyms_cmds"; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100121/2368c9cd/attachment.html>