From owner-svn-ports-head@FreeBSD.ORG  Thu Feb 19 11:19:06 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 4B78C237;
 Thu, 19 Feb 2015 11:19:06 +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 372875E0;
 Thu, 19 Feb 2015 11:19:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1JBJ6NV007055;
 Thu, 19 Feb 2015 11:19:06 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1JBJ6JR007054;
 Thu, 19 Feb 2015 11:19:06 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201502191119.t1JBJ6JR007054@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:19:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r379339 - head/www/trac-email2trac
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:19:06 -0000

Author: jbeich
Date: Thu Feb 19 11:19:05 2015
New Revision: 379339
URL: https://svnweb.freebsd.org/changeset/ports/379339
QAT: https://qat.redports.org/buildarchive/r379339/

Log:
  Oops, drop SLAVE_PORT ugliness

Modified:
  head/www/trac-email2trac/Makefile

Modified: head/www/trac-email2trac/Makefile
==============================================================================
--- head/www/trac-email2trac/Makefile	Thu Feb 19 11:14:23 2015	(r379338)
+++ head/www/trac-email2trac/Makefile	Thu Feb 19 11:19:05 2015	(r379339)
@@ -15,6 +15,8 @@ LICENSE_COMB=	dual
 
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
 
+CONFLICTS_INSTALL?=	trac-email2trac-postfix-[0-9]*
+
 OPTIONS_DEFINE=	POSTFIX DOCS
 POSTFIX_DESC=	Configure suid script for postfix
 
@@ -29,10 +31,6 @@ 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