From cc3ea4b5e97570564dd5429d20b761e7fa4ed4d3 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Thu, 26 Feb 2004 13:28:19 +0000 Subject: [PATCH] Alejandro Mery: updated mono (0.30), xsp (0.9), gtk-sharp (0.16), monodoc (0.10) and mod_mono (0.7) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2405 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/mnemoc/gtk-sharp/gtk-sharp.desc | 4 ++-- package/mnemoc/mod_mono/mod_mono.desc | 4 ++-- package/mnemoc/mono-doc/mono-doc.desc | 4 ++-- package/mnemoc/mono-xsp/mono-xsp.conf | 2 +- package/mnemoc/mono-xsp/mono-xsp.desc | 7 +++---- package/mnemoc/mono/mcs_bytefx_snk.diff | 9 --------- package/mnemoc/mono/mono.conf | 17 +---------------- package/mnemoc/mono/mono.desc | 8 +++++--- package/mnemoc/mono/mono.in | 6 ++++-- 9 files changed, 20 insertions(+), 41 deletions(-) delete mode 100644 package/mnemoc/mono/mcs_bytefx_snk.diff diff --git a/package/mnemoc/gtk-sharp/gtk-sharp.desc b/package/mnemoc/gtk-sharp/gtk-sharp.desc index b5a2cf33a..c6bf734d7 100644 --- a/package/mnemoc/gtk-sharp/gtk-sharp.desc +++ b/package/mnemoc/gtk-sharp/gtk-sharp.desc @@ -39,8 +39,8 @@ [L] GPL [S] Stable -[V] 0.14 +[V] 0.16 [P] X -----5---9 562.000 -[D] 1815586976 gtk-sharp-0.14.tar.gz http://dl.sourceforge.net/sourceforge/gtk-sharp/ +[D] 2028144732 gtk-sharp-0.16.tar.gz http://dl.sourceforge.net/sourceforge/gtk-sharp/ diff --git a/package/mnemoc/mod_mono/mod_mono.desc b/package/mnemoc/mod_mono/mod_mono.desc index f41e1f578..b8ce6be0f 100644 --- a/package/mnemoc/mod_mono/mod_mono.desc +++ b/package/mnemoc/mod_mono/mod_mono.desc @@ -35,12 +35,12 @@ [L] GPL [S] Stable -[V] 0.6 +[V] 0.7 [P] X -----5---9 701.000 #[CV-URL] http://www.apacheworld.org/modmono/ [CV-URL] http://www.go-mono.com/download.html #http://www.apacheworld.org/modmono/0.3.7/mod_mono-0.3.7.tar.gz -[D] 3076149948 mod_mono-0.6.tar.gz http://www.go-mono.com/archive/ +[D] 1023234227 mod_mono-0.7.tar.gz http://www.go-mono.com/archive/ diff --git a/package/mnemoc/mono-doc/mono-doc.desc b/package/mnemoc/mono-doc/mono-doc.desc index 719f70c8b..6f3e19b37 100644 --- a/package/mnemoc/mono-doc/mono-doc.desc +++ b/package/mnemoc/mono-doc/mono-doc.desc @@ -37,9 +37,9 @@ [L] GPL [S] Stable -[V] 0.8 +[V] 0.10 [P] X -----5---9 861.000 [CV-URL] http://www.go-mono.com/download.html -[D] 3536034081 monodoc-0.8.tar.gz http://www.go-mono.org/archive/ +[D] 643945150 monodoc-0.10.tar.gz http://www.go-mono.org/archive/ diff --git a/package/mnemoc/mono-xsp/mono-xsp.conf b/package/mnemoc/mono-xsp/mono-xsp.conf index 6faff4148..b4418dfdd 100644 --- a/package/mnemoc/mono-xsp/mono-xsp.conf +++ b/package/mnemoc/mono-xsp/mono-xsp.conf @@ -23,6 +23,6 @@ . $base/package/mnemoc/mono/mono.in -hook_add premake 4 'cp -v $archdir/asp_state.exe.config tools/asp_state/' +#hook_add premake 4 'cp -v $archdir/asp_state.exe.config tools/asp_state/' diff --git a/package/mnemoc/mono-xsp/mono-xsp.desc b/package/mnemoc/mono-xsp/mono-xsp.desc index f91ca3176..1f82617ad 100644 --- a/package/mnemoc/mono-xsp/mono-xsp.desc +++ b/package/mnemoc/mono-xsp/mono-xsp.desc @@ -43,12 +43,11 @@ [L] GPL [S] Stable -[V] 0.8 +[V] 0.9 [P] X -----5---9 738.000 [CV-URL] http://www.go-mono.com/download.html -[D] 3611902223 xsp-0.8.tar.gz http://www.go-mono.com/archive/ -#[D] 2507355177 xsp-0.6-2003-10-02.tar.bz2 cvs://pserver:anonymous@anoncvs.go-mono.com:/mono::xsp/!2003-10-02/ -[D] 3525964859 asp_state.exe.config !http://cvs.hispalinux.es/cgi-bin/cvsweb/~checkout~/xsp/tools/asp_state/asp_state.exe.config?rev=1.3&cvsroot=mono +[D] 3827138751 xsp-0.9.tar.gz http://www.go-mono.com/archive/ +#[D] 3525964859 asp_state.exe.config !http://cvs.hispalinux.es/cgi-bin/cvsweb/~checkout~/xsp/tools/asp_state/asp_state.exe.config?rev=1.3&cvsroot=mono diff --git a/package/mnemoc/mono/mcs_bytefx_snk.diff b/package/mnemoc/mono/mcs_bytefx_snk.diff deleted file mode 100644 index d58061cd7..000000000 --- a/package/mnemoc/mono/mcs_bytefx_snk.diff +++ /dev/null @@ -1,9 +0,0 @@ ---- ./class/ByteFX.Data/AssemblyInfo.cs.orig 2003-12-03 13:31:28.000000000 -0300 -+++ ./class/ByteFX.Data/AssemblyInfo.cs 2003-12-03 13:33:40.000000000 -0300 -@@ -54,5 +54,5 @@ - // documentation for more information on this. - // - [assembly: AssemblyDelaySign(false)] --[assembly: AssemblyKeyFile("..\\..\\bytefx.snk")] -+//[assembly: AssemblyKeyFile("..\\..\\bytefx.snk")] - [assembly: AssemblyKeyName("")] diff --git a/package/mnemoc/mono/mono.conf b/package/mnemoc/mono/mono.conf index 87ecd6102..1f9864efc 100644 --- a/package/mnemoc/mono/mono.conf +++ b/package/mnemoc/mono/mono.conf @@ -24,20 +24,5 @@ . $base/package/mnemoc/mono/mono.in var_append confopt ' ' '--with-gc=boehm' +export PATH=$PATH:$bindir -function pkg_mono_main() { - # mono - srctar=$( echo "$desc_D" | grep ' mono' | tr ' ' '\t' | tr -s '\t' | \ - cut -f2 | sed 's,.\(t\?\)\(gz\|Z\)$,.\1bz2,' ) - build_this_package - - # mcs - cd $builddir - export PATH=$PATH:$bindir - srctar=$( echo "$desc_D" | grep ' mcs' | tr ' ' '\t' | tr -s '\t' | \ - cut -f2 | sed 's,.\(t\?\)\(gz\|Z\)$,.\1bz2,' ) - var_append patchfiles ' ' $( echo $confdir/mcs*.diff ) - build_this_package -} - -mainfunction=pkg_mono_main diff --git a/package/mnemoc/mono/mono.desc b/package/mnemoc/mono/mono.desc index 36e725bcb..7d5b68556 100644 --- a/package/mnemoc/mono/mono.desc +++ b/package/mnemoc/mono/mono.desc @@ -41,10 +41,12 @@ [L] GPL [S] Stable -[V] 0.29 +[V] 0.30 [P] X -----5---9 492.000 [CV-URL] http://www.go-mono.com/download.html -[D] 1358984936 mono-0.29.tar.gz http://www.go-mono.com/archive/ -[D] 4024736060 mcs-0.29.tar.gz http://www.go-mono.com/archive/ +[D] 2362402862 mono-0.30.tar.gz http://www.go-mono.com/archive/ +[D] 3213418423 mcs-0.30.tar.gz http://www.go-mono.com/archive/ + +[SRC] . diff --git a/package/mnemoc/mono/mono.in b/package/mnemoc/mono/mono.in index 8bef305fd..df0b73649 100644 --- a/package/mnemoc/mono/mono.in +++ b/package/mnemoc/mono/mono.in @@ -20,6 +20,8 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -[ "$prefix_auto" = 1 ] && prefix="opt/mono" -set_confopt +if [ "$prefix_auto" = 1 ]; then + prefix="opt/mono" + set_confopt +fi sysconfdir=${sysconfdir%/mono}