svn commit: r534792 - in head: Mk/Uses biology/mothur/files devel/gmake devel/gmake/files devel/ptlib/files editors/openoffice-4/files editors/openoffice-devel/files emulators/mame/files java/openj...

Sat May 9 19:24:54 UTC 2020

Author: tijl
Date: Sat May  9 19:24:49 2020
New Revision: 534792
URL: https://svnweb.freebsd.org/changeset/ports/534792

Log:
  Update devel/gmake to 4.3.
  
  Some changes have been made in this release that break backwards
  compatibility.  Let USES=gmake force users to upgrade to this version so
  port maintainers don't have to support older versions.
  
  PR:		245725
  Exp-run by:	antoine
  Approved by:	portmgr (antoine)

Added:
  head/biology/mothur/files/
  head/biology/mothur/files/patch-Makefile   (contents, props changed)
  head/devel/gmake/files/patch-lib-glob.c
     - copied, changed from r534791, head/devel/gmake/files/patch-glob-glob.c
  head/devel/gmake/files/patch-src-default.c
     - copied, changed from r534791, head/devel/gmake/files/patch-default.c
  head/devel/ptlib/files/patch-make_common.mak   (contents, props changed)
  head/editors/openoffice-4/files/patch-gmake43   (contents, props changed)
  head/editors/openoffice-devel/files/patch-gmake43   (contents, props changed)
  head/emulators/mame/files/patch-3rdparty_genie_src_host_scripts.c   (contents, props changed)
  head/java/openjdk12/files/patch-10-af5c725b   (contents, props changed)
  head/java/openjdk13/files/patch-10-af5c725b   (contents, props changed)
  head/lang/cparser/files/patch-Makefile   (contents, props changed)
  head/multimedia/aegisub/files/patch-Makefile.target   (contents, props changed)
  head/multimedia/gstreamer1/files/patch-libs_gst_controller_Makefile.in   (contents, props changed)
Deleted:
  head/devel/gmake/files/patch-default.c
  head/devel/gmake/files/patch-glob-glob.c
  head/devel/gmake/files/patch-posixos.c
Modified:
  head/Mk/Uses/gmake.mk
  head/devel/gmake/Makefile
  head/devel/gmake/distinfo
  head/devel/gmake/pkg-plist
  head/multimedia/gstreamer-plugins/Makefile
  head/multimedia/gstreamer1-plugins/Makefile
  head/net-im/farsight2/Makefile
  head/net-im/farstream/Makefile
  head/security/py-pyvex/files/patch-pyvex__c_Makefile

Modified: head/Mk/Uses/gmake.mk
==============================================================================

--- head/Mk/Uses/gmake.mk	Sat May  9 18:45:52 2020	(r534791)
+++ head/Mk/Uses/gmake.mk	Sat May  9 19:24:49 2020	(r534792)
@@ -14,7 +14,7 @@ _INCLUDE_USES_GMAKE_MK=	yes
 IGNORE=	Incorrect 'USES+= gmake:${gmake_ARGS}' gmake takes no arguments
 .endif
 
-BUILD_DEPENDS+=		gmake:devel/gmake
+BUILD_DEPENDS+=		gmake>=4.3:devel/gmake
 CONFIGURE_ENV+=		MAKE=gmake
 MAKE_CMD=		gmake
 

