summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/mono/Makefile20
-rw-r--r--lang/mono/distinfo4
-rw-r--r--lang/mono/files/patch-configure21
-rw-r--r--lang/mono/files/patch-install-sh11
-rw-r--r--lang/mono/files/patch-libgc_Makefile.in14
-rw-r--r--lang/mono/files/patch-libgc_configure13
-rw-r--r--lang/mono/files/patch-libgc_dyn_load.c16
-rw-r--r--lang/mono/files/patch-libgc_ltmain.sh42
-rw-r--r--lang/mono/files/patch-ltmain.sh51
-rw-r--r--lang/mono/files/patch-mono_Makefile.in11
-rw-r--r--lang/mono/files/patch-mono_metadata_assembly.c12
-rw-r--r--lang/mono/pkg-descr4
-rw-r--r--lang/mono/pkg-plist4
13 files changed, 59 insertions, 164 deletions
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index d5258ade9926..b0299c231309 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -6,25 +6,25 @@
#
PORTNAME= mono
-PORTVERSION= 1.0
-PORTREVISION= 1
+PORTVERSION= 1.0.4
CATEGORIES= lang
-MASTER_SITES= http://mono.ximian.com/archive/${PORTVERSION}/
+MASTER_SITES= http://www.go-mono.com/archive/${PORTVERSION}/
MAINTAINER= coop9211@uidaho.edu
COMMENT= An open source implementation of .NET Development Framework
USE_REINPLACE= yes
USE_BISON= yes
-USE_GNOME= gnomehack glib20 pkgconfig
+USE_GNOME= gnomehack glib20
USE_GMAKE= yes
-GNU_CONFIGURE= yes
+LIBTOOLFILES= configure libgc/configure
+USE_LIBTOOL_VER=15
INSTALLS_SHLIB= yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --program-transform-name=\'\' \
--with-gc=included \
- --with-nptl=no
+ --with-tls=pthread
MAN1= cert2spc.1 certmgr.1 chktrust.1 cilc.1 disco.1 gacutil.1 \
genxs.1 ilasm.1 makecert.1 mcs.1 mint.1 mono.1 \
@@ -38,8 +38,12 @@ ONLY_FOR_ARCHS= i386
.if ${OSVERSION} < 500000
EXTRA_PATCHES= ${FILESDIR}/extra-patch-signbit
-.elif ${OSVERSION} < 502113
-IGNORE= "Does not work on 5.X before 502113"
+.elif ${OSVERSION} < 503000
+IGNORE= "Does not work on 5.X before 503000"
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
+ ${WRKSRC}/mono/metadata/assembly.c
+
.include <bsd.port.post.mk>
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 3e3b6f9850c4..7bf582cc59e9 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,2 +1,2 @@
-MD5 (mono-1.0.tar.gz) = 23a5787818837893073e2ae56d4ef3ac
-SIZE (mono-1.0.tar.gz) = 18218284
+MD5 (mono-1.0.4.tar.gz) = 272d26525bfa121ee19713051d5b3a01
+SIZE (mono-1.0.4.tar.gz) = 18452996
diff --git a/lang/mono/files/patch-configure b/lang/mono/files/patch-configure
index 529b42aa2141..f38ee4a42997 100644
--- a/lang/mono/files/patch-configure
+++ b/lang/mono/files/patch-configure
@@ -1,21 +1,6 @@
---- configure.orig Wed Jul 7 22:19:06 2004
-+++ configure Wed Jul 7 22:35:38 2004
-@@ -2020,10 +2020,10 @@
- ;;
- *-*-*freebsd*|*-*-*openbsd*)
- platform_win32=no
-- CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS"
-- libmono_cflags="-D_THREAD_SAFE"
-- LDFLAGS="$LDFLAGS -pthread"
-- libmono_ldflags="-pthread"
-+ CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS -DGC_FREEBSD_THREADS"
-+ libmono_cflags="$PTHREAD_CFLAGS"
-+ LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
-+ libmono_ldflags="$PTHREAD_LIBS"
- need_link_unlink=yes
- cat >>confdefs.h <<\_ACEOF
- #define PTHREAD_POINTER_ID 1
-@@ -14003,8 +14003,8 @@
+--- configure.orig Wed Aug 4 17:42:34 2004
++++ configure Sun Aug 29 02:39:35 2004
+@@ -14148,8 +14148,8 @@
ACCESS_UNALIGNED="yes"
JIT_SUPPORTED=no
diff --git a/lang/mono/files/patch-install-sh b/lang/mono/files/patch-install-sh
new file mode 100644
index 000000000000..4a0b856ccb18
--- /dev/null
+++ b/lang/mono/files/patch-install-sh
@@ -0,0 +1,11 @@
+--- install-sh.orig Wed Nov 3 03:14:42 2004
++++ install-sh Wed Nov 3 03:14:51 2004
+@@ -56,7 +56,7 @@
+ chgrpprog="${CHGRPPROG-chgrp}"
+ stripprog="${STRIPPROG-strip}"
+ rmprog="${RMPROG-rm}"
+-mkdirprog="${MKDIRPROG-mkdir}"
++mkdirprog="${MKDIRPROG-mkdir -p}"
+
+ transformbasename=
+ transform_arg=
diff --git a/lang/mono/files/patch-libgc_Makefile.in b/lang/mono/files/patch-libgc_Makefile.in
index 5ff277292ad5..b1c4ea9f27bf 100644
--- a/lang/mono/files/patch-libgc_Makefile.in
+++ b/lang/mono/files/patch-libgc_Makefile.in
@@ -1,11 +1,11 @@
---- libgc/Makefile.in.orig Sat Jun 12 15:40:48 2004
-+++ libgc/Makefile.in Sat Jun 12 15:41:15 2004
-@@ -120,7 +120,7 @@
-
+--- libgc/Makefile.in.orig Tue Nov 2 21:37:01 2004
++++ libgc/Makefile.in Tue Nov 2 21:39:34 2004
+@@ -278,7 +278,7 @@
+ target_alias = @target_alias@
+ target_all = @target_all@
AUTOMAKE_OPTIONS = foreign
-
-SUBDIRS = include doc
+SUBDIRS = include
- noinst_LTLIBRARIES = libmonogc.la
-
+ #
+ # libtool is not capable of creating shared/static versions of a convenience
diff --git a/lang/mono/files/patch-libgc_configure b/lang/mono/files/patch-libgc_configure
deleted file mode 100644
index e97793bfd125..000000000000
--- a/lang/mono/files/patch-libgc_configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- libgc/configure.bak Tue Jun 29 06:29:58 2004
-+++ libgc/configure Wed Jul 7 22:43:28 2004
-@@ -3686,8 +3686,8 @@
- #define GC_FREEBSD_THREADS 1
- _ACEOF
-
-- INCLUDES="$INCLUDES -pthread"
-- THREADLIBS=-pthread
-+ INCLUDES="$INCLUDES $PTHREAD_CFLAGS"
-+ THREADLIBS="$PTHREAD_LIBS"
- ;;
- *-*-solaris*)
- cat >>confdefs.h <<\_ACEOF
diff --git a/lang/mono/files/patch-libgc_dyn_load.c b/lang/mono/files/patch-libgc_dyn_load.c
index 4f3b6864525b..849ff39b00ef 100644
--- a/lang/mono/files/patch-libgc_dyn_load.c
+++ b/lang/mono/files/patch-libgc_dyn_load.c
@@ -1,24 +1,24 @@
---- libgc/dyn_load.c.orig Tue May 18 14:42:19 2004
-+++ libgc/dyn_load.c Sat Jun 12 15:23:33 2004
-@@ -91,6 +91,13 @@
+--- libgc/dyn_load.c.orig Sat Jul 17 11:31:47 2004
++++ libgc/dyn_load.c Sun Sep 12 04:09:10 2004
+@@ -96,6 +96,13 @@
/* Newer versions of GNU/Linux define this macro. We
* define it similarly for any ELF systems that don't. */
# ifndef ElfW
-+#ifdef __FreeBSD__
++#ifdef FREEBSD
+#if __ELF_WORD_SIZE == 32
+#define ElfW(type) Elf32_##type
+#else
+#define ElfW(type) Elf64_##type
+#endif
+#else
- # ifdef __NetBSD__
+ # ifdef NETBSD
# if ELFSIZE == 32
# define ElfW(type) Elf32_##type
-@@ -104,6 +111,7 @@
- # define ElfW(type) Elf64_##type
+@@ -110,6 +117,7 @@
# endif
# endif
-+#endif
# endif
++#endif
#if defined(SUNOS5DL) && !defined(USE_PROC_FOR_LIBRARIES)
+
diff --git a/lang/mono/files/patch-libgc_ltmain.sh b/lang/mono/files/patch-libgc_ltmain.sh
deleted file mode 100644
index a5226e4b4adf..000000000000
--- a/lang/mono/files/patch-libgc_ltmain.sh
+++ /dev/null
@@ -1,42 +0,0 @@
---- libgc/ltmain.sh.orig Mon Mar 31 09:34:30 2003
-+++ libgc/ltmain.sh Sat Jun 12 15:23:56 2004
-@@ -1060,8 +1060,16 @@
- continue
- ;;
-
-+ -pthread)
-+ compile_command="$compile_command -pthread"
-+ finalize_command="$finalize_command -pthread"
-+ compiler_flags="$compiler_flags -pthread"
-+ continue
-+ ;;
-+
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -2444,6 +2452,9 @@
- *-*-openbsd*)
- # Do not include libc due to us having libc/libc_r.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test $build_libtool_need_lc = "yes"; then
-@@ -4210,10 +4221,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/lang/mono/files/patch-ltmain.sh b/lang/mono/files/patch-ltmain.sh
deleted file mode 100644
index bb660972a6d1..000000000000
--- a/lang/mono/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig Thu May 22 16:42:22 2003
-+++ ltmain.sh Tue May 27 12:12:52 2003
-@@ -1072,7 +1072,7 @@
- esac
- elif test "X$arg" = "X-lc_r"; then
- case $host in
-- *-*-openbsd* | *-*-freebsd*)
-+ *-*-openbsd* | *-*-freebsd4*)
- # Do not include libc_r directly, use -pthread flag.
- continue
- ;;
-@@ -1082,8 +1082,16 @@
- continue
- ;;
-
-+ -pthread)
-+ compile_command="$compile_command -pthread"
-+ finalize_command="$finalize_command -pthread"
-+ compiler_flags="$compiler_flags -pthread"
-+ continue
-+ ;;
-+
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -2498,6 +2506,9 @@
- *-*-openbsd* | *-*-freebsd*)
- # Do not include libc due to us having libc/libc_r.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test $build_libtool_need_lc = "yes"; then
-@@ -4325,10 +4336,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/lang/mono/files/patch-mono_Makefile.in b/lang/mono/files/patch-mono_Makefile.in
deleted file mode 100644
index 7c570d2195b5..000000000000
--- a/lang/mono/files/patch-mono_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- mono/Makefile.in.bak Mon Feb 2 17:02:39 2004
-+++ mono/Makefile.in Tue Mar 2 01:48:16 2004
-@@ -123,7 +123,7 @@
- @PLATFORM_WIN32_TRUE@ arch monograph interpreter mini tests benchmark profiler
-
- @PLATFORM_WIN32_FALSE@SUBDIRS = utils io-layer monoburg os metadata cil dis \
--@PLATFORM_WIN32_FALSE@ arch monograph interpreter mini tests benchmark handles profiler
-+@PLATFORM_WIN32_FALSE@ arch monograph interpreter mini benchmark handles profiler
-
- subdir = mono
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/lang/mono/files/patch-mono_metadata_assembly.c b/lang/mono/files/patch-mono_metadata_assembly.c
new file mode 100644
index 000000000000..154e9ae25af6
--- /dev/null
+++ b/lang/mono/files/patch-mono_metadata_assembly.c
@@ -0,0 +1,12 @@
+--- mono/metadata/assembly.c.orig Mon Sep 6 13:06:56 2004
++++ mono/metadata/assembly.c Sat Oct 30 02:40:05 2004
+@@ -100,7 +100,8 @@
+ const char *path;
+ char **splitted;
+
+- path = g_getenv ("MONO_GAC_PREFIX");
++ path = g_strjoin(G_SEARCHPATH_SEPARATOR_S, "%%X11BASE%%", g_getenv("MONO_GAC_PREFIX"), NULL);
++
+ if (!path)
+ return;
+
diff --git a/lang/mono/pkg-descr b/lang/mono/pkg-descr
index a808a2ca2ba4..6469ff32f88f 100644
--- a/lang/mono/pkg-descr
+++ b/lang/mono/pkg-descr
@@ -1,3 +1,3 @@
-An open source implementation of .NET Development Framework
+An open source implementation of .NET Development Framework.
-WWW: http://www.go-mono.com/
+WWW: http://www.mono-project.com/
diff --git a/lang/mono/pkg-plist b/lang/mono/pkg-plist
index c648772641b4..e65dfdc63943 100644
--- a/lang/mono/pkg-plist
+++ b/lang/mono/pkg-plist
@@ -189,7 +189,7 @@ lib/mono/gac/I18N.Other/1.0.5000.0__0738eb9f132ed756/I18N.Other.dll
lib/mono/gac/I18N.Rare/1.0.5000.0__0738eb9f132ed756/I18N.Rare.dll
lib/mono/gac/I18N.West/1.0.5000.0__0738eb9f132ed756/I18N.West.dll
lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756/I18N.dll
-lib/mono/gac/IBM.Data.DB2/1.0.1641.20878__7c307b91aa13d208/IBM.Data.DB2.dll
+lib/mono/gac/IBM.Data.DB2/1.0.1677.31401__7c307b91aa13d208/IBM.Data.DB2.dll
lib/mono/gac/ICSharpCode.SharpZipLib/0.6.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll
lib/mono/gac/Microsoft.VisualBasic/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll
lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll
@@ -319,7 +319,7 @@ share/mono/cil/cil-opcodes.xml
@dirrm lib/mono/gac/Microsoft.VisualBasic
@dirrm lib/mono/gac/ICSharpCode.SharpZipLib/0.6.0.0__1b03e6acf1164f73
@dirrm lib/mono/gac/ICSharpCode.SharpZipLib
-@dirrm lib/mono/gac/IBM.Data.DB2/1.0.1641.20878__7c307b91aa13d208
+@dirrm lib/mono/gac/IBM.Data.DB2/1.0.1677.31401__7c307b91aa13d208
@dirrm lib/mono/gac/IBM.Data.DB2
@dirrm lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756
@dirrm lib/mono/gac/I18N.West/1.0.5000.0__0738eb9f132ed756