From nobody@FreeBSD.org  Thu Mar 20 20:54:10 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 491996E5
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 20 Mar 2014 20:54:10 +0000 (UTC)
Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 34B4616C
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 20 Mar 2014 20:54:10 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s2KKs9pt070557
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 20 Mar 2014 20:54:09 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s2KKs9Cf070556;
	Thu, 20 Mar 2014 20:54:09 GMT
	(envelope-from nobody)
Message-Id: <201403202054.s2KKs9Cf070556@cgiserv.freebsd.org>
Date: Thu, 20 Mar 2014 20:54:09 GMT
From: Lukasz Wasikowski <lukasz@wasikowski.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer update] mail/sgwi port cleanup and add staging
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         187798
>Category:       ports
>Synopsis:       [maintainer update] mail/sgwi port cleanup and add staging
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rene
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 20 21:00:00 UTC 2014
>Closed-Date:    Sun Apr 06 15:16:55 UTC 2014
>Last-Modified:  Sun Apr  6 15:20:00 UTC 2014
>Originator:     Lukasz Wasikowski
>Release:        9.2-RELEASE-p3
>Organization:
>Environment:
FreeBSD jinx.wasikowski.net 9.2-RELEASE-p3 FreeBSD 9.2-RELEASE-p3 #6 r263415: Thu Mar 20 06:06:15 CET 2014     root@jinx.wasikowski.net:/usr/obj/usr/src/sys/GENERIC  amd64

>Description:
Port cleanup:

- add stage support
- add second mirror to MASTER_SITES
- rename files/patch-.htaccess to files/patch-.htaccess.sample
- rename files/patch-.htpasswd to files/patch-.htpasswd.sample

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN mail/sgwi.orig/Makefile mail/sgwi/Makefile
--- mail/sgwi.orig/Makefile	2013-09-20 21:59:12.000000000 +0200
+++ mail/sgwi/Makefile	2014-03-20 21:15:06.770757790 +0100
@@ -4,7 +4,8 @@
 PORTNAME=	sgwi
 PORTVERSION=	1.1.6
 CATEGORIES=	mail www
-MASTER_SITES=	http://www.vanheusden.com/sgwi/
+MASTER_SITES=	http://www.vanheusden.com/sgwi/ \
+		http://lukasz.wasikowski.net/files/
 DISTNAME=	sqlgreywebinterface-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
@@ -25,7 +26,6 @@
 
 OPTIONS_DEFAULT=MYSQL
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
@@ -42,31 +42,20 @@
 		${FIND} ${WRKSRC} -name '*.orig' -delete
 
 do-install:
-		@[ ! -f ${WRKSRC}/.htpasswd ] || ${MV} ${WRKSRC}/.htpasswd ${WRKSRC}/.htpasswd.sample
-		@[ ! -f ${WRKSRC}/.htaccess ] || ${MV} ${WRKSRC}/.htaccess ${WRKSRC}/.htaccess.sample
-		@[ ! -f ${WRKSRC}/includes/config.inc.php ] || ${MV} ${WRKSRC}/includes/config.inc.php ${WRKSRC}/includes/config.inc.php.sample
-		@${MKDIR} ${WWWDIR}
-		@${MKDIR} ${WWWDIR}/includes
-		${INSTALL_DATA} ${WRKSRC}/*.php ${WWWDIR}
-		${INSTALL_DATA} ${WRKSRC}/*.txt ${WWWDIR}
-		${INSTALL_DATA} ${WRKSRC}/*.css ${WWWDIR}
-		${INSTALL_DATA} ${WRKSRC}/.ht* ${WWWDIR}
-		${INSTALL_DATA} ${WRKSRC}/includes/*.sample ${WWWDIR}/includes/
-		${INSTALL_DATA} ${WRKSRC}/includes/*.php ${WWWDIR}/includes/
-		@if [ -f ${WWWDIR}/config.inc.php ]; then \
-			${MV} ${WWWDIR}/config.inc.php ${WWWDIR}/includes/config.inc.php; \
-		fi
-		@[ -f ${WWWDIR}/includes/config.inc.php ] || \
-			${CP} ${WWWDIR}/includes/config.inc.php.sample ${WWWDIR}/includes/config.inc.php
-		@[ -f ${WWWDIR}/.htpasswd ] || \
-			${CP} ${WWWDIR}/.htpasswd.sample ${WWWDIR}/.htpasswd
-		@[ -f ${WWWDIR}/.htaccess ] || \
-			${CP} ${WWWDIR}/.htaccess.sample ${WWWDIR}/.htaccess
-
-post-install:
-		@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/
-		@${CHOWN} root ${WWWDIR}/.ht* ${WWWDIR}/includes/config.inc.php*
-		@${CHMOD} -R 0640 ${WWWDIR}/*.php ${WWWDIR}/*.txt ${WWWDIR}/*.css ${WWWDIR}/.ht* ${WWWDIR}/includes/*.php ${WWWDIR}/includes/*.sample
-		@${CAT} ${PKGMESSAGE}
+		@${MV} ${WRKSRC}/includes/config.inc.php ${WRKSRC}/includes/config.inc.php.sample
+		@${MKDIR} ${STAGEDIR}${WWWDIR}
+		@${MKDIR} ${STAGEDIR}${WWWDIR}/includes
+		${INSTALL_DATA} ${WRKSRC}/*.php ${STAGEDIR}${WWWDIR}
+		${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${WWWDIR}
+		${INSTALL_DATA} ${WRKSRC}/*.css ${STAGEDIR}${WWWDIR}
+		${INSTALL_DATA} ${WRKSRC}/.ht* ${STAGEDIR}${WWWDIR}
+		${INSTALL_DATA} ${WRKSRC}/includes/*.sample ${STAGEDIR}${WWWDIR}/includes/
+		${INSTALL_DATA} ${WRKSRC}/includes/*.php ${STAGEDIR}${WWWDIR}/includes/
+
+#post-install:
+#		@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}/
+#		@${CHOWN} root ${WWWDIR}/.ht* ${STAGEDIR}${WWWDIR}/includes/config.inc.php*
+#		@${CHMOD} -R 0640 ${STAGEDIR}${WWWDIR}/*.php ${STAGEDIR}${WWWDIR}/*.txt ${STAGEDIR}${WWWDIR}/*.css ${STAGEDIR}${WWWDIR}/.ht* ${STAGEDIR}${WWWDIR}/includes/*.php ${STAGEDIR}${WWWDIR}/includes/*.sample
+#		@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff -ruN mail/sgwi.orig/files/patch-.htaccess mail/sgwi/files/patch-.htaccess
--- mail/sgwi.orig/files/patch-.htaccess	2014-01-22 18:40:44.000000000 +0100
+++ mail/sgwi/files/patch-.htaccess	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- /dev/null	2008-03-11 22:05:01.000000000 +0100
-+++ .htaccess	2008-03-11 22:03:36.000000000 +0100
-@@ -0,0 +1,8 @@
-+AuthUserFile /usr/local/www/sgwi/.htpasswd
-+AuthGroupFile /dev/null
-+AuthName "sgwi Admin"
-+AuthType Basic
-+
-+<limit GET POST>
-+require valid-user
-+</limit>
diff -ruN mail/sgwi.orig/files/patch-.htaccess.sample mail/sgwi/files/patch-.htaccess.sample
--- mail/sgwi.orig/files/patch-.htaccess.sample	1970-01-01 01:00:00.000000000 +0100
+++ mail/sgwi/files/patch-.htaccess.sample	2014-03-20 20:56:04.402753000 +0100
@@ -0,0 +1,11 @@
+--- /dev/null	2008-03-11 22:05:01.000000000 +0100
++++ .htaccess.sample	2008-03-11 22:03:36.000000000 +0100
+@@ -0,0 +1,8 @@
++AuthUserFile /usr/local/www/sgwi/.htpasswd
++AuthGroupFile /dev/null
++AuthName "sgwi Admin"
++AuthType Basic
++
++<limit GET POST>
++require valid-user
++</limit>
diff -ruN mail/sgwi.orig/files/patch-.htpasswd mail/sgwi/files/patch-.htpasswd
--- mail/sgwi.orig/files/patch-.htpasswd	2014-01-22 18:40:44.000000000 +0100
+++ mail/sgwi/files/patch-.htpasswd	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
---- /dev/null	2008-03-11 22:05:01.000000000 +0100
-+++ .htpasswd	2008-03-11 22:02:21.000000000 +0100
-@@ -0,0 +1 @@
-+admin:1Cm2R1zl5.LII
diff -ruN mail/sgwi.orig/files/patch-.htpasswd.sample mail/sgwi/files/patch-.htpasswd.sample
--- mail/sgwi.orig/files/patch-.htpasswd.sample	1970-01-01 01:00:00.000000000 +0100
+++ mail/sgwi/files/patch-.htpasswd.sample	2014-03-20 20:56:12.298766000 +0100
@@ -0,0 +1,4 @@
+--- /dev/null	2008-03-11 22:05:01.000000000 +0100
++++ .htpasswd.sample	2008-03-11 22:02:21.000000000 +0100
+@@ -0,0 +1 @@
++admin:1Cm2R1zl5.LII
diff -ruN mail/sgwi.orig/files/pkg-install.in mail/sgwi/files/pkg-install.in
--- mail/sgwi.orig/files/pkg-install.in	2014-01-22 16:52:06.000000000 +0100
+++ mail/sgwi/files/pkg-install.in	2014-03-20 21:07:32.299756000 +0100
@@ -7,6 +7,7 @@
 if [ "$2" != "POST-INSTALL" ]; then
 	exit 0
 else
-	/usr/sbin/chown ${WWWOWN}:${WWWGRP} ${WWWDIR}/includes/
-	/usr/bin/chgrp ${WWWGRP} ${WWWDIR}/.ht* ${WWWDIR}/includes/config.inc.php
+	/usr/sbin/chown -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	/usr/sbin/chown root:${WWWGRP} ${WWWDIR}/.ht* ${WWWDIR}/includes/config.inc.php*
+	/bin/chmod -R 0640 ${STAGEDIR}${WWWDIR}/*.php ${STAGEDIR}${WWWDIR}/*.txt ${STAGEDIR}${WWWDIR}/*.css ${STAGEDIR}${WWWDIR}/.ht* ${STAGEDIR}${WWWDIR}/includes/*.php ${STAGEDIR}${WWWDIR}/includes/*.sample
 fi
diff -ruN mail/sgwi.orig/pkg-plist mail/sgwi/pkg-plist
--- mail/sgwi.orig/pkg-plist	2014-01-22 16:16:56.000000000 +0100
+++ mail/sgwi/pkg-plist	2014-03-20 21:24:42.234759693 +0100
@@ -7,6 +7,7 @@
 www/sgwi/awl.php
 www/sgwi/connect.php
 www/sgwi/includes/awl.inc.php
+@exec [ -f %D/www/sgwi/config.inc.php ] && mv -f %D/www/sgwi/config.inc.php %D/www/sgwi/includes/config.inc.php
 @unexec if cmp -s %D/www/sgwi/includes/config.inc.php %D/www/sgwi/includes/config.inc.php.sample; then rm -f %D/www/sgwi/includes/config.inc.php; fi
 www/sgwi/includes/config.inc.php.sample
 @exec [ -f %B/config.inc.php ] || cp %B/%f %B/config.inc.php


>Release-Note:
>Audit-Trail:

From: =?UTF-8?B?xYF1a2FzeiBXxIVzaWtvd3NraQ==?= <lukasz@wasikowski.net>
To: freebsd-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc:  
Subject: Re: ports/187798: [maintainer update] mail/sgwi port cleanup and
 add staging
Date: Thu, 20 Mar 2014 22:13:36 +0100

 This is a multi-part message in MIME format.
 --------------090402080907030003040509
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 Original patch included some unnecessary comments which can (and should)
 be removed. Proper patch is attached to this message.
 
 -- 
 best regards,
 Lukasz Wasikowski
 
 --------------090402080907030003040509
 Content-Type: text/plain; charset=windows-1250;
  name="sgwi-1.1.6-staging.diff"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment;
  filename="sgwi-1.1.6-staging.diff"
 
 ZGlmZiAtcnVOIG1haWwvc2d3aS5vcmlnL01ha2VmaWxlIG1haWwvc2d3aS9NYWtlZmlsZQot
 LS0gbWFpbC9zZ3dpLm9yaWcvTWFrZWZpbGUJMjAxMy0wOS0yMCAyMTo1OToxMi4wMDAwMDAw
 MDAgKzAyMDAKKysrIG1haWwvc2d3aS9NYWtlZmlsZQkyMDE0LTAzLTIwIDIyOjExOjA1LjU4
 NTc1NTA3NSArMDEwMApAQCAtNCw3ICs0LDggQEAKIFBPUlROQU1FPQlzZ3dpCiBQT1JUVkVS
 U0lPTj0JMS4xLjYKIENBVEVHT1JJRVM9CW1haWwgd3d3Ci1NQVNURVJfU0lURVM9CWh0dHA6
 Ly93d3cudmFuaGV1c2Rlbi5jb20vc2d3aS8KK01BU1RFUl9TSVRFUz0JaHR0cDovL3d3dy52
 YW5oZXVzZGVuLmNvbS9zZ3dpLyBcCisJCWh0dHA6Ly9sdWthc3oud2FzaWtvd3NraS5uZXQv
 ZmlsZXMvCiBESVNUTkFNRT0Jc3FsZ3JleXdlYmludGVyZmFjZS0ke1BPUlRWRVJTSU9OfQog
 RVhUUkFDVF9TVUZYPQkudGd6CiAKQEAgLTI1LDcgKzI2LDYgQEAKIAogT1BUSU9OU19ERUZB
 VUxUPU1ZU1FMCiAKLU5PX1NUQUdFPQl5ZXMKIC5pbmNsdWRlIDxic2QucG9ydC5vcHRpb25z
 Lm1rPgogCiAuaWYgJHtQT1JUX09QVElPTlM6TU1ZU1FMfQpAQCAtNDIsMzEgKzQyLDE0IEBA
 CiAJCSR7RklORH0gJHtXUktTUkN9IC1uYW1lICcqLm9yaWcnIC1kZWxldGUKIAogZG8taW5z
 dGFsbDoKLQkJQFsgISAtZiAke1dSS1NSQ30vLmh0cGFzc3dkIF0gfHwgJHtNVn0gJHtXUktT
 UkN9Ly5odHBhc3N3ZCAke1dSS1NSQ30vLmh0cGFzc3dkLnNhbXBsZQotCQlAWyAhIC1mICR7
 V1JLU1JDfS8uaHRhY2Nlc3MgXSB8fCAke01WfSAke1dSS1NSQ30vLmh0YWNjZXNzICR7V1JL
 U1JDfS8uaHRhY2Nlc3Muc2FtcGxlCi0JCUBbICEgLWYgJHtXUktTUkN9L2luY2x1ZGVzL2Nv
 bmZpZy5pbmMucGhwIF0gfHwgJHtNVn0gJHtXUktTUkN9L2luY2x1ZGVzL2NvbmZpZy5pbmMu
 cGhwICR7V1JLU1JDfS9pbmNsdWRlcy9jb25maWcuaW5jLnBocC5zYW1wbGUKLQkJQCR7TUtE
 SVJ9ICR7V1dXRElSfQotCQlAJHtNS0RJUn0gJHtXV1dESVJ9L2luY2x1ZGVzCi0JCSR7SU5T
 VEFMTF9EQVRBfSAke1dSS1NSQ30vKi5waHAgJHtXV1dESVJ9Ci0JCSR7SU5TVEFMTF9EQVRB
 fSAke1dSS1NSQ30vKi50eHQgJHtXV1dESVJ9Ci0JCSR7SU5TVEFMTF9EQVRBfSAke1dSS1NS
 Q30vKi5jc3MgJHtXV1dESVJ9Ci0JCSR7SU5TVEFMTF9EQVRBfSAke1dSS1NSQ30vLmh0KiAk
 e1dXV0RJUn0KLQkJJHtJTlNUQUxMX0RBVEF9ICR7V1JLU1JDfS9pbmNsdWRlcy8qLnNhbXBs
 ZSAke1dXV0RJUn0vaW5jbHVkZXMvCi0JCSR7SU5TVEFMTF9EQVRBfSAke1dSS1NSQ30vaW5j
 bHVkZXMvKi5waHAgJHtXV1dESVJ9L2luY2x1ZGVzLwotCQlAaWYgWyAtZiAke1dXV0RJUn0v
 Y29uZmlnLmluYy5waHAgXTsgdGhlbiBcCi0JCQkke01WfSAke1dXV0RJUn0vY29uZmlnLmlu
 Yy5waHAgJHtXV1dESVJ9L2luY2x1ZGVzL2NvbmZpZy5pbmMucGhwOyBcCi0JCWZpCi0JCUBb
 IC1mICR7V1dXRElSfS9pbmNsdWRlcy9jb25maWcuaW5jLnBocCBdIHx8IFwKLQkJCSR7Q1B9
 ICR7V1dXRElSfS9pbmNsdWRlcy9jb25maWcuaW5jLnBocC5zYW1wbGUgJHtXV1dESVJ9L2lu
 Y2x1ZGVzL2NvbmZpZy5pbmMucGhwCi0JCUBbIC1mICR7V1dXRElSfS8uaHRwYXNzd2QgXSB8
 fCBcCi0JCQkke0NQfSAke1dXV0RJUn0vLmh0cGFzc3dkLnNhbXBsZSAke1dXV0RJUn0vLmh0
 cGFzc3dkCi0JCUBbIC1mICR7V1dXRElSfS8uaHRhY2Nlc3MgXSB8fCBcCi0JCQkke0NQfSAk
 e1dXV0RJUn0vLmh0YWNjZXNzLnNhbXBsZSAke1dXV0RJUn0vLmh0YWNjZXNzCi0KLXBvc3Qt
 aW5zdGFsbDoKLQkJQCR7Q0hPV059IC1SICR7V1dXT1dOfToke1dXV0dSUH0gJHtXV1dESVJ9
 LwotCQlAJHtDSE9XTn0gcm9vdCAke1dXV0RJUn0vLmh0KiAke1dXV0RJUn0vaW5jbHVkZXMv
 Y29uZmlnLmluYy5waHAqCi0JCUAke0NITU9EfSAtUiAwNjQwICR7V1dXRElSfS8qLnBocCAk
 e1dXV0RJUn0vKi50eHQgJHtXV1dESVJ9LyouY3NzICR7V1dXRElSfS8uaHQqICR7V1dXRElS
 fS9pbmNsdWRlcy8qLnBocCAke1dXV0RJUn0vaW5jbHVkZXMvKi5zYW1wbGUKLQkJQCR7Q0FU
 fSAke1BLR01FU1NBR0V9CisJCUAke01WfSAke1dSS1NSQ30vaW5jbHVkZXMvY29uZmlnLmlu
 Yy5waHAgJHtXUktTUkN9L2luY2x1ZGVzL2NvbmZpZy5pbmMucGhwLnNhbXBsZQorCQlAJHtN
 S0RJUn0gJHtTVEFHRURJUn0ke1dXV0RJUn0KKwkJQCR7TUtESVJ9ICR7U1RBR0VESVJ9JHtX
 V1dESVJ9L2luY2x1ZGVzCisJCSR7SU5TVEFMTF9EQVRBfSAke1dSS1NSQ30vKi5waHAgJHtT
 VEFHRURJUn0ke1dXV0RJUn0KKwkJJHtJTlNUQUxMX0RBVEF9ICR7V1JLU1JDfS8qLnR4dCAk
 e1NUQUdFRElSfSR7V1dXRElSfQorCQkke0lOU1RBTExfREFUQX0gJHtXUktTUkN9LyouY3Nz
 ICR7U1RBR0VESVJ9JHtXV1dESVJ9CisJCSR7SU5TVEFMTF9EQVRBfSAke1dSS1NSQ30vLmh0
 KiAke1NUQUdFRElSfSR7V1dXRElSfQorCQkke0lOU1RBTExfREFUQX0gJHtXUktTUkN9L2lu
 Y2x1ZGVzLyouc2FtcGxlICR7U1RBR0VESVJ9JHtXV1dESVJ9L2luY2x1ZGVzLworCQkke0lO
 U1RBTExfREFUQX0gJHtXUktTUkN9L2luY2x1ZGVzLyoucGhwICR7U1RBR0VESVJ9JHtXV1dE
 SVJ9L2luY2x1ZGVzLwogCiAuaW5jbHVkZSA8YnNkLnBvcnQubWs+CmRpZmYgLXJ1TiBtYWls
 L3Nnd2kub3JpZy9maWxlcy9wYXRjaC0uaHRhY2Nlc3MgbWFpbC9zZ3dpL2ZpbGVzL3BhdGNo
 LS5odGFjY2VzcwotLS0gbWFpbC9zZ3dpLm9yaWcvZmlsZXMvcGF0Y2gtLmh0YWNjZXNzCTIw
 MTQtMDEtMjIgMTg6NDA6NDQuMDAwMDAwMDAwICswMTAwCisrKyBtYWlsL3Nnd2kvZmlsZXMv
 cGF0Y2gtLmh0YWNjZXNzCTE5NzAtMDEtMDEgMDE6MDA6MDAuMDAwMDAwMDAwICswMTAwCkBA
 IC0xLDExICswLDAgQEAKLS0tLSAvZGV2L251bGwJMjAwOC0wMy0xMSAyMjowNTowMS4wMDAw
 MDAwMDAgKzAxMDAKLSsrKyAuaHRhY2Nlc3MJMjAwOC0wMy0xMSAyMjowMzozNi4wMDAwMDAw
 MDAgKzAxMDAKLUBAIC0wLDAgKzEsOCBAQAotK0F1dGhVc2VyRmlsZSAvdXNyL2xvY2FsL3d3
 dy9zZ3dpLy5odHBhc3N3ZAotK0F1dGhHcm91cEZpbGUgL2Rldi9udWxsCi0rQXV0aE5hbWUg
 InNnd2kgQWRtaW4iCi0rQXV0aFR5cGUgQmFzaWMKLSsKLSs8bGltaXQgR0VUIFBPU1Q+Ci0r
 cmVxdWlyZSB2YWxpZC11c2VyCi0rPC9saW1pdD4KZGlmZiAtcnVOIG1haWwvc2d3aS5vcmln
 L2ZpbGVzL3BhdGNoLS5odGFjY2Vzcy5zYW1wbGUgbWFpbC9zZ3dpL2ZpbGVzL3BhdGNoLS5o
 dGFjY2Vzcy5zYW1wbGUKLS0tIG1haWwvc2d3aS5vcmlnL2ZpbGVzL3BhdGNoLS5odGFjY2Vz
 cy5zYW1wbGUJMTk3MC0wMS0wMSAwMTowMDowMC4wMDAwMDAwMDAgKzAxMDAKKysrIG1haWwv
 c2d3aS9maWxlcy9wYXRjaC0uaHRhY2Nlc3Muc2FtcGxlCTIwMTQtMDMtMjAgMjA6NTY6MDQu
 NDAyNzUzMDAwICswMTAwCkBAIC0wLDAgKzEsMTEgQEAKKy0tLSAvZGV2L251bGwJMjAwOC0w
 My0xMSAyMjowNTowMS4wMDAwMDAwMDAgKzAxMDAKKysrKyAuaHRhY2Nlc3Muc2FtcGxlCTIw
 MDgtMDMtMTEgMjI6MDM6MzYuMDAwMDAwMDAwICswMTAwCitAQCAtMCwwICsxLDggQEAKKytB
 dXRoVXNlckZpbGUgL3Vzci9sb2NhbC93d3cvc2d3aS8uaHRwYXNzd2QKKytBdXRoR3JvdXBG
 aWxlIC9kZXYvbnVsbAorK0F1dGhOYW1lICJzZ3dpIEFkbWluIgorK0F1dGhUeXBlIEJhc2lj
 CisrCisrPGxpbWl0IEdFVCBQT1NUPgorK3JlcXVpcmUgdmFsaWQtdXNlcgorKzwvbGltaXQ+
 CmRpZmYgLXJ1TiBtYWlsL3Nnd2kub3JpZy9maWxlcy9wYXRjaC0uaHRwYXNzd2QgbWFpbC9z
 Z3dpL2ZpbGVzL3BhdGNoLS5odHBhc3N3ZAotLS0gbWFpbC9zZ3dpLm9yaWcvZmlsZXMvcGF0
 Y2gtLmh0cGFzc3dkCTIwMTQtMDEtMjIgMTg6NDA6NDQuMDAwMDAwMDAwICswMTAwCisrKyBt
 YWlsL3Nnd2kvZmlsZXMvcGF0Y2gtLmh0cGFzc3dkCTE5NzAtMDEtMDEgMDE6MDA6MDAuMDAw
 MDAwMDAwICswMTAwCkBAIC0xLDQgKzAsMCBAQAotLS0tIC9kZXYvbnVsbAkyMDA4LTAzLTEx
 IDIyOjA1OjAxLjAwMDAwMDAwMCArMDEwMAotKysrIC5odHBhc3N3ZAkyMDA4LTAzLTExIDIy
 OjAyOjIxLjAwMDAwMDAwMCArMDEwMAotQEAgLTAsMCArMSBAQAotK2FkbWluOjFDbTJSMXps
 NS5MSUkKZGlmZiAtcnVOIG1haWwvc2d3aS5vcmlnL2ZpbGVzL3BhdGNoLS5odHBhc3N3ZC5z
 YW1wbGUgbWFpbC9zZ3dpL2ZpbGVzL3BhdGNoLS5odHBhc3N3ZC5zYW1wbGUKLS0tIG1haWwv
 c2d3aS5vcmlnL2ZpbGVzL3BhdGNoLS5odHBhc3N3ZC5zYW1wbGUJMTk3MC0wMS0wMSAwMTow
 MDowMC4wMDAwMDAwMDAgKzAxMDAKKysrIG1haWwvc2d3aS9maWxlcy9wYXRjaC0uaHRwYXNz
 d2Quc2FtcGxlCTIwMTQtMDMtMjAgMjA6NTY6MTIuMjk4NzY2MDAwICswMTAwCkBAIC0wLDAg
 KzEsNCBAQAorLS0tIC9kZXYvbnVsbAkyMDA4LTAzLTExIDIyOjA1OjAxLjAwMDAwMDAwMCAr
 MDEwMAorKysrIC5odHBhc3N3ZC5zYW1wbGUJMjAwOC0wMy0xMSAyMjowMjoyMS4wMDAwMDAw
 MDAgKzAxMDAKK0BAIC0wLDAgKzEgQEAKKythZG1pbjoxQ20yUjF6bDUuTElJCmRpZmYgLXJ1
 TiBtYWlsL3Nnd2kub3JpZy9maWxlcy9wa2ctaW5zdGFsbC5pbiBtYWlsL3Nnd2kvZmlsZXMv
 cGtnLWluc3RhbGwuaW4KLS0tIG1haWwvc2d3aS5vcmlnL2ZpbGVzL3BrZy1pbnN0YWxsLmlu
 CTIwMTQtMDEtMjIgMTY6NTI6MDYuMDAwMDAwMDAwICswMTAwCisrKyBtYWlsL3Nnd2kvZmls
 ZXMvcGtnLWluc3RhbGwuaW4JMjAxNC0wMy0yMCAyMTowNzozMi4yOTk3NTYwMDAgKzAxMDAK
 QEAgLTcsNiArNyw3IEBACiBpZiBbICIkMiIgIT0gIlBPU1QtSU5TVEFMTCIgXTsgdGhlbgog
 CWV4aXQgMAogZWxzZQotCS91c3Ivc2Jpbi9jaG93biAke1dXV09XTn06JHtXV1dHUlB9ICR7
 V1dXRElSfS9pbmNsdWRlcy8KLQkvdXNyL2Jpbi9jaGdycCAke1dXV0dSUH0gJHtXV1dESVJ9
 Ly5odCogJHtXV1dESVJ9L2luY2x1ZGVzL2NvbmZpZy5pbmMucGhwCisJL3Vzci9zYmluL2No
 b3duIC1SICR7V1dXT1dOfToke1dXV0dSUH0gJHtXV1dESVJ9CisJL3Vzci9zYmluL2Nob3du
 IHJvb3Q6JHtXV1dHUlB9ICR7V1dXRElSfS8uaHQqICR7V1dXRElSfS9pbmNsdWRlcy9jb25m
 aWcuaW5jLnBocCoKKwkvYmluL2NobW9kIC1SIDA2NDAgJHtTVEFHRURJUn0ke1dXV0RJUn0v
 Ki5waHAgJHtTVEFHRURJUn0ke1dXV0RJUn0vKi50eHQgJHtTVEFHRURJUn0ke1dXV0RJUn0v
 Ki5jc3MgJHtTVEFHRURJUn0ke1dXV0RJUn0vLmh0KiAke1NUQUdFRElSfSR7V1dXRElSfS9p
 bmNsdWRlcy8qLnBocCAke1NUQUdFRElSfSR7V1dXRElSfS9pbmNsdWRlcy8qLnNhbXBsZQog
 ZmkKZGlmZiAtcnVOIG1haWwvc2d3aS5vcmlnL3BrZy1wbGlzdCBtYWlsL3Nnd2kvcGtnLXBs
 aXN0Ci0tLSBtYWlsL3Nnd2kub3JpZy9wa2ctcGxpc3QJMjAxNC0wMS0yMiAxNjoxNjo1Ni4w
 MDAwMDAwMDAgKzAxMDAKKysrIG1haWwvc2d3aS9wa2ctcGxpc3QJMjAxNC0wMy0yMCAyMToy
 NDo0Mi4yMzQ3NTkwMDAgKzAxMDAKQEAgLTcsNiArNyw3IEBACiB3d3cvc2d3aS9hd2wucGhw
 CiB3d3cvc2d3aS9jb25uZWN0LnBocAogd3d3L3Nnd2kvaW5jbHVkZXMvYXdsLmluYy5waHAK
 K0BleGVjIFsgLWYgJUQvd3d3L3Nnd2kvY29uZmlnLmluYy5waHAgXSAmJiBtdiAtZiAlRC93
 d3cvc2d3aS9jb25maWcuaW5jLnBocCAlRC93d3cvc2d3aS9pbmNsdWRlcy9jb25maWcuaW5j
 LnBocAogQHVuZXhlYyBpZiBjbXAgLXMgJUQvd3d3L3Nnd2kvaW5jbHVkZXMvY29uZmlnLmlu
 Yy5waHAgJUQvd3d3L3Nnd2kvaW5jbHVkZXMvY29uZmlnLmluYy5waHAuc2FtcGxlOyB0aGVu
 IHJtIC1mICVEL3d3dy9zZ3dpL2luY2x1ZGVzL2NvbmZpZy5pbmMucGhwOyBmaQogd3d3L3Nn
 d2kvaW5jbHVkZXMvY29uZmlnLmluYy5waHAuc2FtcGxlCiBAZXhlYyBbIC1mICVCL2NvbmZp
 Zy5pbmMucGhwIF0gfHwgY3AgJUIvJWYgJUIvY29uZmlnLmluYy5waHAK
 --------------090402080907030003040509--

From: =?UTF-8?B?xYF1a2FzeiBXxIVzaWtvd3NraQ==?= <lukasz@wasikowski.net>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/187798: [maintainer update] mail/sgwi port cleanup and
 add staging
Date: Thu, 20 Mar 2014 22:16:10 +0100

 This is a multi-part message in MIME format.
 --------------080005070408030809090005
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 Original patch included some unnecessary comments which can (and should)
 be removed. Proper patch is attached to this message.
 
 -- 
 best regards,
 Lukasz Wasikowski
 
 
 --------------080005070408030809090005
 Content-Type: text/plain; charset=windows-1250;
  name="sgwi-1.1.6-staging.diff"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment;
  filename="sgwi-1.1.6-staging.diff"
 
 ZGlmZiAtcnVOIG1haWwvc2d3aS5vcmlnL01ha2VmaWxlIG1haWwvc2d3aS9NYWtlZmlsZQot
 LS0gbWFpbC9zZ3dpLm9yaWcvTWFrZWZpbGUJMjAxMy0wOS0yMCAyMTo1OToxMi4wMDAwMDAw
 MDAgKzAyMDAKKysrIG1haWwvc2d3aS9NYWtlZmlsZQkyMDE0LTAzLTIwIDIyOjExOjA1LjU4
 NTc1NTA3NSArMDEwMApAQCAtNCw3ICs0LDggQEAKIFBPUlROQU1FPQlzZ3dpCiBQT1JUVkVS
 U0lPTj0JMS4xLjYKIENBVEVHT1JJRVM9CW1haWwgd3d3Ci1NQVNURVJfU0lURVM9CWh0dHA6
 Ly93d3cudmFuaGV1c2Rlbi5jb20vc2d3aS8KK01BU1RFUl9TSVRFUz0JaHR0cDovL3d3dy52
 YW5oZXVzZGVuLmNvbS9zZ3dpLyBcCisJCWh0dHA6Ly9sdWthc3oud2FzaWtvd3NraS5uZXQv
 ZmlsZXMvCiBESVNUTkFNRT0Jc3FsZ3JleXdlYmludGVyZmFjZS0ke1BPUlRWRVJTSU9OfQog
 RVhUUkFDVF9TVUZYPQkudGd6CiAKQEAgLTI1LDcgKzI2LDYgQEAKIAogT1BUSU9OU19ERUZB
 VUxUPU1ZU1FMCiAKLU5PX1NUQUdFPQl5ZXMKIC5pbmNsdWRlIDxic2QucG9ydC5vcHRpb25z
 Lm1rPgogCiAuaWYgJHtQT1JUX09QVElPTlM6TU1ZU1FMfQpAQCAtNDIsMzEgKzQyLDE0IEBA
 CiAJCSR7RklORH0gJHtXUktTUkN9IC1uYW1lICcqLm9yaWcnIC1kZWxldGUKIAogZG8taW5z
 dGFsbDoKLQkJQFsgISAtZiAke1dSS1NSQ30vLmh0cGFzc3dkIF0gfHwgJHtNVn0gJHtXUktT
 UkN9Ly5odHBhc3N3ZCAke1dSS1NSQ30vLmh0cGFzc3dkLnNhbXBsZQotCQlAWyAhIC1mICR7
 V1JLU1JDfS8uaHRhY2Nlc3MgXSB8fCAke01WfSAke1dSS1NSQ30vLmh0YWNjZXNzICR7V1JL
 U1JDfS8uaHRhY2Nlc3Muc2FtcGxlCi0JCUBbICEgLWYgJHtXUktTUkN9L2luY2x1ZGVzL2Nv
 bmZpZy5pbmMucGhwIF0gfHwgJHtNVn0gJHtXUktTUkN9L2luY2x1ZGVzL2NvbmZpZy5pbmMu
 cGhwICR7V1JLU1JDfS9pbmNsdWRlcy9jb25maWcuaW5jLnBocC5zYW1wbGUKLQkJQCR7TUtE
 SVJ9ICR7V1dXRElSfQotCQlAJHtNS0RJUn0gJHtXV1dESVJ9L2luY2x1ZGVzCi0JCSR7SU5T
 VEFMTF9EQVRBfSAke1dSS1NSQ30vKi5waHAgJHtXV1dESVJ9Ci0JCSR7SU5TVEFMTF9EQVRB
 fSAke1dSS1NSQ30vKi50eHQgJHtXV1dESVJ9Ci0JCSR7SU5TVEFMTF9EQVRBfSAke1dSS1NS
 Q30vKi5jc3MgJHtXV1dESVJ9Ci0JCSR7SU5TVEFMTF9EQVRBfSAke1dSS1NSQ30vLmh0KiAk
 e1dXV0RJUn0KLQkJJHtJTlNUQUxMX0RBVEF9ICR7V1JLU1JDfS9pbmNsdWRlcy8qLnNhbXBs
 ZSAke1dXV0RJUn0vaW5jbHVkZXMvCi0JCSR7SU5TVEFMTF9EQVRBfSAke1dSS1NSQ30vaW5j
 bHVkZXMvKi5waHAgJHtXV1dESVJ9L2luY2x1ZGVzLwotCQlAaWYgWyAtZiAke1dXV0RJUn0v
 Y29uZmlnLmluYy5waHAgXTsgdGhlbiBcCi0JCQkke01WfSAke1dXV0RJUn0vY29uZmlnLmlu
 Yy5waHAgJHtXV1dESVJ9L2luY2x1ZGVzL2NvbmZpZy5pbmMucGhwOyBcCi0JCWZpCi0JCUBb
 IC1mICR7V1dXRElSfS9pbmNsdWRlcy9jb25maWcuaW5jLnBocCBdIHx8IFwKLQkJCSR7Q1B9
 ICR7V1dXRElSfS9pbmNsdWRlcy9jb25maWcuaW5jLnBocC5zYW1wbGUgJHtXV1dESVJ9L2lu
 Y2x1ZGVzL2NvbmZpZy5pbmMucGhwCi0JCUBbIC1mICR7V1dXRElSfS8uaHRwYXNzd2QgXSB8
 fCBcCi0JCQkke0NQfSAke1dXV0RJUn0vLmh0cGFzc3dkLnNhbXBsZSAke1dXV0RJUn0vLmh0
 cGFzc3dkCi0JCUBbIC1mICR7V1dXRElSfS8uaHRhY2Nlc3MgXSB8fCBcCi0JCQkke0NQfSAk
 e1dXV0RJUn0vLmh0YWNjZXNzLnNhbXBsZSAke1dXV0RJUn0vLmh0YWNjZXNzCi0KLXBvc3Qt
 aW5zdGFsbDoKLQkJQCR7Q0hPV059IC1SICR7V1dXT1dOfToke1dXV0dSUH0gJHtXV1dESVJ9
 LwotCQlAJHtDSE9XTn0gcm9vdCAke1dXV0RJUn0vLmh0KiAke1dXV0RJUn0vaW5jbHVkZXMv
 Y29uZmlnLmluYy5waHAqCi0JCUAke0NITU9EfSAtUiAwNjQwICR7V1dXRElSfS8qLnBocCAk
 e1dXV0RJUn0vKi50eHQgJHtXV1dESVJ9LyouY3NzICR7V1dXRElSfS8uaHQqICR7V1dXRElS
 fS9pbmNsdWRlcy8qLnBocCAke1dXV0RJUn0vaW5jbHVkZXMvKi5zYW1wbGUKLQkJQCR7Q0FU
 fSAke1BLR01FU1NBR0V9CisJCUAke01WfSAke1dSS1NSQ30vaW5jbHVkZXMvY29uZmlnLmlu
 Yy5waHAgJHtXUktTUkN9L2luY2x1ZGVzL2NvbmZpZy5pbmMucGhwLnNhbXBsZQorCQlAJHtN
 S0RJUn0gJHtTVEFHRURJUn0ke1dXV0RJUn0KKwkJQCR7TUtESVJ9ICR7U1RBR0VESVJ9JHtX
 V1dESVJ9L2luY2x1ZGVzCisJCSR7SU5TVEFMTF9EQVRBfSAke1dSS1NSQ30vKi5waHAgJHtT
 VEFHRURJUn0ke1dXV0RJUn0KKwkJJHtJTlNUQUxMX0RBVEF9ICR7V1JLU1JDfS8qLnR4dCAk
 e1NUQUdFRElSfSR7V1dXRElSfQorCQkke0lOU1RBTExfREFUQX0gJHtXUktTUkN9LyouY3Nz
 ICR7U1RBR0VESVJ9JHtXV1dESVJ9CisJCSR7SU5TVEFMTF9EQVRBfSAke1dSS1NSQ30vLmh0
 KiAke1NUQUdFRElSfSR7V1dXRElSfQorCQkke0lOU1RBTExfREFUQX0gJHtXUktTUkN9L2lu
 Y2x1ZGVzLyouc2FtcGxlICR7U1RBR0VESVJ9JHtXV1dESVJ9L2luY2x1ZGVzLworCQkke0lO
 U1RBTExfREFUQX0gJHtXUktTUkN9L2luY2x1ZGVzLyoucGhwICR7U1RBR0VESVJ9JHtXV1dE
 SVJ9L2luY2x1ZGVzLwogCiAuaW5jbHVkZSA8YnNkLnBvcnQubWs+CmRpZmYgLXJ1TiBtYWls
 L3Nnd2kub3JpZy9maWxlcy9wYXRjaC0uaHRhY2Nlc3MgbWFpbC9zZ3dpL2ZpbGVzL3BhdGNo
 LS5odGFjY2VzcwotLS0gbWFpbC9zZ3dpLm9yaWcvZmlsZXMvcGF0Y2gtLmh0YWNjZXNzCTIw
 MTQtMDEtMjIgMTg6NDA6NDQuMDAwMDAwMDAwICswMTAwCisrKyBtYWlsL3Nnd2kvZmlsZXMv
 cGF0Y2gtLmh0YWNjZXNzCTE5NzAtMDEtMDEgMDE6MDA6MDAuMDAwMDAwMDAwICswMTAwCkBA
 IC0xLDExICswLDAgQEAKLS0tLSAvZGV2L251bGwJMjAwOC0wMy0xMSAyMjowNTowMS4wMDAw
 MDAwMDAgKzAxMDAKLSsrKyAuaHRhY2Nlc3MJMjAwOC0wMy0xMSAyMjowMzozNi4wMDAwMDAw
 MDAgKzAxMDAKLUBAIC0wLDAgKzEsOCBAQAotK0F1dGhVc2VyRmlsZSAvdXNyL2xvY2FsL3d3
 dy9zZ3dpLy5odHBhc3N3ZAotK0F1dGhHcm91cEZpbGUgL2Rldi9udWxsCi0rQXV0aE5hbWUg
 InNnd2kgQWRtaW4iCi0rQXV0aFR5cGUgQmFzaWMKLSsKLSs8bGltaXQgR0VUIFBPU1Q+Ci0r
 cmVxdWlyZSB2YWxpZC11c2VyCi0rPC9saW1pdD4KZGlmZiAtcnVOIG1haWwvc2d3aS5vcmln
 L2ZpbGVzL3BhdGNoLS5odGFjY2Vzcy5zYW1wbGUgbWFpbC9zZ3dpL2ZpbGVzL3BhdGNoLS5o
 dGFjY2Vzcy5zYW1wbGUKLS0tIG1haWwvc2d3aS5vcmlnL2ZpbGVzL3BhdGNoLS5odGFjY2Vz
 cy5zYW1wbGUJMTk3MC0wMS0wMSAwMTowMDowMC4wMDAwMDAwMDAgKzAxMDAKKysrIG1haWwv
 c2d3aS9maWxlcy9wYXRjaC0uaHRhY2Nlc3Muc2FtcGxlCTIwMTQtMDMtMjAgMjA6NTY6MDQu
 NDAyNzUzMDAwICswMTAwCkBAIC0wLDAgKzEsMTEgQEAKKy0tLSAvZGV2L251bGwJMjAwOC0w
 My0xMSAyMjowNTowMS4wMDAwMDAwMDAgKzAxMDAKKysrKyAuaHRhY2Nlc3Muc2FtcGxlCTIw
 MDgtMDMtMTEgMjI6MDM6MzYuMDAwMDAwMDAwICswMTAwCitAQCAtMCwwICsxLDggQEAKKytB
 dXRoVXNlckZpbGUgL3Vzci9sb2NhbC93d3cvc2d3aS8uaHRwYXNzd2QKKytBdXRoR3JvdXBG
 aWxlIC9kZXYvbnVsbAorK0F1dGhOYW1lICJzZ3dpIEFkbWluIgorK0F1dGhUeXBlIEJhc2lj
 CisrCisrPGxpbWl0IEdFVCBQT1NUPgorK3JlcXVpcmUgdmFsaWQtdXNlcgorKzwvbGltaXQ+
 CmRpZmYgLXJ1TiBtYWlsL3Nnd2kub3JpZy9maWxlcy9wYXRjaC0uaHRwYXNzd2QgbWFpbC9z
 Z3dpL2ZpbGVzL3BhdGNoLS5odHBhc3N3ZAotLS0gbWFpbC9zZ3dpLm9yaWcvZmlsZXMvcGF0
 Y2gtLmh0cGFzc3dkCTIwMTQtMDEtMjIgMTg6NDA6NDQuMDAwMDAwMDAwICswMTAwCisrKyBt
 YWlsL3Nnd2kvZmlsZXMvcGF0Y2gtLmh0cGFzc3dkCTE5NzAtMDEtMDEgMDE6MDA6MDAuMDAw
 MDAwMDAwICswMTAwCkBAIC0xLDQgKzAsMCBAQAotLS0tIC9kZXYvbnVsbAkyMDA4LTAzLTEx
 IDIyOjA1OjAxLjAwMDAwMDAwMCArMDEwMAotKysrIC5odHBhc3N3ZAkyMDA4LTAzLTExIDIy
 OjAyOjIxLjAwMDAwMDAwMCArMDEwMAotQEAgLTAsMCArMSBAQAotK2FkbWluOjFDbTJSMXps
 NS5MSUkKZGlmZiAtcnVOIG1haWwvc2d3aS5vcmlnL2ZpbGVzL3BhdGNoLS5odHBhc3N3ZC5z
 YW1wbGUgbWFpbC9zZ3dpL2ZpbGVzL3BhdGNoLS5odHBhc3N3ZC5zYW1wbGUKLS0tIG1haWwv
 c2d3aS5vcmlnL2ZpbGVzL3BhdGNoLS5odHBhc3N3ZC5zYW1wbGUJMTk3MC0wMS0wMSAwMTow
 MDowMC4wMDAwMDAwMDAgKzAxMDAKKysrIG1haWwvc2d3aS9maWxlcy9wYXRjaC0uaHRwYXNz
 d2Quc2FtcGxlCTIwMTQtMDMtMjAgMjA6NTY6MTIuMjk4NzY2MDAwICswMTAwCkBAIC0wLDAg
 KzEsNCBAQAorLS0tIC9kZXYvbnVsbAkyMDA4LTAzLTExIDIyOjA1OjAxLjAwMDAwMDAwMCAr
 MDEwMAorKysrIC5odHBhc3N3ZC5zYW1wbGUJMjAwOC0wMy0xMSAyMjowMjoyMS4wMDAwMDAw
 MDAgKzAxMDAKK0BAIC0wLDAgKzEgQEAKKythZG1pbjoxQ20yUjF6bDUuTElJCmRpZmYgLXJ1
 TiBtYWlsL3Nnd2kub3JpZy9maWxlcy9wa2ctaW5zdGFsbC5pbiBtYWlsL3Nnd2kvZmlsZXMv
 cGtnLWluc3RhbGwuaW4KLS0tIG1haWwvc2d3aS5vcmlnL2ZpbGVzL3BrZy1pbnN0YWxsLmlu
 CTIwMTQtMDEtMjIgMTY6NTI6MDYuMDAwMDAwMDAwICswMTAwCisrKyBtYWlsL3Nnd2kvZmls
 ZXMvcGtnLWluc3RhbGwuaW4JMjAxNC0wMy0yMCAyMTowNzozMi4yOTk3NTYwMDAgKzAxMDAK
 QEAgLTcsNiArNyw3IEBACiBpZiBbICIkMiIgIT0gIlBPU1QtSU5TVEFMTCIgXTsgdGhlbgog
 CWV4aXQgMAogZWxzZQotCS91c3Ivc2Jpbi9jaG93biAke1dXV09XTn06JHtXV1dHUlB9ICR7
 V1dXRElSfS9pbmNsdWRlcy8KLQkvdXNyL2Jpbi9jaGdycCAke1dXV0dSUH0gJHtXV1dESVJ9
 Ly5odCogJHtXV1dESVJ9L2luY2x1ZGVzL2NvbmZpZy5pbmMucGhwCisJL3Vzci9zYmluL2No
 b3duIC1SICR7V1dXT1dOfToke1dXV0dSUH0gJHtXV1dESVJ9CisJL3Vzci9zYmluL2Nob3du
 IHJvb3Q6JHtXV1dHUlB9ICR7V1dXRElSfS8uaHQqICR7V1dXRElSfS9pbmNsdWRlcy9jb25m
 aWcuaW5jLnBocCoKKwkvYmluL2NobW9kIC1SIDA2NDAgJHtTVEFHRURJUn0ke1dXV0RJUn0v
 Ki5waHAgJHtTVEFHRURJUn0ke1dXV0RJUn0vKi50eHQgJHtTVEFHRURJUn0ke1dXV0RJUn0v
 Ki5jc3MgJHtTVEFHRURJUn0ke1dXV0RJUn0vLmh0KiAke1NUQUdFRElSfSR7V1dXRElSfS9p
 bmNsdWRlcy8qLnBocCAke1NUQUdFRElSfSR7V1dXRElSfS9pbmNsdWRlcy8qLnNhbXBsZQog
 ZmkKZGlmZiAtcnVOIG1haWwvc2d3aS5vcmlnL3BrZy1wbGlzdCBtYWlsL3Nnd2kvcGtnLXBs
 aXN0Ci0tLSBtYWlsL3Nnd2kub3JpZy9wa2ctcGxpc3QJMjAxNC0wMS0yMiAxNjoxNjo1Ni4w
 MDAwMDAwMDAgKzAxMDAKKysrIG1haWwvc2d3aS9wa2ctcGxpc3QJMjAxNC0wMy0yMCAyMToy
 NDo0Mi4yMzQ3NTkwMDAgKzAxMDAKQEAgLTcsNiArNyw3IEBACiB3d3cvc2d3aS9hd2wucGhw
 CiB3d3cvc2d3aS9jb25uZWN0LnBocAogd3d3L3Nnd2kvaW5jbHVkZXMvYXdsLmluYy5waHAK
 K0BleGVjIFsgLWYgJUQvd3d3L3Nnd2kvY29uZmlnLmluYy5waHAgXSAmJiBtdiAtZiAlRC93
 d3cvc2d3aS9jb25maWcuaW5jLnBocCAlRC93d3cvc2d3aS9pbmNsdWRlcy9jb25maWcuaW5j
 LnBocAogQHVuZXhlYyBpZiBjbXAgLXMgJUQvd3d3L3Nnd2kvaW5jbHVkZXMvY29uZmlnLmlu
 Yy5waHAgJUQvd3d3L3Nnd2kvaW5jbHVkZXMvY29uZmlnLmluYy5waHAuc2FtcGxlOyB0aGVu
 IHJtIC1mICVEL3d3dy9zZ3dpL2luY2x1ZGVzL2NvbmZpZy5pbmMucGhwOyBmaQogd3d3L3Nn
 d2kvaW5jbHVkZXMvY29uZmlnLmluYy5waHAuc2FtcGxlCiBAZXhlYyBbIC1mICVCL2NvbmZp
 Zy5pbmMucGhwIF0gfHwgY3AgJUIvJWYgJUIvY29uZmlnLmluYy5waHAK
 --------------080005070408030809090005--
Responsible-Changed-From-To: freebsd-ports-bugs->rene 
Responsible-Changed-By: rene 
Responsible-Changed-When: Sun Apr 6 15:14:33 UTC 2014 
Responsible-Changed-Why:  
Take 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187798 
State-Changed-From-To: open->closed 
State-Changed-By: rene 
State-Changed-When: Sun Apr 6 15:16:41 UTC 2014 
State-Changed-Why:  
Committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187798 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/187798: commit references a PR
Date: Sun,  6 Apr 2014 15:15:56 +0000 (UTC)

 Author: rene
 Date: Sun Apr  6 15:15:52 2014
 New Revision: 350365
 URL: http://svnweb.freebsd.org/changeset/ports/350365
 QAT: https://qat.redports.org/buildarchive/r350365/
 
 Log:
   - Stage support
   - Add a second MASTER_SITE
   - Suffix patch and resulting files for .htaccess and .htpasswd with ".sample"
   
   PR:		ports/187798
   Submitted by:	Lukasz Wasikowski <lukasz@wasikowski.net> (maintainer)
 
 Added:
   head/mail/sgwi/files/patch-.htaccess.sample   (contents, props changed)
   head/mail/sgwi/files/patch-.htpasswd.sample   (contents, props changed)
 Deleted:
   head/mail/sgwi/files/patch-.htaccess
   head/mail/sgwi/files/patch-.htpasswd
 Modified:
   head/mail/sgwi/Makefile
   head/mail/sgwi/files/pkg-install.in
   head/mail/sgwi/pkg-plist
 
 Modified: head/mail/sgwi/Makefile
 ==============================================================================
 --- head/mail/sgwi/Makefile	Sun Apr  6 15:11:09 2014	(r350364)
 +++ head/mail/sgwi/Makefile	Sun Apr  6 15:15:52 2014	(r350365)
 @@ -4,7 +4,8 @@
  PORTNAME=	sgwi
  PORTVERSION=	1.1.6
  CATEGORIES=	mail www
 -MASTER_SITES=	http://www.vanheusden.com/sgwi/
 +MASTER_SITES=	http://www.vanheusden.com/sgwi/ \
 +		http://lukasz.wasikowski.net/files/
  DISTNAME=	sqlgreywebinterface-${PORTVERSION}
  EXTRACT_SUFX=	.tgz
  
 @@ -25,7 +26,6 @@ PGSQL_DESC=	PostgreSQL back-end (use pgs
  
  OPTIONS_DEFAULT=MYSQL
  
 -NO_STAGE=	yes
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MMYSQL}
 @@ -42,31 +42,14 @@ post-patch:
  		${FIND} ${WRKSRC} -name '*.orig' -delete
  
  do-install:
 -		@[ ! -f ${WRKSRC}/.htpasswd ] || ${MV} ${WRKSRC}/.htpasswd ${WRKSRC}/.htpasswd.sample
 -		@[ ! -f ${WRKSRC}/.htaccess ] || ${MV} ${WRKSRC}/.htaccess ${WRKSRC}/.htaccess.sample
 -		@[ ! -f ${WRKSRC}/includes/config.inc.php ] || ${MV} ${WRKSRC}/includes/config.inc.php ${WRKSRC}/includes/config.inc.php.sample
 -		@${MKDIR} ${WWWDIR}
 -		@${MKDIR} ${WWWDIR}/includes
 -		${INSTALL_DATA} ${WRKSRC}/*.php ${WWWDIR}
 -		${INSTALL_DATA} ${WRKSRC}/*.txt ${WWWDIR}
 -		${INSTALL_DATA} ${WRKSRC}/*.css ${WWWDIR}
 -		${INSTALL_DATA} ${WRKSRC}/.ht* ${WWWDIR}
 -		${INSTALL_DATA} ${WRKSRC}/includes/*.sample ${WWWDIR}/includes/
 -		${INSTALL_DATA} ${WRKSRC}/includes/*.php ${WWWDIR}/includes/
 -		@if [ -f ${WWWDIR}/config.inc.php ]; then \
 -			${MV} ${WWWDIR}/config.inc.php ${WWWDIR}/includes/config.inc.php; \
 -		fi
 -		@[ -f ${WWWDIR}/includes/config.inc.php ] || \
 -			${CP} ${WWWDIR}/includes/config.inc.php.sample ${WWWDIR}/includes/config.inc.php
 -		@[ -f ${WWWDIR}/.htpasswd ] || \
 -			${CP} ${WWWDIR}/.htpasswd.sample ${WWWDIR}/.htpasswd
 -		@[ -f ${WWWDIR}/.htaccess ] || \
 -			${CP} ${WWWDIR}/.htaccess.sample ${WWWDIR}/.htaccess
 -
 -post-install:
 -		@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/
 -		@${CHOWN} root ${WWWDIR}/.ht* ${WWWDIR}/includes/config.inc.php*
 -		@${CHMOD} -R 0640 ${WWWDIR}/*.php ${WWWDIR}/*.txt ${WWWDIR}/*.css ${WWWDIR}/.ht* ${WWWDIR}/includes/*.php ${WWWDIR}/includes/*.sample
 -		@${CAT} ${PKGMESSAGE}
 +		@${MV} ${WRKSRC}/includes/config.inc.php ${WRKSRC}/includes/config.inc.php.sample
 +		@${MKDIR} ${STAGEDIR}${WWWDIR}
 +		@${MKDIR} ${STAGEDIR}${WWWDIR}/includes
 +		${INSTALL_DATA} ${WRKSRC}/*.php ${STAGEDIR}${WWWDIR}
 +		${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${WWWDIR}
 +		${INSTALL_DATA} ${WRKSRC}/*.css ${STAGEDIR}${WWWDIR}
 +		${INSTALL_DATA} ${WRKSRC}/.ht* ${STAGEDIR}${WWWDIR}
 +		${INSTALL_DATA} ${WRKSRC}/includes/*.sample ${STAGEDIR}${WWWDIR}/includes/
 +		${INSTALL_DATA} ${WRKSRC}/includes/*.php ${STAGEDIR}${WWWDIR}/includes/
  
  .include <bsd.port.mk>
 
 Added: head/mail/sgwi/files/patch-.htaccess.sample
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/mail/sgwi/files/patch-.htaccess.sample	Sun Apr  6 15:15:52 2014	(r350365)
 @@ -0,0 +1,11 @@
 +--- /dev/null	2008-03-11 22:05:01.000000000 +0100
 ++++ .htaccess.sample	2008-03-11 22:03:36.000000000 +0100
 +@@ -0,0 +1,8 @@
 ++AuthUserFile /usr/local/www/sgwi/.htpasswd
 ++AuthGroupFile /dev/null
 ++AuthName "sgwi Admin"
 ++AuthType Basic
 ++
 ++<limit GET POST>
 ++require valid-user
 ++</limit>
 
 Added: head/mail/sgwi/files/patch-.htpasswd.sample
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/mail/sgwi/files/patch-.htpasswd.sample	Sun Apr  6 15:15:52 2014	(r350365)
 @@ -0,0 +1,4 @@
 +--- /dev/null	2008-03-11 22:05:01.000000000 +0100
 ++++ .htpasswd.sample	2008-03-11 22:02:21.000000000 +0100
 +@@ -0,0 +1 @@
 ++admin:1Cm2R1zl5.LII
 
 Modified: head/mail/sgwi/files/pkg-install.in
 ==============================================================================
 --- head/mail/sgwi/files/pkg-install.in	Sun Apr  6 15:11:09 2014	(r350364)
 +++ head/mail/sgwi/files/pkg-install.in	Sun Apr  6 15:15:52 2014	(r350365)
 @@ -7,6 +7,7 @@ WWWGRP=%%WWWGRP%%
  if [ "$2" != "POST-INSTALL" ]; then
  	exit 0
  else
 -	/usr/sbin/chown ${WWWOWN}:${WWWGRP} ${WWWDIR}/includes/
 -	/usr/bin/chgrp ${WWWGRP} ${WWWDIR}/.ht* ${WWWDIR}/includes/config.inc.php
 +	/usr/sbin/chown -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
 +	/usr/sbin/chown root:${WWWGRP} ${WWWDIR}/.ht* ${WWWDIR}/includes/config.inc.php*
 +	/bin/chmod -R 0640 ${STAGEDIR}${WWWDIR}/*.php ${STAGEDIR}${WWWDIR}/*.txt ${STAGEDIR}${WWWDIR}/*.css ${STAGEDIR}${WWWDIR}/.ht* ${STAGEDIR}${WWWDIR}/includes/*.php ${STAGEDIR}${WWWDIR}/includes/*.sample
  fi
 
 Modified: head/mail/sgwi/pkg-plist
 ==============================================================================
 --- head/mail/sgwi/pkg-plist	Sun Apr  6 15:11:09 2014	(r350364)
 +++ head/mail/sgwi/pkg-plist	Sun Apr  6 15:15:52 2014	(r350365)
 @@ -7,6 +7,7 @@ www/sgwi/.htpasswd.sample
  www/sgwi/awl.php
  www/sgwi/connect.php
  www/sgwi/includes/awl.inc.php
 +@exec [ -f %D/www/sgwi/config.inc.php ] && mv -f %D/www/sgwi/config.inc.php %D/www/sgwi/includes/config.inc.php
  @unexec if cmp -s %D/www/sgwi/includes/config.inc.php %D/www/sgwi/includes/config.inc.php.sample; then rm -f %D/www/sgwi/includes/config.inc.php; fi
  www/sgwi/includes/config.inc.php.sample
  @exec [ -f %B/config.inc.php ] || cp %B/%f %B/config.inc.php
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