Added: head/biology/mothur/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/biology/mothur/files/patch-Makefile	Sat May  9 19:24:49 2020	(r534792)
@@ -0,0 +1,22 @@
+--- Makefile.orig	2019-09-30 19:02:13 UTC
++++ Makefile
+@@ -100,7 +100,7 @@ endif
+     subdirs :=  $(sort $(dir $(filter-out  $(skipUchime), $(wildcard source/*/))))
+     subDirIncludes = $(patsubst %, -I %, $(subdirs))
+     subDirLinking =  $(patsubst %, -L%, $(subdirs))
+-    CXXFLAGS += -I. $(subDirIncludes)
++    CXXFLAGS += -Isource $(subDirIncludes)
+     LDFLAGS += $(subDirLinking)
+ 
+ 
+@@ -109,8 +109,8 @@ endif
+ #
+     OBJECTS=$(patsubst %.cpp,%.o,$(wildcard $(addsuffix *.cpp,$(subdirs))))
+     OBJECTS+=$(patsubst %.c,%.o,$(wildcard $(addsuffix *.c,$(subdirs))))
+-    OBJECTS+=$(patsubst %.cpp,%.o,$(wildcard *.cpp))
+-    OBJECTS+=$(patsubst %.c,%.o,$(wildcard *.c))
++    OBJECTS+=$(patsubst %.cpp,%.o,$(wildcard source/*.cpp))
++    OBJECTS+=$(patsubst %.c,%.o,$(wildcard source/*.c))
+ 
+ mothur : $(OBJECTS) uchime
+ 	$(CXX) $(LDFLAGS) $(TARGET_ARCH) -o $@ $(OBJECTS) $(LIBS)

Modified: head/devel/gmake/Makefile
==============================================================================
--- head/devel/gmake/Makefile	Sat May  9 18:45:52 2020	(r534791)
+++ head/devel/gmake/Makefile	Sat May  9 19:24:49 2020	(r534792)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gmake
-PORTVERSION=	4.2.1
-PORTREVISION=	3
+PORTVERSION=	4.3
 CATEGORIES=	devel
 MASTER_SITES=	GNU/make
 DISTNAME=	make-${PORTVERSION}
@@ -21,7 +20,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g \
 		--without-guile
 
-USES=		cpe tar:bzip2
+USES=		cpe tar:lz
 CPE_VENDOR=	gnu
 
 OPTIONS_DEFINE=	NLS

Modified: head/devel/gmake/distinfo
==============================================================================
--- head/devel/gmake/distinfo	Sat May  9 18:45:52 2020	(r534791)
+++ head/devel/gmake/distinfo	Sat May  9 19:24:49 2020	(r534792)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465732758
-SHA256 (make-4.2.1.tar.bz2) = d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589
-SIZE (make-4.2.1.tar.bz2) = 1407126
+TIMESTAMP = 1587222848
+SHA256 (make-4.3.tar.lz) = de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82
+SIZE (make-4.3.tar.lz) = 1266180

Copied and modified: head/devel/gmake/files/patch-lib-glob.c (from r534791, head/devel/gmake/files/patch-glob-glob.c)
==============================================================================
--- head/devel/gmake/files/patch-glob-glob.c	Sat May  9 18:45:52 2020	(r534791, copy source)
+++ head/devel/gmake/files/patch-lib-glob.c	Sat May  9 19:24:49 2020	(r534792)
@@ -1,5 +1,5 @@
---- glob/glob.c.orig	2013-10-20 17:14:38 UTC
-+++ glob/glob.c
+--- lib/glob.c.orig	2020-01-03 07:11:27 UTC
++++ lib/glob.c
 @@ -203,7 +203,6 @@ my_realloc (p, n)
      return (char *) malloc (n);
    return (char *) realloc (p, n);

Copied and modified: head/devel/gmake/files/patch-src-default.c (from r534791, head/devel/gmake/files/patch-default.c)
==============================================================================
--- head/devel/gmake/files/patch-default.c	Sat May  9 18:45:52 2020	(r534791, copy source)
+++ head/devel/gmake/files/patch-src-default.c	Sat May  9 19:24:49 2020	(r534792)
@@ -1,6 +1,6 @@
---- default.c.orig	2015-05-13 16:16:24 UTC
-+++ default.c
-@@ -447,7 +447,7 @@ static const char *default_variables[] =
+--- src/default.c.orig	2020-01-03 07:11:27 UTC
++++ src/default.c
+@@ -530,7 +530,7 @@ static const char *default_variables[] =
      "OBJC", "gcc",
  #else
      "CC", "cc",

Modified: head/devel/gmake/pkg-plist
==============================================================================
--- head/devel/gmake/pkg-plist	Sat May  9 18:45:52 2020	(r534791)
+++ head/devel/gmake/pkg-plist	Sat May  9 19:24:49 2020	(r534792)
@@ -1,6 +1,7 @@
 bin/gmake
 include/gnumake.h
 %%NLS%%share/locale/be/LC_MESSAGES/make.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/make.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/make.mo
 %%NLS%%share/locale/da/LC_MESSAGES/make.mo
 %%NLS%%share/locale/de/LC_MESSAGES/make.mo
@@ -18,11 +19,14 @@ include/gnumake.h
 %%NLS%%share/locale/lt/LC_MESSAGES/make.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/make.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/make.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/make.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/make.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/make.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/make.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/make.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/make.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/make.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/make.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/make.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/make.mo
 man/man1/gmake.1.gz

Added: head/devel/ptlib/files/patch-make_common.mak
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ptlib/files/patch-make_common.mak	Sat May  9 19:24:49 2020	(r534792)
@@ -0,0 +1,27 @@
+--- make/common.mak.orig	2013-08-14 23:20:27 UTC
++++ make/common.mak
+@@ -370,20 +370,20 @@ ifdef VERSION_FILE
+ # If not specified, find the various version components in the VERSION_FILE
+ 
+   ifndef MAJOR_VERSION
+-    MAJOR_VERSION:=$(strip $(subst \#define,, $(subst $(MAJOR_VERSION_DEFINE),,\
++    MAJOR_VERSION:=$(strip $(subst #define,, $(subst $(MAJOR_VERSION_DEFINE),,\
+                    $(shell grep "define *$(MAJOR_VERSION_DEFINE) *" $(VERSION_FILE)))))
+   endif
+   ifndef MINOR_VERSION
+-    MINOR_VERSION:=$(strip $(subst \#define,, $(subst $(MINOR_VERSION_DEFINE),,\
++    MINOR_VERSION:=$(strip $(subst #define,, $(subst $(MINOR_VERSION_DEFINE),,\
+                    $(shell grep "define *$(MINOR_VERSION_DEFINE)" $(VERSION_FILE)))))
+   endif
+   ifndef BUILD_TYPE
+-    BUILD_TYPE:=$(strip $(subst \#define,,$(subst BUILD_TYPE,,\
++    BUILD_TYPE:=$(strip $(subst #define,,$(subst BUILD_TYPE,,\
+                 $(subst AlphaCode,alpha,$(subst BetaCode,beta,$(subst ReleaseCode,.,\
+                 $(shell grep "define *BUILD_TYPE" $(VERSION_FILE))))))))
+   endif
+   ifndef BUILD_NUMBER
+-    BUILD_NUMBER:=$(strip $(subst \#define,,$(subst $(BUILD_NUMBER_DEFINE),,\
++    BUILD_NUMBER:=$(strip $(subst #define,,$(subst $(BUILD_NUMBER_DEFINE),,\
+                   $(shell grep "define *$(BUILD_NUMBER_DEFINE)" $(VERSION_FILE)))))
+   endif
+ 

Added: head/editors/openoffice-4/files/patch-gmake43
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/openoffice-4/files/patch-gmake43	Sat May  9 19:24:49 2020	(r534792)
@@ -0,0 +1,11 @@
+--- solenv/gbuild/Tempfile.mk.orig	2019-09-17 22:55:21 UTC
++++ solenv/gbuild/Tempfile.mk
+@@ -27,7 +27,7 @@ $(strip $(1)
+ $(eval gb_var2file_helpervar := $$(shell printf "%s" "" > $(1) ))\
+ $(foreach item,$(3),$(eval gb_var2file_curblock += $(item)
+     ifeq ($$(words $$(gb_var2file_curblock)),$(2)) 
+-        gb_var2file_helpervar := $$(shell printf "%s" "$$(gb_var2file_curblock)" >> $(1) )
++        gb_var2file_helpervar := $$(shell printf " %s" "$$(gb_var2file_curblock)" >> $(1) )
+         gb_var2file_curblock :=
+     endif
+     ))\

Added: head/editors/openoffice-devel/files/patch-gmake43
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/openoffice-devel/files/patch-gmake43	Sat May  9 19:24:49 2020	(r534792)
@@ -0,0 +1,11 @@
+--- solenv/gbuild/Tempfile.mk.orig	2019-09-17 22:55:21 UTC
++++ solenv/gbuild/Tempfile.mk
+@@ -27,7 +27,7 @@ $(strip $(1)
+ $(eval gb_var2file_helpervar := $$(shell printf "%s" "" > $(1) ))\
+ $(foreach item,$(3),$(eval gb_var2file_curblock += $(item)
+     ifeq ($$(words $$(gb_var2file_curblock)),$(2)) 
+-        gb_var2file_helpervar := $$(shell printf "%s" "$$(gb_var2file_curblock)" >> $(1) )
++        gb_var2file_helpervar := $$(shell printf " %s" "$$(gb_var2file_curblock)" >> $(1) )
+         gb_var2file_curblock :=
+     endif
+     ))\

Added: head/emulators/mame/files/patch-3rdparty_genie_src_host_scripts.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/mame/files/patch-3rdparty_genie_src_host_scripts.c	Sat May  9 19:24:49 2020	(r534792)
@@ -0,0 +1,11 @@
+--- 3rdparty/genie/src/host/scripts.c.orig	2019-08-02 19:05:18 UTC
++++ 3rdparty/genie/src/host/scripts.c
+@@ -220,7 +220,7 @@ const char* builtin_scripts[] = {
+ 	/* actions/make/make_cpp.lua */
+ 	"premake.make.cpp = { }\npremake.make.override = { }\npremake.make.makefile_ignore = false\nlocal cpp = premake.make.cpp\nlocal make = premake.make\nfunction premake.make_cpp(prj)\nlocal cc = premake.gettool(prj)\nlocal platforms = premake.filterplatforms(prj.solution, cc.platforms, \"Native\")\npremake.gmake_cpp_header(prj, cc, platforms)\nfor _, platform in ipairs(platforms) do\nfor cfg in premake.eachconfig(prj, platform) do\npremake.gmake_cpp_config(prj, cfg, cc)\nend\nend\ntable.sort(prj.allfiles)\nlocal objdirs = {}\nlocal additionalobjdirs = {}\nfor _, file in ipairs(prj.allfiles) do\nif path.issourcefile(file) then\nobjdirs[_MAKE.esc(path.getdirectory(path.trimdots(file)))] = 1\nend\nend\nfor _, custombuildtask in ipairs(prj.custombuildtask or {}) do\nfor _, buildtask in ipairs(custombuildtask or {}) do\nadditionalobjdirs[_MAKE.esc(path.getdirectory(path.getrelative(prj.location,buildtask[2])))] = 1\nend\nend\n_p('OBJDIRS := \\\\')\n_p('\\t$(OBJDIR) \\\\')\nfor dir, _ in i
 ter.sortByKeys(objdirs) do\n_p("
+ 	"'\\t$(OBJDIR)/%s \\\\', dir)\nend\nfor dir, _ in iter.sortByKeys(additionalobjdirs) do\n_p('\\t%s \\\\', dir)\nend\n_p('')\n_p('RESOURCES := \\\\')\nfor _, file in ipairs(prj.allfiles) do\nif path.isresourcefile(file) then\n_p('\\t$(OBJDIR)/%s.res \\\\', _MAKE.esc(path.getbasename(file)))\nend\nend\n_p('')\n_p('.PHONY: clean prebuild prelink')\n_p('')\nif os.is(\"MacOSX\") and prj.kind == \"WindowedApp\" then\n_p('all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) $(dir $(TARGETDIR))PkgInfo $(dir $(TARGETDIR))Info.plist')\nelse\n_p('all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET)')\nend\n_p('\\t@:')\n_p('')\nif (prj.kind == \"StaticLib\" and prj.options.ArchiveSplit) then\n_p('define max_args')\n_p('\\t$(eval _args:=)')\n_p('\\t$(foreach obj,$3,$(eval _args+=$(obj))$(if $(word $2,$(_args)),$1$(_args)$(EOL)$(eval _args:=)))')\n_p('\\t$(if $(_args),$1$(_args))')\n_p('endef')\n_p('')\n_p('define EOL')\n_p('')\n_p('')\n_p('endef')\n_p('')\nend\n_p('$(TARGET): $(GCH) $(OB
 JECTS) $(LDDEPS) $(EXTERNAL_LIB"
+-	"S) $(RESOURCES) | $(TARGETDIR) $(OBJDIRS)')\nif prj.kind == \"StaticLib\" then\nif prj.msgarchiving then\n_p('\\t at echo ' .. prj.msgarchiving)\nelse\n_p('\\t at echo Archiving %s', prj.name)\nend\nif (not prj.archivesplit_size) then\nprj.archivesplit_size=200\nend\nif (not prj.options.ArchiveSplit) then\n_p('ifeq (posix,$(SHELLTYPE))')\n_p('\\t$(SILENT) rm -f  $(TARGET)')\n_p('else')\n_p('\\t$(SILENT) if exist $(subst /,\\\\\\\\,$(TARGET)) del $(subst /,\\\\\\\\,$(TARGET))')\n_p('endif')\n_p('\\t$(SILENT) $(LINKCMD) $(OBJECTS)' .. (os.is(\"MacOSX\") and \" 2>&1 > /dev/null | sed -e '/.o) has no symbols$$/d'\" or \"\"))\nelse\n_p('\\t$(call RM,$(TARGET))')\n_p('\\t@$(call max_args,$(LINKCMD),'.. prj.archivesplit_size ..',$(OBJECTS))' .. (os.is(\"MacOSX\") and \" 2>&1 > /dev/null | sed -e '/.o) has no symbols$$/d'\" or \"\"))\n_p('\\t$(SILENT) $(LINKCMD_NDX)')\nend\nelse\nif prj.msglinking then\n_p('\\t at echo ' .. prj.msglinking)\nelse\n_p('\\t at echo Linking %s', prj.name)\nend\n_p('\\t$
 (SILENT) $(LINKCMD)')\nend\n_p("
++	"S) $(RESOURCES) | $(TARGETDIR) $(OBJDIRS)')\nif prj.kind == \"StaticLib\" then\nif prj.msgarchiving then\n_p('\\t at echo ' .. prj.msgarchiving)\nelse\n_p('\\t at echo Archiving %s', prj.name)\nend\nif (not prj.archivesplit_size) then\nprj.archivesplit_size=200\nend\nif (not prj.options.ArchiveSplit) then\n_p('ifeq (posix,$(SHELLTYPE))')\n_p('\\t$(SILENT) rm -f  $(TARGET)')\n_p('else')\n_p('\\t$(SILENT) if exist $(subst /,\\\\\\\\,$(TARGET)) del $(subst /,\\\\\\\\,$(TARGET))')\n_p('endif')\n_p('\\t$(SILENT) $(LINKCMD) $(OBJECTS)' .. (os.is(\"MacOSX\") and \" 2>&1 > /dev/null | sed -e '/.o) has no symbols$$/d'\" or \"\"))\nelse\n_p('\\t$(call RM,$(TARGET))')\n_p('\\t@$(call max_args,$(LINKCMD) ,'.. prj.archivesplit_size ..',$(OBJECTS))' .. (os.is(\"MacOSX\") and \" 2>&1 > /dev/null | sed -e '/.o) has no symbols$$/d'\" or \"\"))\n_p('\\t$(SILENT) $(LINKCMD_NDX)')\nend\nelse\nif prj.msglinking then\n_p('\\t at echo ' .. prj.msglinking)\nelse\n_p('\\t at echo Linking %s', prj.name)\nend\n_p('\\t
 $(SILENT) $(LINKCMD)')\nend\n_p("
+ 	"'\\t$(POSTBUILDCMDS)')\n_p('')\n_p('$(TARGETDIR):')\npremake.make_mkdirrule(\"$(TARGETDIR)\")\n_p('$(OBJDIRS):')\nif (not prj.solution.messageskip) or (not table.contains(prj.solution.messageskip, \"SkipCreatingMessage\")) then\n_p('\\t at echo Creating $(@)')\nend\n_p('\\t-$(call MKDIR,$@)')\n_p('')\nif os.is(\"MacOSX\") and prj.kind == \"WindowedApp\" then\n_p('$(dir $(TARGETDIR))PkgInfo:')\n_p('$(dir $(TARGETDIR))Info.plist:')\n_p('')\nend\n_p('clean:')\nif (not prj.solution.messageskip) or (not table.contains(prj.solution.messageskip, \"SkipCleaningMessage\")) then\n_p('\\t at echo Cleaning %s', prj.name)\nend\n_p('ifeq (posix,$(SHELLTYPE))')\n_p('\\t$(SILENT) rm -f  $(TARGET)')\n_p('\\t$(SILENT) rm -rf $(OBJDIR)')\n_p('else')\n_p('\\t$(SILENT) if exist $(subst /,\\\\\\\\,$(TARGET)) del $(subst /,\\\\\\\\,$(TARGET))')\n_p('\\t$(SILENT) if exist $(subst /,\\\\\\\\,$(OBJDIR)) rmdir /s /q $(subst /,\\\\\\\\,$(OBJDIR))')\n_p('endif')\n_p('')\n_p('prebuild:')\n_p('\\t$(PREBUILDCMDS)')\n
 _p('')\n_p('prelink:')\n_p('\\t"
+ 	"$(PRELINKCMDS)')\n_p('')\ncpp.pchrules(prj)\ncpp.fileRules(prj, cc)\ncpp.dependencyRules(prj)\nfor _, custombuildtask in ipairs(prj.custombuildtask or {}) do\nfor _, buildtask in ipairs(custombuildtask or {}) do\nlocal deps =  string.format(\"%s \",path.getrelative(prj.location,buildtask[1]))\nfor _, depdata in ipairs(buildtask[3] or {}) do\ndeps = deps .. string.format(\"%s \",path.getrelative(prj.location,depdata))\nend\n_p('%s: %s | $(TARGETDIR) $(OBJDIRS)'\n,path.getrelative(prj.location,buildtask[2])\n, deps\n)\nfor _, cmdline in ipairs(buildtask[4] or {}) do\nlocal cmd = cmdline\nlocal num = 1\nfor _, depdata in ipairs(buildtask[3] or {}) do\ncmd = string.gsub(cmd,\"%$%(\" .. num ..\"%)\", string.format(\"%s \",path.getrelative(prj.location,depdata)))\nnum = num + 1\nend\ncmd = string.gsub(cmd, \"%$%(<%)\", \"$<\")\ncmd = string.gsub(cmd, \"%$%(@%)\", \"$@\")\n_p('\\t$(SILENT) %s',cmd)\nend\n_p('')\nend\nend\n_p('-include $(OBJECTS:%%.o=%%.d)')\n_p('ifneq (,$(PCH))')\n_p(' 
  -include $(OBJDIR)/$(notdir $("
+ 	"PCH)).d')\n_p('  -include $(OBJDIR)/$(notdir $(PCH))_objc.d')\n_p('endif')\nend\nfunction premake.gmake_cpp_header(prj, cc, platforms)\n_p('# %s project makefile autogenerated by GENie', premake.action.current().shortname)\n_p('ifndef config')\n_p('  config=%s', _MAKE.esc(premake.getconfigname(prj.solution.configurations[1], platforms[1], true)))\n_p('endif')\n_p('')\n_p('ifndef verbose')\n_p('  SILENT = @')\n_p('endif')\n_p('')\n_p('SHELLTYPE := msdos')\n_p('ifeq (,$(ComSpec)$(COMSPEC))')\n_p('  SHELLTYPE := posix')\n_p('endif')\n_p('ifeq (/bin,$(findstring /bin,$(SHELL)))')\n_p('  SHELLTYPE := posix')\n_p('endif')\n_p('ifeq (/bin,$(findstring /bin,$(MAKESHELL)))')\n_p('  SHELLTYPE := posix')\n_p('endif')\n_p('')\n_p('ifeq (posix,$(SHELLTYPE))')\n_p('  MKDIR = $(SILENT) mkdir -p \"$(1)\"')\n_p('  COPY  = $(SILENT) cp -fR \"$(1)\" \"$(2)\"')\n_p('  RM    = $(SILENT) rm -f \"$(1)\"')\n_p('else')\n_p('  MKDIR = $(SILENT) mkdir \"$(subst /,\\\\\\\\,$(1))\" 2> nul || exit 0')\n_p('  
 COPY  = $(SILENT) copy /Y \"$(s"

Added: head/java/openjdk12/files/patch-10-af5c725b
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjdk12/files/patch-10-af5c725b	Sat May  9 19:24:49 2020	(r534792)
@@ -0,0 +1,25 @@
+diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
+index 8de519fc606..221e9455960 100644
+--- make/common/MakeBase.gmk
++++ make/common/MakeBase.gmk
+@@ -525,15 +525,16 @@ DependOnVariableFileName = \
+ # Param 2 - (optional) name of file to store value in
+ DependOnVariableHelper = \
+     $(strip \
+-        $(eval -include $(call DependOnVariableFileName, $1, $2)) \
++        $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
++        $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
+         $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
+-          $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
++          $(call MakeDir, $(dir $($1_filename))) \
+           $(if $(findstring $(LOG_LEVEL), trace), \
+               $(info NewVariable $1: >$(strip $($1))<) \
+               $(info OldVariable $1: >$(strip $($1_old))<)) \
+           $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
+-              $(call DependOnVariableFileName, $1, $2))) \
+-        $(call DependOnVariableFileName, $1, $2) \
++              $($1_filename))) \
++        $($1_filename) \
+     )
+ 
+ # Main macro

Added: head/java/openjdk13/files/patch-10-af5c725b
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjdk13/files/patch-10-af5c725b	Sat May  9 19:24:49 2020	(r534792)
@@ -0,0 +1,25 @@
+diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
+index 8de519fc606..221e9455960 100644
+--- make/common/MakeBase.gmk
++++ make/common/MakeBase.gmk
+@@ -525,15 +525,16 @@ DependOnVariableFileName = \
+ # Param 2 - (optional) name of file to store value in
+ DependOnVariableHelper = \
+     $(strip \
+-        $(eval -include $(call DependOnVariableFileName, $1, $2)) \
++        $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
++        $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
+         $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
+-          $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
++          $(call MakeDir, $(dir $($1_filename))) \
+           $(if $(findstring $(LOG_LEVEL), trace), \
+               $(info NewVariable $1: >$(strip $($1))<) \
+               $(info OldVariable $1: >$(strip $($1_old))<)) \
+           $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
+-              $(call DependOnVariableFileName, $1, $2))) \
+-        $(call DependOnVariableFileName, $1, $2) \
++              $($1_filename))) \
++        $($1_filename) \
+     )
+ 
+ # Main macro

