Revision
69314
Author
michaelld@macports.org
Date
2010-06-29 22:16:09 -0700 (Tue, 29 Jun 2010)

Log Message

Corrected use of select group, and installation of select file.
Should fix ticket #25459 .

Modified Paths

Diff

Modified: trunk/dports/aqua/qt4-mac/Portfile (69313 => 69314)


--- trunk/dports/aqua/qt4-mac/Portfile	2010-06-30 04:40:19 UTC (rev 69313)
+++ trunk/dports/aqua/qt4-mac/Portfile	2010-06-30 05:16:09 UTC (rev 69314)
@@ -8,7 +8,7 @@
 set select_branch   mac
 set select_port     ${select_group}_select
 set select_name     ${select_group}-${select_branch}
-select.group        ${select_group}
+# select.group        ${select_group}
 
 name                ${select_name}
 #conflicts           kdelibs3 kdelibs4 xmlrpcxx
@@ -221,10 +221,9 @@
         xinstall -c -m 644 ${worksrcpath}/${doc} \
             ${destroot}${qt_dir}/share/doc/${name}
     }
-}
 
-post-activate {
     # install the appropriate select file
+    xinstall -m 755 -d ${destroot}${prefix}/etc/select/${select_port}
     if {[variant_isset no_debug]} {
         xinstall -c -m 644 ${filespath}/${select_name}-no-debug \
             ${destroot}${prefix}/etc/select/${select_port}/${select_name}
@@ -232,6 +231,9 @@
         xinstall -c -m 644 ${filespath}/${select_name} \
             ${destroot}${prefix}/etc/select/${select_port}/${select_name}
     }
+}
+
+post-activate {
     # If this is the first qt4-* installed, select it.
     set current_select [exec ${prefix}/bin/${select_port} -s]
     if {${current_select} == "none"} {

Modified: trunk/dports/aqua/qt4-mac-devel/Portfile (69313 => 69314)


--- trunk/dports/aqua/qt4-mac-devel/Portfile	2010-06-30 04:40:19 UTC (rev 69313)
+++ trunk/dports/aqua/qt4-mac-devel/Portfile	2010-06-30 05:16:09 UTC (rev 69314)
@@ -8,7 +8,7 @@
 set select_branch   mac-devel
 set select_port     ${select_group}_select
 set select_name     ${select_group}-${select_branch}
-select.group        ${select_group}
+# select.group        ${select_group}
 
 name                ${select_name}
 #conflicts           kdelibs3 kdelibs4 xmlrpcxx
@@ -220,10 +220,9 @@
         xinstall -c -m 644 ${worksrcpath}/${doc} \
             ${destroot}${qt_dir}/share/doc/${name}
     }
-}
 
-post-activate {
     # install the appropriate select file
+    xinstall -m 755 -d ${destroot}${prefix}/etc/select/${select_port}
     if {[variant_isset no_debug]} {
         xinstall -c -m 644 ${filespath}/${select_name}-no-debug \
             ${destroot}${prefix}/etc/select/${select_port}/${select_name}
@@ -231,6 +230,9 @@
         xinstall -c -m 644 ${filespath}/${select_name} \
             ${destroot}${prefix}/etc/select/${select_port}/${select_name}
     }
+}
+
+post-activate {
     # If this is the first qt4-* installed, select it.
     set current_select [exec ${prefix}/bin/${select_port} -s]
     if {${current_select} == "none"} {