[37635] trunk/dports/devel/apr-util/Portfile

[dluke at macports.org]

Revision: 37635
          http://trac.macosforge.org/projects/macports/changeset/37635
Author:   dluke at macports.org
Date:     2008-06-16 11:55:42 -0700 (Mon, 16 Jun 2008)

Log Message:
-----------
version bump, update apr-util to 1.3.0

also:
- now depend on db46
- add mysql5 and postgres83 variants

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

Modified: trunk/dports/devel/apr-util/Portfile
===================================================================
--- trunk/dports/devel/apr-util/Portfile	2008-06-16 18:54:51 UTC (rev 37634)
+++ trunk/dports/devel/apr-util/Portfile	2008-06-16 18:55:42 UTC (rev 37635)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name		apr-util
-version		1.2.12
+version		1.3.0
 categories	devel
 maintainers	dluke at geeklair.net
 platforms	darwin
@@ -15,26 +15,30 @@
 homepage	http://apr.apache.org/
 master_sites	apache:apr
 use_bzip2	yes
-checksums	md5 4ec0474c61113dcb57943916e7f53522 \
-		sha1 1e0e4215ce064544976d96118ab1e51100aab577 \
-		rmd160 5290770ae1a97b022d93f4596aa612130fee6187
+checksums	md5 3cb56bbeefb72def43dee4bf69c46a21 \
+		sha1 d6835e1541b4b80002673815e1a78efb597679ab \
+		rmd160 b00b5bcecd72de79cdd7d0fe9c55dae6df3e43bc
 
 depends_lib	port:apr port:expat \
-		port:libiconv port:db44 \
+		port:libiconv port:db46 \
 		port:sqlite3
 
 use_parallel_build	yes
 configure.args	--with-apr=${prefix}/bin/apr-1-config --with-expat=${prefix} \
-		--with-iconv=${prefix} --with-berkeley-db=${prefix}/include:${prefix}/lib/db44 \
+		--with-iconv=${prefix} --with-berkeley-db=${prefix}/include:${prefix}/lib/db46 \
 		--without-mysql --without-pgsql --with-sqlite3=${prefix}
 
 test.run	yes
 test.target	check
 test.env	DYLD_LIBRARY_PATH=${worksrcpath}/.libs
+pre-test	{
+	use_parallel_build	no
+}
 
+
 variant no_bdb	description {Build without BerkeleyDB support} {
-			depends_lib-delete port:db44
-			configure.args-delete --with-berkeley-db=${prefix}/include:${prefix}/lib/db44
+			depends_lib-delete port:db46
+			configure.args-delete --with-berkeley-db=${prefix}/include:${prefix}/lib/db46
 			configure.args-append --without-berkeley-db
 		}
 
@@ -52,13 +56,28 @@
 					--with-ldap-lib=${prefix}/lib
 			}
 
-set extralibs	"-L${prefix}/lib/db44"
+set extralibs	"-L${prefix}/lib/db46"
 
 pre-configure	{
 			reinplace "s|^Libs: |Libs: ${extralibs} |" $worksrcpath/apr-util.pc.in
 		}
 
-variant postgresql82	description {Build with postgres support (using postgresql v8.2)} {
+variant postgresql83	description {Build with postgres support (using postgresql v8.3)} conflicts postgresql82 {
+				depends_lib-append port:postgresql83
+				configure.args-delete --without-pgsql
+				configure.args-append --with-pgsql=yes
+				configure.cppflags-append "-I${prefix}/include/postgresql83"
+				configure.ldflags-append "-L${prefix}/lib/postgresql83"
+				post-patch	{
+					set extralibs "${extralibs} -L${prefix}/lib/postgresql83"
+					reinplace "s|^INCLUDES = |INCLUDES = -I at prefix@/include/postgresql83 |" \
+						$worksrcpath/Makefile.in
+					reinplace "s|^APRUTIL_LDFLAGS = |APRUTIL_LDFLAGS = -L at prefix@/lib/postgresql83 |" \
+						$worksrcpath/Makefile.in
+				}
+			}
+
+variant postgresql82	description {Build with postgres support (using postgresql v8.2)} conflicts postgresql83 {
 				depends_lib-append port:postgresql82
 				configure.args-delete --without-pgsql
 				configure.args-append --with-pgsql=yes
@@ -73,6 +92,13 @@
 				}
 			}
 
+variant mysql5	description {Build with MySQL5 suppoprt} {
+		depends_lib-append port:mysql5
+		configure.args-append --with-mysql \
+			--with-mysql-include=${prefix}/include/mysql5 \
+			--with-mysql-lib=${prefix}/lib/mysql5
+		}
+
 livecheck.check regex
 livecheck.url   http://apache.org/dist/apr/
 livecheck.regex {<a href="#aprutil">APR-util (\d+(?:\.\d+)*) is the latest available version</a>}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080616/eb7aa3fe/attachment.htm