[30590] trunk/dports/mail/vm-pop3d/Portfile

[source_changes at macosforge.org]

Revision: 30590
          http://trac.macosforge.org/projects/macports/changeset/30590
Author:   markd at macports.org
Date:     2007-10-31 19:04:01 -0700 (Wed, 31 Oct 2007)

Log Message:
-----------
Revert to script startupitem; startupitem.executable starts multiple processes and
startupitem.executable can't handle that.

Modified Paths:
--------------
    trunk/dports/mail/vm-pop3d/Portfile

Modified: trunk/dports/mail/vm-pop3d/Portfile
===================================================================
--- trunk/dports/mail/vm-pop3d/Portfile	2007-10-31 21:52:15 UTC (rev 30589)
+++ trunk/dports/mail/vm-pop3d/Portfile	2007-11-01 02:04:01 UTC (rev 30590)
@@ -4,9 +4,9 @@
 
 name				vm-pop3d  
 version				1.1.6
-revision			3
+revision			2
 categories			mail
-maintainers			markd
+maintainers			markd at macports.org
 platforms			darwin
 
 description			POP3 server for Postfix that supports virtual domains and mailboxes
@@ -16,20 +16,26 @@
 				Unix accounts.
 
 homepage			http://www.reedmedia.net/software/virtualmail-pop3d/
+					
 master_sites		        http://www.ibiblio.org/pub/Linux/system/mail/pop/ \
 				ftp://sunsite.unc.edu/pub/Linux/system/mail/pop/
-#patchfiles			patch-vm-pop3d.init
+
 checksums			md5 0399cc06f5329a6eaebec05d959a6ec1
+
+patchfiles                      patch-vm-pop3d.init
+
 destroot.destdir		prefix=${destroot}${prefix}
 
 depends_lib			port:postfix
 
 configure.args			--enable-virtual
 
+
 variant server {
-    startupitem.create      yes
-    startupitem.name        ${name}
-    startupitem.executable  ${prefix}/sbin/vm-pop3d --user postfix --group postfix -d 10 -t 600
+
+    startupitem.create    yes
+    startupitem.start "${prefix}/share/${name}/vm-pop3d.init start"
+    startupitem.stop "${prefix}/share/${name}/vm-pop3d.init stop"
 }
 
 pre-configure {
@@ -53,15 +59,14 @@
 	system "chown postfix:postfix ${destroot}${prefix}/var/${name}/spool"
 
 # Create lock file path
-#	xinstall -m 755 -d ${destroot}${prefix}/var/${name}/lock
+	xinstall -m 755 -d ${destroot}${prefix}/var/${name}/lock
 
 # Keep the empty virtual spool and passwd file paths
 destroot.keepdirs \
         ${destroot}${prefix}/var/${name}/spool \
+        ${destroot}${prefix}/var/${name}/lock \
 	${destroot}${prefix}/etc/${name}
-#	${destroot}${prefix}/var/${name}/lock
 
-
 # Install documentation type stuff
 	xinstall -d ${destroot}${prefix}/share/doc/${name}
 	xinstall -m 644 ${worksrcpath}/AUTHORS ${destroot}${prefix}/share/doc/${name}
@@ -73,16 +78,21 @@
 	xinstall -m 644 ${worksrcpath}/TODO ${destroot}${prefix}/share/doc/${name}
 
 # Fix and copy the init script
-#	reinplace "s|daemon vm-pop3d|${prefix}/sbin/vm-pop3d --user postfix --group postfix|g" \
-#               "${worksrcpath}/vm-pop3d.init"
-#	reinplace "s|/usr/local/sbin|${prefix}/sbin|g" \
-#                "${worksrcpath}/vm-pop3d.init"
-#	reinplace "s|/var/lock/subsys|${prefix}/var/${name}/lock|g" \
-#                "${worksrcpath}/vm-pop3d.init"
-#	reinplace "s|/etc/rc.d/init.d/functions|/etc/rc.common|g" \
-#		"${worksrcpath}/vm-pop3d.init"
-#	xinstall -d -m 755  ${destroot}${prefix}/share/${name}
-#	xinstall -m 755 ${worksrcpath}/vm-pop3d.init ${destroot}${prefix}/share/${name}
+	reinplace "s|daemon vm-pop3d|${prefix}/sbin/vm-pop3d --user postfix --group postfix|g" \
+                "${worksrcpath}/vm-pop3d.init"
+
+	reinplace "s|/usr/local/sbin|${prefix}/sbin|g" \
+                "${worksrcpath}/vm-pop3d.init"
+
+	reinplace "s|/var/lock/subsys|${prefix}/var/${name}/lock|g" \
+                "${worksrcpath}/vm-pop3d.init"
+
+	reinplace "s|/etc/rc.d/init.d/functions|/etc/rc.common|g" \
+		"${worksrcpath}/vm-pop3d.init"
+
+	xinstall -d -m 755  ${destroot}${prefix}/share/${name}
+	
+	xinstall -m 755 ${worksrcpath}/vm-pop3d.init ${destroot}${prefix}/share/${name}
 }
 
 post-activate {
@@ -169,8 +179,8 @@
    OS X 10.3 and previous - A startup item was created in /Library/StartupItems
         Add \"VMPOP-3D=-YES-\" to the /etc/hostconfig file to run vm-pop3d at system boot
 
-   If you didn't install vm-pop3d using the +server variant, and you wish to start vm-pop3d manually:
-	sudo ${prefix}/share/sbin/vm-pop3d --user postfix --group postfix -d 10 -t 600
+   Start vm-pop3d manually:
+	sudo ${prefix}/share/vm-pop3d/vm-pop3d.init start (stop|status)
 
 	telnet localhost 110  (response ->)  +OK POP3 Welcome to vm-pop3d 1.x.x
 	USER <user at domain>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071031/23a7ab17/attachment.html