[19606] trunk/dports/mail/qpopper

[source_changes at macosforge.org]

Revision: 19606
Author:   pguyot at kallisys.net
Date:     2006-09-17 03:03:34 -0700 (Sun, 17 Sep 2006)

Log Message:
-----------
mail/qpopper: allow qpopper to be installed in a non-root MP installation.

Modified Paths:
--------------
    trunk/dports/mail/qpopper/Portfile
    trunk/dports/mail/qpopper/files/patch-Makefile.in

Added Paths:
-----------
    trunk/dports/mail/qpopper/files/patch-popper-Makefile.in

Modified: trunk/dports/mail/qpopper/Portfile
===================================================================
--- trunk/dports/mail/qpopper/Portfile	2006-09-17 09:40:35 UTC (rev 19605)
+++ trunk/dports/mail/qpopper/Portfile	2006-09-17 10:03:34 UTC (rev 19606)
@@ -19,14 +19,21 @@
 					rmd160 b48a68cd9e282bfb3d78c6b53f3dee7c97bdf77d \
 					sha1 5629aa86d92fe10565021980882dffb733ce73d9
 worksrcdir			${portname}${portversion}
-patchfiles			patch-Makefile.in
+patchfiles			patch-Makefile.in patch-popper-Makefile.in
 configure.args		--mandir=${prefix}/share/man \
 					--without-pam
 destroot.destdir	prefix=${destroot}/${prefix} mandir=${destroot}/${prefix}/share/man
 
+post-patch {
+	reinplace "s|@@INSTALL.USER@@|${install.user}|g" \
+		${worksrcpath}/Makefile.in
+	reinplace "s|@@INSTALL.USER@@|${install.user}|g" \
+		${worksrcpath}/popper/Makefile.in
+}
+
 pre-destroot {
 	xinstall -d ${destroot}${prefix}/etc/xinetd.d
-	xinstall -o root -m 755 -c ${portpath}/files/qpopper-dist \
+	xinstall -o ${install.user} -m 755 -c ${portpath}/files/qpopper-dist \
 		${destroot}${prefix}/etc/xinetd.d/
 	reinplace "s|@@PREFIX@@|${prefix}|g" \
 		${destroot}${prefix}/etc/xinetd.d/qpopper-dist
@@ -53,7 +60,7 @@
 platform darwin 8 {
 	pre-destroot {
 		xinstall -d ${destroot}${prefix}/Library/LaunchDaemons/
-		xinstall -o root -m 755 -c ${portpath}/files/org.macports.mail.qpopper.plist-dist \
+		xinstall -o ${install.user} -m 755 -c ${portpath}/files/org.macports.mail.qpopper.plist-dist \
 			${destroot}${prefix}/Library/LaunchDaemons/
 		reinplace "s|@@PREFIX@@|${prefix}|g" \
 			${destroot}${prefix}/Library/LaunchDaemons/org.macports.mail.qpopper.plist-dist

Modified: trunk/dports/mail/qpopper/files/patch-Makefile.in
===================================================================
--- trunk/dports/mail/qpopper/files/patch-Makefile.in	2006-09-17 09:40:35 UTC (rev 19605)
+++ trunk/dports/mail/qpopper/files/patch-Makefile.in	2006-09-17 10:03:34 UTC (rev 19606)
@@ -1,10 +1,15 @@
---- Makefile.in.orig	Tue Feb  4 18:33:01 2003
-+++ Makefile.in	Mon Oct 27 01:05:31 2003
-@@ -58,6 +58,7 @@
+--- Makefile.in.orig	2006-09-17 18:47:48.000000000 +0900
++++ Makefile.in	2006-09-17 18:49:40.000000000 +0900
+@@ -58,9 +58,10 @@
  	cd ${popper_dir}  && ${MAKE} all
  
  install:
+-	${INSTALL} -m 0644 -o root ${top_srcdir}/man/popper.8  ${mandir}/man8/
 +	${INSTALL} -d ${mandir}/man8
- 	${INSTALL} -m 0644 -o root ${top_srcdir}/man/popper.8  ${mandir}/man8/
++	${INSTALL} -m 0644 -o @@INSTALL.USER@@ ${top_srcdir}/man/popper.8  ${mandir}/man8/
  	echo "Installed man/popper.8 as ${mandir}/man8/popper.8"
- 	${INSTALL} -m 0644 -o root ${top_srcdir}/man/popauth.8 ${mandir}/man8/
+-	${INSTALL} -m 0644 -o root ${top_srcdir}/man/popauth.8 ${mandir}/man8/
++	${INSTALL} -m 0644 -o @@INSTALL.USER@@ ${top_srcdir}/man/popauth.8 ${mandir}/man8/
+ 	echo "Installed man/popauth.8 as ${mandir}/man8/popauth.8"
+ 	cd ${popper_dir}  && ${MAKE} install
+ 

Added: trunk/dports/mail/qpopper/files/patch-popper-Makefile.in
===================================================================
--- trunk/dports/mail/qpopper/files/patch-popper-Makefile.in	                        (rev 0)
+++ trunk/dports/mail/qpopper/files/patch-popper-Makefile.in	2006-09-17 10:03:34 UTC (rev 19606)
@@ -0,0 +1,11 @@
+--- popper/Makefile.in.orig	2006-09-17 18:50:47.000000000 +0900
++++ popper/Makefile.in	2006-09-17 18:51:04.000000000 +0900
+@@ -210,7 +210,7 @@
+ ${POPAUTHSRCS}:
+ 
+ install: popper ${pop_auth}
+-	${INSTALL} -s -m 0755 -o root popper ${installdir}/popper
++	${INSTALL} -s -m 0755 -o @@INSTALL.USER@@ popper ${installdir}/popper
+ 	echo "Installed popper as ${installdir}/popper"
+ 	if [ "x${poppassd}" != "x" ]; then \
+ 	    cd ${password_dir} && ${MAKE} $@ ;\

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