sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by George Sherwood (d48cc584b03e6b7dabcfe268fa7df93655d6793e)

From: George Sherwood <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (d48cc584b03e6b7dabcfe268fa7df93655d6793e)
Date: Sat, 20 Nov 2010 10:14:12 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

devel/mono/DETAILS | 4 ++--
devel/mono/HISTORY | 6 ++++++
devel/mono/PRE_BUILD | 1 -
devel/mono/gacutil-fix.patch | 33 ---------------------------------
4 files changed, 8 insertions(+), 36 deletions(-)

New commits:
commit d48cc584b03e6b7dabcfe268fa7df93655d6793e
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

mono: Updated to version 2.8.1. Removed patch which was breaking the
build.

diff --git a/devel/mono/DETAILS b/devel/mono/DETAILS
index e5c77fb..8f3494b 100755
--- a/devel/mono/DETAILS
+++ b/devel/mono/DETAILS
@@ -5,11 +5,11 @@ if [[ "${MONO_TRUNK}" = 'y' ]]; then

SOURCE_URL=http://mono.ximian.com/monobuild/snapshot/snapshot_sources/mono/${SOURCE}

SOURCE_HASH=sha512:2067ee108f15610ea11c515fba67625995f5136c8888d21a1ef9417320538f5e46cc39c19c351873b5c126170bc23f21f042b544575506ca4c454beda4b8438a
else
- VERSION=2.6.7
+ VERSION=2.8.1
SECURITY_PATCH=1
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL=ftp://ftp.novell.com/pub/mono/sources/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:e24be0229c0e0e91ef0c265c0267ae30ef84447c03a298b71a77123c06517ec081ba53ed6f0ca69deb079cb7843bc7daf6aa7aedb874da3c8924ef03cef388b3
+
SOURCE_HASH=sha512:af452ba25146a44f2e2b923149bb4372c392b0c246aad80aa893f48de88598e989222ed59909cc307dbbf9a484e919c6cf47f10f7e183164cae455e6789cb91f
fi
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/devel/mono/HISTORY b/devel/mono/HISTORY
index 16e5ddb..f4c6b60 100644
--- a/devel/mono/HISTORY
+++ b/devel/mono/HISTORY
@@ -1,3 +1,9 @@
+2010-11-20 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated stable to version 2.8.1
+ * PRE_BUILD: Removed patch
+ * gacutil-fix.patch: Removed. Breaks build due to 1.x assemblies
+ being removed.
+
2010-08-01 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated stable to version 2.6.7

diff --git a/devel/mono/PRE_BUILD b/devel/mono/PRE_BUILD
index f5cd1e4..1676f73 100755
--- a/devel/mono/PRE_BUILD
+++ b/devel/mono/PRE_BUILD
@@ -1,5 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/gacutil-fix.patch &&
# fix install location for jay manpage
sedit 's:/man/man1:/share/man/man1:' mcs/jay/Makefile
diff --git a/devel/mono/gacutil-fix.patch b/devel/mono/gacutil-fix.patch
deleted file mode 100644
index 4db9156..0000000
--- a/devel/mono/gacutil-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- mcs/tools/gacutil/driver.cs.orig 2006-01-23 11:14:03.000000000 +0100
-+++ mcs/tools/gacutil/driver.cs 2006-01-23 11:17:29.000000000 +0100
-@@ -280,7 +280,8 @@
- string ref_dir = Path.Combine (libdir,
package);
- string ref_path = Path.Combine (ref_dir,
asmb_file);
-
-- if (File.Exists (ref_path))
-+ Mono.Unix.Native.Stat ignored_stat;
-+ if (Mono.Unix.Native.Syscall.lstat (ref_path, out ignored_stat) ==
0)
- File.Delete (ref_path);
- try {
- Directory.CreateDirectory (ref_dir);
---- mcs/tools/gacutil/Makefile~ 2005-07-26 06:34:18.000000000 +0200
-+++ mcs/tools/gacutil/Makefile 2006-01-23 11:17:49.000000000 +0100
-@@ -2,7 +2,7 @@
- SUBDIRS =
- include ../../build/rules.make
-
--LOCAL_MCS_FLAGS = -r:Mono.Security.dll
-+LOCAL_MCS_FLAGS = -r:Mono.Security.dll -r:Mono.Posix.dll
-
- ifeq (net_1_1_bootstrap, $(PROFILE))
- PROGRAM = $(topdir)/class/lib/$(PROFILE)/gacutil.exe
---- mcs/class/Makefile~ 2006-01-05 12:30:49.000000000 +0100
-+++ mcs/class/Makefile 2006-01-23 11:57:39.000000000 +0100
-@@ -8,6 +8,7 @@
- System \
- System.XML \
- Mono.Security \
-+ Mono.Posix \
- System.Security \
- System.Configuration \
- System \

[SM-Commit] GIT changes to master grimoire by George Sherwood (d48cc584b03e6b7dabcfe268fa7df93655d6793e), George Sherwood, 11/20/2010