Ticket #25320: qt4-mac-Portfile.diff

(a) Portfile_orig vs. (b) Portfile

@@ -59 +59 @@
 set dirname qt4-mac
 set qt_dir ${prefix}/libexec/${dirname}
 
+#  use compiler.cflags and compiler.library_flags, as per
+#  http://trac.macports.org/ticket/25321 for all -I and -L entries,
+#  so-as to avoid conflicts with already-installed headers and
+#  libraries (giving preference to internal-to-this-port first)
+#
 #  CPATH is used instead of -I to avoid conflicts with other ports.
 #  See http://trac.macports.org/ticket/15219 and http://trac.macports.org/ticket/18723.
 #
@@ -70 +75 @@
 #
 configure.args                                            \
     -v                                                    \
-    -debug-and-release                                    \
+    -release                                              \
     -confirm-license                                      \
     -opensource                                           \
     -prefix          ${qt_dir}                            \
@@ -81 +86 @@
     -system-sqlite                                        \
     -openssl-linked                                       \
     -dbus-linked                                          \
-    -L${prefix}/lib                                       \
     -arch            \"${build_arch}\"
 
-lappend cpath        ${prefix}/include
-lappend library_path ${prefix}/lib
-
-pre-configure {
-    configure.env-append \
-        CPATH=[join ${cpath} :] \
-        LIBRARY_PATH=[join ${library_path} :]
-}
-
-pre-build {
-    build.env-append \
-        CPATH=[join ${cpath} :] \
-        LIBRARY_PATH=[join ${library_path} :]
-}
-
 # Stop configure script from searching for SQL Drivers
 #    not available from MacPorts.
 foreach driver {db2 ibase oci tds} {
@@ -126 +115 @@
 
 variant mysql description {Enable MySQL SQL Driver} {
     depends_lib-append path:lib/mysql5:mysql5
-
-    lappend cpath        ${prefix}/include/mysql5/mysql
-    lappend library_path ${prefix}/lib/mysql5/mysql
-
+    # reverse the search paths, such that the defaults are searched last
+    compiler.cpath ${prefix}/include/mysql5/mysql:${compiler.cpath}
+    compiler.library_path ${prefix}/lib/mysql5/mysql:${compiler.library_path}
     configure.args-delete -no-sql-mysql
 }
 
@@ -140 +128 @@
 
 variant psql description {Enable PostgreSQL SQL Driver} {
     depends_lib-append port:postgresql83
-
-    lappend cpath        ${prefix}/include/postgresql83
-    lappend library_path ${prefix}/lib/postgresql83
-
+    # reverse the search paths, such that the defaults are searched last
+    compiler.cpath ${prefix}/include/postgresql83:${compiler.cpath}
+    compiler.library_path ${prefix}/lib/postgresql83:${compiler.library_path}
     configure.args-delete -no-sql-psql
 }
 
@@ -152 +139 @@
     configure.args-delete -no-sql-sqlite2
 }
 
+variant debug conflicts combined description {Compile and Link with Debugging} {
+    configure.args-delete -release
+    configure.args-append -debug
+}
+
+variant combined conflicts debug description {Compile and Link with and without Debugging} {
+    configure.args-delete -release
+    configure.args-append -debug-and-release
+}
+
 build.target        first
 use_parallel_build  yes