Update to 1.2.5.1

- reenable amd64 support while we're at it.

Submitted by:	Phillip Neumann
Project by:	BSD# (http://www.mono-project.com/Mono:FreeBSD)

9 files changed, 72 insertions, 215 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 5927be7cc9f5..dc6dd666770b 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -3,23 +3,21 @@
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
-#   $Id: Makefile,v 1.78 2007/02/26 22:13:36 tmclau02 Exp $
+#   $Id: Makefile,v 1.94 2007/10/03 01:34:13 killfill Exp $
 #
 
 PORTNAME=	mono
-PORTVERSION=	1.2.3.1
-PORTREVISION=	3
+PORTVERSION=	1.2.5.1
 CATEGORIES=	lang
-MASTER_SITES=	http://www.go-mono.com/sources/mono/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	tmclaugh/mono
+MASTER_SITES=	http://go-mono.com/sources/${PORTNAME}/
 
 MAINTAINER=	bsd-sharp-list@forge.novell.com
 COMMENT=	An open source implementation of .NET Development Framework
 
 CONFLICTS=	mono-devel-[0-9]* mono-svn-[0-9]*
 
-USE_BISON=	build
+USE_BZIP2=	yes
+USE_BISON=	yes
 USE_GNOME=	gnomehack glib20
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
@@ -30,7 +28,8 @@ CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--program-transform-name=\'\' \
 		--with-gc=included \
-		--with-tls=pthread
+		--with-tls=pthread \
+		--mandir=${PREFIX}/man
 MAKE_ARGS=	EXTERNAL_MCS=false
 
 # Set location for .wapi creation.
@@ -44,7 +43,7 @@ MAKE_ENV=	MONO_SHARED_DIR="${MONO_SHARED_DIR}" \
 
 # Removed amd64 arch because builds are exhibiting semaphore problems on
 # pointyhat runs causing failure to build.
-ONLY_FOR_ARCHS= i386 #amd64
+ONLY_FOR_ARCHS= i386 amd64
 
 MAN1=		al.1 cert2spc.1 certmgr.1 chktrust.1 cilc.1 disco.1 dtd2xsd.1 \
 		gacutil.1 genxs.1 ilasm.1 jay.1 macpack.1 makecert.1 mcs.1 \
@@ -52,11 +51,15 @@ MAN1=		al.1 cert2spc.1 certmgr.1 chktrust.1 cilc.1 disco.1 dtd2xsd.1 \
 		monoburg.1 monodis.1 monop.1 monostyle.1 mozroots.1 oldmono.1 \
 		permview.1 prj2make.1 secutil.1 setreg.1 signcode.1 sn.1 \
 		soapsuds.1 sqlsharp.1 wsdl.1 xsd.1 mono-xmltool.1 sgen.1 \
-		httpcfg.1
+		httpcfg.1 vbnc.1 resgen.1 monolinker.1
 MAN5=		mono-config.5
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "amd64"
+USE_FAM=	yes
+.endif
+
 pre-everything::
 	@${CAT} ${PKGMESSAGE}
 
@@ -74,15 +77,16 @@ USE_FAM=	yes
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/mono/metadata/assembly.c
-	@${REINPLACE_CMD} -e 's|.so.0|.so|g' \
-		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/configure ${WRKSRC}/libgc/configure
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \
 		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/mcs/tools/mkbundle/mkbundle.cs
+	@${REINPLACE_CMD} -e 's|libgamin-1.so.0|libgamin-1.so.1|g' \
+		${WRKSRC}/mcs/class/System/System.IO/FAMWatcher.cs
+	@${REINPLACE_CMD} -e 's|^#!/bin/bash|#!/bin/sh|g' \
+		${WRKSRC}/mcs/class/Managed.Windows.Forms/build-csproj \
+		${WRKSRC}/mcs/class/Managed.Windows.Forms/build-csproj2k5
 
 .if ${OSVERSION} >= 700000
 	@${REINPLACE_CMD} -e 's|freebsd6|freebsd7|g' \
@@ -95,12 +99,8 @@ tests: build
 		${MAKE_FLAGS} Makefile ${MAKE_ARGS} test)
 
 post-configure:
-	${REINPLACE_CMD} -e 's|share\/man|man|g' \
+	@${REINPLACE_CMD} -e 's|share\/man|man|g' \
 		${WRKSRC}/mcs/jay/Makefile
 
