From owner-svn-ports-all@FreeBSD.ORG  Fri Oct  4 01:52:31 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 491CD3D1;
 Fri,  4 Oct 2013 01:52:31 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 36C2F2D0B;
 Fri,  4 Oct 2013 01:52:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r941qVjn079740;
 Fri, 4 Oct 2013 01:52:31 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r941qVti079739;
 Fri, 4 Oct 2013 01:52:31 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201310040152.r941qVti079739@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 4 Oct 2013 01:52:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r329257 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Oct 2013 01:52:31 -0000

Author: bdrewery
Date: Fri Oct  4 01:52:30 2013
New Revision: 329257
URL: http://svnweb.freebsd.org/changeset/ports/329257

Log:
  - Add support for PATCHFILES and PATCH_SITES
  - While here, cleanup r329186 and move EXTRA_PATCHES to common
    section
  
  With hat:	portmgr

Modified:
  head/Mk/bsd.options.mk

Modified: head/Mk/bsd.options.mk
==============================================================================
--- head/Mk/bsd.options.mk	Fri Oct  4 01:47:03 2013	(r329256)
+++ head/Mk/bsd.options.mk	Fri Oct  4 01:52:30 2013	(r329257)
@@ -97,7 +97,8 @@
 # 							EXTRA_PATCHES
 #
 # For each of CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CONFIGURE_ENV MAKE_ARGS MAKE_ENV
-# USES DISTFILES PLIST_FILES PLIST_DIRS PLIST_DIRSTRY, defining
+# USES DISTFILES PLIST_FILES PLIST_DIRS PLIST_DIRSTRY EXTRA_PATCHES
+# PATCHFILES PATCH_SITES, defining
 # ${opt}_${variable} will add it to the actual variable when the option is enabled.
 #
 # For each of the depends target PKG EXTRACT PATCH FETCH BUILD LIB RUN,
@@ -383,9 +384,6 @@ PLIST_SUB:=	${PLIST_SUB} ${opt}="@commen
 .  endif
 
 .  if ${PORT_OPTIONS:M${opt}}
-.    if defined(${opt}_EXTRA_PATCHES)
-EXTRA_PATCHES+=		${${opt}_EXTRA_PATCHES}
-.    endif
 .    if defined(${opt}_CONFIGURE_ENABLE)
 CONFIGURE_ARGS+=	--enable-${${opt}_CONFIGURE_ENABLE}
 .    endif
@@ -399,7 +397,8 @@ CONFIGURE_ARGS+=	${${opt}_CONFIGURE_ON}
 CMAKE_ARGS+=	${${opt}_CMAKE_ON}
 .    endif
 .    for flags in CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CONFIGURE_ENV MAKE_ARGS MAKE_ENV \
-                  USES DISTFILES PLIST_FILES PLIST_DIRS PLIST_DIRSTRY
+                  USES DISTFILES PLIST_FILES PLIST_DIRS PLIST_DIRSTRY \
+                  EXTRA_PATCHES PATCHFILES PATCH_SITES
 .      if defined(${opt}_${flags})
 ${flags}+=	${${opt}_${flags}}
 .      endif