Ticket #20404: Portfile.2.diff

Portfile

@@ -38 +38 @@
 configure.env       LC_ALL=C
 configure.cmd       sh Configure
 configure.pre_args
+configure.universal_args-delete --disable-dependency-tracking
 configure.post_args     \
                                         -des    \
                                         -Dprefix='${prefix}'    \
-                                        -Dccflags="-I'${prefix}/include'" \
-                    -Dldflags=-L'${prefix}/lib' \
+                                        -Dcppflags="\${CPPFLAGS}" \
+                                        -Dccflags="\${CFLAGS}" \
+                    -Dldflags="\${LDFLAGS}" \
                     -Dvendorprefix='${prefix}'  \
                                         -D cc=\${CC} \
                                         -D ld=\${CC} \
@@ -58 +60 @@
 
 configure.ccache        no
 
-universal_variant   no
+if {[variant_isset universal]} {
+    post-configure {
+        system "cd ${worksrcpath} && ed - ${worksrcpath}/config.h < ${filespath}/config.h.ed"
+    }
+}
 
 test.run            yes