Ticket #20759: py25-denyhosts.2.diff

Portfile

@@ -2 +2 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           python25 1.0
 
 name                denyhosts
 version             2.6
-categories          security sysutils
 maintainers         snc openmaintainer
 description         DenyHosts is a utility to help sys admins thwart ssh hackers
 long_description    DenyHosts is a python program that automatically blocks ssh\
@@ -25 +23 @@
 patchfiles          patch-denyhosts.cfg-dist.diff \
                     patch-daemon-control-dist.diff
 
+variant python25 conflicts python26 description {Use Python 2.5} {
+    PortGroup       python25 1.0
+    categories      security sysutils
+}
+
+variant python26 conflicts python25 description {Use Python 2.6} {
+    PortGroup       python26 1.0
+    categories      security sysutils
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python25
+}
+
 build {}
 
 pre-build {
@@ -33 +45 @@
     reinplace s|@PYTHON@|${python.bin}| ${worksrcpath}/daemon-control-dist
     reinplace s|@PREFIX@|${prefix}| ${worksrcpath}/daemon-control-dist
     reinplace s|@PREFIX@|${prefix}| ${worksrcpath}/denyhosts.cfg-dist
+    reinplace s|@PREFIX@|${prefix}| ${filespath}/denyhosts.plist
 }
 
+pre-destroot {
+    xinstall -d ${destroot}${prefix}/var/run/
+    xinstall -d ${destroot}${prefix}/var/log/
+}
 post-destroot {
+    ui_msg ""
     ui_msg "    Please read ${prefix}/share/denyhosts/README.txt"
+    ui_msg ""
+    ui_msg "    You need to make config files in ${prefix}/share/denyhosts"
+    ui_msg "    The files ending with '-dist' are examples for you to copy"
+    ui_msg ""
 }
+destroot.keepdirs   ${destroot}${prefix}/var/run \
+                    ${destroot}${prefix}/var/log
 
 startupitem.create  yes
 startupitem.type    launchd
-startupitem.start   ${prefix}/share/denyhosts/daemon-control-dist start
-startupitem.stop    ${prefix}/share/denyhosts/daemon-control-dist stop
-
-livecheck.name      denyhosts
+startupitem.start   "${prefix}/share/denyhosts/daemon-control start"
+startupitem.stop    "${prefix}/share/denyhosts/daemon-control stop"