-pre-su-install:
-	${MKDIR} ${X11BASE}/lib/mono/1.0
-	${MKDIR} ${X11BASE}/lib/mono/2.0
-	${MKDIR} ${X11BASE}/lib/mono/gac
-
+.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
 .include <bsd.port.post.mk>
diff --git a/lang/mono/bsd.mono.mk b/lang/mono/bsd.mono.mk
index 542a6b8408c8..01d72df0dc2b 100644
--- a/lang/mono/bsd.mono.mk
+++ b/lang/mono/bsd.mono.mk
@@ -6,7 +6,7 @@
 # the FreeBSD ports system.
 #
 # $FreeBSD$
-#   $Id: bsd.mono.mk,v 1.20 2007/02/07 15:37:10 killfill Exp $
+#   $Id: bsd.mono.mk,v 1.25 2007/08/19 19:35:30 killfill Exp $
 #
 
 # USE_NANT		- If set, the port uses nant.
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 2c0bdc6fc598..8c8b10176ea3 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,3 +1,3 @@
-MD5 (mono-1.2.3.1.tar.gz) = 4e4cdb6f98f1ea62bb1900f214c55e58
-SHA256 (mono-1.2.3.1.tar.gz) = b177ced4e3ec0c2efc6a4e17f1f87f6e852f319332d4f138d25d4a68ffba2c78
-SIZE (mono-1.2.3.1.tar.gz) = 20694945
+MD5 (mono-1.2.5.1.tar.bz2) = dfede0c8c29384a8f8a6953a9bd06224
+SHA256 (mono-1.2.5.1.tar.bz2) = 434f91032e48c03e1202ba3cef1648e2708eeefcf51143d3547e34acc9c68a96
+SIZE (mono-1.2.5.1.tar.bz2) = 17492757
diff --git a/lang/mono/files/patch-configure b/lang/mono/files/patch-configure
new file mode 100644
index 000000000000..ab55b91f0be2
--- /dev/null
+++ b/lang/mono/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig	Sun Aug 26 00:12:42 2007
++++ configure	Sun Aug 26 00:12:59 2007
+@@ -39673,8 +39673,8 @@
+ INTERP_SUPPORTED=no
+ LIBC="libc.so.6"
+ INTL="libc.so.6"
+-SQLITE="libsqlite.so.0"
+-SQLITE3="libsqlite3.so.0"
++SQLITE="libsqlite.so.8"
++SQLITE3="libsqlite3.so.8"
+ X11="libX11.so"
+ 
+ jit_wanted=false
diff --git a/lang/mono/files/patch-mcs_class_MWF_build-csproj b/lang/mono/files/patch-mcs_class_MWF_build-csproj
index 33bf2f8e2ff2..9d069f58fa87 100644
--- a/lang/mono/files/patch-mcs_class_MWF_build-csproj
+++ b/lang/mono/files/patch-mcs_class_MWF_build-csproj
@@ -1,5 +1,5 @@
---- mcs/class/Managed.Windows.Forms/build-csproj.orig	Thu Jan 25 01:19:43 2007
-+++ mcs/class/Managed.Windows.Forms/build-csproj	Sun Jun 10 15:27:31 2007
+--- mcs/class/Managed.Windows.Forms/build-csproj.orig	Thu Apr 19 21:32:15 2007
++++ mcs/class/Managed.Windows.Forms/build-csproj	Mon Apr 23 20:21:51 2007
 @@ -177,7 +177,7 @@
  {
  cat $Resource | while read SRC; do
diff --git a/lang/mono/files/patch-mono_io-layer_shared.c b/lang/mono/files/patch-mono_io-layer_shared.c
deleted file mode 100644
index 140d0c10fa7c..000000000000
--- a/lang/mono/files/patch-mono_io-layer_shared.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- mono/io-layer/shared.c.orig	Fri Dec  1 01:57:46 2006
-+++ mono/io-layer/shared.c	Wed Feb 21 13:28:07 2007
-@@ -330,10 +330,10 @@
- 		while ((_wapi_sem_id = semget (key, _WAPI_SHARED_SEM_COUNT,
- 					       IPC_CREAT | IPC_EXCL | 0600)) == -1) {
- 			if (errno == ENOMEM) {
--				g_critical ("%s: semget error: %s", __func__,
-+				g_error ("%s: semget error: %s", __func__,
- 					    g_strerror (errno));
- 			} else if (errno == ENOSPC) {
--				g_critical ("%s: semget error: %s.  Try deleting some semaphores with ipcs and ipcrm", __func__, g_strerror (errno));
-+				g_error ("%s: semget error: %s.  Try deleting some semaphores with ipcs and ipcrm\nor increase the maximum number of semaphore in the system.", __func__, g_strerror (errno));
- 			} else if (errno != EEXIST) {
- 				if (retries > 3)
- 					g_warning ("%s: semget error: %s key 0x%x - trying again", __func__,
diff --git a/lang/mono/files/patch-mono_io-layer_socket-private.h b/lang/mono/files/patch-mono_io-layer_socket-private.h
deleted file mode 100644
index f5e8eb0120ba..000000000000
--- a/lang/mono/files/patch-mono_io-layer_socket-private.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- mono/io-layer/socket-private.h.orig	Thu Jan 25 01:11:18 2007
-+++ mono/io-layer/socket-private.h	Sat Mar 24 16:49:54 2007
-@@ -20,6 +20,7 @@
- 	int domain;
- 	int type;
- 	int protocol;
-+	int saved_error;
- };
- 
- #endif /* _WAPI_SOCKET_PRIVATE_H_ */
diff --git a/lang/mono/files/patch-mono_io-layer_sockets.c b/lang/mono/files/patch-mono_io-layer_sockets.c
deleted file mode 100644
index 4da7536457b9..000000000000
--- a/lang/mono/files/patch-mono_io-layer_sockets.c
+++ /dev/null
@@ -1,152 +0,0 @@
---- mono/io-layer/sockets.c	2007/01/11 13:28:29	70852
-+++ mono/io-layer/sockets.c	2007/03/22 14:59:57	74811
-@@ -15,6 +15,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
-+#include <sys/poll.h>
- #ifdef HAVE_SYS_FILIO_H
- #include <sys/filio.h>     /* defines FIONBIO and FIONREAD */
- #endif
-@@ -272,7 +273,8 @@
- 		  socklen_t addrlen)
- {
- 	gpointer handle = GUINT_TO_POINTER (fd);
--	int ret;
-+	struct _WapiHandle_socket *socket_handle;
-+	gboolean ok;
- 	gint errnum;
- 	
- 	if (startup_count == 0) {
-@@ -285,26 +287,82 @@
- 		return(SOCKET_ERROR);
- 	}
- 	
--	do {
--		ret = connect (fd, serv_addr, addrlen);
--	} while (ret==-1 && errno==EINTR && !_wapi_thread_cur_apc_pending());
--
--	if (ret == -1) {
-+	if (connect (fd, serv_addr, addrlen) == -1) {
-+		struct pollfd fds;
-+		int so_error;
-+		socklen_t len;
-+		
- 		errnum = errno;
- 		
-+		if (errno != EINTR) {
- #ifdef DEBUG
--		g_message ("%s: connect error: %s", __func__,
--			   strerror (errnum));
-+			g_message ("%s: connect error: %s", __func__,
-+				   strerror (errnum));
- #endif
--		errnum = errno_to_WSA (errnum, __func__);
--		if (errnum == WSAEINPROGRESS)
--			errnum = WSAEWOULDBLOCK; /* see bug #73053 */
- 
--		WSASetLastError (errnum);
-+			errnum = errno_to_WSA (errnum, __func__);
-+			if (errnum == WSAEINPROGRESS)
-+				errnum = WSAEWOULDBLOCK; /* see bug #73053 */
-+
-+			WSASetLastError (errnum);
- 		
--		return(SOCKET_ERROR);
-+			return(SOCKET_ERROR);
-+		}
-+
-+		fds.fd = fd;
-+		fds.events = POLLOUT;
-+		while (poll (&fds, 1, -1) == -1 &&
-+		       !_wapi_thread_cur_apc_pending ()) {
-+			if (errno != EINTR) {
-+				errnum = errno_to_WSA (errno, __func__);
-+
-+#ifdef DEBUG
-+				g_message ("%s: connect poll error: %s",
-+					   __func__, strerror (errno));
-+#endif
-+
-+				WSASetLastError (errnum);
-+				return(SOCKET_ERROR);
-+			}
-+		}
-+
-+		len = sizeof(so_error);
-+		if (getsockopt (fd, SOL_SOCKET, SO_ERROR, &so_error,
-+				&len) == -1) {
-+			errnum = errno_to_WSA (errno, __func__);
-+
-+#ifdef DEBUG
-+			g_message ("%s: connect getsockopt error: %s",
-+				   __func__, strerror (errno));
-+#endif
-+
-+			WSASetLastError (errnum);
-+			return(SOCKET_ERROR);
-+		}
-+		
-+		if (so_error != 0) {
-+			errnum = errno_to_WSA (so_error, __func__);
-+
-+			/* Need to save this socket error */
-+			ok = _wapi_lookup_handle (handle, WAPI_HANDLE_SOCKET,
-+						  (gpointer *)&socket_handle);
-+			if (ok == FALSE) {
-+				g_warning ("%s: error looking up socket handle %p", __func__, handle);
-+			} else {
-+				socket_handle->saved_error = errnum;
-+			}
-+			
-+#ifdef DEBUG
-+			g_message ("%s: connect getsockopt returned error: %s",
-+				   __func__, strerror (so_error));
-+#endif
-+
-+			WSASetLastError (errnum);
-+			return(SOCKET_ERROR);
-+		}
- 	}
--	return(ret);
-+		
-+	return(0);
- }
- 
- int _wapi_getpeername(guint32 fd, struct sockaddr *name, socklen_t *namelen)
-@@ -378,7 +436,9 @@
- 	int ret;
- 	struct timeval tv;
- 	void *tmp_val;
--
-+	struct _WapiHandle_socket *socket_handle;
-+	gboolean ok;
-+	
- 	if (startup_count == 0) {
- 		WSASetLastError (WSANOTINITIALISED);
- 		return(SOCKET_ERROR);
-@@ -415,9 +475,23 @@
- 	}
- 
- 	if (optname == SO_ERROR) {
--		if (*((int *)optval) != 0) {
-+		ok = _wapi_lookup_handle (handle, WAPI_HANDLE_SOCKET,
-+					  (gpointer *)&socket_handle);
-+		if (ok == FALSE) {
-+			g_warning ("%s: error looking up socket handle %p",
-+				   __func__, handle);
-+
-+			/* can't extract the last error */
- 			*((int *) optval) = errno_to_WSA (*((int *)optval),
- 							  __func__);
-+		} else {
-+			if (*((int *)optval) != 0) {
-+				*((int *) optval) = errno_to_WSA (*((int *)optval),
-+								  __func__);
-+				socket_handle->saved_error = *((int *)optval);
-+			} else {
-+				*((int *)optval) = socket_handle->saved_error;
-+			}
- 		}
- 	}
- 	
diff --git a/lang/mono/pkg-plist b/lang/mono/pkg-plist
index fc71ae1c456c..4ee0104111c4 100644
--- a/lang/mono/pkg-plist
+++ b/lang/mono/pkg-plist
@@ -14,6 +14,7 @@ bin/gmcs
 bin/httpcfg
 bin/ilasm
 bin/ilasm2
+bin/installvst
 bin/jay
 bin/macpack
 bin/makecert
@@ -23,15 +24,18 @@ bin/mjs
 bin/mkbundle
 bin/mkbundle2
 bin/mono
+bin/mono-api-diff
+bin/mono-api-info
+bin/mono-api-info2
 bin/mono-find-provides
 bin/mono-find-requires
 bin/mono-service
 bin/mono-service2
 bin/mono-shlib-cop
 bin/mono-xmltool
-bin/monodiet
 bin/monodis
 bin/monograph
+bin/monolinker
 bin/monop
 bin/monop2
 bin/mozroots
@@ -46,6 +50,7 @@ bin/secutil
 bin/setreg
 bin/sgen
 bin/signcode
+bin/smcs
 bin/sn
 bin/soapsuds
 bin/sqlsharp
@@ -118,6 +123,7 @@ include/mono-1.0/mono/utils/mono-codeman.h
 include/mono-1.0/mono/utils/mono-counters.h
 include/mono-1.0/mono/utils/mono-digest.h
 include/mono-1.0/mono/utils/mono-hash.h
+include/mono-1.0/mono/utils/mono-internal-hash.h
 include/mono-1.0/mono/utils/mono-logger.h
 include/mono-1.0/mono/utils/mono-math.h
 include/mono-1.0/mono/utils/mono-path.h
@@ -165,6 +171,7 @@ lib/mono/1.0/Microsoft.VisualC.dll
 lib/mono/1.0/Microsoft.Vsa.dll
 lib/mono/1.0/Mono.Cairo.dll
 lib/mono/1.0/Mono.CompilerServices.SymbolWriter.dll
+lib/mono/1.0/Mono.Data.Sqlite.dll
 lib/mono/1.0/Mono.Data.SqliteClient.dll
 lib/mono/1.0/Mono.Data.SybaseClient.dll
 lib/mono/1.0/Mono.Data.Tds.dll
@@ -212,6 +219,8 @@ lib/mono/1.0/chktrust.exe
 lib/mono/1.0/chktrust.exe.mdb
 lib/mono/1.0/cilc.exe
 lib/mono/1.0/cilc.exe.mdb
+lib/mono/1.0/culevel.exe
+lib/mono/1.0/culevel.exe.mdb
 lib/mono/1.0/cscompmgd.dll
 lib/mono/1.0/disco.exe
 lib/mono/1.0/disco.exe.mdb
@@ -227,6 +236,8 @@ lib/mono/1.0/ictool.exe
 lib/mono/1.0/ictool.exe.mdb
 lib/mono/1.0/ilasm.exe
 lib/mono/1.0/ilasm.exe.mdb
+lib/mono/1.0/installvst.exe
+lib/mono/1.0/installvst.exe.mdb
 lib/mono/1.0/macpack.exe
 lib/mono/1.0/macpack.exe.mdb
 lib/mono/1.0/makecert.exe
@@ -247,6 +258,8 @@ lib/mono/1.0/mono-shlib-cop.exe.config
 lib/mono/1.0/mono-shlib-cop.exe.mdb
 lib/mono/1.0/mono-xmltool.exe
 lib/mono/1.0/mono-xmltool.exe.mdb
+lib/mono/1.0/monolinker.exe
+lib/mono/1.0/monolinker.exe.mdb
 lib/mono/1.0/monop.exe
 lib/mono/1.0/monop.exe.mdb
 lib/mono/1.0/mozroots.exe
@@ -310,6 +323,7 @@ lib/mono/2.0/Microsoft.Vsa.dll
 lib/mono/2.0/Mono.C5.dll
 lib/mono/2.0/Mono.Cairo.dll
 lib/mono/2.0/Mono.CompilerServices.SymbolWriter.dll
+lib/mono/2.0/Mono.Data.Sqlite.dll
 lib/mono/2.0/Mono.Data.SqliteClient.dll
 lib/mono/2.0/Mono.Data.SybaseClient.dll
 lib/mono/2.0/Mono.Data.Tds.dll
@@ -325,6 +339,7 @@ lib/mono/2.0/Npgsql.dll
 lib/mono/2.0/OpenSystem.C.dll
 lib/mono/2.0/PEAPI.dll
 lib/mono/2.0/System.Configuration.Install.dll
+lib/mono/2.0/System.Core.dll
 lib/mono/2.0/System.Configuration.dll
 lib/mono/2.0/System.Data.OracleClient.dll
 lib/mono/2.0/System.Data.dll
@@ -351,6 +366,8 @@ lib/mono/2.0/cscompmgd.dll
 lib/mono/2.0/gmcs.exe
 lib/mono/2.0/gmcs.exe.config
 lib/mono/2.0/gmcs.exe.mdb
+lib/mono/2.0/httpcfg.exe
+lib/mono/2.0/httpcfg.exe.mdb
 lib/mono/2.0/ilasm.exe
 lib/mono/2.0/ilasm.exe.mdb
 lib/mono/2.0/mkbundle.exe
@@ -454,10 +471,16 @@ lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/Mono.Cairo.dll
 lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/Mono.Cairo.dll.mdb
 lib/mono/gac/Mono.Cairo/2.0.0.0__0738eb9f132ed756/Mono.Cairo.dll
 lib/mono/gac/Mono.Cairo/2.0.0.0__0738eb9f132ed756/Mono.Cairo.dll.mdb
+lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll
+lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb
 lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll
 lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll.mdb
 lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll
 lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll.mdb
+lib/mono/gac/Mono.Data.Sqlite/1.0.5000.0__0738eb9f132ed756/Mono.Data.Sqlite.dll
+lib/mono/gac/Mono.Data.Sqlite/1.0.5000.0__0738eb9f132ed756/Mono.Data.Sqlite.dll.mdb
+lib/mono/gac/Mono.Data.Sqlite/2.0.0.0__0738eb9f132ed756/Mono.Data.Sqlite.dll
+lib/mono/gac/Mono.Data.Sqlite/2.0.0.0__0738eb9f132ed756/Mono.Data.Sqlite.dll.mdb
 lib/mono/gac/Mono.Data.SqliteClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.SqliteClient.dll
 lib/mono/gac/Mono.Data.SqliteClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.SqliteClient.dll.mdb
 lib/mono/gac/Mono.Data.SqliteClient/2.0.0.0__0738eb9f132ed756/Mono.Data.SqliteClient.dll
@@ -520,6 +543,8 @@ lib/mono/gac/System.Configuration.Install/2.0.0.0__b03f5f7f11d50a3a/System.Confi
 lib/mono/gac/System.Configuration.Install/2.0.0.0__b03f5f7f11d50a3a/System.Configuration.Install.dll.mdb
 lib/mono/gac/System.Configuration/2.0.0.0__b03f5f7f11d50a3a/System.Configuration.dll
 lib/mono/gac/System.Configuration/2.0.0.0__b03f5f7f11d50a3a/System.Configuration.dll.mdb
+lib/mono/gac/System.Core/2.0.0.0__b77a5c561934e089/System.Core.dll
+lib/mono/gac/System.Core/2.0.0.0__b77a5c561934e089/System.Core.dll.mdb
 lib/mono/gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089/System.Data.OracleClient.dll
 lib/mono/gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089/System.Data.OracleClient.dll.mdb
 lib/mono/gac/System.Data.OracleClient/2.0.0.0__b77a5c561934e089/System.Data.OracleClient.dll
@@ -733,6 +758,8 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
 @dirrm lib/mono/gac/System.Configuration.Install/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Configuration.Install
 @dirrm lib/mono/gac/System.Configuration
+@dirrm lib/mono/gac/System.Core/2.0.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Core
 @dirrm lib/mono/gac/System
 @dirrm lib/mono/gac/PEAPI/2.0.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756
@@ -772,6 +799,9 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
 @dirrm lib/mono/gac/Mono.Data.SybaseClient/2.0.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Data.SybaseClient
+@dirrm lib/mono/gac/Mono.Data.Sqlite/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data.Sqlite/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data.Sqlite
 @dirrm lib/mono/gac/Mono.Data.SqliteClient/2.0.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Data.SqliteClient/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Data.SqliteClient
@@ -779,6 +809,8 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
 @dirrm lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.CompilerServices.SymbolWriter
+@dirrm lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Cecil
 @dirrm lib/mono/gac/Mono.Cairo/2.0.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Cairo
@@ -858,14 +890,3 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
 @dirrm etc/mono/2.0
 @dirrm etc/mono/1.0
 @dirrm etc/mono
-@exec mkdir -p %%X11BASE%%/lib/mono/1.0
-@exec mkdir -p %%X11BASE%%/lib/mono/2.0
-@exec mkdir -p %%X11BASE%%/lib/mono/compat-1.0
-@exec mkdir -p %%X11BASE%%/lib/mono/compat-2.0
-@exec mkdir -p %%X11BASE%%/lib/mono/gac
-@unexec rmdir %%X11BASE%%/lib/mono/gac 2>/dev/null || true
-@unexec rmdir %%X11BASE%%/lib/mono/compat-2.0 2>/dev/null || true
-@unexec rmdir %%X11BASE%%/lib/mono/compat-1.0 2>/dev/null || true
-@unexec rmdir %%X11BASE%%/lib/mono/2.0 2>/dev/null || true
-@unexec rmdir %%X11BASE%%/lib/mono/1.0 2>/dev/null || true
-@unexec rmdir %%X11BASE%%/lib/mono 2>/dev/null || true