[138309] trunk/dports

[jmr at macports.org]

Revision: 138309
          https://trac.macports.org/changeset/138309
Author:   jmr at macports.org
Date:     2015-07-05 06:03:32 -0700 (Sun, 05 Jul 2015)
Log Message:
-----------
Make db_select into a stub that just cleans up the symlinks it formerly enabled, because actually using it caused breakage. (#47921) No rev bumps for db46 and db48; reinstalling them is neither necessary nor sufficient to fix the problem.

Modified Paths:
--------------
    trunk/dports/databases/db46/Portfile
    trunk/dports/databases/db48/Portfile
    trunk/dports/sysutils/db_select/Portfile

Removed Paths:
-------------
    trunk/dports/databases/db46/files/db46
    trunk/dports/databases/db48/files/db48
    trunk/dports/sysutils/db_select/files/

Modified: trunk/dports/databases/db46/Portfile
===================================================================
--- trunk/dports/databases/db46/Portfile	2015-07-05 12:20:59 UTC (rev 138308)
+++ trunk/dports/databases/db46/Portfile	2015-07-05 13:03:32 UTC (rev 138309)
@@ -2,7 +2,6 @@
 
 PortSystem 1.0
 PortGroup  muniversal 1.0
-PortGroup  select 1.0
 
 name            db46
 version         4.6.21
@@ -130,9 +129,6 @@
 }
 
 if {$subport == $name} {
-    depends_run-append  port:db_select
-    select.group        db
-    select.file         ${filespath}/db46
 
     post-destroot {
         foreach bin [glob -tails -directory ${destroot}${prefix}/bin/ db_*] {
@@ -142,7 +138,6 @@
         }
 
         delete ${destroot}${prefix}/share/doc/${name}/java
-        select::install ${select.group} ${select.file}
     }
 
     # Delete this variant on or after 2013-10-08.

Deleted: trunk/dports/databases/db46/files/db46
===================================================================
--- trunk/dports/databases/db46/files/db46	2015-07-05 12:20:59 UTC (rev 138308)
+++ trunk/dports/databases/db46/files/db46	2015-07-05 13:03:32 UTC (rev 138309)
@@ -1,6 +0,0 @@
-include/db46/db.h
-include/db46/db_cxx.h
-lib/db46/libdb.a
-lib/db46/libdb.dylib
-lib/db46/libdb_cxx.a
-lib/db46/libdb_cxx.dylib

Modified: trunk/dports/databases/db48/Portfile
===================================================================
--- trunk/dports/databases/db48/Portfile	2015-07-05 12:20:59 UTC (rev 138308)
+++ trunk/dports/databases/db48/Portfile	2015-07-05 13:03:32 UTC (rev 138309)
@@ -3,7 +3,6 @@
 
 PortSystem 1.0
 PortGroup  muniversal 1.0
-PortGroup  select 1.0
 
 name            db48
 version         4.8.30
@@ -50,10 +49,6 @@
 }
 configure.cxx ${configure.cxx} ${cxx_stdlibflags}
 
-depends_run-append  port:db_select
-select.group        db
-select.file         ${filespath}/db48
-
 destroot.args       docdir=${prefix}/share/doc/${name}
 
 post-destroot {

Deleted: trunk/dports/databases/db48/files/db48
===================================================================
--- trunk/dports/databases/db48/files/db48	2015-07-05 12:20:59 UTC (rev 138308)
+++ trunk/dports/databases/db48/files/db48	2015-07-05 13:03:32 UTC (rev 138309)
@@ -1,6 +0,0 @@
-include/db48/db.h
-include/db48/db_cxx.h
-lib/db48/libdb.a
-lib/db48/libdb.dylib
-lib/db48/libdb_cxx.a
-lib/db48/libdb_cxx.dylib

Modified: trunk/dports/sysutils/db_select/Portfile
===================================================================
--- trunk/dports/sysutils/db_select/Portfile	2015-07-05 12:20:59 UTC (rev 138308)
+++ trunk/dports/sysutils/db_select/Portfile	2015-07-05 13:03:32 UTC (rev 138309)
@@ -1,21 +1,17 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup select 1.0
 
 name                db_select
 version             0.1
-revision            2
+revision            3
 categories          sysutils
 platforms           darwin
 license             BSD
 maintainers         nomaintainer
 supported_archs     noarch
-description         common files for selecting default db version
-long_description    db_select installs files that allow 'port select' to \
-            switch the default version of db. \
-            It symlinks the standard compiler executables \
-            in the MacPorts prefix to the selected version.
+description         stub port
+long_description    This port is only a stub.
 
 homepage        http://www.macports.org/
 distfiles
@@ -23,8 +19,20 @@
 use_configure           no
 build                   {}
 destroot {
-    select::install db ${filespath}/base
-    select::install db ${filespath}/none
+    xinstall -d ${destroot}${prefix}/share/doc/${name}
+    system "echo '$long_description' > ${destroot}${prefix}/share/doc/${name}/README.txt"
 }
 
+# Clean up symlinks from using 'port select db'
+# https://trac.macports.org/ticket/47921
+post-activate {
+    set file_list [list include/db.h include/db_cxx.h lib/libdb.a lib/libdb.dylib lib/libdb_cxx.a lib/libdb_cxx.dylib]
+    foreach f $file_list {
+        set fullpath ${prefix}/${f}
+        if {![catch {file type $fullpath}] && [registry_file_registered $fullpath] == "0"} {
+            file delete -force $fullpath
+        }
+    }
+}
+
 livecheck.type  none
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150705/5b4835aa/attachment.html>