Revision: 117331 https://trac.macports.org/changeset/117331 Author: jwa@macports.org Date: 2014-02-22 01:13:03 -0800 (Sat, 22 Feb 2014) Log Message: ----------- postgresql: regroup contrib vuild, to make it more reliable Modified Paths: -------------- trunk/dports/databases/postgresql84/Portfile trunk/dports/databases/postgresql90/Portfile trunk/dports/databases/postgresql91/Portfile trunk/dports/databases/postgresql92/Portfile trunk/dports/databases/postgresql93/Portfile Modified: trunk/dports/databases/postgresql84/Portfile =================================================================== --- trunk/dports/databases/postgresql84/Portfile 2014-02-22 07:23:22 UTC (rev 117330) +++ trunk/dports/databases/postgresql84/Portfile 2014-02-22 09:13:03 UTC (rev 117331) @@ -88,15 +88,15 @@ } # prepare the contrib modules -set contribdirs [glob -nocomplain -type d ${worksrcpath}/contrib/*] -set contribs "" -foreach d [lsort $contribdirs] { - if { [file exists $d/Makefile] } { - lappend contribs [file tail $d] - } -} +set contribs {} post-build { + set contribdirs [glob -nocomplain -type d ${worksrcpath}/contrib/*] + foreach d [lsort $contribdirs] { + if { [file exists $d/Makefile] } { + lappend contribs [file tail $d] + } + } foreach contrib ${contribs} { system "cd ${worksrcpath}/contrib/${contrib}/ && ${build.cmd}" } Modified: trunk/dports/databases/postgresql90/Portfile =================================================================== --- trunk/dports/databases/postgresql90/Portfile 2014-02-22 07:23:22 UTC (rev 117330) +++ trunk/dports/databases/postgresql90/Portfile 2014-02-22 09:13:03 UTC (rev 117331) @@ -91,15 +91,15 @@ } # prepare the contrib modules -set contribdirs [glob -nocomplain -type d ${worksrcpath}/contrib/*] -set contribs "" -foreach d [lsort $contribdirs] { - if { [file exists $d/Makefile] } { - lappend contribs [file tail $d] - } -} +set contribs {} post-build { + set contribdirs [glob -nocomplain -type d ${worksrcpath}/contrib/*] + foreach d [lsort $contribdirs] { + if { [file exists $d/Makefile] } { + lappend contribs [file tail $d] + } + } foreach contrib ${contribs} { system "cd ${worksrcpath}/contrib/${contrib}/ && ${build.cmd}" } Modified: trunk/dports/databases/postgresql91/Portfile =================================================================== --- trunk/dports/databases/postgresql91/Portfile 2014-02-22 07:23:22 UTC (rev 117330) +++ trunk/dports/databases/postgresql91/Portfile 2014-02-22 09:13:03 UTC (rev 117331) @@ -91,17 +91,17 @@ } # prepare the contrib modules -# remove a Linux-specific contrib before continuing -file delete -force ${worksrcpath}/contrib/sepgsql -set contribdirs [glob -nocomplain -type d ${worksrcpath}/contrib/*] -set contribs "" -foreach d [lsort $contribdirs] { - if { [file exists $d/Makefile] } { - lappend contribs [file tail $d] - } -} +set contribs {} post-build { + # remove a Linux-specific contrib before continuing + file delete -force ${worksrcpath}/contrib/sepgsql + set contribdirs [glob -nocomplain -type d ${worksrcpath}/contrib/*] + foreach d [lsort $contribdirs] { + if { [file exists $d/Makefile] } { + lappend contribs [file tail $d] + } + } foreach contrib ${contribs} { system "cd ${worksrcpath}/contrib/${contrib}/ && ${build.cmd}" } Modified: trunk/dports/databases/postgresql92/Portfile =================================================================== --- trunk/dports/databases/postgresql92/Portfile 2014-02-22 07:23:22 UTC (rev 117330) +++ trunk/dports/databases/postgresql92/Portfile 2014-02-22 09:13:03 UTC (rev 117331) @@ -96,17 +96,17 @@ # prepare the contrib modules -# remove a Linux-specific contrib before continuing -file delete -force ${worksrcpath}/contrib/sepgsql -set contribdirs [glob -nocomplain -type d ${worksrcpath}/contrib/*] -set contribs "" -foreach d [lsort $contribdirs] { - if { [file exists $d/Makefile] } { - lappend contribs [file tail $d] - } -} +set contribs {} post-build { + # remove a Linux-specific contrib before continuing + file delete -force ${worksrcpath}/contrib/sepgsql + set contribdirs [glob -nocomplain -type d ${worksrcpath}/contrib/*] + foreach d [lsort $contribdirs] { + if { [file exists $d/Makefile] } { + lappend contribs [file tail $d] + } + } foreach contrib ${contribs} { system "cd ${worksrcpath}/contrib/${contrib}/ && ${build.cmd}" } Modified: trunk/dports/databases/postgresql93/Portfile =================================================================== --- trunk/dports/databases/postgresql93/Portfile 2014-02-22 07:23:22 UTC (rev 117330) +++ trunk/dports/databases/postgresql93/Portfile 2014-02-22 09:13:03 UTC (rev 117331) @@ -95,17 +95,17 @@ } # prepare the contrib modules +set contribs {} + +post-build { # remove a Linux-specific contrib before continuing -file delete -force ${worksrcpath}/contrib/sepgsql -set contribdirs [glob -nocomplain -type d ${worksrcpath}/contrib/*] -set contribs "" -foreach d [lsort $contribdirs] { - if { [file exists $d/Makefile] } { - lappend contribs [file tail $d] + file delete -force ${worksrcpath}/contrib/sepgsql + set contribdirs [glob -nocomplain -type d ${worksrcpath}/contrib/*] + foreach d [lsort $contribdirs] { + if { [file exists $d/Makefile] } { + lappend contribs [file tail $d] + } } -} - -post-build { foreach contrib ${contribs} { system "cd ${worksrcpath}/contrib/${contrib}/ && ${build.cmd}" }