Use ${MAKE_PROGRAM} instead of hardcoding gmake. The latter will cause

problems on linux systems. Bump PKGREVISION. Noticed by Tobias Nygren

11 files changed, 74 insertions, 58 deletions

diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index 987020877c5..7fd72e7c755 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2010/04/16 10:44:20 kefren Exp $
+# $NetBSD: Makefile,v 1.32 2010/04/17 17:11:04 kefren Exp $
 
 DISTNAME=	monodevelop-2.2.2
 CATEGORIES=	devel
-PKGREVISION=	1
+PKGREVISION=	2
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/monodevelop/
 EXTRACT_SUFX=	.tar.bz2
 
@@ -23,6 +23,22 @@ REPLACE_BASH+=	src/addins/MonoDevelop.Autotools/templates/configure.template
 REPLACE_BASH+=	contrib/extract_makefile_variable.sh
 REPLACE_BASH+=	theme-icons/icon-theme-installer
 
+MAKE_OVERRIDE=	src/addins/MonoDeveloperExtensions/MonoSolutionItemHandler.cs
+MAKE_OVERRIDE+=	src/addins/MonoDevelop.Autotools/SolutionDeployer.cs
+MAKE_OVERRIDE+=	src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs
+MAKE_OVERRIDE+=	tests/UnitTests/MonoDevelop.Projects/PackagingTests.cs
+MAKE_OVERRIDE+=	src/addins/MonoDevelop.Autotools/templates/Makefile.noauto.project.template
+MAKE_OVERRIDE+=	src/addins/MonoDevelop.Autotools/templates/Makefile.solution.template
+MAKE_OVERRIDE+=	src/addins/MonoDevelop.Autotools/templates/make-dist.targets
+MAKE_OVERRIDE+=	src/addins/MonoDevelop.Autotools/templates/rules.make
+MAKE_OVERRIDE+=	src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
+
+SUBST_CLASSES+=			fix-gmake
+SUBST_STAGE.fix-gmake=		post-patch
+SUBST_MESSAGE.fix-gmake=	Fixing GNU make references
+SUBST_FILES.fix-gmake=		${MAKE_OVERRIDE}
+SUBST_SED.fix-gmake=		-e 's,MAKEPROGRAM,${MAKE_PROGRAM},'
+
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../devel/mono-addins/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/devel/monodevelop/distinfo b/devel/monodevelop/distinfo
index 736f50a4614..43c74c1f880 100644
--- a/devel/monodevelop/distinfo
+++ b/devel/monodevelop/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.12 2010/04/16 10:44:20 kefren Exp $
+$NetBSD: distinfo,v 1.13 2010/04/17 17:11:05 kefren Exp $
 
 SHA1 (monodevelop-2.2.2.tar.bz2) = fbb9ab1cbd9cc10c2052d1045a24cedb16158546
 RMD160 (monodevelop-2.2.2.tar.bz2) = 49ea0db9a09690e5b88bb60861fedc0171d31df1
 Size (monodevelop-2.2.2.tar.bz2) = 5892854 bytes
-SHA1 (patch-aa) = beb2d998fa8722d5cf2518edb243c88bd48d7f06
-SHA1 (patch-ab) = 6f3bb5ec755d5c26381c0d714e71645f99b1fcaa
-SHA1 (patch-ac) = d090d120a867e8c81dabf284282b61bd4ac068fd
-SHA1 (patch-ad) = 60094ecbc11ce866ee7f88af26ead3a5e1e1193b
-SHA1 (patch-ae) = 1d6819da0c7257a0a99be3537cdb68f174d987c8
-SHA1 (patch-af) = 2d5e99de5b3d9fd822f7e6782df11adc3d51dc59
-SHA1 (patch-ag) = f4b6a610282703575410ace694c85581dc6bf13a
-SHA1 (patch-ah) = 2515b841359274d3ae3c5f8b2dff8cafb5e36c37
-SHA1 (patch-ai) = a30eb921dfb0ba94ee7e3a65d447bcaaf8434d83
+SHA1 (patch-aa) = 59f7ee1c4f8d5ec1c6827c7b6159f4e1ee6efa99
+SHA1 (patch-ab) = d848eaebe976be37f141c19c67037a6f4bd12582
+SHA1 (patch-ac) = 527e5c37ecebd220eb51333115e910458ded2a4f
+SHA1 (patch-ad) = 0ffe6474264fb9e771e4f9579f30b9366763f8b8
+SHA1 (patch-ae) = b7541afd70530ae58f361813da3c9b4f76c26a25
+SHA1 (patch-af) = cebb95c6e3a9d4299ae45a6d1384242c5991c7fc
+SHA1 (patch-ag) = d1cf6d1fd663dfa1ae6316a5dc60b5f4b4e23c39
+SHA1 (patch-ah) = 245dfc303a825f50e24152a3d444f336cd80f948
+SHA1 (patch-ai) = 5c538b8af742e1efa9b599bc006e3c0f37ef06fc
diff --git a/devel/monodevelop/patches/patch-aa b/devel/monodevelop/patches/patch-aa
index 7b06336e03c..43941a04b6e 100644
--- a/devel/monodevelop/patches/patch-aa
+++ b/devel/monodevelop/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2010/04/16 10:44:20 kefren Exp $
+$NetBSD: patch-aa,v 1.8 2010/04/17 17:11:05 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
@@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.7 2010/04/16 10:44:20 kefren Exp $
  			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);
