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

ryandesign at macports.org ryandesign at macports.org
Sat Jan 26 00:02:23 PST 2008


Revision: 33396
          http://trac.macosforge.org/projects/macports/changeset/33396
Author:   ryandesign at macports.org
Date:     2008-01-26 00:01:39 -0800 (Sat, 26 Jan 2008)

Log Message:
-----------
qmail-spamcontrol: simplify the rest of the post-destroot using xinstall too; 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 07:53:44 UTC (rev 33395)
+++ trunk/dports/mail/qmail-spamcontrol/Portfile	2008-01-26 08:01:39 UTC (rev 33396)
@@ -122,6 +122,7 @@
 pre-destroot {
 	# A whole lot of keepdirs, Qmail creates lots of required, empty directories
 	destroot.keepdirs \
+		${destroot}${prefix}/var/log/qmail/smtpd \
 		${destroot}${prefix}/var/qmail/control \
 		${destroot}${prefix}/var/qmail/users \
 		${destroot}${prefix}/var/qmail/queue/pid \
@@ -153,10 +154,7 @@
 	touch ${destroot}${prefix}/var/qmail/alias/.qmail-root
 
 	# Create the log directories
-	file mkdir ${destroot}${prefix}/var/log/qmail
-	file mkdir ${destroot}${prefix}/var/log/qmail/smtpd
-	system "chown -R qmaill ${destroot}${prefix}/var/log/qmail"
-	touch ${destroot}${prefix}/var/log/qmail/smtpd/.turd_${name}
+	xinstall -d -o qmaill ${destroot}${prefix}/var/log/qmail/smtpd
 
 	# Copy example files
 	xinstall -d ${destroot}${prefix}/var/qmail/samples
@@ -167,49 +165,55 @@
 	}
 	
 	# Additional Spamcontrol files
-	file mkdir ${destroot}${prefix}/var/qmail/scripts
-	file copy ${worksrcpath}/qmail-alias2recipients ${destroot}${prefix}/var/qmail/scripts
-	file copy ${worksrcpath}/qmail-users2recipients ${destroot}${prefix}/var/qmail/scripts
-	file copy ${worksrcpath}/qmail-pwd2recipients ${destroot}${prefix}/var/qmail/scripts
-	file copy ${worksrcpath}/qmail-vpopmail2recipients ${destroot}${prefix}/var/qmail/scripts
-	file copy ${worksrcpath}/conf-spamcontrol ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/ucspi-ssl-0.70_ucspitls-0.4.patch_ ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/clamav-0.90.1_output.patch_ ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/Makefile.djbdns ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/badmailfrom ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/badmimetypes ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/badloadertypes ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/badrcptto ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/tarpitcount ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/install_spamcontrol.sh ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/README_spamcontrol.html ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/README.wildmat ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/README.moreipme ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/README.bigtodo ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/README.qmailqueue ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/README.bouncemaxbytes ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/README.doublebouncetrim ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/README.recipients ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/README.djbdns ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/INSTALL.spamcontrol ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/HISTORY.spamcontrol ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/FILES.spamcontrol ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/LICENSE.spamcontrol ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/TODO.spamcontrol ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/RELEASE_22.spamcontrol ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/RELEASE_23.spamcontrol ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/RELEASE_24.spamcontrol ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/LOGGING.spamcontrol ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/SMTPREPLY.spamcontrol ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/README.mav ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/PROPOSAL.mav ${destroot}${prefix}/var/qmail/doc
-	file copy ${worksrcpath}/README.clamav ${destroot}${prefix}/var/qmail/doc
+	xinstall -d ${destroot}${prefix}/var/qmail/scripts
+	xinstall -W ${worksrcpath} \
+		qmail-alias2recipients \
+		qmail-users2recipients \
+		qmail-pwd2recipients \
+		qmail-vpopmail2recipients \
+		${destroot}${prefix}/var/qmail/scripts
+	xinstall -m 644 -W ${worksrcpath} \
+		conf-spamcontrol \
+		ucspi-ssl-0.70_ucspitls-0.4.patch_ \
+		clamav-0.90.1_output.patch_ \
+		Makefile.djbdns \
+		badmailfrom \
+		badmimetypes \
+		badloadertypes \
+		badrcptto \
+		tarpitcount \
+		README_spamcontrol.html \
+		README.wildmat \
+		README.moreipme \
+		README.bigtodo \
+		README.qmailqueue \
+		README.bouncemaxbytes \
+		README.doublebouncetrim \
+		README.recipients \
+		README.djbdns \
+		INSTALL.spamcontrol \
+		HISTORY.spamcontrol \
+		FILES.spamcontrol \
+		LICENSE.spamcontrol \
+		TODO.spamcontrol \
+		RELEASE_22.spamcontrol \
+		RELEASE_23.spamcontrol \
+		RELEASE_24.spamcontrol \
+		LOGGING.spamcontrol \
+		SMTPREPLY.spamcontrol \
+		README.mav \
+		PROPOSAL.mav \
+		README.clamav \
+		${destroot}${prefix}/var/qmail/doc
+	xinstall -W ${worksrcpath} \
+		install_spamcontrol.sh \
+		${destroot}${prefix}/var/qmail/doc
 
 	# User must run this
-	file copy ${worksrcpath}/config-fast ${destroot}${prefix}/var/qmail/scripts/config-fast
+	xinstall -W ${worksrcpath} config-fast ${destroot}${prefix}/var/qmail/scripts/config-fast
 
 	# Per Qmail install doc
-	file copy ${destroot}/${prefix}/var/qmail/boot/home ${destroot}${prefix}/var/qmail/rc
+	xinstall ${destroot}${prefix}/var/qmail/boot/home ${destroot}${prefix}/var/qmail/rc
 }
 
 post-install {

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


More information about the macports-changes mailing list