Changeset 98577

Timestamp:

Oct 9, 2012, 8:43:20 AM (12 years ago)

Author:

ryandesign@…

Message:

redis:

• the launchd plist now uses startupitem.executable to launch redis-server in non-daemonized mode directly, thus fixing problems stopping the server (#33476)
• redis.conf.sample is now based on redis.conf included in redis source, instead of an out of date copy in our files directory (#32951); one less thing we have to remember to update when we update the port
• only redis.conf.sample is now installed; redis-daemon.conf.sample is gone; if you want to run redis-server as a daemon (which is unusual on OS X, since we use launchd) then you can modify redis.conf manually
• adjust port notes to clarify that the presented "redis-server" command is an alternative to the usual "port load" mechanism

Location:

trunk/dports/databases/redis

Files:

• Portfile (modified) (5 diffs)
• files/patch-redis.conf.diff (added)
• files/redis-daemon.conf.sample.in (deleted)
• files/redis.conf.sample.in (deleted)

trunk/dports/databases/redis/Portfile

@@ -6 +6 @@
 name                redis
 version             2.4.17
-revision            0
+revision            1
 categories          databases
 license             BSD
@@ -22 +22 @@
                     sha256  3fae7c47ef84886ff65073593c91586bb675babaf702eb6f3b37855ab3066ebd
 
+patchfiles          patch-redis.conf.diff
+
+post-patch {
+    reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/redis.conf
+}
+
 use_configure       no
 
@@ -27 +33 @@
 
 build.env-append    CC="${configure.cc} [get_canonical_archflags]"
-
-post-build {
-    copy ${filespath}/redis.conf.sample.in ${workpath}/redis.conf.sample
-    copy ${filespath}/redis-daemon.conf.sample.in ${workpath}/redis-daemon.conf.sample
-    reinplace "s|@PREFIX@|${prefix}|g" \
-        ${workpath}/redis.conf.sample \
-        ${workpath}/redis-daemon.conf.sample
-}
 
 destroot.keepdirs   ${destroot}${prefix}/var/db/redis
@@ -47 +45 @@
         redis-server \
         ${destroot}${prefix}/bin
-    xinstall -m 0644 -W ${workpath} \
-        redis.conf.sample \
-        redis-daemon.conf.sample \
-        ${destroot}${prefix}/etc
+    xinstall -m 0644 ${worksrcpath}/redis.conf \
+        ${destroot}${prefix}/etc/redis.conf.sample
 }
 
 post-activate {
-    if {![file exists ${prefix}/etc/redis-daemon.conf]} {
-        file copy ${prefix}/etc/redis-daemon.conf.sample \
-            ${prefix}/etc/redis-daemon.conf
-    }
     if {![file exists ${prefix}/etc/redis.conf]} {
-        file copy ${prefix}/etc/redis.conf.sample \
-            ${prefix}/etc/redis.conf
+        file copy ${prefix}/etc/redis.conf.sample ${prefix}/etc/redis.conf
     }
     xinstall -d ${prefix}/var/log
@@ -67 +58 @@
 
 startupitem.create  yes
-startupitem.start   "${prefix}/bin/redis-server ${prefix}/etc/redis-daemon.conf"
-startupitem.stop    "echo \"SHUTDOWN\" | nc localhost 6379"
+startupitem.executable  ${prefix}/bin/redis-server ${prefix}/etc/redis.conf
 
 notes "
-To start up a redis server instance use this command:
+If you prefer to start a redis server manually, rather than using 'port load', then use this command:
 
     redis-server ${prefix}/etc/redis.conf