[33392] trunk/dports/mail/qmail-spamcontrol/Portfile

ryandesign at macports.org ryandesign at macports.org
Fri Jan 25 22:47:17 PST 2008


Revision: 33392
          http://trac.macosforge.org/projects/macports/changeset/33392
Author:   ryandesign at macports.org
Date:     2008-01-25 22:47:01 -0800 (Fri, 25 Jan 2008)

Log Message:
-----------
qmail-spamcontrol: simplify the creation of the required empty directories; see #13972

Modified Paths:
--------------
    trunk/dports/mail/qmail-spamcontrol/Portfile

Modified: trunk/dports/mail/qmail-spamcontrol/Portfile
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/Portfile	2008-01-26 06:02:23 UTC (rev 33391)
+++ trunk/dports/mail/qmail-spamcontrol/Portfile	2008-01-26 06:47:01 UTC (rev 33392)
@@ -50,104 +50,6 @@
 build.target		setup-patch
 destroot.cmd		./install-destroot
 
-# A whole lot of keepdirs, Qmail creates lots of required, empty directories
-destroot.keepdirs	${destroot}${prefix}/var/qmail/control \
-			${destroot}${prefix}/var/qmail/users \
-			${destroot}${prefix}/var/qmail/queue/pid \
-			${destroot}${prefix}/var/qmail/queue/bounce \
-			${destroot}${prefix}/var/qmail/queue/info/0 \
-			${destroot}${prefix}/var/qmail/queue/info/1 \
-			${destroot}${prefix}/var/qmail/queue/info/2 \
-			${destroot}${prefix}/var/qmail/queue/info/3 \
-			${destroot}${prefix}/var/qmail/queue/info/4 \
-			${destroot}${prefix}/var/qmail/queue/info/5 \
-			${destroot}${prefix}/var/qmail/queue/info/6 \
-			${destroot}${prefix}/var/qmail/queue/info/7 \
-			${destroot}${prefix}/var/qmail/queue/info/8 \
-			${destroot}${prefix}/var/qmail/queue/info/9 \
-			${destroot}${prefix}/var/qmail/queue/info/10 \
-			${destroot}${prefix}/var/qmail/queue/info/11 \
-			${destroot}${prefix}/var/qmail/queue/info/12 \
-			${destroot}${prefix}/var/qmail/queue/info/13 \
-			${destroot}${prefix}/var/qmail/queue/info/14 \
-			${destroot}${prefix}/var/qmail/queue/info/15 \
-			${destroot}${prefix}/var/qmail/queue/info/16 \
-			${destroot}${prefix}/var/qmail/queue/info/17 \
-			${destroot}${prefix}/var/qmail/queue/info/18 \
-			${destroot}${prefix}/var/qmail/queue/info/19 \
-			${destroot}${prefix}/var/qmail/queue/info/20 \
-			${destroot}${prefix}/var/qmail/queue/info/21 \
-			${destroot}${prefix}/var/qmail/queue/info/22 \
-			${destroot}${prefix}/var/qmail/queue/remote/0 \
-			${destroot}${prefix}/var/qmail/queue/remote/1 \
-			${destroot}${prefix}/var/qmail/queue/remote/2 \
-			${destroot}${prefix}/var/qmail/queue/remote/3 \
-			${destroot}${prefix}/var/qmail/queue/remote/4 \
-			${destroot}${prefix}/var/qmail/queue/remote/5 \
-			${destroot}${prefix}/var/qmail/queue/remote/6 \
-			${destroot}${prefix}/var/qmail/queue/remote/7 \
-			${destroot}${prefix}/var/qmail/queue/remote/8 \
-			${destroot}${prefix}/var/qmail/queue/remote/9 \
-			${destroot}${prefix}/var/qmail/queue/remote/10 \
-			${destroot}${prefix}/var/qmail/queue/remote/11 \
-			${destroot}${prefix}/var/qmail/queue/remote/12 \
-			${destroot}${prefix}/var/qmail/queue/remote/13 \
-			${destroot}${prefix}/var/qmail/queue/remote/14 \
-			${destroot}${prefix}/var/qmail/queue/remote/15 \
-			${destroot}${prefix}/var/qmail/queue/remote/16 \
-			${destroot}${prefix}/var/qmail/queue/remote/17 \
-			${destroot}${prefix}/var/qmail/queue/remote/18 \
-			${destroot}${prefix}/var/qmail/queue/remote/19 \
-			${destroot}${prefix}/var/qmail/queue/remote/20 \
-			${destroot}${prefix}/var/qmail/queue/remote/21 \
-			${destroot}${prefix}/var/qmail/queue/remote/22 \
-			${destroot}${prefix}/var/qmail/queue/local/0 \
-			${destroot}${prefix}/var/qmail/queue/local/1 \
-			${destroot}${prefix}/var/qmail/queue/local/2 \
-			${destroot}${prefix}/var/qmail/queue/local/3 \
-			${destroot}${prefix}/var/qmail/queue/local/4 \
-			${destroot}${prefix}/var/qmail/queue/local/5 \
-			${destroot}${prefix}/var/qmail/queue/local/6 \
-			${destroot}${prefix}/var/qmail/queue/local/7 \
-			${destroot}${prefix}/var/qmail/queue/local/8 \
-			${destroot}${prefix}/var/qmail/queue/local/9 \
-			${destroot}${prefix}/var/qmail/queue/local/10 \
-			${destroot}${prefix}/var/qmail/queue/local/11 \
-			${destroot}${prefix}/var/qmail/queue/local/12 \
-			${destroot}${prefix}/var/qmail/queue/local/13 \
-			${destroot}${prefix}/var/qmail/queue/local/14 \
-			${destroot}${prefix}/var/qmail/queue/local/15 \
-			${destroot}${prefix}/var/qmail/queue/local/16 \
-			${destroot}${prefix}/var/qmail/queue/local/17 \
-			${destroot}${prefix}/var/qmail/queue/local/18 \
-			${destroot}${prefix}/var/qmail/queue/local/19 \
-			${destroot}${prefix}/var/qmail/queue/local/20 \
-			${destroot}${prefix}/var/qmail/queue/local/21 \
-			${destroot}${prefix}/var/qmail/queue/local/22 \
-			${destroot}${prefix}/var/qmail/queue/mess/0 \
-			${destroot}${prefix}/var/qmail/queue/mess/1 \
-			${destroot}${prefix}/var/qmail/queue/mess/2 \
-			${destroot}${prefix}/var/qmail/queue/mess/3 \
-			${destroot}${prefix}/var/qmail/queue/mess/4 \
-			${destroot}${prefix}/var/qmail/queue/mess/5 \
-			${destroot}${prefix}/var/qmail/queue/mess/6 \
-			${destroot}${prefix}/var/qmail/queue/mess/7 \
-			${destroot}${prefix}/var/qmail/queue/mess/8 \
-			${destroot}${prefix}/var/qmail/queue/mess/9 \
-			${destroot}${prefix}/var/qmail/queue/mess/10 \
-			${destroot}${prefix}/var/qmail/queue/mess/11 \
-			${destroot}${prefix}/var/qmail/queue/mess/12 \
-			${destroot}${prefix}/var/qmail/queue/mess/13 \
-			${destroot}${prefix}/var/qmail/queue/mess/14 \
-			${destroot}${prefix}/var/qmail/queue/mess/15 \
-			${destroot}${prefix}/var/qmail/queue/mess/16 \
-			${destroot}${prefix}/var/qmail/queue/mess/17 \
-			${destroot}${prefix}/var/qmail/queue/mess/18 \
-			${destroot}${prefix}/var/qmail/queue/mess/19 \
-			${destroot}${prefix}/var/qmail/queue/mess/20 \
-			${destroot}${prefix}/var/qmail/queue/mess/21 \
-			${destroot}${prefix}/var/qmail/queue/mess/22
-
 post-extract {
 
 	# Merge Spamcontrol source with Qmail source
@@ -217,6 +119,33 @@
 	adduser qmails uid=7796 gid=[existsgroup qmail] realname=Qmail-send-user home=${prefix}/var/qmail shell=/usr/bin/true
 }
 
