pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/monodevelop Use ${MAKE_PROGRAM} instead of hardc...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c1ccc43ae56f
branches: trunk
changeset: 574472:c1ccc43ae56f
user: kefren <kefren%pkgsrc.org@localhost>
date: Sat Apr 17 17:11:04 2010 +0000
description:
Use ${MAKE_PROGRAM} instead of hardcoding gmake. The latter will cause
problems on linux systems. Bump PKGREVISION. Noticed by Tobias Nygren
diffstat:
devel/monodevelop/Makefile | 20 ++++++++++++++++++--
devel/monodevelop/distinfo | 20 ++++++++++----------
devel/monodevelop/patches/patch-aa | 4 ++--
devel/monodevelop/patches/patch-ab | 4 ++--
devel/monodevelop/patches/patch-ac | 10 +++++-----
devel/monodevelop/patches/patch-ad | 6 +++---
devel/monodevelop/patches/patch-ae | 10 +++++-----
devel/monodevelop/patches/patch-af | 10 +++++-----
devel/monodevelop/patches/patch-ag | 16 ++++++++--------
devel/monodevelop/patches/patch-ah | 18 +++++++++---------
devel/monodevelop/patches/patch-ai | 14 +++++++-------
11 files changed, 74 insertions(+), 58 deletions(-)
diffs (truncated from 375 to 300 lines):
diff -r 609b686bfb6c -r c1ccc43ae56f devel/monodevelop/Makefile
--- a/devel/monodevelop/Makefile Sat Apr 17 17:09:01 2010 +0000
+++ b/devel/monodevelop/Makefile Sat Apr 17 17:11:04 2010 +0000
@@ -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+= 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 -r 609b686bfb6c -r c1ccc43ae56f devel/monodevelop/distinfo
--- a/devel/monodevelop/distinfo Sat Apr 17 17:09:01 2010 +0000
+++ b/devel/monodevelop/distinfo Sat Apr 17 17:11:04 2010 +0000
@@ -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 -r 609b686bfb6c -r c1ccc43ae56f devel/monodevelop/patches/patch-aa
--- a/devel/monodevelop/patches/patch-aa Sat Apr 17 17:09:01 2010 +0000
+++ b/devel/monodevelop/patches/patch-aa Sat Apr 17 17:11:04 2010 +0000
@@ -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 @@
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 -r 609b686bfb6c -r c1ccc43ae56f devel/monodevelop/patches/patch-ab
--- a/devel/monodevelop/patches/patch-ab Sat Apr 17 17:09:01 2010 +0000
+++ b/devel/monodevelop/patches/patch-ab Sat Apr 17 17:11:04 2010 +0000
@@ -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 @@
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 -r 609b686bfb6c -r c1ccc43ae56f devel/monodevelop/patches/patch-ac
--- a/devel/monodevelop/patches/patch-ac Sat Apr 17 17:09:01 2010 +0000
+++ b/devel/monodevelop/patches/patch-ac Sat Apr 17 17:11:04 2010 +0000
@@ -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 @@
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 @@
//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 @@
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 @@
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 -r 609b686bfb6c -r c1ccc43ae56f devel/monodevelop/patches/patch-ad
--- a/devel/monodevelop/patches/patch-ad Sat Apr 17 17:09:01 2010 +0000
+++ b/devel/monodevelop/patches/patch-ad Sat Apr 17 17:11:04 2010 +0000
@@ -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 @@
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 -r 609b686bfb6c -r c1ccc43ae56f devel/monodevelop/patches/patch-ae
--- a/devel/monodevelop/patches/patch-ae Sat Apr 17 17:09:01 2010 +0000
+++ b/devel/monodevelop/patches/patch-ae Sat Apr 17 17:11:04 2010 +0000
@@ -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 @@
$(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 -r 609b686bfb6c -r c1ccc43ae56f devel/monodevelop/patches/patch-af
--- a/devel/monodevelop/patches/patch-af Sat Apr 17 17:09:01 2010 +0000
+++ b/devel/monodevelop/patches/patch-af Sat Apr 17 17:11:04 2010 +0000
@@ -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 @@
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 -r 609b686bfb6c -r c1ccc43ae56f devel/monodevelop/patches/patch-ag
--- a/devel/monodevelop/patches/patch-ag Sat Apr 17 17:09:01 2010 +0000
+++ b/devel/monodevelop/patches/patch-ag Sat Apr 17 17:11:04 2010 +0000
@@ -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 @@
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 @@
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 -r 609b686bfb6c -r c1ccc43ae56f devel/monodevelop/patches/patch-ah
--- a/devel/monodevelop/patches/patch-ah Sat Apr 17 17:09:01 2010 +0000
+++ b/devel/monodevelop/patches/patch-ah Sat Apr 17 17:11:04 2010 +0000
@@ -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:
Home |
Main Index |
Thread Index |
Old Index