diff options
| author | mezz <mezz@FreeBSD.org> | 2004-11-26 13:44:10 +0800 |
|---|---|---|
| committer | mezz <mezz@FreeBSD.org> | 2004-11-26 13:44:10 +0800 |
| commit | 5a9e416334faeab340deb7245f566010956b0a62 (patch) | |
| tree | 8ba4e6535b2e0f7751858f0f984c0739afc8356b /x11-toolkits | |
| parent | dda26c56d5e85163d2de7b86b6529daa7172532c (diff) | |
| download | freebsd-ports-graphics-5a9e416334faeab340deb7245f566010956b0a62.tar.gz freebsd-ports-graphics-5a9e416334faeab340deb7245f566010956b0a62.tar.zst freebsd-ports-graphics-5a9e416334faeab340deb7245f566010956b0a62.zip | |
Update to 1.0.4. Mono has been set to IGNORE on 5.x if OSVERSION is below
503000. Mono 1.0.1 and greater have been broken on earlier OSVERSION
versions. Warning, not all C# apps will not working, because FreeBSD still
need to work more on pthread issues. Few C# apps such as Blam, Muine, Tomboy
and etc work perfect.
PR: ports/74397 ports/74398
Submitted by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Project by: BSD# - http://forge.novell.com/modules/xfmod/project/?bsd-sharp
Approved by: maintainer timeout (no contract for months)
Diffstat (limited to 'x11-toolkits')
32 files changed, 212 insertions, 376 deletions
diff --git a/x11-toolkits/gtk-sharp-devel/Makefile b/x11-toolkits/gtk-sharp-devel/Makefile index d2310bfa8a4..90199d6b07d 100644 --- a/x11-toolkits/gtk-sharp-devel/Makefile +++ b/x11-toolkits/gtk-sharp-devel/Makefile @@ -6,10 +6,9 @@ # PORTNAME= gtk-sharp -PORTVERSION= 1.0 -PORTREVISION= 3 +PORTVERSION= 1.0.4 CATEGORIES= x11-toolkits -MASTER_SITES= http://mono.ximian.com/archive/${PORTVERSION}/ +MASTER_SITES= http://www.go-mono.com/archive/${PORTVERSION}/ MAINTAINER= coop9211@uidaho.edu COMMENT= GTK+ and GNOME interfaces for the .NET runtime @@ -17,7 +16,8 @@ COMMENT= GTK+ and GNOME interfaces for the .NET runtime BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono RUN_DEPENDS= ${BUILD_DEPENDS} -GNU_CONFIGURE= yes +USE_X_PREFIX= yes +USE_LIBTOOL_VER=15 USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_GMAKE= yes diff --git a/x11-toolkits/gtk-sharp-devel/distinfo b/x11-toolkits/gtk-sharp-devel/distinfo index feee8052543..a3360a8bade 100644 --- a/x11-toolkits/gtk-sharp-devel/distinfo +++ b/x11-toolkits/gtk-sharp-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (gtk-sharp-1.0.tar.gz) = 6eab56e11c1e1245ec6af12312969399 -SIZE (gtk-sharp-1.0.tar.gz) = 1424982 +MD5 (gtk-sharp-1.0.4.tar.gz) = c105e94934a22f7734c5657948977078 +SIZE (gtk-sharp-1.0.4.tar.gz) = 1774252 diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-art_art-sharp.dll.config.in b/x11-toolkits/gtk-sharp-devel/files/patch-art_art-sharp.dll.config.in index 1e97f4b5116..a4e805dbfc4 100644 --- a/x11-toolkits/gtk-sharp-devel/files/patch-art_art-sharp.dll.config.in +++ b/x11-toolkits/gtk-sharp-devel/files/patch-art_art-sharp.dll.config.in @@ -3,5 +3,5 @@ @@ -1,3 +1,3 @@ <configuration> - <dllmap dll="art_lgpl" target="libart_lgpl_2@LIB_PREFIX@.2@LIB_SUFFIX@"/> -+ <dllmap dll="art_lgpl" target="libart_lgpl@LIB_PREFIX@@LIB_SUFFIX@"/> ++ <dllmap dll="art_lgpl" target="libart_lgpl_2@LIB_PREFIX@@LIB_SUFFIX@"/> </configuration> diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-configure b/x11-toolkits/gtk-sharp-devel/files/patch-configure index 751dc04f6af..93536b31fff 100644 --- a/x11-toolkits/gtk-sharp-devel/files/patch-configure +++ b/x11-toolkits/gtk-sharp-devel/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.bak Tue Jun 29 09:02:24 2004 -+++ configure Thu Jul 8 02:13:18 2004 -@@ -8441,7 +8441,7 @@ +--- configure.orig Tue Nov 2 23:10:31 2004 ++++ configure Tue Nov 2 23:13:55 2004 +@@ -20740,7 +20740,7 @@ @@ -9,3 +9,12 @@ # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 +@@ -20909,7 +20909,7 @@ + + + if test "x$has_mono" = "xtrue"; then +-GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(DESTDIR)$(libdir)' ++GACUTIL_FLAGS='/package $(PACKAGE) /root $(DESTDIR)$(libdir) /gacdir $(DESTDIR)$(libdir)' + GENERATED_SOURCES=generated/*.cs + # Extract the first word of "mono", so it can be a program name with args. + set dummy mono; ac_word=$2 diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-ltmain.sh b/x11-toolkits/gtk-sharp-devel/files/patch-ltmain.sh deleted file mode 100644 index 642e3d0bdb0..00000000000 --- a/x11-toolkits/gtk-sharp-devel/files/patch-ltmain.sh +++ /dev/null @@ -1,41 +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 - ;; - -@@ -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/x11-toolkits/gtk-sharp-devel/files/patch-pango_pango-sharp.dll.config.in b/x11-toolkits/gtk-sharp-devel/files/patch-pango_pango-sharp.dll.config.in index 58b403b8255..7da66e51ed5 100644 --- a/x11-toolkits/gtk-sharp-devel/files/patch-pango_pango-sharp.dll.config.in +++ b/x11-toolkits/gtk-sharp-devel/files/patch-pango_pango-sharp.dll.config.in @@ -1,7 +1,9 @@ ---- pango/pango-sharp.dll.config.in.orig Wed Jul 14 22:25:54 2004 -+++ pango/pango-sharp.dll.config.in Wed Jul 14 22:26:14 2004 -@@ -1,3 +1,3 @@ +--- pango/pango-sharp.dll.config.in.orig Fri Aug 20 17:04:23 2004 ++++ pango/pango-sharp.dll.config.in Tue Oct 26 21:38:51 2004 +@@ -1,4 +1,4 @@ <configuration> +- <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> - <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> ++ <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/> + <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@@LIB_SUFFIX@"/> </configuration> diff --git a/x11-toolkits/gtk-sharp-devel/files/patch-sample_rsvg_Makefile.in b/x11-toolkits/gtk-sharp-devel/files/patch-sample_rsvg_Makefile.in deleted file mode 100644 index 6765daaf112..00000000000 --- a/x11-toolkits/gtk-sharp-devel/files/patch-sample_rsvg_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- sample/rsvg/Makefile.in.bak Tue Jun 29 09:03:12 2004 -+++ sample/rsvg/Makefile.in Thu Jul 8 16:27:33 2004 -@@ -119,7 +119,7 @@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ --assemblies = ../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll ../../rsvg/rsvg-sharp.dll -+assemblies = ../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll ../../art/art-sharp.dll ../../rsvg/rsvg-sharp.dll - references = $(addprefix /r:, $(assemblies)) - - @ENABLE_RSVG_TRUE@TARGETS = svghelloworld.exe diff --git a/x11-toolkits/gtk-sharp-devel/pkg-plist b/x11-toolkits/gtk-sharp-devel/pkg-plist index 6cd2a13ff49..d008333cd24 100644 --- a/x11-toolkits/gtk-sharp-devel/pkg-plist +++ b/x11-toolkits/gtk-sharp-devel/pkg-plist @@ -1,48 +1,48 @@ -@unexec gacutil /u glib-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@unexec gacutil /u glib-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/glib-sharp.dll -@exec gacutil /i glib-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u pango-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i glib-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u pango-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/pango-sharp.dll -@exec gacutil /i pango-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u atk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i pango-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u atk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/atk-sharp.dll -@exec gacutil /i atk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gdk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i atk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gdk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gdk-sharp.dll -@exec gacutil /i gdk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null +@exec gacutil /i gdk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null @unexec gacutil /u gtk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gtk-sharp.dll -@exec gacutil /i gtk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u glade-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gtk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u glade-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/glade-sharp.dll -@exec gacutil /i glade-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u art-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i glade-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u art-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/art-sharp.dll -@exec gacutil /i art-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gnome-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i art-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gnome-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gnome-sharp.dll -@exec gacutil /i gnome-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gda-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gnome-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gda-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gda-sharp.dll -@exec gacutil /i gda-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gnomedb-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gda-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gnomedb-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gnomedb-sharp.dll -@exec gacutil /i gnomedb-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gtkhtml-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gnomedb-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gtkhtml-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gtkhtml-sharp.dll -@exec gacutil /i gtkhtml-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gconf-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gtkhtml-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gconf-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gconf-sharp.dll -@exec gacutil /i gconf-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gconf-sharp-peditors.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gconf-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gconf-sharp-peditors.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gconf-sharp-peditors.dll -@exec gacutil /i gconf-sharp-peditors.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u rsvg-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gconf-sharp-peditors.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u rsvg-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/rsvg-sharp.dll -@exec gacutil /i rsvg-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u vte-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i rsvg-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u vte-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/vte-sharp.dll -@exec gacutil /i vte-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null +@exec gacutil /i vte-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null bin/gapi-codegen bin/gapi-fixup bin/gapi-fixup.exe diff --git a/x11-toolkits/gtk-sharp/Makefile b/x11-toolkits/gtk-sharp/Makefile index d2310bfa8a4..90199d6b07d 100644 --- a/x11-toolkits/gtk-sharp/Makefile +++ b/x11-toolkits/gtk-sharp/Makefile @@ -6,10 +6,9 @@ # PORTNAME= gtk-sharp -PORTVERSION= 1.0 -PORTREVISION= 3 +PORTVERSION= 1.0.4 CATEGORIES= x11-toolkits -MASTER_SITES= http://mono.ximian.com/archive/${PORTVERSION}/ +MASTER_SITES= http://www.go-mono.com/archive/${PORTVERSION}/ MAINTAINER= coop9211@uidaho.edu COMMENT= GTK+ and GNOME interfaces for the .NET runtime @@ -17,7 +16,8 @@ COMMENT= GTK+ and GNOME interfaces for the .NET runtime BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono RUN_DEPENDS= ${BUILD_DEPENDS} -GNU_CONFIGURE= yes +USE_X_PREFIX= yes +USE_LIBTOOL_VER=15 USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_GMAKE= yes diff --git a/x11-toolkits/gtk-sharp/distinfo b/x11-toolkits/gtk-sharp/distinfo index feee8052543..a3360a8bade 100644 --- a/x11-toolkits/gtk-sharp/distinfo +++ b/x11-toolkits/gtk-sharp/distinfo @@ -1,2 +1,2 @@ -MD5 (gtk-sharp-1.0.tar.gz) = 6eab56e11c1e1245ec6af12312969399 -SIZE (gtk-sharp-1.0.tar.gz) = 1424982 +MD5 (gtk-sharp-1.0.4.tar.gz) = c105e94934a22f7734c5657948977078 +SIZE (gtk-sharp-1.0.4.tar.gz) = 1774252 diff --git a/x11-toolkits/gtk-sharp/files/patch-art_art-sharp.dll.config.in b/x11-toolkits/gtk-sharp/files/patch-art_art-sharp.dll.config.in index 1e97f4b5116..a4e805dbfc4 100644 --- a/x11-toolkits/gtk-sharp/files/patch-art_art-sharp.dll.config.in +++ b/x11-toolkits/gtk-sharp/files/patch-art_art-sharp.dll.config.in @@ -3,5 +3,5 @@ @@ -1,3 +1,3 @@ <configuration> - <dllmap dll="art_lgpl" target="libart_lgpl_2@LIB_PREFIX@.2@LIB_SUFFIX@"/> -+ <dllmap dll="art_lgpl" target="libart_lgpl@LIB_PREFIX@@LIB_SUFFIX@"/> ++ <dllmap dll="art_lgpl" target="libart_lgpl_2@LIB_PREFIX@@LIB_SUFFIX@"/> </configuration> diff --git a/x11-toolkits/gtk-sharp/files/patch-configure b/x11-toolkits/gtk-sharp/files/patch-configure index 751dc04f6af..93536b31fff 100644 --- a/x11-toolkits/gtk-sharp/files/patch-configure +++ b/x11-toolkits/gtk-sharp/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.bak Tue Jun 29 09:02:24 2004 -+++ configure Thu Jul 8 02:13:18 2004 -@@ -8441,7 +8441,7 @@ +--- configure.orig Tue Nov 2 23:10:31 2004 ++++ configure Tue Nov 2 23:13:55 2004 +@@ -20740,7 +20740,7 @@ @@ -9,3 +9,12 @@ # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 +@@ -20909,7 +20909,7 @@ + + + if test "x$has_mono" = "xtrue"; then +-GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(DESTDIR)$(libdir)' ++GACUTIL_FLAGS='/package $(PACKAGE) /root $(DESTDIR)$(libdir) /gacdir $(DESTDIR)$(libdir)' + GENERATED_SOURCES=generated/*.cs + # Extract the first word of "mono", so it can be a program name with args. + set dummy mono; ac_word=$2 diff --git a/x11-toolkits/gtk-sharp/files/patch-ltmain.sh b/x11-toolkits/gtk-sharp/files/patch-ltmain.sh deleted file mode 100644 index 642e3d0bdb0..00000000000 --- a/x11-toolkits/gtk-sharp/files/patch-ltmain.sh +++ /dev/null @@ -1,41 +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 - ;; - -@@ -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/x11-toolkits/gtk-sharp/files/patch-pango_pango-sharp.dll.config.in b/x11-toolkits/gtk-sharp/files/patch-pango_pango-sharp.dll.config.in index 58b403b8255..7da66e51ed5 100644 --- a/x11-toolkits/gtk-sharp/files/patch-pango_pango-sharp.dll.config.in +++ b/x11-toolkits/gtk-sharp/files/patch-pango_pango-sharp.dll.config.in @@ -1,7 +1,9 @@ ---- pango/pango-sharp.dll.config.in.orig Wed Jul 14 22:25:54 2004 -+++ pango/pango-sharp.dll.config.in Wed Jul 14 22:26:14 2004 -@@ -1,3 +1,3 @@ +--- pango/pango-sharp.dll.config.in.orig Fri Aug 20 17:04:23 2004 ++++ pango/pango-sharp.dll.config.in Tue Oct 26 21:38:51 2004 +@@ -1,4 +1,4 @@ <configuration> +- <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> - <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> ++ <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/> + <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@@LIB_SUFFIX@"/> </configuration> diff --git a/x11-toolkits/gtk-sharp/files/patch-sample_rsvg_Makefile.in b/x11-toolkits/gtk-sharp/files/patch-sample_rsvg_Makefile.in deleted file mode 100644 index 6765daaf112..00000000000 --- a/x11-toolkits/gtk-sharp/files/patch-sample_rsvg_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- sample/rsvg/Makefile.in.bak Tue Jun 29 09:03:12 2004 -+++ sample/rsvg/Makefile.in Thu Jul 8 16:27:33 2004 -@@ -119,7 +119,7 @@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ --assemblies = ../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll ../../rsvg/rsvg-sharp.dll -+assemblies = ../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll ../../art/art-sharp.dll ../../rsvg/rsvg-sharp.dll - references = $(addprefix /r:, $(assemblies)) - - @ENABLE_RSVG_TRUE@TARGETS = svghelloworld.exe diff --git a/x11-toolkits/gtk-sharp/pkg-plist b/x11-toolkits/gtk-sharp/pkg-plist index 6cd2a13ff49..d008333cd24 100644 --- a/x11-toolkits/gtk-sharp/pkg-plist +++ b/x11-toolkits/gtk-sharp/pkg-plist @@ -1,48 +1,48 @@ -@unexec gacutil /u glib-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@unexec gacutil /u glib-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/glib-sharp.dll -@exec gacutil /i glib-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u pango-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i glib-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u pango-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/pango-sharp.dll -@exec gacutil /i pango-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u atk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i pango-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u atk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/atk-sharp.dll -@exec gacutil /i atk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gdk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i atk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gdk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gdk-sharp.dll -@exec gacutil /i gdk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null +@exec gacutil /i gdk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null @unexec gacutil /u gtk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gtk-sharp.dll -@exec gacutil /i gtk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u glade-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gtk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u glade-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/glade-sharp.dll -@exec gacutil /i glade-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u art-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i glade-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u art-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/art-sharp.dll -@exec gacutil /i art-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gnome-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i art-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gnome-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gnome-sharp.dll -@exec gacutil /i gnome-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gda-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gnome-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gda-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gda-sharp.dll -@exec gacutil /i gda-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gnomedb-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gda-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gnomedb-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gnomedb-sharp.dll -@exec gacutil /i gnomedb-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gtkhtml-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gnomedb-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gtkhtml-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gtkhtml-sharp.dll -@exec gacutil /i gtkhtml-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gconf-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gtkhtml-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gconf-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gconf-sharp.dll -@exec gacutil /i gconf-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gconf-sharp-peditors.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gconf-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gconf-sharp-peditors.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gconf-sharp-peditors.dll -@exec gacutil /i gconf-sharp-peditors.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u rsvg-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gconf-sharp-peditors.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u rsvg-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/rsvg-sharp.dll -@exec gacutil /i rsvg-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u vte-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i rsvg-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u vte-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/vte-sharp.dll -@exec gacutil /i vte-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null +@exec gacutil /i vte-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null bin/gapi-codegen bin/gapi-fixup bin/gapi-fixup.exe diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile index d2310bfa8a4..90199d6b07d 100644 --- a/x11-toolkits/gtk-sharp10/Makefile +++ b/x11-toolkits/gtk-sharp10/Makefile @@ -6,10 +6,9 @@ # PORTNAME= gtk-sharp -PORTVERSION= 1.0 -PORTREVISION= 3 +PORTVERSION= 1.0.4 CATEGORIES= x11-toolkits -MASTER_SITES= http://mono.ximian.com/archive/${PORTVERSION}/ +MASTER_SITES= http://www.go-mono.com/archive/${PORTVERSION}/ MAINTAINER= coop9211@uidaho.edu COMMENT= GTK+ and GNOME interfaces for the .NET runtime @@ -17,7 +16,8 @@ COMMENT= GTK+ and GNOME interfaces for the .NET runtime BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono RUN_DEPENDS= ${BUILD_DEPENDS} -GNU_CONFIGURE= yes +USE_X_PREFIX= yes +USE_LIBTOOL_VER=15 USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_GMAKE= yes diff --git a/x11-toolkits/gtk-sharp10/distinfo b/x11-toolkits/gtk-sharp10/distinfo index feee8052543..a3360a8bade 100644 --- a/x11-toolkits/gtk-sharp10/distinfo +++ b/x11-toolkits/gtk-sharp10/distinfo @@ -1,2 +1,2 @@ -MD5 (gtk-sharp-1.0.tar.gz) = 6eab56e11c1e1245ec6af12312969399 -SIZE (gtk-sharp-1.0.tar.gz) = 1424982 +MD5 (gtk-sharp-1.0.4.tar.gz) = c105e94934a22f7734c5657948977078 +SIZE (gtk-sharp-1.0.4.tar.gz) = 1774252 diff --git a/x11-toolkits/gtk-sharp10/files/patch-art_art-sharp.dll.config.in b/x11-toolkits/gtk-sharp10/files/patch-art_art-sharp.dll.config.in index 1e97f4b5116..a4e805dbfc4 100644 --- a/x11-toolkits/gtk-sharp10/files/patch-art_art-sharp.dll.config.in +++ b/x11-toolkits/gtk-sharp10/files/patch-art_art-sharp.dll.config.in @@ -3,5 +3,5 @@ @@ -1,3 +1,3 @@ <configuration> - <dllmap dll="art_lgpl" target="libart_lgpl_2@LIB_PREFIX@.2@LIB_SUFFIX@"/> -+ <dllmap dll="art_lgpl" target="libart_lgpl@LIB_PREFIX@@LIB_SUFFIX@"/> ++ <dllmap dll="art_lgpl" target="libart_lgpl_2@LIB_PREFIX@@LIB_SUFFIX@"/> </configuration> diff --git a/x11-toolkits/gtk-sharp10/files/patch-configure b/x11-toolkits/gtk-sharp10/files/patch-configure index 751dc04f6af..93536b31fff 100644 --- a/x11-toolkits/gtk-sharp10/files/patch-configure +++ b/x11-toolkits/gtk-sharp10/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.bak Tue Jun 29 09:02:24 2004 -+++ configure Thu Jul 8 02:13:18 2004 -@@ -8441,7 +8441,7 @@ +--- configure.orig Tue Nov 2 23:10:31 2004 ++++ configure Tue Nov 2 23:13:55 2004 +@@ -20740,7 +20740,7 @@ @@ -9,3 +9,12 @@ # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 +@@ -20909,7 +20909,7 @@ + + + if test "x$has_mono" = "xtrue"; then +-GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(DESTDIR)$(libdir)' ++GACUTIL_FLAGS='/package $(PACKAGE) /root $(DESTDIR)$(libdir) /gacdir $(DESTDIR)$(libdir)' + GENERATED_SOURCES=generated/*.cs + # Extract the first word of "mono", so it can be a program name with args. + set dummy mono; ac_word=$2 diff --git a/x11-toolkits/gtk-sharp10/files/patch-ltmain.sh b/x11-toolkits/gtk-sharp10/files/patch-ltmain.sh deleted file mode 100644 index 642e3d0bdb0..00000000000 --- a/x11-toolkits/gtk-sharp10/files/patch-ltmain.sh +++ /dev/null @@ -1,41 +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 - ;; - -@@ -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/x11-toolkits/gtk-sharp10/files/patch-pango_pango-sharp.dll.config.in b/x11-toolkits/gtk-sharp10/files/patch-pango_pango-sharp.dll.config.in index 58b403b8255..7da66e51ed5 100644 --- a/x11-toolkits/gtk-sharp10/files/patch-pango_pango-sharp.dll.config.in +++ b/x11-toolkits/gtk-sharp10/files/patch-pango_pango-sharp.dll.config.in @@ -1,7 +1,9 @@ ---- pango/pango-sharp.dll.config.in.orig Wed Jul 14 22:25:54 2004 -+++ pango/pango-sharp.dll.config.in Wed Jul 14 22:26:14 2004 -@@ -1,3 +1,3 @@ +--- pango/pango-sharp.dll.config.in.orig Fri Aug 20 17:04:23 2004 ++++ pango/pango-sharp.dll.config.in Tue Oct 26 21:38:51 2004 +@@ -1,4 +1,4 @@ <configuration> +- <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> - <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> ++ <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/> + <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@@LIB_SUFFIX@"/> </configuration> diff --git a/x11-toolkits/gtk-sharp10/files/patch-sample_rsvg_Makefile.in b/x11-toolkits/gtk-sharp10/files/patch-sample_rsvg_Makefile.in deleted file mode 100644 index 6765daaf112..00000000000 --- a/x11-toolkits/gtk-sharp10/files/patch-sample_rsvg_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- sample/rsvg/Makefile.in.bak Tue Jun 29 09:03:12 2004 -+++ sample/rsvg/Makefile.in Thu Jul 8 16:27:33 2004 -@@ -119,7 +119,7 @@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ --assemblies = ../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll ../../rsvg/rsvg-sharp.dll -+assemblies = ../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll ../../art/art-sharp.dll ../../rsvg/rsvg-sharp.dll - references = $(addprefix /r:, $(assemblies)) - - @ENABLE_RSVG_TRUE@TARGETS = svghelloworld.exe diff --git a/x11-toolkits/gtk-sharp10/pkg-plist b/x11-toolkits/gtk-sharp10/pkg-plist index 6cd2a13ff49..d008333cd24 100644 --- a/x11-toolkits/gtk-sharp10/pkg-plist +++ b/x11-toolkits/gtk-sharp10/pkg-plist @@ -1,48 +1,48 @@ -@unexec gacutil /u glib-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@unexec gacutil /u glib-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/glib-sharp.dll -@exec gacutil /i glib-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u pango-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i glib-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u pango-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/pango-sharp.dll -@exec gacutil /i pango-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u atk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i pango-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u atk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/atk-sharp.dll -@exec gacutil /i atk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gdk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i atk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gdk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gdk-sharp.dll -@exec gacutil /i gdk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null +@exec gacutil /i gdk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null @unexec gacutil /u gtk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gtk-sharp.dll -@exec gacutil /i gtk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u glade-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gtk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u glade-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/glade-sharp.dll -@exec gacutil /i glade-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u art-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i glade-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u art-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/art-sharp.dll -@exec gacutil /i art-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gnome-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i art-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gnome-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gnome-sharp.dll -@exec gacutil /i gnome-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gda-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gnome-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gda-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gda-sharp.dll -@exec gacutil /i gda-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gnomedb-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gda-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gnomedb-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gnomedb-sharp.dll -@exec gacutil /i gnomedb-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gtkhtml-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gnomedb-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gtkhtml-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gtkhtml-sharp.dll -@exec gacutil /i gtkhtml-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gconf-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gtkhtml-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gconf-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gconf-sharp.dll -@exec gacutil /i gconf-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gconf-sharp-peditors.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gconf-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gconf-sharp-peditors.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gconf-sharp-peditors.dll -@exec gacutil /i gconf-sharp-peditors.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u rsvg-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gconf-sharp-peditors.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u rsvg-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/rsvg-sharp.dll -@exec gacutil /i rsvg-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u vte-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i rsvg-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u vte-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/vte-sharp.dll -@exec gacutil /i vte-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null +@exec gacutil /i vte-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null bin/gapi-codegen bin/gapi-fixup bin/gapi-fixup.exe diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile index d2310bfa8a4..90199d6b07d 100644 --- a/x11-toolkits/gtk-sharp20/Makefile +++ b/x11-toolkits/gtk-sharp20/Makefile @@ -6,10 +6,9 @@ # PORTNAME= gtk-sharp -PORTVERSION= 1.0 -PORTREVISION= 3 +PORTVERSION= 1.0.4 CATEGORIES= x11-toolkits -MASTER_SITES= http://mono.ximian.com/archive/${PORTVERSION}/ +MASTER_SITES= http://www.go-mono.com/archive/${PORTVERSION}/ MAINTAINER= coop9211@uidaho.edu COMMENT= GTK+ and GNOME interfaces for the .NET runtime @@ -17,7 +16,8 @@ COMMENT= GTK+ and GNOME interfaces for the .NET runtime BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono RUN_DEPENDS= ${BUILD_DEPENDS} -GNU_CONFIGURE= yes +USE_X_PREFIX= yes +USE_LIBTOOL_VER=15 USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_GMAKE= yes diff --git a/x11-toolkits/gtk-sharp20/distinfo b/x11-toolkits/gtk-sharp20/distinfo index feee8052543..a3360a8bade 100644 --- a/x11-toolkits/gtk-sharp20/distinfo +++ b/x11-toolkits/gtk-sharp20/distinfo @@ -1,2 +1,2 @@ -MD5 (gtk-sharp-1.0.tar.gz) = 6eab56e11c1e1245ec6af12312969399 -SIZE (gtk-sharp-1.0.tar.gz) = 1424982 +MD5 (gtk-sharp-1.0.4.tar.gz) = c105e94934a22f7734c5657948977078 +SIZE (gtk-sharp-1.0.4.tar.gz) = 1774252 diff --git a/x11-toolkits/gtk-sharp20/files/patch-art_art-sharp.dll.config.in b/x11-toolkits/gtk-sharp20/files/patch-art_art-sharp.dll.config.in index 1e97f4b5116..a4e805dbfc4 100644 --- a/x11-toolkits/gtk-sharp20/files/patch-art_art-sharp.dll.config.in +++ b/x11-toolkits/gtk-sharp20/files/patch-art_art-sharp.dll.config.in @@ -3,5 +3,5 @@ @@ -1,3 +1,3 @@ <configuration> - <dllmap dll="art_lgpl" target="libart_lgpl_2@LIB_PREFIX@.2@LIB_SUFFIX@"/> -+ <dllmap dll="art_lgpl" target="libart_lgpl@LIB_PREFIX@@LIB_SUFFIX@"/> ++ <dllmap dll="art_lgpl" target="libart_lgpl_2@LIB_PREFIX@@LIB_SUFFIX@"/> </configuration> diff --git a/x11-toolkits/gtk-sharp20/files/patch-configure b/x11-toolkits/gtk-sharp20/files/patch-configure index 751dc04f6af..93536b31fff 100644 --- a/x11-toolkits/gtk-sharp20/files/patch-configure +++ b/x11-toolkits/gtk-sharp20/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.bak Tue Jun 29 09:02:24 2004 -+++ configure Thu Jul 8 02:13:18 2004 -@@ -8441,7 +8441,7 @@ +--- configure.orig Tue Nov 2 23:10:31 2004 ++++ configure Tue Nov 2 23:13:55 2004 +@@ -20740,7 +20740,7 @@ @@ -9,3 +9,12 @@ # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 +@@ -20909,7 +20909,7 @@ + + + if test "x$has_mono" = "xtrue"; then +-GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(DESTDIR)$(libdir)' ++GACUTIL_FLAGS='/package $(PACKAGE) /root $(DESTDIR)$(libdir) /gacdir $(DESTDIR)$(libdir)' + GENERATED_SOURCES=generated/*.cs + # Extract the first word of "mono", so it can be a program name with args. + set dummy mono; ac_word=$2 diff --git a/x11-toolkits/gtk-sharp20/files/patch-ltmain.sh b/x11-toolkits/gtk-sharp20/files/patch-ltmain.sh deleted file mode 100644 index 642e3d0bdb0..00000000000 --- a/x11-toolkits/gtk-sharp20/files/patch-ltmain.sh +++ /dev/null @@ -1,41 +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 - ;; - -@@ -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/x11-toolkits/gtk-sharp20/files/patch-pango_pango-sharp.dll.config.in b/x11-toolkits/gtk-sharp20/files/patch-pango_pango-sharp.dll.config.in index 58b403b8255..7da66e51ed5 100644 --- a/x11-toolkits/gtk-sharp20/files/patch-pango_pango-sharp.dll.config.in +++ b/x11-toolkits/gtk-sharp20/files/patch-pango_pango-sharp.dll.config.in @@ -1,7 +1,9 @@ ---- pango/pango-sharp.dll.config.in.orig Wed Jul 14 22:25:54 2004 -+++ pango/pango-sharp.dll.config.in Wed Jul 14 22:26:14 2004 -@@ -1,3 +1,3 @@ +--- pango/pango-sharp.dll.config.in.orig Fri Aug 20 17:04:23 2004 ++++ pango/pango-sharp.dll.config.in Tue Oct 26 21:38:51 2004 +@@ -1,4 +1,4 @@ <configuration> +- <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> - <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> ++ <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/> + <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@@LIB_SUFFIX@"/> </configuration> diff --git a/x11-toolkits/gtk-sharp20/files/patch-sample_rsvg_Makefile.in b/x11-toolkits/gtk-sharp20/files/patch-sample_rsvg_Makefile.in deleted file mode 100644 index 6765daaf112..00000000000 --- a/x11-toolkits/gtk-sharp20/files/patch-sample_rsvg_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- sample/rsvg/Makefile.in.bak Tue Jun 29 09:03:12 2004 -+++ sample/rsvg/Makefile.in Thu Jul 8 16:27:33 2004 -@@ -119,7 +119,7 @@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ --assemblies = ../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll ../../rsvg/rsvg-sharp.dll -+assemblies = ../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll ../../art/art-sharp.dll ../../rsvg/rsvg-sharp.dll - references = $(addprefix /r:, $(assemblies)) - - @ENABLE_RSVG_TRUE@TARGETS = svghelloworld.exe diff --git a/x11-toolkits/gtk-sharp20/pkg-plist b/x11-toolkits/gtk-sharp20/pkg-plist index 6cd2a13ff49..d008333cd24 100644 --- a/x11-toolkits/gtk-sharp20/pkg-plist +++ b/x11-toolkits/gtk-sharp20/pkg-plist @@ -1,48 +1,48 @@ -@unexec gacutil /u glib-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@unexec gacutil /u glib-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/glib-sharp.dll -@exec gacutil /i glib-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u pango-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i glib-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u pango-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/pango-sharp.dll -@exec gacutil /i pango-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u atk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i pango-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u atk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/atk-sharp.dll -@exec gacutil /i atk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gdk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i atk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gdk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gdk-sharp.dll -@exec gacutil /i gdk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null +@exec gacutil /i gdk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null @unexec gacutil /u gtk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gtk-sharp.dll -@exec gacutil /i gtk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u glade-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gtk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u glade-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/glade-sharp.dll -@exec gacutil /i glade-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u art-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i glade-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u art-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/art-sharp.dll -@exec gacutil /i art-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gnome-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i art-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gnome-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gnome-sharp.dll -@exec gacutil /i gnome-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gda-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gnome-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gda-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gda-sharp.dll -@exec gacutil /i gda-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gnomedb-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gda-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gnomedb-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gnomedb-sharp.dll -@exec gacutil /i gnomedb-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gtkhtml-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gnomedb-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gtkhtml-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gtkhtml-sharp.dll -@exec gacutil /i gtkhtml-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gconf-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gtkhtml-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gconf-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gconf-sharp.dll -@exec gacutil /i gconf-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u gconf-sharp-peditors.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gconf-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u gconf-sharp-peditors.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/gconf-sharp-peditors.dll -@exec gacutil /i gconf-sharp-peditors.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u rsvg-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i gconf-sharp-peditors.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u rsvg-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/rsvg-sharp.dll -@exec gacutil /i rsvg-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null -@unexec gacutil /u vte-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true +@exec gacutil /i rsvg-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null +@unexec gacutil /u vte-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true lib/mono/gtk-sharp/vte-sharp.dll -@exec gacutil /i vte-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null +@exec gacutil /i vte-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null bin/gapi-codegen bin/gapi-fixup bin/gapi-fixup.exe |