+pre-destroot {
+	# A whole lot of keepdirs, Qmail creates lots of required, empty directories
+	destroot.keepdirs \
+		${destroot}${prefix}/var/qmail/control \
+		${destroot}${prefix}/var/qmail/users \
+		${destroot}${prefix}/var/qmail/queue/pid \
+		${destroot}${prefix}/var/qmail/queue/bounce
+	if {![variant_isset bigtodo]} {
+		destroot.keepdirs-append \
+			${destroot}${prefix}/var/qmail/queue/todo \
+			${destroot}${prefix}/var/qmail/queue/intd
+	}
+	
+	for {set i 0} {$i <= 22} {incr i} {
+		destroot.keepdirs-append \
+			${destroot}${prefix}/var/qmail/queue/info/${i} \
+			${destroot}${prefix}/var/qmail/queue/remote/${i} \
+			${destroot}${prefix}/var/qmail/queue/local/${i} \
+			${destroot}${prefix}/var/qmail/queue/mess/${i}
+		if {[variant_isset bigtodo]} {
+			destroot.keepdirs-append \
+				${destroot}${prefix}/var/qmail/queue/todo/${i} \
+				${destroot}${prefix}/var/qmail/queue/intd/${i}
+		}
+	}
+}
+
 post-destroot {
 	# Minimal requirements per Qmail install doc
 	touch ${destroot}${prefix}/var/qmail/alias/.qmail-postmaster
@@ -290,60 +219,6 @@
 
 	# Per Qmail install doc
 	file copy ${destroot}/${prefix}/var/qmail/boot/home ${destroot}${prefix}/var/qmail/rc
-
-	# Variant causes more empty directories to be required
-	if {[variant_isset bigtodo]} {
-		touch ${destroot}${prefix}/var/qmail/queue/todo/0/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/1/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/2/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/3/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/4/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/5/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/6/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/7/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/8/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/9/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/10/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/11/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/12/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/13/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/14/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/15/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/16/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/17/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/18/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/19/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/20/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/21/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/todo/22/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/0/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/1/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/2/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/3/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/4/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/5/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/6/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/7/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/8/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/9/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/10/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/11/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/12/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/13/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/14/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/15/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/16/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/17/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/18/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/19/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/20/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/21/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/22/.turd_qmail-spamcontrol
-	}
-	if {![variant_isset bigtodo]} {
-		touch ${destroot}${prefix}/var/qmail/queue/todo/.turd_qmail-spamcontrol
-		touch ${destroot}${prefix}/var/qmail/queue/intd/.turd_qmail-spamcontrol
-	}
 }
 
 post-install {

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


More information about the macports-changes mailing list