From owner-svn-ports-head@FreeBSD.ORG  Mon Mar 11 00:51:40 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 3B246759;
 Mon, 11 Mar 2013 00:51:40 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 23A819FE;
 Mon, 11 Mar 2013 00:51:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2B0pdWS017073;
 Mon, 11 Mar 2013 00:51:39 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2B0pdW5017072;
 Mon, 11 Mar 2013 00:51:39 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201303110051.r2B0pdW5017072@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 11 Mar 2013 00:51:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r313850 - head/Mk
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.14
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: Mon, 11 Mar 2013 00:51:40 -0000

Author: bdrewery
Date: Mon Mar 11 00:51:39 2013
New Revision: 313850
URL: http://svnweb.freebsd.org/changeset/ports/313850

Log:
  - Fix bsd.pbi.mk being processed twice when including both
    bsd.port.pre.mk and bsd.port.mk. This was causing duplicate
    target warnings.
  
  PR:		ports/176825
  Reported by:	crees@
  Approved by:	portmgr (miwi)

Modified:
  head/Mk/bsd.pbi.mk

Modified: head/Mk/bsd.pbi.mk
==============================================================================
--- head/Mk/bsd.pbi.mk	Sun Mar 10 23:20:00 2013	(r313849)
+++ head/Mk/bsd.pbi.mk	Mon Mar 11 00:51:39 2013	(r313850)
@@ -2,6 +2,9 @@
 #
 # Creates a PBI file from a port with just 'make pbi'
 #
+.if !defined(_INCLUDE_PBI_MK)
+
+_INCLUDE_PBI_MK=	yes
 PBI_MAINTAINER=		kmoore@FreeBSD.org
 
 _PBIMAKEPORT=	pbi_makeport
@@ -49,3 +52,5 @@ pbi-generate: check-pbimanager
 clean-pbi:
 	@${ECHO_MSG} "===> Cleaning PBI for ${PORTNAME}"
 	@${RM} -rf ${_PBIDIR}
+
+.endif