Date: Fri, 4 Oct 2013 01:52:31 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329257 - head/Mk Message-ID: <201310040152.r941qVti079739@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310040152.r941qVti079739>