Ticket #14857: Portfile.diff

Portfile

@@ -20 +20 @@
                 rmd160 5290770ae1a97b022d93f4596aa612130fee6187
 
 depends_lib     port:apr port:expat \
-                port:libiconv port:db44 \
+                port:libiconv port:db46 \
                 port:sqlite3
 
 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
@@ -32 +32 @@
 test.env        DYLD_LIBRARY_PATH=${worksrcpath}/.libs
 
 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
                 }
 
@@ -51 +51 @@
                                         --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 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
@@ -72 +72 @@
                                 }
                         }
 
+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@prefix@/include/postgresql83 |" \
+                                                $worksrcpath/Makefile.in
+                                        reinplace "s|^APRUTIL_LDFLAGS = |APRUTIL_LDFLAGS = -L@prefix@/lib/postgresql83 |" \
+                                                $worksrcpath/Makefile.in
+                                }
+                        }
+
 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>}