Ticket #50290: Portfile_84.diff

Portfile

@@ -3 +3 @@
 
 PortSystem 1.0
 PortGroup select 1.0
+PortGroup muniversal 1.0
 
 name                    postgresql84
 version                 8.4.22
@@ -56 +57 @@
                                 --with-ossp-uuid
 configure.cppflags-append       -I${prefix}/include/ossp
 
-if {[variant_isset universal]} {
-    post-configure {
-        system "cd ${worksrcpath}/src/include \
-                && ed - pg_config.h < ${filespath}/pg_config.h.ed \
-                && touch stamp-h"
-        system "cd ${worksrcpath}/src/interfaces/ecpg/include \
-                && ed - ecpg_config.h < ${filespath}/ecpg_config.h.ed \
-                && touch stamp-h"
-    }
-}
-
 build.type              gnu
 build.target
 
@@ -87 +77 @@
 # prepare the contrib modules
 set contribs {}
 
-post-build {
+if { ![variant_isset universal] } {
+    post-build {
     set contribdirs [glob -nocomplain -type d ${worksrcpath}/contrib/*]
     foreach d [lsort $contribdirs] {
         if { [file exists $d/Makefile] } {
@@ -97 +88 @@
         foreach contrib ${contribs} {
                 system "cd ${worksrcpath}/contrib/${contrib}/ && ${build.cmd}"
         }
+    }
+} else {
+    post-build {
+        foreach arch ${universal_archs_to_use} {
+            set contribdirs [glob -nocomplain -type d ${worksrcpath}-${arch}/contrib/*]
+            foreach d [lsort $contribdirs] {
+                if { [file exists $d/Makefile] } {
+                    lappend contribs [file tail $d]
+                }
+            }
+            foreach contrib ${contribs} {
+                system "cd ${worksrcpath}-${arch}/contrib/${contrib}/ && ${build.cmd}"
+            }
+        }
+    }
 }
 
-post-destroot {
+if { ![variant_isset universal] } {
+    post-destroot {
         foreach contrib ${contribs} {
                 system "echo contrib: \"${contrib}\""
                 system "cd ${worksrcpath}/contrib/${contrib}/ && \
                         ${destroot.cmd} install ${destroot.destdir} && touch DONE"
         }
+
+        reinplace -E "s#-arch\[\[:space:\]\]+\[\[:alnum:\]_\]+##g" \
+            ${destroot}${prefix}/lib/postgresql84/pgxs/src/Makefile.global
+    }
+} else {
+    merger-post-destroot {
+        foreach arch ${universal_archs_to_use} {
+            foreach contrib ${contribs} {
+                system "echo contrib: \"${contrib}\""
+                system "cd ${worksrcpath}-${arch}/contrib/${contrib}/ && \
+                        ${destroot.cmd} install ${destroot.destdir}-${arch} && touch DONE"
+            }
+
+            reinplace -E "s#-arch\[\[:space:\]\]+\[\[:alnum:\]_\]+##g" \
+                ${destroot}-${arch}${prefix}/lib/postgresql84/pgxs/src/Makefile.global
+
+            reinplace "s#${worksrcpath}-${arch}#${worksrcpath}#g" \
+                ${destroot}-${arch}${prefix}/lib/${name}/pgxs/src/Makefile.global
+        }
+    }
+}
+
+post-destroot {
         system "cd ${destroot}${prefix}/bin && ln -sf ${libdir}/bin/psql psql84"
         file delete -force ${destroot}${prefix}/share/doc/postgresql \
                 ${destroot}${prefix}/share/man
@@ -144 +174 @@
 post-install {
         ui_msg "\nTo use the postgresql server, install the postgresql84-server port"
 }
-