Make it use GNU make as it expects
Bump PKGREVISION


(kefren)

$NetBSD: patch-aa,v 1.7 2010/04/16 10:44:20 kefren Exp $
--- src/addins/MonoDeveloperExtensions/MonoSolutionItemHandler.cs.orig	2010-04-16 12:49:05.000000000 +0300
+++ src/addins/MonoDeveloperExtensions/MonoSolutionItemHandler.cs	2010-04-16 12:49:13.000000000 +0300
@@ -185,7 +185,7 @@ namespace MonoDeveloper
 			tw.ChainWriter (output);
 			tw.ChainWriter (monitor.Log);
 			
-			ProcessWrapper proc = Runtime.ProcessService.StartProcess ("make", "PROFILE=" + conf.Id + " " + target, conf.OutputDirectory, monitor.Log, tw, null);
+			ProcessWrapper proc = Runtime.ProcessService.StartProcess ("gmake", "PROFILE=" + conf.Id + " " + target, conf.OutputDirectory, monitor.Log, tw, null);
 			proc.WaitForOutput ();
 			
 			CompilerResults cr = new CompilerResults (null);			

$NetBSD: patch-ab,v 1.1 2010/04/16 10:44:20 kefren Exp $
--- src/addins/MonoDevelop.Autotools/SolutionDeployer.cs.orig	2010-04-16 12:49:50.000000000 +0300
+++ src/addins/MonoDevelop.Autotools/SolutionDeployer.cs	2010-04-16 12:50:35.000000000 +0300
@@ -180,7 +180,7 @@ namespace MonoDevelop.Autotools
 				chainedOutput.ChainWriter (monitor.Log);
 				chainedOutput.ChainWriter (sw);
 
