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

[khindenburg at macports.org]

Revision: 127816
          https://trac.macports.org/changeset/127816
Author:   khindenburg at macports.org
Date:     2014-11-04 07:44:26 -0800 (Tue, 04 Nov 2014)
Log Message:
-----------
logwatch: delete bad installed file correctly

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

Modified: trunk/dports/security/logwatch/Portfile
===================================================================
--- trunk/dports/security/logwatch/Portfile	2014-11-04 15:28:06 UTC (rev 127815)
+++ trunk/dports/security/logwatch/Portfile	2014-11-04 15:44:26 UTC (rev 127816)
@@ -5,7 +5,7 @@
 
 name                logwatch
 version             7.4.1
-revision            1
+revision            2
 distname            logwatch-${version}
 categories          security
 license             MIT
@@ -61,12 +61,23 @@
 
 post-destroot {
     file delete /Library/LaunchDaemons/org.macports.${name}.plist
-    file delete /opt/local/bin/logwatch
     xinstall -d -m 0755 ${destroot}/Library/LaunchDaemons
     ln -sf ${prefix}/etc/LaunchDaemons/${name}/org.macports.${name}.plist ${destroot}/Library/LaunchDaemons/
     ln -sf ${prefix}/share/${name}/scripts/logwatch.pl ${destroot}${prefix}/bin/logwatch
 }
 
+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
+    set badfile ${prefix}/bin/${name}
+    if {[file exists ${badfile}] && [registry_file_registered ${badfile}] == "0"} {
+        if {[catch {delete ${badfile}}]} {
+            ui_warn "Cannot delete ${badfile}; please remove it manually"
+        }
+    }
+}
+
 notes "
 A startup item has been generated that will aid in
 starting logwatch with launchd. It is disabled
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141104/63ae5c1f/attachment.html>