Added: head/lang/cparser/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/cparser/files/patch-Makefile	Sat May  9 19:24:49 2020	(r534792)
@@ -0,0 +1,11 @@
+--- Makefile.orig	2012-11-21 17:50:43 UTC
++++ Makefile
+@@ -104,7 +104,7 @@ REVISION ?= $(shell git describe --abbrev=40 --always 
+ 
+ # Update revision.h if necessary
+ UNUSED := $(shell \
+-	REV="\#define cparser_REVISION \"$(REVISION)\""; \
++	REV="#define cparser_REVISION \"$(REVISION)\""; \
+ 	echo "$$REV" | cmp -s - revision.h 2> /dev/null || echo "$$REV" > revision.h \
+ )
+ 

Added: head/multimedia/aegisub/files/patch-Makefile.target
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/aegisub/files/patch-Makefile.target	Sat May  9 19:24:49 2020	(r534792)
@@ -0,0 +1,11 @@
+--- Makefile.target.orig	2014-12-08 00:07:09 UTC
++++ Makefile.target
+@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
+ # Libraries contain all object files they depend on (but they may depend on other files)
+ # Not using libtool on OS X because it has an unsilenceable warning about a
+ # compatibility issue with BSD 4.3 (wtf)
+-lib%.a: $$($$*_OBJ)
++lib%.a: $$($$(*F)_OBJ)
+ 	@$(BIN_MKDIR_P) $(dir $@)
+ 	$(BIN_AR) cru $@ $(filter %.o,$^)
+ 	$(BIN_RANLIB) $@

Modified: head/multimedia/gstreamer-plugins/Makefile
==============================================================================
--- head/multimedia/gstreamer-plugins/Makefile	Sat May  9 18:45:52 2020	(r534791)
+++ head/multimedia/gstreamer-plugins/Makefile	Sat May  9 19:24:49 2020	(r534792)
@@ -160,6 +160,9 @@ post-patch:
 	  s|$$(top_builddir)/gst-libs/gst/video/libgstbasevideo- at GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstbasevideo- at GST_MAJORMINOR@.la|; \
 	  s|$$(top_builddir)/gst-libs/gst/video/libgstvideo- at GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstvideo- at GST_MAJORMINOR@.la|; \
 	  s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda- at GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstcdda- at GST_MAJORMINOR@.la|'
+	@${FIND} ${WRKSRC}/ext ${WRKSRC}/gst ${WRKSRC}/gst-libs \
+		-name Makefile.in -exec ${REINPLACE_CMD} \
+		'/foreach/s/\\#include/#include/' {} +
 	@${REINPLACE_CMD} -e 's|DEFAULT_AUDIOSINK="alsasink"|DEFAULT_AUDIOSINK="${DEFAULT_AUDIOSINK}"|; \
 		s|DEFAULT_AUDIOSRC="alsasrc"|DEFAULT_AUDIOSRC="${DEFAULT_AUDIOSRC}"|' \
 		-e 's|-Wmissing-include-dirs||g' \

Modified: head/multimedia/gstreamer1-plugins/Makefile
==============================================================================
--- head/multimedia/gstreamer1-plugins/Makefile	Sat May  9 18:45:52 2020	(r534791)
+++ head/multimedia/gstreamer1-plugins/Makefile	Sat May  9 19:24:49 2020	(r534792)
@@ -176,6 +176,9 @@ post-patch:
 	  s|$$(top_builddir)/gst-libs/gst/allocators/libgstbadallocators-$$(GST_API_VERSION).la|-lgstbadallocators-${VERSION}|; \
 	  s|$$(top_builddir)/gst-libs/gst/audio/libgstbadaudio-$$(GST_API_VERSION).la|-lgstbadaudio-${VERSION}|; \
 	  s|$$(top_builddir)/gst-libs/gst/video/libgstbadvideo-$$(GST_API_VERSION).la|-lgstbadvideo-${VERSION}|'
+	@${FIND} ${WRKSRC}/ext ${WRKSRC}/gst ${WRKSRC}/gst-libs \
+		-name Makefile.in -exec ${REINPLACE_CMD} \
+		'/foreach/s/\\#include/#include/' {} +
 .endif
 
 .if ${DIST} == bad

Added: head/multimedia/gstreamer1/files/patch-libs_gst_controller_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/gstreamer1/files/patch-libs_gst_controller_Makefile.in	Sat May  9 19:24:49 2020	(r534792)
@@ -0,0 +1,11 @@
+--- libs/gst/controller/Makefile.in.orig	2019-12-03 10:52:27 UTC
++++ libs/gst/controller/Makefile.in
+@@ -591,7 +591,7 @@ libgstcontroller_ at GST_API_VERSION@_la_CFLAGS = $(GST_O
+ libgstcontroller_ at GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS) $(LIBM)
+ libgstcontroller_ at GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+ CLEANFILES = *.gcno *.gcda *.gcov $(BUILT_SOURCES) $(am__append_1)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\")
+ @HAVE_INTROSPECTION_TRUE at BUILT_GIRSOURCES = GstController- at GST_API_VERSION@.gir
+ @HAVE_INTROSPECTION_TRUE at gir_headers = $(patsubst %,$(srcdir)/%, \
+ @HAVE_INTROSPECTION_TRUE@	$(libgstcontroller_ at GST_API_VERSION@_include_HEADERS)) \

Modified: head/net-im/farsight2/Makefile
==============================================================================
--- head/net-im/farsight2/Makefile	Sat May  9 18:45:52 2020	(r534791)
+++ head/net-im/farsight2/Makefile	Sat May  9 19:24:49 2020	(r534792)
@@ -28,4 +28,8 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.in -exec ${REINPLACE_CMD} \
+		'/foreach/s/\\#include/#include/' {} +
+
 .include <bsd.port.mk>

Modified: head/net-im/farstream/Makefile
==============================================================================
--- head/net-im/farstream/Makefile	Sat May  9 18:45:52 2020	(r534791)
+++ head/net-im/farstream/Makefile	Sat May  9 19:24:49 2020	(r534792)
@@ -24,4 +24,8 @@ USE_GSTREAMER1=	good bad
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.in -exec ${REINPLACE_CMD} \
+		'/foreach/s/\\#include/#include/' {} +
+
 .include <bsd.port.mk>

Modified: head/security/py-pyvex/files/patch-pyvex__c_Makefile
==============================================================================
--- head/security/py-pyvex/files/patch-pyvex__c_Makefile	Sat May  9 18:45:52 2020	(r534791)
+++ head/security/py-pyvex/files/patch-pyvex__c_Makefile	Sat May  9 19:24:49 2020	(r534792)
@@ -12,9 +12,16 @@
  ifeq ($(UNAME), Linux)
  	LIBRARY_FILE=libpyvex.so
  	STATIC_LIBRARY_FILE=libpyvex.a
-@@ -27,10 +32,10 @@ sp +=
- qs = $(subst ?,$(sp),$1)
- sq = $(subst $(sp),?,$1)
+@@ -22,15 +27,13 @@ endif
+ 
+ # deeply evil
+ # https://www.cmcrossroads.com/article/gnu-make-meets-file-names-spaces-them
+-sp :=
+-sp +=
+-qs = $(subst ?,$(sp),$1)
+-sq = $(subst $(sp),?,$1)
++qs = $(subst ?,\ ,$1)
++sq = $(subst \ ,?,$1)
  
 -CC=gcc
 -AR=ar