++			ProcessWrapper proc = Runtime.ProcessService.StartProcess ("MAKEPROGRAM", "PROFILE=" + conf.Id + " " + target, conf.OutputDirectory, monitor.Log, tw, null);
  			proc.WaitForOutput ();
  			
  			CompilerResults cr = new CompilerResults (null);			
diff --git a/devel/monodevelop/patches/patch-ab b/devel/monodevelop/patches/patch-ab
index 9d3ce93fcf5..a5651ea8cc2 100644
--- a/devel/monodevelop/patches/patch-ab
+++ b/devel/monodevelop/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2010/04/16 10:44:20 kefren Exp $
+$NetBSD: patch-ab,v 1.2 2010/04/17 17:11:05 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
@@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.1 2010/04/16 10:44:20 kefren Exp $
  				chainedOutput.ChainWriter (sw);
  
 -				ProcessWrapper process = Runtime.ProcessService.StartProcess ( "make", 
-+				ProcessWrapper process = Runtime.ProcessService.StartProcess ( "gmake", 
++				ProcessWrapper process = Runtime.ProcessService.StartProcess ( "MAKEPROGRAM", 
  						"dist", 
  						baseDir, 
  						chainedOutput, 
diff --git a/devel/monodevelop/patches/patch-ac b/devel/monodevelop/patches/patch-ac
index 256f8f85e0d..3536d6683f7 100644
--- a/devel/monodevelop/patches/patch-ac
+++ b/devel/monodevelop/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2010/04/16 10:44:20 kefren Exp $
+$NetBSD: patch-ac,v 1.2 2010/04/17 17:11:05 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
@@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.1 2010/04/16 10:44:20 kefren Exp $
  				chainedOutput.ChainWriter (swOutput);
  
 -				ProcessWrapper process = Runtime.ProcessService.StartProcess ("make",
-+				ProcessWrapper process = Runtime.ProcessService.StartProcess ("gmake",
++				ProcessWrapper process = Runtime.ProcessService.StartProcess ("MAKEPROGRAM",
  						data.BuildTargetName,
  						baseDir, 
  						chainedOutput, 
@@ -15,7 +15,7 @@ $NetBSD: patch-ac,v 1.1 2010/04/16 10:44:20 kefren Exp $
  		//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 `(.*)'");
++		static Regex regexEnterDir = new Regex (@"MAKEPROGRAM\[[0-9]*\]: ([a-zA-Z]*) directory `(.*)'");
  		
  		private static CompilerError CreateCompilerErrorFromString (string error_string, Stack<string> dirs, Regex regex)
  		{
@@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.1 2010/04/16 10:44:20 kefren Exp $
  				string baseDir = proj.BaseDirectory;
  	
 -				ProcessWrapper process = Runtime.ProcessService.StartProcess ( "make", 
-+				ProcessWrapper process = Runtime.ProcessService.StartProcess ( "gmake", 
++				ProcessWrapper process = Runtime.ProcessService.StartProcess ( "MAKEPROGRAM", 
  						data.CleanTargetName,
  						baseDir, 
  						monitor.Log, 
@@ -33,7 +33,7 @@ $NetBSD: patch-ac,v 1.1 2010/04/16 10:44:20 kefren Exp $
  			try
  			{
 -				ProcessWrapper process = Runtime.ProcessService.StartProcess ("make",
-+				ProcessWrapper process = Runtime.ProcessService.StartProcess ("gmake",
++				ProcessWrapper process = Runtime.ProcessService.StartProcess ("MAKEPROGRAM",
  						data.ExecuteTargetName,
  						project.BaseDirectory,
  						console.Out,
diff --git a/devel/monodevelop/patches/patch-ad b/devel/monodevelop/patches/patch-ad
index 2bbd83b7d38..bd3fa1d694c 100644
--- a/devel/monodevelop/patches/patch-ad
+++ b/devel/monodevelop/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2010/04/16 10:44:20 kefren Exp $
+$NetBSD: patch-ad,v 1.2 2010/04/17 17:11:05 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
@@ -6,11 +6,11 @@ $NetBSD: patch-ad,v 1.1 2010/04/16 10:44:20 kefren Exp $
  				Assert.Fail ("Configure script failed");
  			
 -			if (!Exec ("make", "all", tarDir))
-+			if (!Exec ("gmake", "all", tarDir))
++			if (!Exec ("MAKEPROGRAM", "all", tarDir))
  				Assert.Fail ("Build failed");
  			
 -			if (!Exec ("make", "install", tarDir))
-+			if (!Exec ("gmake", "install", tarDir))
++			if (!Exec ("MAKEPROGRAM", "install", tarDir))
  				Assert.Fail ("Install failed");
  			
  			CheckDirContents (prefix, expectedFiles);
diff --git a/devel/monodevelop/patches/patch-ae b/devel/monodevelop/patches/patch-ae
index c45368de36b..3786ee854eb 100644
--- a/devel/monodevelop/patches/patch-ae
+++ b/devel/monodevelop/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 2010/04/16 10:44:20 kefren Exp $
+$NetBSD: patch-ae,v 1.2 2010/04/17 17:11:05 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 @@
@@ -6,15 +6,15 @@ $NetBSD: patch-ae,v 1.1 2010/04/16 10:44:20 kefren Exp $
  $(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)
++	MAKEPROGRAM pre-all-local-hook prefix=$(prefix)
  	mkdir -p $(shell dirname $(ASSEMBLY))
 -	make $(CONFIG)_BeforeBuild
-+	gmake $(CONFIG)_BeforeBuild
++	MAKEPROGRAM $(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)
++	MAKEPROGRAM $(CONFIG)_AfterBuild
++	MAKEPROGRAM post-all-local-hook prefix=$(prefix)
  
  %%INSTALL_TARGET%%
  %%UNINSTALL_TARGET%%
diff --git a/devel/monodevelop/patches/patch-af b/devel/monodevelop/patches/patch-af
index 063c54f0709..b97039a75f3 100644
--- a/devel/monodevelop/patches/patch-af
+++ b/devel/monodevelop/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2010/04/16 10:44:20 kefren Exp $
+$NetBSD: patch-af,v 1.2 2010/04/17 17:11:05 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 @@
@@ -6,17 +6,17 @@ $NetBSD: patch-af,v 1.1 2010/04/16 10:44:20 kefren Exp $
  	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) ; \
++	MAKEPROGRAM 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; };;\
++		.) MAKEPROGRAM $*-local || { final_exit="exit 1"; $$dk; };;\
++		*) (cd "$$dir" && MAKEPROGRAM $*) || { final_exit="exit 1"; $$dk; };;\
  		esac \
  	done; \
 -	make post-$*-hook prefix=$(prefix) ; \
-+	gmake post-$*-hook prefix=$(prefix) ; \
++	MAKEPROGRAM post-$*-hook prefix=$(prefix) ; \
  	$$final_exit
  
  $(CONFIG_MAKE):
diff --git a/devel/monodevelop/patches/patch-ag b/devel/monodevelop/patches/patch-ag
index 9f4466a1eeb..1f44e70a533 100644
--- a/devel/monodevelop/patches/patch-ag
+++ b/devel/monodevelop/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1 2010/04/16 10:44:21 kefren Exp $
+$NetBSD: patch-ag,v 1.2 2010/04/17 17:11:05 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 @@
@@ -6,23 +6,23 @@ $NetBSD: patch-ag,v 1.1 2010/04/16 10:44:21 kefren Exp $
  	rm -rf $(PACKAGE)-$(VERSION)
  	mkdir $(PACKAGE)-$(VERSION)
 -	make pre-dist-hook distdir=$$distdir
-+	gmake pre-dist-hook distdir=$$distdir
++	MAKEPROGRAM 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;; \
++		.) MAKEPROGRAM dist-local "distdir=$$pkgdir" || exit 1;; \
++		*) (cd "$$dir"; MAKEPROGRAM 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"
++	(MAKEPROGRAM dist-local distdir=$(PACKAGE)-$(VERSION))
++	MAKEPROGRAM
++	MAKEPROGRAM post-dist-hook "distsir=$$distdir"
  	tar czvf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
  	rm -rf $(PACKAGE)-$(VERSION)
  	@echo "=========================================="
@@ -31,5 +31,5 @@ $NetBSD: patch-ag,v 1.1 2010/04/16 10:44:21 kefren Exp $
  	tar xzvf ../$(PACKAGE)-$(VERSION).tar.gz; cd $(PACKAGE)-$(VERSION); \
  	./configure --prefix=$$(cd `pwd`/..; pwd); \
 -	make && make install && make dist);
-+	gmake && gmake install && gmake dist);
++	MAKEPROGRAM && ${MAKE_PROGRAM} install && ${MAKE_PROGRAM} dist);
  	rm -rf test
diff --git a/devel/monodevelop/patches/patch-ah b/devel/monodevelop/patches/patch-ah
index d0ec04a6183..9fe8a13936f 100644
--- a/devel/monodevelop/patches/patch-ah
+++ b/devel/monodevelop/patches/patch-ah
@@ -1,17 +1,17 @@
-$NetBSD: patch-ah,v 1.1 2010/04/16 10:44:21 kefren Exp $
+$NetBSD: patch-ah,v 1.2 2010/04/17 17:11:05 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
++	MAKEPROGRAM pre-clean-local-hook
++	MAKEPROGRAM $(CONFIG)_BeforeClean
  	-rm -f $(call quote_each,$(CLEANFILES))
 -	make $(CONFIG)_AfterClean
 -	make post-clean-local-hook
-+	gmake $(CONFIG)_AfterClean
-+	gmake post-clean-local-hook
++	MAKEPROGRAM $(CONFIG)_AfterClean
++	MAKEPROGRAM post-clean-local-hook
  
  install-local:
  uninstall-local:
@@ -20,7 +20,7 @@ $NetBSD: patch-ah,v 1.1 2010/04/16 10:44:21 kefren Exp $
  
  dist-local:
 -	make pre-dist-local-hook "distdir=$$distdir"
-+	gmake pre-dist-local-hook "distdir=$$distdir"
++	MAKEPROGRAM pre-dist-local-hook "distdir=$$distdir"
  	for f in Makefile $(call quote_each,$(EXTRA_DIST)); do \
  		d=`dirname "$$f"`; \
  		test -d "$(distdir)/$$d" || \
@@ -28,7 +28,7 @@ $NetBSD: patch-ah,v 1.1 2010/04/16 10:44:21 kefren Exp $
  		cp -p "$$f" "$(distdir)/$$d" || exit 1; \
  	done
 -	make post-dist-local-hook "distdir=$$distdir"
-+	gmake post-dist-local-hook "distdir=$$distdir"
++	MAKEPROGRAM post-dist-local-hook "distdir=$$distdir"
  
  dist-local-recursive:
  	for dir in $(call quote_each,$(SUBDIRS)); do \
@@ -36,8 +36,8 @@ $NetBSD: patch-ah,v 1.1 2010/04/16 10:44:21 kefren Exp $
  		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; \
++		.) MAKEPROGRAM dist-local "distdir=$(distdir)" || exit 1;; \
++		*) (cd "$$dir"; MAKEPROGRAM dist-local "distdir=$(distdir)/$$dir") || exit 1; \
  		esac \
  	done
  
diff --git a/devel/monodevelop/patches/patch-ai b/devel/monodevelop/patches/patch-ai
index 56a2b79a9af..b225ca1f0f4 100644
--- a/devel/monodevelop/patches/patch-ai
+++ b/devel/monodevelop/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1 2010/04/16 10:44:21 kefren Exp $
+$NetBSD: patch-ai,v 1.2 2010/04/17 17:11:05 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
@@ -7,8 +7,8 @@ $NetBSD: patch-ai,v 1.1 2010/04/16 10:44:21 kefren Exp $
  					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.Append ("\tMAKEPROGRAM pre-install-local-hook prefix=$(prefix)\n");
++					installTarget.Append ("\tMAKEPROGRAM 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);
@@ -16,8 +16,8 @@ $NetBSD: patch-ai,v 1.1 2010/04/16 10:44:21 kefren Exp $
  					//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.Append ("\tMAKEPROGRAM pre-uninstall-local-hook prefix=$(prefix)\n");
++					uninstallTarget.Append ("\tMAKEPROGRAM 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);
  
@@ -26,11 +26,11 @@ $NetBSD: patch-ai,v 1.1 2010/04/16 10:44:21 kefren Exp $
  				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");
++					installTarget.Append ("\tMAKEPROGRAM 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");
++					uninstallTarget.Append ("\tMAKEPROGRAM post-uninstall-local-hook prefix=$(prefix)\n");
  				}
  
  				if (!generateAutotools && customCommands.Length > 0)