-				ProcessWrapper process = Runtime.ProcessService.StartProcess ( "make", 
+				ProcessWrapper process = Runtime.ProcessService.StartProcess ( "gmake", 
 						"dist", 
 						baseDir, 
 						chainedOutput, 

$NetBSD: patch-ac,v 1.1 2010/04/16 10:44:20 kefren Exp $
--- src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs.orig	2010-04-16 12:51:03.000000000 +0300
+++ src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs	2010-04-16 12:51:58.000000000 +0300
@@ -169,7 +169,7 @@ namespace MonoDevelop.Autotools
 				chainedOutput.ChainWriter (monitor.Log);
 				chainedOutput.ChainWriter (swOutput);
 
-				ProcessWrapper process = Runtime.ProcessService.StartProcess ("make",
+				ProcessWrapper process = Runtime.ProcessService.StartProcess ("gmake",
 						data.BuildTargetName,
 						baseDir, 
 						chainedOutput, 
@@ -257,7 +257,7 @@ namespace MonoDevelop.Autotools
 		// Snatched from our codedom code :-).
 		//FIXME: Get this from the language binding.. if a known lang
 
-		static Regex regexEnterDir = new Regex (@"make\[[0-9]*\]: ([a-zA-Z]*) directory `(.*)'");
+		static Regex regexEnterDir = new Regex (@"gmake\[[0-9]*\]: ([a-zA-Z]*) directory `(.*)'");
 		
 		private static CompilerError CreateCompilerErrorFromString (string error_string, Stack<string> dirs, Regex regex)
 		{
@@ -348,7 +348,7 @@ namespace MonoDevelop.Autotools
 			{
 				string baseDir = proj.BaseDirectory;
 	
-				ProcessWrapper process = Runtime.ProcessService.StartProcess ( "make", 
+				ProcessWrapper process = Runtime.ProcessService.StartProcess ( "gmake", 
 						data.CleanTargetName,
 						baseDir, 
 						monitor.Log, 
@@ -403,7 +403,7 @@ namespace MonoDevelop.Autotools
 			monitor.BeginTask (GettextCatalog.GetString ("Executing {0}", project.Name), 1);
 			try
 			{
-				ProcessWrapper process = Runtime.ProcessService.StartProcess ("make",
+				ProcessWrapper process = Runtime.ProcessService.StartProcess ("gmake",
 						data.ExecuteTargetName,
 						project.BaseDirectory,
 						console.Out,

$NetBSD: patch-ad,v 1.1 2010/04/16 10:44:20 kefren Exp $
--- tests/UnitTests/MonoDevelop.Projects/PackagingTests.cs.orig	2010-04-16 12:52:26.000000000 +0300
+++ tests/UnitTests/MonoDevelop.Projects/PackagingTests.cs	2010-04-16 12:52:40.000000000 +0300
@@ -248,10 +248,10 @@ namespace MonoDevelop.Deployment
 			if (!Exec (Path.Combine (tarDir, "configure"), "--prefix=" + prefix, tarDir))
 				Assert.Fail ("Configure script failed");
 			
-			if (!Exec ("make", "all", tarDir))
+			if (!Exec ("gmake", "all", tarDir))
 				Assert.Fail ("Build failed");
 			
-			if (!Exec ("make", "install", tarDir))
+			if (!Exec ("gmake", "install", tarDir))
 				Assert.Fail ("Install failed");
 			
 			CheckDirContents (prefix, expectedFiles);

$NetBSD: patch-ae,v 1.1 2010/04/16 10:44:20 kefren Exp $
--- src/addins/MonoDevelop.Autotools/templates/Makefile.noauto.project.template.orig	2010-04-16 13:17:14.000000000 +0300
+++ src/addins/MonoDevelop.Autotools/templates/Makefile.noauto.project.template	2010-04-16 13:17:28.000000000 +0300
@@ -32,12 +32,12 @@
 %%CUSTOM_COMMAND_TARGETS%%
 $(ASSEMBLY_MDB): $(ASSEMBLY)
 $(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
-	make pre-all-local-hook prefix=$(prefix)
+	gmake pre-all-local-hook prefix=$(prefix)
 	mkdir -p $(shell dirname $(ASSEMBLY))
-	make $(CONFIG)_BeforeBuild
+	gmake $(CONFIG)_BeforeBuild
 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
-	make $(CONFIG)_AfterBuild
-	make post-all-local-hook prefix=$(prefix)
+	gmake $(CONFIG)_AfterBuild
+	gmake post-all-local-hook prefix=$(prefix)
 
 %%INSTALL_TARGET%%
 %%UNINSTALL_TARGET%%

$NetBSD: patch-af,v 1.1 2010/04/16 10:44:20 kefren Exp $
--- src/addins/MonoDevelop.Autotools/templates/Makefile.solution.template.orig	2010-04-16 13:17:54.000000000 +0300
+++ src/addins/MonoDevelop.Autotools/templates/Makefile.solution.template	2010-04-16 13:18:08.000000000 +0300
@@ -8,14 +8,14 @@
 	@set . $$MAKEFLAGS; final_exit=:; \
 	case $$2 in --unix) shift ;; esac; \
 	case $$2 in *=*) dk="exit 1" ;; *k*) dk=: ;; *) dk="exit 1" ;; esac; \
-	make pre-$*-hook prefix=$(prefix) ; \
+	gmake pre-$*-hook prefix=$(prefix) ; \
 	for dir in $(call quote_each,$(SUBDIRS)); do \
 		case "$$dir" in \
-		.) make $*-local || { final_exit="exit 1"; $$dk; };;\
-		*) (cd "$$dir" && make $*) || { final_exit="exit 1"; $$dk; };;\
+		.) gmake $*-local || { final_exit="exit 1"; $$dk; };;\
+		*) (cd "$$dir" && gmake $*) || { final_exit="exit 1"; $$dk; };;\
 		esac \
 	done; \
-	make post-$*-hook prefix=$(prefix) ; \
+	gmake post-$*-hook prefix=$(prefix) ; \
 	$$final_exit
 
 $(CONFIG_MAKE):

$NetBSD: patch-ag,v 1.1 2010/04/16 10:44:21 kefren Exp $
--- src/addins/MonoDevelop.Autotools/templates/make-dist.targets.orig	2010-04-16 13:18:51.000000000 +0300
+++ src/addins/MonoDevelop.Autotools/templates/make-dist.targets	2010-04-16 13:19:21.000000000 +0300
@@ -1,18 +1,18 @@
 dist: $(CONFIG_MAKE)
 	rm -rf $(PACKAGE)-$(VERSION)
 	mkdir $(PACKAGE)-$(VERSION)
-	make pre-dist-hook distdir=$$distdir
+	gmake pre-dist-hook distdir=$$distdir
 	for dir in $(call quote_each,$(SUBDIRS)); do \
 		pkgdir=`pwd`/$(PACKAGE)-$(VERSION); \
 		mkdir "$$pkgdir/$$dir" || true; \
 		case $$dir in \
-		.) make dist-local "distdir=$$pkgdir" || exit 1;; \
-		*) (cd "$$dir"; make dist-local "distdir=$$pkgdir/$$dir") || exit 1;; \
+		.) gmake dist-local "distdir=$$pkgdir" || exit 1;; \
+		*) (cd "$$dir"; gmake dist-local "distdir=$$pkgdir/$$dir") || exit 1;; \
 		esac \
 	done
-	(make dist-local distdir=$(PACKAGE)-$(VERSION))
-	make
-	make post-dist-hook "distsir=$$distdir"
+	(gmake dist-local distdir=$(PACKAGE)-$(VERSION))
+	gmake
+	gmake post-dist-hook "distsir=$$distdir"
 	tar czvf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
 	rm -rf $(PACKAGE)-$(VERSION)
 	@echo "=========================================="
@@ -23,5 +23,5 @@
 	(mkdir test; cd test;  \
 	tar xzvf ../$(PACKAGE)-$(VERSION).tar.gz; cd $(PACKAGE)-$(VERSION); \
 	./configure --prefix=$$(cd `pwd`/..; pwd); \
-	make && make install && make dist);
+	gmake && gmake install && gmake dist);
 	rm -rf test

