[145392] trunk/dports/security/logwatch/Portfile

[ryandesign at macports.org]

Revision: 145392
          https://trac.macports.org/changeset/145392
Author:   ryandesign at macports.org
Date:     2016-02-03 18:46:05 -0800 (Wed, 03 Feb 2016)
Log Message:
-----------
logwatch: remove unregistered /opt/local/bin/logwatch properly before activation (#50528)

Modified Paths:
--------------
    trunk/dports/security/logwatch/Portfile

Modified: trunk/dports/security/logwatch/Portfile
===================================================================
--- trunk/dports/security/logwatch/Portfile	2016-02-04 02:31:59 UTC (rev 145391)
+++ trunk/dports/security/logwatch/Portfile	2016-02-04 02:46:05 UTC (rev 145392)
@@ -5,7 +5,7 @@
 
 name                logwatch
 version             7.4.1
-revision            3
+revision            4
 distname            logwatch-${version}
 categories          security
 license             MIT
@@ -68,11 +68,11 @@
 }
 
 pre-activate {
-    #- this port used to create a symlink directly in ${prefix} which was fixed in 7.4.1_1
-    #- we need to remove this symlink from ${prefix} though, so upgrades work
-    #- this can eventually be removed, origionally added 2014-10-01
+    # This port used to create a symlink directly in ${prefix} which was fixed in 7.4.1_1.
+    # The old unregistered symlink needs to be deleted from ${prefix} so upgrades work; fixed in 7.4.1_4.
+    # This can eventually be removed. Originally added 2014-10-01; fixed 2016-02-03.
     set badfile ${prefix}/bin/${name}
-    if {[file exists ${badfile}] && [registry_file_registered ${badfile}] == "0"} {
+    if {![catch {file type ${badfile}}] && [registry_file_registered ${badfile}] == "0"} {
         if {[catch {delete ${badfile}}]} {
             ui_warn "Cannot delete ${badfile}; please remove it manually"
         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160203/d67a90c2/attachment-0001.html>