diff options
23 files changed, 212 insertions, 193 deletions
diff --git a/Mk/Uses/gmake.mk b/Mk/Uses/gmake.mk index 9181da894075..1a162aa326f9 100644 --- a/Mk/Uses/gmake.mk +++ b/Mk/Uses/gmake.mk @@ -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 diff --git a/biology/mothur/files/patch-Makefile b/biology/mothur/files/patch-Makefile new file mode 100644 index 000000000000..9d0709f1ea26 --- /dev/null +++ b/biology/mothur/files/patch-Makefile @@ -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) diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index ab80a3066f6f..0df1525afb5d 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -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 diff --git a/devel/gmake/distinfo b/devel/gmake/distinfo index bdecf1bd0b45..b8f83469ce24 100644 --- a/devel/gmake/distinfo +++ b/devel/gmake/distinfo @@ -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 diff --git a/devel/gmake/files/patch-default.c b/devel/gmake/files/patch-default.c deleted file mode 100644 index 44588ced1af7..000000000000 --- a/devel/gmake/files/patch-default.c +++ /dev/null @@ -1,11 +0,0 @@ ---- default.c.orig 2015-05-13 16:16:24 UTC -+++ default.c -@@ -447,7 +447,7 @@ static const char *default_variables[] = - "OBJC", "gcc", - #else - "CC", "cc", -- "CXX", "g++", -+ "CXX", "c++", - "OBJC", "cc", - #endif - diff --git a/devel/gmake/files/patch-glob-glob.c b/devel/gmake/files/patch-lib-glob.c index c922217e5556..a51d38144d88 100644 --- a/devel/gmake/files/patch-glob-glob.c +++ b/devel/gmake/files/patch-lib-glob.c @@ -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); diff --git a/devel/gmake/files/patch-posixos.c b/devel/gmake/files/patch-posixos.c deleted file mode 100644 index c411dcf7ecc0..000000000000 --- a/devel/gmake/files/patch-posixos.c +++ /dev/null @@ -1,170 +0,0 @@ -From b552b05251980f693c729e251f93f5225b400714 Mon Sep 17 00:00:00 2001 -From: Paul Smith <psmith@gnu.org> -Date: Sat, 3 Jun 2017 16:20:51 -0400 -Subject: [SV 51159] Use a non-blocking read with pselect to avoid hangs. - -* posixos.c (set_blocking): Set blocking on a file descriptor. -(jobserver_setup): Set non-blocking on the jobserver read side. -(jobserver_parse_auth): Ditto. -(jobserver_acquire_all): Set blocking to avoid a busy-wait loop. -(jobserver_acquire): If the non-blocking read() returns without -taking a token then try again. ---- - posixos.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++----------------- - 1 file changed, 71 insertions(+), 26 deletions(-) - -diff --git a/posixos.c b/posixos.c -index e642d7f..dbafa51 100644 ---- posixos.c -+++ posixos.c -@@ -62,6 +62,24 @@ make_job_rfd (void) - #endif - } - -+static void -+set_blocking (int fd, int blocking) -+{ -+ // If we're not using pselect() don't change the blocking -+#ifdef HAVE_PSELECT -+ int flags; -+ EINTRLOOP (flags, fcntl (fd, F_GETFL)); -+ if (flags >= 0) -+ { -+ int r; -+ flags = blocking ? (flags & ~O_NONBLOCK) : (flags | O_NONBLOCK); -+ EINTRLOOP (r, fcntl (fd, F_SETFL, flags)); -+ if (r < 0) -+ pfatal_with_name ("fcntl(O_NONBLOCK)"); -+ } -+#endif -+} -+ - unsigned int - jobserver_setup (int slots) - { -@@ -86,6 +104,9 @@ jobserver_setup (int slots) - pfatal_with_name (_("init jobserver pipe")); - } - -+ /* When using pselect() we want the read to be non-blocking. */ -+ set_blocking (job_fds[0], 0); -+ - return 1; - } - -@@ -121,6 +142,9 @@ jobserver_parse_auth (const char *auth) - return 0; - } - -+ /* When using pselect() we want the read to be non-blocking. */ -+ set_blocking (job_fds[0], 0); -+ - return 1; - } - -@@ -169,7 +193,10 @@ jobserver_acquire_all (void) - { - unsigned int tokens = 0; - -- /* Close the write side, so the read() won't hang. */ -+ /* Use blocking reads to wait for all outstanding jobs. */ -+ set_blocking (job_fds[0], 1); -+ -+ /* Close the write side, so the read() won't hang forever. */ - close (job_fds[1]); - job_fds[1] = -1; - -@@ -236,18 +263,12 @@ jobserver_pre_acquire (void) - unsigned int - jobserver_acquire (int timeout) - { -- sigset_t empty; -- fd_set readfds; - struct timespec spec; - struct timespec *specp = NULL; -- int r; -- char intake; -+ sigset_t empty; - - sigemptyset (&empty); - -- FD_ZERO (&readfds); -- FD_SET (job_fds[0], &readfds); -- - if (timeout) - { - /* Alarm after one second (is this too granular?) */ -@@ -256,28 +277,52 @@ jobserver_acquire (int timeout) - specp = &spec; - } - -- r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); -- -- if (r == -1) -+ while (1) - { -- /* Better be SIGCHLD. */ -- if (errno != EINTR) -- pfatal_with_name (_("pselect jobs pipe")); -- return 0; -- } -+ fd_set readfds; -+ int r; -+ char intake; - -- if (r == 0) -- /* Timeout. */ -- return 0; -+ FD_ZERO (&readfds); -+ FD_SET (job_fds[0], &readfds); - -- /* The read FD is ready: read it! */ -- EINTRLOOP (r, read (job_fds[0], &intake, 1)); -- if (r < 0) -- pfatal_with_name (_("read jobs pipe")); -+ r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); -+ if (r < 0) -+ switch (errno) -+ { -+ case EINTR: -+ /* SIGCHLD will show up as an EINTR. */ -+ return 0; -+ -+ case EBADF: -+ /* Someone closed the jobs pipe. -+ That shouldn't happen but if it does we're done. */ -+ O (fatal, NILF, _("job server shut down")); - -- /* What does it mean if read() returns 0? It shouldn't happen because only -- the master make can reap all the tokens and close the write side...?? */ -- return r > 0; -+ default: -+ pfatal_with_name (_("pselect jobs pipe")); -+ } -+ -+ if (r == 0) -+ /* Timeout. */ -+ return 0; -+ -+ /* The read FD is ready: read it! This is non-blocking. */ -+ EINTRLOOP (r, read (job_fds[0], &intake, 1)); -+ -+ if (r < 0) -+ { -+ /* Someone sniped our token! Try again. */ -+ if (errno == EAGAIN) -+ continue; -+ -+ pfatal_with_name (_("read jobs pipe")); -+ } -+ -+ /* read() should never return 0: only the master make can reap all the -+ tokens and close the write side...?? */ -+ return r > 0; -+ } - } - - #else --- -cgit v1.0-41-gc330 - diff --git a/devel/gmake/files/patch-src-default.c b/devel/gmake/files/patch-src-default.c new file mode 100644 index 000000000000..df78eb415b2e --- /dev/null +++ b/devel/gmake/files/patch-src-default.c @@ -0,0 +1,11 @@ +--- 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", +- "CXX", "g++", ++ "CXX", "c++", + "OBJC", "cc", + #endif + diff --git a/devel/gmake/pkg-plist b/devel/gmake/pkg-plist index cb51cf793a08..ec60fd19c420 100644 --- a/devel/gmake/pkg-plist +++ b/devel/gmake/pkg-plist @@ -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 diff --git a/devel/ptlib/files/patch-make_common.mak b/devel/ptlib/files/patch-make_common.mak new file mode 100644 index 000000000000..0aa72ceac89b --- /dev/null +++ b/devel/ptlib/files/patch-make_common.mak @@ -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 + diff --git a/editors/openoffice-4/files/patch-gmake43 b/editors/openoffice-4/files/patch-gmake43 new file mode 100644 index 000000000000..a32207fa2277 --- /dev/null +++ b/editors/openoffice-4/files/patch-gmake43 @@ -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 + ))\ diff --git a/editors/openoffice-devel/files/patch-gmake43 b/editors/openoffice-devel/files/patch-gmake43 new file mode 100644 index 000000000000..a32207fa2277 --- /dev/null +++ b/editors/openoffice-devel/files/patch-gmake43 @@ -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 + ))\ diff --git a/emulators/mame/files/patch-3rdparty_genie_src_host_scripts.c b/emulators/mame/files/patch-3rdparty_genie_src_host_scripts.c new file mode 100644 index 000000000000..5aba60882299 --- /dev/null +++ b/emulators/mame/files/patch-3rdparty_genie_src_host_scripts.c @@ -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 iter.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) $(OBJECTS) $(LDDEPS) $(EXTERNAL_LIB" +- "S) $(RESOURCES) | $(TARGETDIR) $(OBJDIRS)')\nif prj.kind == \"StaticLib\" then\nif prj.msgarchiving then\n_p('\\t@echo ' .. prj.msgarchiving)\nelse\n_p('\\t@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@echo ' .. prj.msglinking)\nelse\n_p('\\t@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@echo ' .. prj.msgarchiving)\nelse\n_p('\\t@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@echo ' .. prj.msglinking)\nelse\n_p('\\t@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@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@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" diff --git a/java/openjdk12/files/patch-10-af5c725b b/java/openjdk12/files/patch-10-af5c725b new file mode 100644 index 000000000000..0e4ec063a266 --- /dev/null +++ b/java/openjdk12/files/patch-10-af5c725b @@ -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 diff --git a/java/openjdk13/files/patch-10-af5c725b b/java/openjdk13/files/patch-10-af5c725b new file mode 100644 index 000000000000..0e4ec063a266 --- /dev/null +++ b/java/openjdk13/files/patch-10-af5c725b @@ -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 diff --git a/lang/cparser/files/patch-Makefile b/lang/cparser/files/patch-Makefile new file mode 100644 index 000000000000..3812e98678dd --- /dev/null +++ b/lang/cparser/files/patch-Makefile @@ -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 \ + ) + diff --git a/multimedia/aegisub/files/patch-Makefile.target b/multimedia/aegisub/files/patch-Makefile.target new file mode 100644 index 000000000000..3a84e06db188 --- /dev/null +++ b/multimedia/aegisub/files/patch-Makefile.target @@ -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) $@ diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index 5a535fc3e7ea..a971f94c53e4 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -160,6 +160,9 @@ post-patch: s|$$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstbasevideo-@GST_MAJORMINOR@.la|; \ s|$$(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstvideo-@GST_MAJORMINOR@.la|; \ s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstcdda-@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' \ diff --git a/multimedia/gstreamer1-plugins/Makefile b/multimedia/gstreamer1-plugins/Makefile index 91e7bdbfb7f6..487d630906c9 100644 --- a/multimedia/gstreamer1-plugins/Makefile +++ b/multimedia/gstreamer1-plugins/Makefile @@ -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 diff --git a/multimedia/gstreamer1/files/patch-libs_gst_controller_Makefile.in b/multimedia/gstreamer1/files/patch-libs_gst_controller_Makefile.in new file mode 100644 index 000000000000..ee76c5cb2286 --- /dev/null +++ b/multimedia/gstreamer1/files/patch-libs_gst_controller_Makefile.in @@ -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_@GST_API_VERSION@_la_CFLAGS = $(GST_O + libgstcontroller_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS) $(LIBM) + libgstcontroller_@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@BUILT_GIRSOURCES = GstController-@GST_API_VERSION@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstcontroller_@GST_API_VERSION@_include_HEADERS)) \ diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile index 1702aa40243b..129084e527be 100644 --- a/net-im/farsight2/Makefile +++ b/net-im/farsight2/Makefile @@ -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> diff --git a/net-im/farstream/Makefile b/net-im/farstream/Makefile index 048a1361af2c..da5d0e43dab1 100644 --- a/net-im/farstream/Makefile +++ b/net-im/farstream/Makefile @@ -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> diff --git a/security/py-pyvex/files/patch-pyvex__c_Makefile b/security/py-pyvex/files/patch-pyvex__c_Makefile index b0408ea31318..3e5920df8006 100644 --- a/security/py-pyvex/files/patch-pyvex__c_Makefile +++ b/security/py-pyvex/files/patch-pyvex__c_Makefile @@ -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 |