Index: Portfile
===================================================================
--- Portfile	(revision 121137)
+++ Portfile	(working copy)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem	      1.0
@@ -3,11 +4,9 @@
 
 name		      varnish
-epoch                 20110709
-version               3.0.3
-revision              1
+version               3.0.4
 categories	      www
-license               BSD zlib
 platforms	      darwin
-maintainers	      wohner.eu:normen
+maintainers           pmq openmaintainer
+license               BSD
 
 description	      Varnish is a state-of-the-art, high-performance HTTP accelerator
@@ -18,16 +17,21 @@
 homepage	      http://www.varnish-cache.org
 master_sites	      http://repo.varnish-cache.org/source/
 
-checksums             rmd160 a911a2637ef26607aad8a1c34a83bc797a15235d \
-                      sha256 2d37d18d952f58b208ac3a0706d4d3e4c0de304b1fcc9df5019571c75f148ab2
+checksums             rmd160  ed8aba21af17d5fee225eb03950fd90ad7b07911 \
+                      sha256  4e044ccb5c76222bddf89c808f13ea8f66977972675aecb48a920f6800ad0f79
 
-depends_build         port:pkgconfig
+depends_build         port:pkgconfig \
+                      port:py27-docutils
 
 depends_lib           port:pcre
 
+configure.args-append --with-rst2man=${prefix}/bin/rst2man-2.7.py
+
 startupitem.create    yes
+startupitem.pidfile   auto "${prefix}/var/run/${name}/${name}.pid"
 startupitem.start     "${prefix}/share/${name}/varnish.init start"
 startupitem.stop      "${prefix}/share/${name}/varnish.init stop"
+startupitem.restart   "${prefix}/share/${name}/varnish.init restart"
 
 post-destroot {
     # create dir
@@ -64,4 +68,4 @@
 
 livecheck.url      ${master_sites}
 livecheck.type     regex
-livecheck.regex    ${name}-(\\d+\\.\\d+\\.\\d+).tar.gz
\ No newline at end of file
+livecheck.regex    ${name}-(\\d+\\.\\d+\\.\\d+).tar.gz
Index: files/varnish.conf.in
===================================================================
--- files/varnish.conf.in	(revision 121137)
+++ files/varnish.conf.in	(working copy)
@@ -3,11 +3,9 @@
 #
 
 VARNISH_CFG="@PREFIX@/etc/varnish/default.vcl"
-VARNISHD_PID="@PREFIX@/var/run/varnish/varnish.pid"
 
-VARNISHD_OPTS="-a 0.0.0.0:80 \
-               -f $VARNISH_CFG \
-               -T localhost:6082 \
-               -P $VARNISHD_PID \
+VARNISHD_OPTS="-a 0.0.0.0:80
+               -f $VARNISH_CFG
+               -T localhost:6082
                -s malloc,64M
                -u nobody -g nobody"
Index: files/varnish.init.in
===================================================================
--- files/varnish.init.in	(revision 121137)
+++ files/varnish.init.in	(working copy)
@@ -2,6 +2,8 @@
 
 . @PREFIX@/etc/varnish/varnish.conf
 
+VARNISHD_PID="@PREFIX@/var/run/varnish/varnish.pid"
+
 if [[ -r $VARNISHD_PID ]]; then
     read -r PID < "$VARNISHD_PID"
     ps -p $PID &> /dev/null
@@ -14,7 +16,7 @@
 
 case $1 in
     start)
-        @PREFIX@/sbin/varnishd $VARNISHD_OPTS
+        @PREFIX@/sbin/varnishd $VARNISHD_OPTS -P $VARNISHD_PID
     ;;
     stop)
         [[ $PID ]] && kill $PID &>/dev/null