[22339] trunk

[source_changes at macosforge.org]

Revision: 22339
          http://trac.macosforge.org/projects/macports/changeset/22339
Author:   dluke at macports.org
Date:     2007-02-26 14:54:42 -0800 (Mon, 26 Feb 2007)

Log Message:
-----------
Make apr-util specifically depend on sqlite3 from macports (to make things work on 10.3 systems without sqlite) and update the no_sqlite variant to work with the new changes.

Modified Paths:
--------------
    trunk/dports/devel/apr-util/Portfile

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 023a8b07-a327-4f20-9012-67c915bb7b7c:/local/branches/updates:21118
023a8b07-a327-4f20-9012-67c915bb7b7c:/local/trunk:21326
a2b01108-8822-4c85-91cd-1541804339d8:/local/macports:20632
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/libdnet-maintainer:20898
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-app-cli:20923
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-list-moreutils:20919
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-path-class:20929
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/updates:20946
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/trunk:20947
d9146071-5dc1-4620-afc7-8ba4e23d31df:/local/trunk:21690
f2dd1c64-7982-4318-98ce-263798263e0a:/local:22377
   + 023a8b07-a327-4f20-9012-67c915bb7b7c:/local/branches/updates:21118
023a8b07-a327-4f20-9012-67c915bb7b7c:/local/trunk:21326
a2b01108-8822-4c85-91cd-1541804339d8:/local/macports:20632
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/libdnet-maintainer:20898
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-app-cli:20923
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-list-moreutils:20919
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-path-class:20929
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/updates:20946
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/trunk:20947
d9146071-5dc1-4620-afc7-8ba4e23d31df:/local/trunk:21690
f2dd1c64-7982-4318-98ce-263798263e0a:/local:22470

Modified: trunk/dports/devel/apr-util/Portfile
===================================================================
--- trunk/dports/devel/apr-util/Portfile	2007-02-26 22:20:51 UTC (rev 22338)
+++ trunk/dports/devel/apr-util/Portfile	2007-02-26 22:54:42 UTC (rev 22339)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		apr-util
 version		1.2.8
-revision	1
+revision	2
 categories	devel
 maintainers	dluke at geeklair.net
 description	utilities built with the apache group's portability library
@@ -17,12 +17,13 @@
 checksums	md5 b122f35ee6883a216cd2e7d44504521e
 
 depends_lib	lib:libapr-1:apr port:expat \
-		port:libiconv port:db44
+		port:libiconv port:db44 \
+		port:sqlite3
 
 configure.env	CPPFLAGS=-I${prefix}/include LDFLAGS=-L${prefix}/lib
 configure.args	--with-apr=${prefix}/bin/apr-1-config --with-expat=${prefix} \
 		--with-iconv=${prefix} --with-berkeley-db=${prefix}/include:${prefix}/lib/db44 \
-		--without-mysql --without-pgsql
+		--without-mysql --without-pgsql --with-sqlite3=${prefix}
 
 test.run	yes
 test.target	check
@@ -35,6 +36,8 @@
 		}
 
 variant no_sqlite	{
+				depends_lib-delete port:sqlite3
+				configure.args-delete --with-sqlite3=${prefix}
 				configure.args-append --without-sqlite2 \
 					--without-sqlite3
 			}

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