$NetBSD: patch-ah,v 1.1 2010/04/16 10:44:21 kefren Exp $
--- src/addins/MonoDevelop.Autotools/templates/rules.make.orig	2010-04-16 13:19:36.000000000 +0300
+++ src/addins/MonoDevelop.Autotools/templates/rules.make	2010-04-16 13:20:02.000000000 +0300
@@ -1,9 +1,9 @@
 clean-local:
-	make pre-clean-local-hook
-	make $(CONFIG)_BeforeClean
+	gmake pre-clean-local-hook
+	gmake $(CONFIG)_BeforeClean
 	-rm -f $(call quote_each,$(CLEANFILES))
-	make $(CONFIG)_AfterClean
-	make post-clean-local-hook
+	gmake $(CONFIG)_AfterClean
+	gmake post-clean-local-hook
 
 install-local:
 uninstall-local:
@@ -12,21 +12,21 @@
 quote_each = $(foreach f,$(call s2q,$1),$(call q2quote,$f))
 
 dist-local:
-	make pre-dist-local-hook "distdir=$$distdir"
+	gmake pre-dist-local-hook "distdir=$$distdir"
 	for f in Makefile $(call quote_each,$(EXTRA_DIST)); do \
 		d=`dirname "$$f"`; \
 		test -d "$(distdir)/$$d" || \
 			mkdir -p "$(distdir)/$$d"; \
 		cp -p "$$f" "$(distdir)/$$d" || exit 1; \
 	done
-	make post-dist-local-hook "distdir=$$distdir"
+	gmake post-dist-local-hook "distdir=$$distdir"
 
 dist-local-recursive:
 	for dir in $(call quote_each,$(SUBDIRS)); do \
 		mkdir -p "$(distdir)/$$dir" || true; \
 		case "$$dir" in \
-		.) make dist-local "distdir=$(distdir)" || exit 1;; \
-		*) (cd "$$dir"; make dist-local "distdir=$(distdir)/$$dir") || exit 1; \
+		.) gmake dist-local "distdir=$(distdir)" || exit 1;; \
+		*) (cd "$$dir"; gmake dist-local "distdir=$(distdir)/$$dir") || exit 1; \
 		esac \
 	done
 

$NetBSD: patch-ai,v 1.1 2010/04/16 10:44:21 kefren Exp $
--- src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs.orig	2010-04-16 13:33:31.000000000 +0300
+++ src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs	2010-04-16 13:34:22.000000000 +0300
@@ -210,15 +210,15 @@ namespace MonoDevelop.Autotools
 					//FIXME:temp
 					programFilesDir = TranslateDir (programFilesDir);
 					installDirs.Add (programFilesDir);
-					installTarget.Append ("\tmake pre-install-local-hook prefix=$(prefix)\n");
-					installTarget.Append ("\tmake install-satellite-assemblies prefix=$(prefix)\n");
+					installTarget.Append ("\tgmake pre-install-local-hook prefix=$(prefix)\n");
+					installTarget.Append ("\tgmake install-satellite-assemblies prefix=$(prefix)\n");
 					installTarget.AppendFormat ("\tmkdir -p '$(DESTDIR){0}'\n", programFilesDir);
 					installTarget.AppendFormat ("\t$(call cp,$(ASSEMBLY),$(DESTDIR){0})\n", programFilesDir);
 					installTarget.AppendFormat ("\t$(call cp,$(ASSEMBLY_MDB),$(DESTDIR){0})\n", programFilesDir);
 
 					//remove dir?
-					uninstallTarget.Append ("\tmake pre-uninstall-local-hook prefix=$(prefix)\n");
-					uninstallTarget.Append ("\tmake uninstall-satellite-assemblies prefix=$(prefix)\n");
+					uninstallTarget.Append ("\tgmake pre-uninstall-local-hook prefix=$(prefix)\n");
+					uninstallTarget.Append ("\tgmake uninstall-satellite-assemblies prefix=$(prefix)\n");
 					uninstallTarget.AppendFormat ("\t$(call rm,$(ASSEMBLY),$(DESTDIR){0})\n", programFilesDir);
 					uninstallTarget.AppendFormat ("\t$(call rm,$(ASSEMBLY_MDB),$(DESTDIR){0})\n", programFilesDir);
 
@@ -444,10 +444,10 @@ endif", s.SwitchName.Replace ('-', '_').
 
 				if (!generateAutotools) {
 					installTarget.Insert (0, String.Format ("install-local:{0}\n", installDeps.ToString ()));
-					installTarget.Append ("\tmake post-install-local-hook prefix=$(prefix)\n");
+					installTarget.Append ("\tgmake post-install-local-hook prefix=$(prefix)\n");
 
 					uninstallTarget.Insert (0, String.Format ("uninstall-local:{0}\n", installDeps.ToString ()));
-					uninstallTarget.Append ("\tmake post-uninstall-local-hook prefix=$(prefix)\n");
+					uninstallTarget.Append ("\tgmake post-uninstall-local-hook prefix=$(prefix)\n");
 				}
 
 				if (!generateAutotools && customCommands.Length > 0)