From owner-svn-ports-head@FreeBSD.ORG  Thu Feb 19 11:14:25 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 618DAF54;
 Thu, 19 Feb 2015 11:14:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 323413D6;
 Thu, 19 Feb 2015 11:14:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1JBEP3V006313;
 Thu, 19 Feb 2015 11:14:25 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1JBEOMB006310;
 Thu, 19 Feb 2015 11:14:24 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201502191114.t1JBEOMB006310@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 19 Feb 2015 11:14:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r379338 - in head/www: trac-email2trac
 trac-email2trac-postfix
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Feb 2015 11:14:25 -0000

Author: jbeich
Date: Thu Feb 19 11:14:23 2015
New Revision: 379338
URL: https://svnweb.freebsd.org/changeset/ports/379338
QAT: https://qat.redports.org/buildarchive/r379338/

Log:
  - Convert to @sample
  - Convert to @(user,group,mode)
  - Convert to OPTIONS_SLAVE
  - Register CONFLICTS with -postfix slave port

Modified:
  head/www/trac-email2trac-postfix/Makefile
  head/www/trac-email2trac/Makefile
  head/www/trac-email2trac/pkg-plist

Modified: head/www/trac-email2trac-postfix/Makefile
==============================================================================
--- head/www/trac-email2trac-postfix/Makefile	Thu Feb 19 09:29:12 2015	(r379337)
+++ head/www/trac-email2trac-postfix/Makefile	Thu Feb 19 11:14:23 2015	(r379338)
@@ -2,7 +2,9 @@
 
 PKGNAMESUFFIX=		-postfix
 
-WITH_POSTFIX=		yes
+CONFLICTS_INSTALL=	trac-email2trac-[0-9]*
+
+OPTIONS_SLAVE=		POSTFIX
 
 MASTERDIR=		${.CURDIR}/../trac-email2trac
 

Modified: head/www/trac-email2trac/Makefile
==============================================================================
--- head/www/trac-email2trac/Makefile	Thu Feb 19 09:29:12 2015	(r379337)
+++ head/www/trac-email2trac/Makefile	Thu Feb 19 11:14:23 2015	(r379338)
@@ -29,6 +29,10 @@ PORTDOCS=	AUTHORS ChangeLog INSTALL READ
 
 .include <bsd.port.options.mk>
 
+.if ${SLAVE_PORT} == no
+CONFLICTS_INSTALL+=	trac-email2trac-postfix-[0-9]*
+.endif
+
 .if ${PORT_OPTIONS:MPOSTFIX}
 MTAUSER?=	nobody
 .else
@@ -38,14 +42,10 @@ MTAUSER?=	mailnull
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/delete_spam.py ${STAGEDIR}${PREFIX}/bin/delete_spam
 	@${INSTALL_SCRIPT} ${WRKSRC}/email2trac.py ${STAGEDIR}${PREFIX}/bin/email2trac
-	@${INSTALL} ${COPY} ${STRIP} ${_BINOWNGRP} -m 4111 \
+	@${INSTALL_PROGRAM} \
 	    ${WRKSRC}/run_email2trac ${STAGEDIR}${PREFIX}/bin
 	@${INSTALL_DATA} ${WRKSRC}/email2trac.conf \
 	    ${STAGEDIR}${PREFIX}/etc/email2trac.conf.sample
-	@if [ ! -e ${STAGEDIR}${PREFIX}/etc/email2trac.conf ]; then \
-		${CP} -p ${STAGEDIR}${PREFIX}/etc/email2trac.conf.sample \
-		    ${STAGEDIR}${PREFIX}/etc/email2trac.conf ; \
-	fi
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}

Modified: head/www/trac-email2trac/pkg-plist
==============================================================================
--- head/www/trac-email2trac/pkg-plist	Thu Feb 19 09:29:12 2015	(r379337)
+++ head/www/trac-email2trac/pkg-plist	Thu Feb 19 11:14:23 2015	(r379338)
@@ -1,6 +1,4 @@
 bin/delete_spam
 bin/email2trac
-bin/run_email2trac
-@unexec if cmp -s %D/etc/email2trac.conf %D/etc/email2trac.conf.sample; then rm -f %D/etc/email2trac.conf; fi
-etc/email2trac.conf.sample
-@exec if [ ! -e %D/etc/email2trac.conf ]; then cp %D/etc/email2trac.conf.sample %D/etc/email2trac.conf; fi
+@(,,4111) bin/run_email2trac
+@sample etc/email2trac.conf.sample