aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.gnome.mk10
-rw-r--r--audio/muine/Makefile16
-rw-r--r--audio/muine/distinfo6
-rw-r--r--audio/muine/files/patch-src-muine.in10
-rw-r--r--audio/muine/files/patch-src_Makefile.in14
-rw-r--r--audio/muine/pkg-plist7
-rw-r--r--comms/gfax/Makefile2
-rw-r--r--deskutils/tomboy/Makefile19
-rw-r--r--deskutils/tomboy/distinfo6
-rw-r--r--deskutils/tomboy/pkg-plist114
-rw-r--r--devel/mono-tools/Makefile17
-rw-r--r--devel/mono-tools/distinfo6
-rw-r--r--devel/mono-tools/files/patch-Makefile.in.in12
-rw-r--r--devel/mono-tools/pkg-plist43
-rw-r--r--devel/monodoc/Makefile13
-rw-r--r--devel/monodoc/distinfo6
-rw-r--r--devel/monodoc/pkg-plist17
-rw-r--r--editors/bless/Makefile5
-rw-r--r--editors/bless/distinfo6
-rw-r--r--editors/bless/pkg-plist54
-rw-r--r--graphics/f-spot/Makefile21
-rw-r--r--graphics/f-spot/distinfo6
-rw-r--r--graphics/f-spot/files/patch-icon-theme-installer26
-rw-r--r--graphics/f-spot/files/patch-icons_Makefile.in14
-rw-r--r--graphics/f-spot/files/patch-src-MainWindow.cs15
-rw-r--r--graphics/f-spot/files/patch-src_f-spot.in14
-rw-r--r--graphics/f-spot/pkg-plist241
-rw-r--r--lang/mono/Makefile52
-rw-r--r--lang/mono/bsd.mono.mk2
-rw-r--r--lang/mono/distinfo6
-rw-r--r--lang/mono/files/patch-configure30
-rw-r--r--lang/mono/files/patch-libgc_configure18
-rw-r--r--lang/mono/files/patch-mcs_class_System_System.Net.Sockets_Socket.cs30
-rw-r--r--lang/mono/files/patch-mcs_tools_gensources.sh8
-rw-r--r--lang/mono/files/patch-mono_metadata_class.c14
-rw-r--r--lang/mono/files/patch-mono_metadata_marshal.c29
-rw-r--r--lang/mono/files/patch-mono_mini_mini-x86.h11
-rw-r--r--lang/mono/files/patch-mono_mini_mini.c14
-rw-r--r--lang/mono/files/patch-mono_tests_libtest.c14
-rw-r--r--lang/mono/pkg-plist159
-rw-r--r--mail/Makefile2
-rw-r--r--mail/gmime2-sharp/Makefile4
-rw-r--r--mail/gmime2-sharp/pkg-plist16
-rw-r--r--mail/gmime24-sharp/Makefile37
-rw-r--r--mail/gmime24-sharp/pkg-descr3
-rw-r--r--mail/gmime24-sharp/pkg-plist8
-rw-r--r--mail/gmime24/Makefile48
-rw-r--r--mail/gmime24/distinfo3
-rw-r--r--mail/gmime24/files/patch-Makefile.in14
-rw-r--r--mail/gmime24/files/patch-docs_Makefile.in14
-rw-r--r--mail/gmime24/files/patch-gmime-2.4.pc.in10
-rw-r--r--mail/gmime24/files/patch-mono_Makefile.in21
-rw-r--r--mail/gmime24/files/patch-src_Makefile.in33
-rw-r--r--mail/gmime24/files/patch-tests__test-mbox.c10
-rw-r--r--mail/gmime24/files/patch-tests__test-mime.c10
-rw-r--r--mail/gmime24/files/patch-tests__test-parser.c10
-rw-r--r--mail/gmime24/pkg-descr19
-rw-r--r--mail/gmime24/pkg-plist140
-rw-r--r--net/blam/Makefile45
-rw-r--r--net/blam/distinfo6
-rw-r--r--net/blam/files/patch-blam.exe.config8
-rw-r--r--net/blam/files/patch-blam.in9
-rw-r--r--net/blam/files/patch-src-Application.cs25
-rw-r--r--net/blam/pkg-descr4
-rw-r--r--net/blam/pkg-plist92
-rw-r--r--www/Makefile1
-rw-r--r--www/gecko-sharp20/Makefile10
-rw-r--r--www/gecko-sharp20/distinfo6
-rw-r--r--www/webkit-sharp/Makefile35
-rw-r--r--www/webkit-sharp/distinfo3
-rw-r--r--www/webkit-sharp/pkg-descr3
-rw-r--r--www/webkit-sharp/pkg-plist12
-rw-r--r--x11-toolkits/Makefile1
-rw-r--r--x11-toolkits/gnome-desktop-sharp20/Makefile30
-rw-r--r--x11-toolkits/gnome-desktop-sharp20/distinfo3
-rw-r--r--x11-toolkits/gnome-desktop-sharp20/files/patch-configure20
-rw-r--r--x11-toolkits/gnome-desktop-sharp20/pkg-descr3
-rw-r--r--x11-toolkits/gnome-desktop-sharp20/pkg-plist109
-rw-r--r--x11-toolkits/gnome-sharp20/Makefile12
-rw-r--r--x11-toolkits/gnome-sharp20/distinfo6
-rw-r--r--x11-toolkits/gnome-sharp20/files/patch-art_art-sharp.dll.config.in7
-rw-r--r--x11-toolkits/gnome-sharp20/files/patch-configure20
-rw-r--r--x11-toolkits/gnome-sharp20/files/patch-gconf_GConf_gconf-sharp.dll.config.in7
-rw-r--r--x11-toolkits/gnome-sharp20/files/patch-gtkhtml_gtkhtml-sharp.dll.config.in8
-rw-r--r--x11-toolkits/gnome-sharp20/files/patch-rsvg_rsvg-sharp.dll.config.in7
-rw-r--r--x11-toolkits/gnome-sharp20/files/patch-vte_vte-sharp.dll.config.in9
-rw-r--r--x11-toolkits/gnome-sharp20/pkg-plist184
-rw-r--r--x11-toolkits/gtk-sharp20/Makefile7
-rw-r--r--x11-toolkits/gtk-sharp20/distinfo6
-rw-r--r--x11-toolkits/gtk-sharp20/pkg-plist83
-rw-r--r--x11-toolkits/gtksourceview-sharp/Makefile5
-rw-r--r--x11-toolkits/gtksourceview-sharp/distinfo6
-rw-r--r--x11-toolkits/gtksourceview-sharp/files/patch-Makefile.in48
-rw-r--r--x11-toolkits/libgdiplus/Makefile17
-rw-r--r--x11-toolkits/libgdiplus/distinfo6
95 files changed, 1704 insertions, 668 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index ad0ca88a6336..1b53775b1409 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -6,7 +6,6 @@
# $MCom: ports/Mk/bsd.gnome.mk,v 1.471 2008/09/01 16:45:46 ahze Exp $
#
# Please view me with 4 column tabs!
-
#######################################################
#
# *** WARNING: Disable MARCUSCOM before merge in FreeBSD!
@@ -71,8 +70,8 @@ _USE_GNOME_ALL+= bonobo gal gconf gdkpixbuf glib12 glibwww \
# GNOME 2 components
_USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gal2 \
- gconf2 _glib20 glib20 gnomecontrolcenter2 gnomedesktop gnomedocutils \
- gnomemenus gnomepanel gnomesharp20 gnomespeech gnomevfs2 gtk20 \
+ gconf2 _glib20 glib20 gnomecontrolcenter2 gnomedesktop gnomedesktopsharp20 \
+ gnomedocutils gnomemenus gnomepanel gnomesharp20 gnomespeech gnomevfs2 gtk20 \
gtkhtml3 gtksharp10 gtksharp20 gtksourceview gtksourceview2 gvfs \
libartlgpl2 libbonobo libbonoboui libgailgnome libgda2 libgda3 libgda4 \
libglade2 libgnome libgnomecanvas libgnomedb libgnomekbd libgnomeprint \
@@ -362,6 +361,11 @@ gnomedesktop_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-desktop-2.0.pc
gnomedesktop_USE_GNOME_IMPL= libgnomeui gnomedocutils
gnomedesktop_GNOME_DESKTOP_VERSION=2
+gnomedesktopsharp20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-desktop-sharp-2.0.pc
+gnomedesktopsharp20_BUILD_DEPENDS= ${gnomedesktopsharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-desktop-sharp20
+gnomedesktopsharp20_RUN_DEPENDS= ${gnomedesktopsharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-desktop-sharp20
+gnomedesktopsharp20_USE_GNOME_IMPL= gnomesharp20
+
libwnck_LIB_DEPENDS= wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck
libwnck_DETECT= ${LOCALBASE}/libdata/pkgconfig/libwnck-1.0.pc
libwnck_USE_GNOME_IMPL= gtk20
diff --git a/audio/muine/Makefile b/audio/muine/Makefile
index 479e03d3dd61..a4a33cb9acab 100644
--- a/audio/muine/Makefile
+++ b/audio/muine/Makefile
@@ -7,14 +7,11 @@
#
PORTNAME= muine
-PORTVERSION= 0.8.8
-PORTREVISION= 2
+PORTVERSION= 0.8.10
CATEGORIES= audio gnome
-MASTER_SITES= http://muine-player.org/releases/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= tmclaugh/muine
+MASTER_SITES= GNOME
-MAINTAINER= bsd-sharp@googlegroups.com
+MAINTAINER= mono@FreeBSD.org
COMMENT= Mono based Gnome audio player
LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \
@@ -22,7 +19,8 @@ LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \
gdbm:${PORTSDIR}/databases/gdbm \
vorbis.4:${PORTSDIR}/audio/libvorbis \
musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
-RUN_DEPENDS= dbus-daemon:${PORTSDIR}/devel/dbus
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib
+RUN_DEPENDS= ${BUILD_DEPENDS}
USE_GMAKE= yes
USE_GETTEXT= yes
@@ -61,8 +59,8 @@ post-patch:
${WRKSRC}/data/Makefile.in
@${REINPLACE_CMD} -e 's|libmusicbrainz.so.4|libmusicbrainz.so|g' \
${WRKSRC}/src/muine.exe.config.in
- @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -E -e \
- 's|-DG.*_DISABLE_DEPRECATED||g'
+ @${REINPLACE_CMD} -e 's|/bin/bash|/usr/bin/env bash|g' \
+ ${WRKSRC}/src/muine.in
post-install:
${MKDIR} ${PREFIX}/lib/muine/plugins
diff --git a/audio/muine/distinfo b/audio/muine/distinfo
index 11ff6d3e4552..6cad722cb1cf 100644
--- a/audio/muine/distinfo
+++ b/audio/muine/distinfo
@@ -1,3 +1,3 @@
-MD5 (muine-0.8.8.tar.gz) = 0bf318424d35241525df701e107dd6b1
-SHA256 (muine-0.8.8.tar.gz) = 92288652db03588b57fe87b089dfc2560702934b5c08cd80164b4cdade44798a
-SIZE (muine-0.8.8.tar.gz) = 833148
+MD5 (muine-0.8.10.tar.gz) = b44cb7a30010e98686b1f4a7759c776d
+SHA256 (muine-0.8.10.tar.gz) = d6503a5c01344b4402bd7150f1cd1ab561beb6bd778ee1ca35fea8ccbdecc045
+SIZE (muine-0.8.10.tar.gz) = 781734
diff --git a/audio/muine/files/patch-src-muine.in b/audio/muine/files/patch-src-muine.in
deleted file mode 100644
index cfed90dd2ada..000000000000
--- a/audio/muine/files/patch-src-muine.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/muine.in.orig 2007-11-07 20:28:52.000000000 +0000
-+++ src/muine.in 2007-11-07 20:29:06.000000000 +0000
-@@ -1,5 +1,5 @@
--#!/bin/bash
-+#!/bin/sh
-
- export MONO_GAC_PREFIX=$MONO_GAC_PREFIX:@prefix@
-
--exec -a "muine" @mono@ @mono_flags@ @pkglibdir@/@target@ "$@"
-+@mono@ @mono_flags@ @pkglibdir@/@target@ "$@"
diff --git a/audio/muine/files/patch-src_Makefile.in b/audio/muine/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..66d555c95fde
--- /dev/null
+++ b/audio/muine/files/patch-src_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/Makefile.in.orig
++++ src/Makefile.in
+@@ -563,7 +563,7 @@
+
+ # FIXME MONO_XMLSERIALIZER_THS=no works around Ximian Bugzilla #58194
+ AmazonSearchService.cs: AmazonSearchService.wsdl
+- MONO_XMLSERIALIZER_THS=no wsdl -namespace:Amazon $(srcdir)/AmazonSearchService.wsdl
++ MONO_XMLSERIALIZER_THS=no wsdl1 -namespace:Amazon $(srcdir)/AmazonSearchService.wsdl
+
+ $(WRAPPER): $(srcdir)/$(WRAPPER).in
+ sed -e "s|\@prefix\@|$(prefix)|g" \
diff --git a/audio/muine/pkg-plist b/audio/muine/pkg-plist
index 0e8ecb5e3817..330309e3897b 100644
--- a/audio/muine/pkg-plist
+++ b/audio/muine/pkg-plist
@@ -1,10 +1,8 @@
+@comment $FreeBSD$
bin/muine
share/doc/muine/muine-docs.zip
share/doc/muine/muine-docs.tree
share/doc/muine/muine-docs.source
-lib/muine/NDesk.DBus.GLib.dll
-lib/muine/NDesk.DBus.GLib.dll.config
-lib/muine/NDesk.DBus.dll
lib/muine/libmuine.a
lib/muine/libmuine.la
lib/muine/libmuine.so
@@ -14,6 +12,7 @@ lib/muine/muine-plugin.dll
lib/muine/muine.exe
lib/muine/muine.exe.config
lib/muine/plugins/TrayIcon.dll
+lib/muine/plugins/TrayIcon.dll.config
libdata/pkgconfig/muine-dbus.pc
libdata/pkgconfig/muine-plugin.pc
share/dbus-1/services/org.gnome.Muine.service
@@ -22,6 +21,7 @@ share/icons/hicolor/16x16/apps/muine.png
share/icons/hicolor/22x22/apps/muine.png
share/icons/hicolor/24x24/apps/muine.png
share/icons/hicolor/32x32/apps/muine.png
+share/icons/hicolor/48x48/apps/muine.png
share/icons/hicolor/scalable/apps/muine.svg
share/locale/ar/LC_MESSAGES/muine.mo
share/locale/az/LC_MESSAGES/muine.mo
@@ -65,6 +65,7 @@ share/locale/sr/LC_MESSAGES/muine.mo
share/locale/sr@Latn/LC_MESSAGES/muine.mo
share/locale/sv/LC_MESSAGES/muine.mo
share/locale/th/LC_MESSAGES/muine.mo
+share/locale/tr/LC_MESSAGES/muine.mo
share/locale/uk/LC_MESSAGES/muine.mo
share/locale/vi/LC_MESSAGES/muine.mo
share/locale/zh_CN/LC_MESSAGES/muine.mo
diff --git a/comms/gfax/Makefile b/comms/gfax/Makefile
index 7a9e5eb95145..3048448cee4c 100644
--- a/comms/gfax/Makefile
+++ b/comms/gfax/Makefile
@@ -21,6 +21,8 @@ RUN_DEPENDS= ${LOCALBASE}/bin/sendfax:${PORTSDIR}/comms/hylafax \
bash:${PORTSDIR}/shells/bash \
${LOCALBASE}/libdata/pkgconfig/evolution-sharp.pc:${PORTSDIR}/mail/evolution-sharp
+BROKEN= doesn't build with mono 2.0.1
+
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehier libgnomeprint gnomesharp20
diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index 7921c1eecfb1..7c362a6edf30 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -7,24 +7,25 @@
#
PORTNAME= tomboy
-PORTVERSION= 0.10.0
-PORTREVISION= 1
+PORTVERSION= 0.12.2
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
-MAINTAINER= bsd-sharp-list@forge.novell.com
+MAINTAINER= mono@FreeBSD.org
COMMENT= Personal note taking system for the GNOME desktop
LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell
-BUILD_DEPENDS= ${LOCALBASE}/lib/mono/gmime-sharp/gmime-sharp.dll:${PORTSDIR}/mail/gmime2-sharp \
- ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib
-RUN_DEPENDS= ${LOCALBASE}/lib/mono/gmime-sharp/gmime-sharp.dll:${PORTSDIR}/mail/gmime2-sharp \
- ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib
+BUILD_DEPENDS= ${LOCALBASE}/lib/mono/gmime-sharp-2.4/gmime-sharp.dll:${PORTSDIR}/mail/gmime24-sharp \
+ ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib \
+ mautil:${PORTSDIR}/devel/mono-addins
+RUN_DEPENDS= ${LOCALBASE}/lib/mono/gmime-sharp-2.4/gmime-sharp.dll:${PORTSDIR}/mail/gmime24-sharp \
+ ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib \
+ mautil:${PORTSDIR}/devel/mono-addins
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_GNOME= gnomehack gnometarget intlhack gnomeprefix gnomesharp20
+USE_GNOME= gnomehack gnometarget intlhack gnomeprefix gnomedesktopsharp20
GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_ICONS= yes
@@ -50,6 +51,8 @@ post-patch:
${WRKSRC}/configure
@${REINPLACE_CMD} 's|/bin/bash|/bin/sh|g' \
${WRKSRC}/Tomboy/tomboy*.in
+ @${REINPLACE_CMD} 's|gmime-sharp|gmime-sharp-2.4|g' \
+ ${WRKSRC}/configure
.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
.include <bsd.port.post.mk>
diff --git a/deskutils/tomboy/distinfo b/deskutils/tomboy/distinfo
index e8c7afe20b01..9d6fb3ee3163 100644
--- a/deskutils/tomboy/distinfo
+++ b/deskutils/tomboy/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/tomboy-0.10.0.tar.bz2) = cf200d49beae64260b9e029b6dcc579a
-SHA256 (gnome2/tomboy-0.10.0.tar.bz2) = 470a86ed40d24bc404ee07a6541c95245f96e281f78f448434378ab53d550960
-SIZE (gnome2/tomboy-0.10.0.tar.bz2) = 3283254
+MD5 (gnome2/tomboy-0.12.2.tar.bz2) = 326ee483081ae43eaf87103f1e1153bc
+SHA256 (gnome2/tomboy-0.12.2.tar.bz2) = 7a870d99d3c4758ad9a94fd56fd55cae9639a872321f8b23cf43cd4efdbc995f
+SIZE (gnome2/tomboy-0.12.2.tar.bz2) = 4406374
diff --git a/deskutils/tomboy/pkg-plist b/deskutils/tomboy/pkg-plist
index 32c3ec54cba4..49c37f1e478b 100644
--- a/deskutils/tomboy/pkg-plist
+++ b/deskutils/tomboy/pkg-plist
@@ -1,23 +1,34 @@
+@comment $FreeBSD$
bin/tomboy
bin/tomboy-panel
-lib/tomboy/Mono.Addins.Gui.dll
-lib/tomboy/Mono.Addins.Setup.dll
-lib/tomboy/Mono.Addins.dll
-lib/tomboy/Mono.Addins.dll.config
lib/tomboy/Tomboy.exe
lib/tomboy/Tomboy.exe.config
+lib/tomboy/Tomboy.exe.mdb
lib/tomboy/addins/Backlinks.dll
+lib/tomboy/addins/Backlinks.dll.mdb
lib/tomboy/addins/Bugzilla.dll
+lib/tomboy/addins/Bugzilla.dll.mdb
lib/tomboy/addins/Evolution.dll
+lib/tomboy/addins/Evolution.dll.mdb
lib/tomboy/addins/ExportToHtml.dll
+lib/tomboy/addins/ExportToHtml.dll.mdb
lib/tomboy/addins/FileSystemSyncService.dll
+lib/tomboy/addins/FileSystemSyncService.dll.mdb
lib/tomboy/addins/FixedWidth.dll
+lib/tomboy/addins/FixedWidth.dll.mdb
lib/tomboy/addins/InsertTimestamp.dll
+lib/tomboy/addins/InsertTimestamp.dll.mdb
lib/tomboy/addins/NoteOfTheDay.dll
+lib/tomboy/addins/NoteOfTheDay.dll.mdb
lib/tomboy/addins/PrintNotes.dll
lib/tomboy/addins/SshSyncServiceAddin.dll
+lib/tomboy/addins/SshSyncServiceAddin.dll.mdb
lib/tomboy/addins/StickyNoteImport.dll
+lib/tomboy/addins/StickyNoteImport.dll.mdb
+lib/tomboy/addins/Tasque.Addin.dll
+lib/tomboy/addins/Tasque.Addin.dll.mdb
lib/tomboy/addins/WebDavSyncService.dll
+lib/tomboy/addins/WebDavSyncService.dll.mdb
lib/tomboy/libprintnotes.la
lib/tomboy/libprintnotes.so
lib/tomboy/libtomboy.la
@@ -83,6 +94,25 @@ share/gnome/help/tomboy/de/figures/tomboy-preferences-synchronization.png
share/gnome/help/tomboy/de/figures/tomboy-tools.png
share/gnome/help/tomboy/de/legal.xml
share/gnome/help/tomboy/de/tomboy.xml
+share/gnome/help/tomboy/el/figures/add-notebook-search.png
+share/gnome/help/tomboy/el/figures/add-to-notebook.png
+share/gnome/help/tomboy/el/figures/delete-notebook.png
+share/gnome/help/tomboy/el/figures/move-notes-search.png
+share/gnome/help/tomboy/el/figures/new-notebook.png
+share/gnome/help/tomboy/el/figures/note-template.png
+share/gnome/help/tomboy/el/figures/notebook-icon.png
+share/gnome/help/tomboy/el/figures/tomboy-main-menu.png
+share/gnome/help/tomboy/el/figures/tomboy-new-note.png
+share/gnome/help/tomboy/el/figures/tomboy-panel.png
+share/gnome/help/tomboy/el/figures/tomboy-pindown.png
+share/gnome/help/tomboy/el/figures/tomboy-pinup.png
+share/gnome/help/tomboy/el/figures/tomboy-preferences-add-ins.png
+share/gnome/help/tomboy/el/figures/tomboy-preferences-editing.png
+share/gnome/help/tomboy/el/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/el/figures/tomboy-preferences-synchronization.png
+share/gnome/help/tomboy/el/figures/tomboy-tools.png
+share/gnome/help/tomboy/el/legal.xml
+share/gnome/help/tomboy/el/tomboy.xml
share/gnome/help/tomboy/en_GB/figures/add-notebook-search.png
share/gnome/help/tomboy/en_GB/figures/add-to-notebook.png
share/gnome/help/tomboy/en_GB/figures/delete-notebook.png
@@ -140,6 +170,25 @@ share/gnome/help/tomboy/fr/figures/tomboy-preferences-synchronization.png
share/gnome/help/tomboy/fr/figures/tomboy-tools.png
share/gnome/help/tomboy/fr/legal.xml
share/gnome/help/tomboy/fr/tomboy.xml
+share/gnome/help/tomboy/it/figures/add-notebook-search.png
+share/gnome/help/tomboy/it/figures/add-to-notebook.png
+share/gnome/help/tomboy/it/figures/delete-notebook.png
+share/gnome/help/tomboy/it/figures/move-notes-search.png
+share/gnome/help/tomboy/it/figures/new-notebook.png
+share/gnome/help/tomboy/it/figures/note-template.png
+share/gnome/help/tomboy/it/figures/notebook-icon.png
+share/gnome/help/tomboy/it/figures/tomboy-main-menu.png
+share/gnome/help/tomboy/it/figures/tomboy-new-note.png
+share/gnome/help/tomboy/it/figures/tomboy-panel.png
+share/gnome/help/tomboy/it/figures/tomboy-pindown.png
+share/gnome/help/tomboy/it/figures/tomboy-pinup.png
+share/gnome/help/tomboy/it/figures/tomboy-preferences-add-ins.png
+share/gnome/help/tomboy/it/figures/tomboy-preferences-editing.png
+share/gnome/help/tomboy/it/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/it/figures/tomboy-preferences-synchronization.png
+share/gnome/help/tomboy/it/figures/tomboy-tools.png
+share/gnome/help/tomboy/it/legal.xml
+share/gnome/help/tomboy/it/tomboy.xml
share/gnome/help/tomboy/oc/figures/add-notebook-search.png
share/gnome/help/tomboy/oc/figures/add-to-notebook.png
share/gnome/help/tomboy/oc/figures/delete-notebook.png
@@ -159,6 +208,25 @@ share/gnome/help/tomboy/oc/figures/tomboy-preferences-synchronization.png
share/gnome/help/tomboy/oc/figures/tomboy-tools.png
share/gnome/help/tomboy/oc/legal.xml
share/gnome/help/tomboy/oc/tomboy.xml
+share/gnome/help/tomboy/pl/figures/add-notebook-search.png
+share/gnome/help/tomboy/pl/figures/add-to-notebook.png
+share/gnome/help/tomboy/pl/figures/delete-notebook.png
+share/gnome/help/tomboy/pl/figures/move-notes-search.png
+share/gnome/help/tomboy/pl/figures/new-notebook.png
+share/gnome/help/tomboy/pl/figures/note-template.png
+share/gnome/help/tomboy/pl/figures/notebook-icon.png
+share/gnome/help/tomboy/pl/figures/tomboy-main-menu.png
+share/gnome/help/tomboy/pl/figures/tomboy-new-note.png
+share/gnome/help/tomboy/pl/figures/tomboy-panel.png
+share/gnome/help/tomboy/pl/figures/tomboy-pindown.png
+share/gnome/help/tomboy/pl/figures/tomboy-pinup.png
+share/gnome/help/tomboy/pl/figures/tomboy-preferences-add-ins.png
+share/gnome/help/tomboy/pl/figures/tomboy-preferences-editing.png
+share/gnome/help/tomboy/pl/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/pl/figures/tomboy-preferences-synchronization.png
+share/gnome/help/tomboy/pl/figures/tomboy-tools.png
+share/gnome/help/tomboy/pl/legal.xml
+share/gnome/help/tomboy/pl/tomboy.xml
share/gnome/help/tomboy/pt_BR/figures/add-notebook-search.png
share/gnome/help/tomboy/pt_BR/figures/add-to-notebook.png
share/gnome/help/tomboy/pt_BR/figures/delete-notebook.png
@@ -272,13 +340,17 @@ share/locale/ja/LC_MESSAGES/tomboy.mo
share/locale/kn/LC_MESSAGES/tomboy.mo
share/locale/ko/LC_MESSAGES/tomboy.mo
share/locale/ku/LC_MESSAGES/tomboy.mo
+share/locale/la/LC_MESSAGES/tomboy.mo
share/locale/lt/LC_MESSAGES/tomboy.mo
share/locale/lv/LC_MESSAGES/tomboy.mo
+share/locale/mai/LC_MESSAGES/tomboy.mo
share/locale/mk/LC_MESSAGES/tomboy.mo
share/locale/ml/LC_MESSAGES/tomboy.mo
+share/locale/mr/LC_MESSAGES/tomboy.mo
share/locale/nb/LC_MESSAGES/tomboy.mo
share/locale/ne/LC_MESSAGES/tomboy.mo
share/locale/nl/LC_MESSAGES/tomboy.mo
+share/locale/nn/LC_MESSAGES/tomboy.mo
share/locale/oc/LC_MESSAGES/tomboy.mo
share/locale/or/LC_MESSAGES/tomboy.mo
share/locale/pa/LC_MESSAGES/tomboy.mo
@@ -293,7 +365,7 @@ share/locale/sk/LC_MESSAGES/tomboy.mo
share/locale/sl/LC_MESSAGES/tomboy.mo
share/locale/sq/LC_MESSAGES/tomboy.mo
share/locale/sr/LC_MESSAGES/tomboy.mo
-share/locale/sr@Latn/LC_MESSAGES/tomboy.mo
+share/locale/sr@latin/LC_MESSAGES/tomboy.mo
share/locale/sv/LC_MESSAGES/tomboy.mo
share/locale/ta/LC_MESSAGES/tomboy.mo
share/locale/te/LC_MESSAGES/tomboy.mo
@@ -307,10 +379,13 @@ share/locale/zh_TW/LC_MESSAGES/tomboy.mo
share/omf/tomboy/tomboy-C.omf
share/omf/tomboy/tomboy-ca.omf
share/omf/tomboy/tomboy-de.omf
+share/omf/tomboy/tomboy-el.omf
share/omf/tomboy/tomboy-en_GB.omf
share/omf/tomboy/tomboy-es.omf
share/omf/tomboy/tomboy-fr.omf
+share/omf/tomboy/tomboy-it.omf
share/omf/tomboy/tomboy-oc.omf
+share/omf/tomboy/tomboy-pl.omf
share/omf/tomboy/tomboy-pt_BR.omf
share/omf/tomboy/tomboy-ru.omf
share/omf/tomboy/tomboy-sv.omf
@@ -354,6 +429,8 @@ share/omf/tomboy/tomboy-uk.omf
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%
@dirrm share/omf/tomboy
+@dirrm share/locale/la/LC_MESSAGES
+@dirrm share/locale/la
@dirrm share/gnome/help/tomboy/uk/figures
@dirrm share/gnome/help/tomboy/uk
@dirrm share/gnome/help/tomboy/sv/figures
@@ -362,14 +439,20 @@ share/omf/tomboy/tomboy-uk.omf
@dirrm share/gnome/help/tomboy/ru
@dirrm share/gnome/help/tomboy/pt_BR/figures
@dirrm share/gnome/help/tomboy/pt_BR
+@dirrm share/gnome/help/tomboy/pl/figures
+@dirrm share/gnome/help/tomboy/pl
@dirrm share/gnome/help/tomboy/oc/figures
@dirrm share/gnome/help/tomboy/oc
+@dirrm share/gnome/help/tomboy/it/figures
+@dirrm share/gnome/help/tomboy/it
@dirrm share/gnome/help/tomboy/fr/figures
@dirrm share/gnome/help/tomboy/fr
@dirrm share/gnome/help/tomboy/es/figures
@dirrm share/gnome/help/tomboy/es
@dirrm share/gnome/help/tomboy/en_GB/figures
@dirrm share/gnome/help/tomboy/en_GB
+@dirrm share/gnome/help/tomboy/el/figures
+@dirrm share/gnome/help/tomboy/el
@dirrm share/gnome/help/tomboy/de/figures
@dirrm share/gnome/help/tomboy/de
@dirrm share/gnome/help/tomboy/ca/figures
@@ -377,26 +460,5 @@ share/omf/tomboy/tomboy-uk.omf
@dirrm share/gnome/help/tomboy/C/figures
@dirrm share/gnome/help/tomboy/C
@dirrm share/gnome/help/tomboy
-@dirrmtry share/applications
@dirrm lib/tomboy/addins
@dirrm lib/tomboy
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
diff --git a/devel/mono-tools/Makefile b/devel/mono-tools/Makefile
index 2547e1748984..41cdd6cd31f6 100644
--- a/devel/mono-tools/Makefile
+++ b/devel/mono-tools/Makefile
@@ -3,31 +3,30 @@
# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
#
# $FreeBSD$
-# $Id: Makefile,v 1.26 2007/05/21 02:18:46 killfill Exp $
+# $Id: Makefile,v 1.30 2007/12/13 19:32:53 killfill Exp $
#
PORTNAME= mono-tools
-PORTVERSION= 1.2.4
-PORTREVISION= 3
+PORTVERSION= 2.0
CATEGORIES= devel
-MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
+MASTER_SITES= ftp://ftp.novell.com/pub/mono/sources/${PORTNAME}/
-MAINTAINER= bsd-sharp@googlegroups.com
+MAINTAINER= mono@FreeBSD.org
COMMENT= Documentation browser for Mono and Mono libraries
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gecko-sharp-2.0.pc:${PORTSDIR}/www/gecko-sharp20 \
+ ${LOCALBASE}/lib/libgdiplus.a:${PORTSDIR}/x11-toolkits/libgdiplus \
monodocer:${PORTSDIR}/devel/monodoc
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gecko-sharp-2.0.pc:${PORTSDIR}/www/gecko-sharp20 \
monodocer:${PORTSDIR}/devel/monodoc
USE_BZIP2= yes
-USE_GNOME= gnomehack gnometarget gnomesharp20
+USE_GNOME= gnomehack gnometarget gnomedesktopsharp20
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GECKO= firefox mozilla
-CONFIGURE_ARGS= --mandir=${PREFIX}/man
-MAN1= create-native-map.1
+MAN1= create-native-map.1 gendarme.1 mprof-decoder.1 mprof-heap-viewer.1
.include <bsd.port.pre.mk>
@@ -38,6 +37,8 @@ post-patch:
${WRKSRC}/create-native-map/lib/pkgconfig/Makefile.in
@${REINPLACE_CMD} -e "s|%%FBSD_MOZILLA_HOME%%|${PREFIX}/lib/${GECKO}|g" \
${WRKSRC}/docbrowser/monodoc.in
+ @${FIND} ${WRKSRC} -name "${GNOME_MAKEFILEIN}*" -type f | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|@datadir@/man/man1|@mandir@/man1|g'
.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
diff --git a/devel/mono-tools/distinfo b/devel/mono-tools/distinfo
index 537a6fee8565..cac2aeb15bb0 100644
--- a/devel/mono-tools/distinfo
+++ b/devel/mono-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (mono-tools-1.2.4.tar.bz2) = 7d193fea94123a3f30f67bca2873c791
-SHA256 (mono-tools-1.2.4.tar.bz2) = 9246dad467d4d66f1d8e54d55051ba5e7e788efb8f070ca96d4407c5d9f961dd
-SIZE (mono-tools-1.2.4.tar.bz2) = 301009
+MD5 (mono-tools-2.0.tar.bz2) = 955025ab9b25bc58058facc39ab88aae
+SHA256 (mono-tools-2.0.tar.bz2) = 69f18340b8abfe8c92a0324ad0e20641690f81e64fbb2514e53c8ca0689c34e8
+SIZE (mono-tools-2.0.tar.bz2) = 742545
diff --git a/devel/mono-tools/files/patch-Makefile.in.in b/devel/mono-tools/files/patch-Makefile.in.in
index d89a70946377..41ecec3dfc0b 100644
--- a/devel/mono-tools/files/patch-Makefile.in.in
+++ b/devel/mono-tools/files/patch-Makefile.in.in
@@ -1,10 +1,10 @@
---- po/Makefile.in.in.orig Fri Jun 17 01:34:05 2005
-+++ po/Makefile.in.in Fri Jun 17 01:39:12 2005
-@@ -32,6 +32,7 @@
- gettextsrcdir = $(datadir)/glib-2.0/gettext/po
- subdir = po
+--- po/Makefile.in.in.orig 2007-11-24 13:32:28.000000000 +0000
++++ po/Makefile.in.in 2007-11-24 13:32:48.000000000 +0000
+@@ -35,6 +35,7 @@
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
++top_builddir = ..
+ CC = @CC@
+ GENCAT = @GENCAT@
diff --git a/devel/mono-tools/pkg-plist b/devel/mono-tools/pkg-plist
index 3e8c0e662bb4..16a66db8a5c4 100644
--- a/devel/mono-tools/pkg-plist
+++ b/devel/mono-tools/pkg-plist
@@ -1,24 +1,63 @@
+@comment $FreeBSD$
bin/create-native-map
bin/gasnview
+bin/gendarme
+bin/gendarme-wizard
bin/gnunit
bin/gnunit2
+bin/gui-compare
bin/ilcontrast
bin/monodoc
+bin/mprof-decoder
+bin/mprof-heap-viewer
lib/create-native-map/MapAttribute.cs
lib/create-native-map/create-native-map.exe
+lib/gendarme/Gendarme.Framework.dll
+lib/gendarme/Gendarme.Rules.BadPractice.dll
+lib/gendarme/Gendarme.Rules.Concurrency.dll
+lib/gendarme/Gendarme.Rules.Correctness.dll
+lib/gendarme/Gendarme.Rules.Design.dll
+lib/gendarme/Gendarme.Rules.Exceptions.dll
+lib/gendarme/Gendarme.Rules.Interoperability.dll
+lib/gendarme/Gendarme.Rules.Maintainability.dll
+lib/gendarme/Gendarme.Rules.Naming.dll
+lib/gendarme/Gendarme.Rules.Performance.dll
+lib/gendarme/Gendarme.Rules.Portability.dll
+lib/gendarme/Gendarme.Rules.Security.dll
+lib/gendarme/Gendarme.Rules.Serialization.dll
+lib/gendarme/Gendarme.Rules.Smells.dll
+lib/gendarme/Gendarme.Rules.Ui.dll
+lib/gendarme/gendarme-wizard.exe
+lib/gendarme/gendarme.exe
+lib/gendarme/rules.xml
+lib/gui-compare/Mono.Cecil.dll
+lib/gui-compare/gui-compare.exe
lib/ilcontrast/ilcontrast.exe
+lib/mono-tools/mprof-decoder-library.dll
+lib/mono-tools/mprof-decoder-library.dll.mdb
+lib/mono-tools/mprof-decoder.exe
+lib/mono-tools/mprof-decoder.exe.mdb
+lib/mono-tools/mprof-heap-snapshot-explorer.dll
+lib/mono-tools/mprof-heap-snapshot-explorer.dll.mdb
+lib/mono-tools/mprof-heap-viewer.exe
+lib/mono-tools/mprof-heap-viewer.exe.mdb
lib/mono/1.0/gasnview.exe
lib/mono/1.0/gnunit.exe
lib/mono/2.0/gnunit2.exe
lib/monodoc/GeckoHtmlRender.dll
lib/monodoc/GtkHtmlHtmlRender.dll
+lib/monodoc/MonoWebBrowserHtmlRender.dll
lib/monodoc/browser.exe
libdata/pkgconfig/create-native-map.pc
+libdata/pkgconfig/gendarme-framework.pc
share/applications/ilcontrast.desktop
share/applications/monodoc.desktop
+share/applications/mprof-heap-viewer.desktop
share/pixmaps/ilcontrast.png
share/pixmaps/monodoc.png
-@dirrmtry share/applications
-@dirrmtry lib/ilcontrast
@dirrmtry lib/monodoc
+@dirrm lib/mono-tools
+@dirrmtry lib/ilcontrast
+@dirrm lib/gui-compare
+@dirrm lib/gendarme
@dirrm lib/create-native-map
diff --git a/devel/monodoc/Makefile b/devel/monodoc/Makefile
index bf8cd0bc599a..9aeb2f4d7650 100644
--- a/devel/monodoc/Makefile
+++ b/devel/monodoc/Makefile
@@ -4,16 +4,15 @@
# Whom: Christopher Nehren
#
# $FreeBSD$
-# $Id: Makefile,v 1.46 2007/09/08 22:26:20 killfill Exp $
+# $Id: Makefile,v 1.50 2007/12/13 19:33:57 killfill Exp $
#
PORTNAME= monodoc
-PORTVERSION= 1.2.5
-PORTREVISION= 1
+PORTVERSION= 2.0
CATEGORIES= devel gnome
-MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
+MASTER_SITES= ftp://ftp.novell.com/pub/mono/sources/${PORTNAME}/
-MAINTAINER= bsd-sharp@googlegroups.com
+MAINTAINER= mono@FreeBSD.org
COMMENT= Documentation for Mono and Mono libraries
BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono
@@ -26,7 +25,9 @@ USE_GMAKE= yes
CONFIGURE_ARGS= --mandir=${PREFIX}/man
MAN1= mdnormalizer.1 mdvalidator.1 monodocer.1 monodocs2html.1 \
- mdassembler.1 mdcs2ecma.1
+ mdassembler.1 mdcs2ecma.1 mdoc-assemble.1 mdoc-export-html.1 \
+ mdoc-export-msxdoc.1 mdoc-update.1 mdoc-validate.1 mdoc.1
+MAN5= mdoc.5
.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
.include <bsd.port.mk>
diff --git a/devel/monodoc/distinfo b/devel/monodoc/distinfo
index f525993bd4ea..40ddfbce4650 100644
--- a/devel/monodoc/distinfo
+++ b/devel/monodoc/distinfo
@@ -1,3 +1,3 @@
-MD5 (monodoc-1.2.5.zip) = 7eb942dc85db3deb6284ce2e0dff9d6f
-SHA256 (monodoc-1.2.5.zip) = 7ac42896edf2c2a3f2fb8fbf44c3190d99ca6f5f41d49fd5910382d642c18f04
-SIZE (monodoc-1.2.5.zip) = 14883704
+MD5 (monodoc-2.0.zip) = 1d1be22bb55f1c2f2fc50578fddb279e
+SHA256 (monodoc-2.0.zip) = 87bce307390ea45722bb59bdacc937dc507cc6a91755545e15920eda983fc104
+SIZE (monodoc-2.0.zip) = 18561139
diff --git a/devel/monodoc/pkg-plist b/devel/monodoc/pkg-plist
index dbd5c024275a..faacc54ade24 100644
--- a/devel/monodoc/pkg-plist
+++ b/devel/monodoc/pkg-plist
@@ -1,6 +1,12 @@
bin/mdassembler
bin/mdcs2ecma
bin/mdnormalizer
+bin/mdoc
+bin/mdoc-assemble
+bin/mdoc-export-html
+bin/mdoc-export-msxdoc
+bin/mdoc-update
+bin/mdoc-validate
bin/mdvalidater
bin/mod
bin/monodocer
@@ -10,8 +16,10 @@ lib/mono/gac/monodoc/1.0.0.0__0738eb9f132ed756/monodoc.dll
lib/mono/gac/monodoc/1.0.0.0__0738eb9f132ed756/monodoc.dll.config
lib/mono/gac/monodoc/1.0.0.0__0738eb9f132ed756/monodoc.dll.mdb
lib/mono/monodoc/monodoc.dll
+lib/monodoc/NDesk.Options.dll
lib/monodoc/assembler.exe
lib/monodoc/cs2ecma.exe
+lib/monodoc/mdoc.exe
lib/monodoc/mod.exe
lib/monodoc/monodoc.xml
lib/monodoc/monodocer.exe
@@ -22,15 +30,18 @@ lib/monodoc/normalize.exe
lib/monodoc/sources/Mono.source
lib/monodoc/sources/Mono.tree
lib/monodoc/sources/Mono.zip
-lib/monodoc/sources/Novell.source
-lib/monodoc/sources/Novell.tree
-lib/monodoc/sources/Novell.zip
lib/monodoc/sources/cs-errors.source
lib/monodoc/sources/cs-errors.tree
lib/monodoc/sources/cs-errors.zip
lib/monodoc/sources/ecma334.source
lib/monodoc/sources/ecma334.tree
lib/monodoc/sources/ecma334.zip
+lib/monodoc/sources/mono-tools.source
+lib/monodoc/sources/mono-tools.tree
+lib/monodoc/sources/mono-tools.zip
+lib/monodoc/sources/monoapi.source
+lib/monodoc/sources/monoapi.tree
+lib/monodoc/sources/monoapi.zip
lib/monodoc/sources/netdocs.source
lib/monodoc/sources/netdocs.tree
lib/monodoc/sources/netdocs.zip
diff --git a/editors/bless/Makefile b/editors/bless/Makefile
index 2e8d99daffda..d7aea5851d37 100644
--- a/editors/bless/Makefile
+++ b/editors/bless/Makefile
@@ -7,13 +7,12 @@
#
PORTNAME= bless
-PORTVERSION= 0.5.0
-PORTREVISION= 3
+PORTVERSION= 0.6.0
PORTEPOCH= 1
CATEGORIES= editors
MASTER_SITES= http://download.gna.org/bless/
-MAINTAINER= bsd-sharp@googlegroups.com
+MAINTAINER= mono@FreeBSD.org
COMMENT= A high quality, full featured hex editor
USE_GNOME= gnomehack gnomeprefix gnometarget gnomedocutils gtksharp20
diff --git a/editors/bless/distinfo b/editors/bless/distinfo
index e56788153672..898238e4a26a 100644
--- a/editors/bless/distinfo
+++ b/editors/bless/distinfo
@@ -1,3 +1,3 @@
-MD5 (bless-0.5.0.tar.gz) = bc32bab8404d46adda52143e27b5a24e
-SHA256 (bless-0.5.0.tar.gz) = f922796d0fa9f32c579e54dc4d92df35d576e90b0849f38a8dffc4ade5f9d0c3
-SIZE (bless-0.5.0.tar.gz) = 695462
+MD5 (bless-0.6.0.tar.gz) = b4c20d113281dfedb67d9f3ff8b174e3
+SHA256 (bless-0.6.0.tar.gz) = 34dc984c35df19184e5b61a4b11fe79901c417693f57d874dc70ef0c58896de1
+SIZE (bless-0.6.0.tar.gz) = 745694
diff --git a/editors/bless/pkg-plist b/editors/bless/pkg-plist
index 9b4f875d2253..06d067cb731f 100644
--- a/editors/bless/pkg-plist
+++ b/editors/bless/pkg-plist
@@ -1,24 +1,26 @@
bin/bless
-lib/bless-0.5.0/data/help_script.sh
-lib/bless-0.5.0/data/default-preferences.xml
-lib/bless-0.5.0/data/bless.glade
-lib/bless-0.5.0/data/bless-default.layout
-lib/bless-0.5.0/data/bless-all-number-bases.layout
-lib/bless-0.5.0/data/bless-about.png
-lib/bless-0.5.0/data/bless-48x48.png
-lib/bless-0.5.0/data/bless-16-bytes-per-row.layout
-lib/bless-0.5.0/bin/bless.exe
-lib/bless-0.5.0/bin/Bless.Util.dll
-lib/bless-0.5.0/bin/Bless.Tools.dll
-lib/bless-0.5.0/bin/Bless.Tools.Find.dll
-lib/bless-0.5.0/bin/Bless.Tools.Export.dll
-lib/bless-0.5.0/bin/Bless.Tools.Export.Plugins.dll
-lib/bless-0.5.0/bin/Bless.Plugins.dll
-lib/bless-0.5.0/bin/Bless.Gui.dll
-lib/bless-0.5.0/bin/Bless.Gui.Plugins.dll
-lib/bless-0.5.0/bin/Bless.Gui.Drawers.dll
-lib/bless-0.5.0/bin/Bless.Gui.Areas.dll
-lib/bless-0.5.0/bin/Bless.Buffers.dll
+lib/bless/Bless.Buffers.dll
+lib/bless/Bless.Gui.Areas.Plugins.dll
+lib/bless/Bless.Gui.Areas.dll
+lib/bless/Bless.Gui.Drawers.dll
+lib/bless/Bless.Gui.Plugins.dll
+lib/bless/Bless.Gui.dll
+lib/bless/Bless.Plugins.dll
+lib/bless/Bless.Tools.Export.Plugins.dll
+lib/bless/Bless.Tools.Export.dll
+lib/bless/Bless.Tools.Find.dll
+lib/bless/Bless.Tools.dll
+lib/bless/Bless.Util.dll
+lib/bless/bless.exe
+share/applications/bless.desktop
+%%DATADIR%%/bless-16-bytes-per-row.layout
+%%DATADIR%%/bless-48x48.png
+%%DATADIR%%/bless-about.png
+%%DATADIR%%/bless-all-number-bases.layout
+%%DATADIR%%/bless-default.layout
+%%DATADIR%%/bless.glade
+%%DATADIR%%/default-preferences.xml
+%%DATADIR%%/help_script.sh
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -27,7 +29,6 @@ lib/bless-0.5.0/bin/Bless.Buffers.dll
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/README.packaging
%%PORTDOCS%%%%DOCSDIR%%/bless.spec
-%%PORTDOCS%%%%DOCSDIR%%/developer/bless.xmi
%%PORTDOCS%%%%DOCSDIR%%/user/bless-manual.xml
%%PORTDOCS%%%%DOCSDIR%%/user/ch01.html
%%PORTDOCS%%%%DOCSDIR%%/user/ch02.html
@@ -39,6 +40,7 @@ lib/bless-0.5.0/bin/Bless.Buffers.dll
%%PORTDOCS%%%%DOCSDIR%%/user/ch04s03.html
%%PORTDOCS%%%%DOCSDIR%%/user/ch04s04.html
%%PORTDOCS%%%%DOCSDIR%%/user/ch04s05.html
+%%PORTDOCS%%%%DOCSDIR%%/user/ch04s06.html
%%PORTDOCS%%%%DOCSDIR%%/user/ch05.html
%%PORTDOCS%%%%DOCSDIR%%/user/ch05s02.html
%%PORTDOCS%%%%DOCSDIR%%/user/ch05s03.html
@@ -46,6 +48,7 @@ lib/bless-0.5.0/bin/Bless.Buffers.dll
%%PORTDOCS%%%%DOCSDIR%%/user/ch06.html
%%PORTDOCS%%%%DOCSDIR%%/user/ch07.html
%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_area_focus.png
+%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_bitwise_ops.png
%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_display_tag.png
%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_edit_mode.png
%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_export_dialog.png
@@ -55,6 +58,7 @@ lib/bless-0.5.0/bin/Bless.Buffers.dll
%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_number_base.png
%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_preferences_general.png
%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_preferences_session.png
+%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_preferences_undo.png
%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_search_find.png
%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_search_replace.png
%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_select_range.png
@@ -62,15 +66,13 @@ lib/bless-0.5.0/bin/Bless.Buffers.dll
%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_tab_close.png
%%PORTDOCS%%%%DOCSDIR%%/user/index.html
%%PORTDOCS%%%%DOCSDIR%%/user/legal.xml
-share/applications/bless.desktop
share/omf/bless/bless-manual.omf
share/pixmaps/bless-48x48.png
+@dirrm %%DATADIR%%
@dirrm share/omf/bless
+@dirrmtry share/omf
%%PORTDOCS%%@dirrm %%DOCSDIR%%/user/figures
%%PORTDOCS%%@dirrm %%DOCSDIR%%/user
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/developer
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/bless-0.5.0/data
-@dirrm lib/bless-0.5.0/bin
-@dirrm lib/bless-0.5.0
@dirrmtry share/applications
+@dirrm lib/bless
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index d3ac289ae810..70887d8eb72b 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -7,30 +7,32 @@
#
PORTNAME= f-spot
-PORTVERSION= 0.4.0
-PORTREVISION= 2
+PORTVERSION= 0.5.0.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics gnome
-MASTER_SITES= GNOME
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-MAINTAINER= bsd-sharp@googlegroups.com
+MAINTAINER= mono@FreeBSD.org
COMMENT= Personal photo management to the GNOME desktop
LIB_DEPENDS= lcms.1:${PORTSDIR}/graphics/lcms \
exif.12:${PORTSDIR}/graphics/libexif \
gphoto2.2:${PORTSDIR}/graphics/libgphoto2
-RUN_DEPENDS= dbus-daemon:${PORTSDIR}/devel/dbus
-
-BROKEN= does not compile
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib
+RUN_DEPENDS= dbus-daemon:${PORTSDIR}/devel/dbus \
+ ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib
USE_BZIP2= yes
USE_SQLITE= yes
-USE_GNOME= gnomehack gnomeprefix gnometarget intlhack gnomesharp20
+USE_GNOME= gnomehack gnomeprefix gnometarget intlhack gnomedesktopsharp20
GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GMAKE= yes
INSTALLS_ICONS= yes
INSTALLS_OMF= yes
+USE_LDCONFIG= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -41,7 +43,8 @@ post-patch:
${WRKSRC}/src/f-spot.exe.config.in
@${REINPLACE_CMD} 's|target="libgphoto2.so.2"|target="libgphoto2.so"|g'\
${WRKSRC}/libgphoto2-sharp/libgphoto2-sharp.dll.config
- @${REINPLACE_CMD} 's|#!/bin/bash|#!/bin/sh|g' \
+ @${REINPLACE_CMD} 's|#!/bin/bash|#!/usr/bin/env bash|g' \
+ ${WRKSRC}/src/f-spot.in \
${WRKSRC}/tools/f-spot-import
@${REINPLACE_CMD} 's|G_GNUC_FUNCTION|G_STRLOC|g' \
${WRKSRC}/libfspot/f-jpeg-utils.c
diff --git a/graphics/f-spot/distinfo b/graphics/f-spot/distinfo
index bbb2636d4e52..23ca18a8c97c 100644
--- a/graphics/f-spot/distinfo
+++ b/graphics/f-spot/distinfo
@@ -1,3 +1,3 @@
-MD5 (f-spot-0.4.0.tar.bz2) = 0f21ff56d310329185cc17a2fadda5fe
-SHA256 (f-spot-0.4.0.tar.bz2) = c0288df6c83b63698a47ad70ec596d424f1bf40e567c294a677e01f82df5348e
-SIZE (f-spot-0.4.0.tar.bz2) = 2178174
+MD5 (f-spot-0.5.0.3.tar.bz2) = 52db86f1dc715a3958425aa3d006c900
+SHA256 (f-spot-0.5.0.3.tar.bz2) = 7f0f9229e0b832c2ce5c75fb49247f7227141b49a5bcfb2020d0a01e6972e0bd
+SIZE (f-spot-0.5.0.3.tar.bz2) = 2776582
diff --git a/graphics/f-spot/files/patch-icon-theme-installer b/graphics/f-spot/files/patch-icon-theme-installer
new file mode 100644
index 000000000000..ff3ded394217
--- /dev/null
+++ b/graphics/f-spot/files/patch-icon-theme-installer
@@ -0,0 +1,26 @@
+
+$FreeBSD$
+
+--- icon-theme-installer.orig
++++ icon-theme-installer
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ # icon-theme-installer
+ # Copyright (C) 2006 Novell, Inc.
+@@ -101,12 +101,12 @@
+ exit 1
+ fi
+
+-if test ! -x $(echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' '); then
++if ! which $(echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' '); then
+ echo "Cannot find '$MKINSTALLDIRS_EXEC'; You probably want to pass -m \$(mkinstalldirs)"
+ exit 1
+ fi
+
+-if test ! -x $(echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '); then
++if ! which $(echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '); then
+ echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x \$(INSTALL_DATA)"
+ exit 1
+ fi
diff --git a/graphics/f-spot/files/patch-icons_Makefile.in b/graphics/f-spot/files/patch-icons_Makefile.in
new file mode 100644
index 000000000000..11eca93d8d7e
--- /dev/null
+++ b/graphics/f-spot/files/patch-icons_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- icons/Makefile.in.orig
++++ icons/Makefile.in
+@@ -38,7 +38,7 @@
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ SOURCES =
diff --git a/graphics/f-spot/files/patch-src-MainWindow.cs b/graphics/f-spot/files/patch-src-MainWindow.cs
new file mode 100644
index 000000000000..941036ecb76a
--- /dev/null
+++ b/graphics/f-spot/files/patch-src-MainWindow.cs
@@ -0,0 +1,15 @@
+--- src/MainWindow.cs.orig 2008-10-18 07:54:25.000000000 -0300
++++ src/MainWindow.cs 2008-11-17 18:05:48.000000000 -0300
+@@ -2700,8 +2700,10 @@
+
+ case Preferences.MAIN_WINDOW_WIDTH:
+ case Preferences.MAIN_WINDOW_HEIGHT:
+- main_window.Resize(Preferences.Get<int> (Preferences.MAIN_WINDOW_WIDTH),
+- Preferences.Get<int> (Preferences.MAIN_WINDOW_HEIGHT));
++ if (Preferences.Get<int> (Preferences.MAIN_WINDOW_WIDTH) > 0 &&
++ Preferences.Get<int> (Preferences.MAIN_WINDOW_HEIGHT) > 0)
++ main_window.Resize(Preferences.Get<int> (Preferences.MAIN_WINDOW_WIDTH),
++ Preferences.Get<int> (Preferences.MAIN_WINDOW_HEIGHT));
+
+ break;
+
diff --git a/graphics/f-spot/files/patch-src_f-spot.in b/graphics/f-spot/files/patch-src_f-spot.in
deleted file mode 100644
index e2345df6bb21..000000000000
--- a/graphics/f-spot/files/patch-src_f-spot.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/f-spot.in.orig Mon Jan 15 04:53:32 2007
-+++ src/f-spot.in Thu Jan 18 13:27:50 2007
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- prefix=@prefix@
- exec_prefix=@exec_prefix@
-@@ -44,4 +43,4 @@
- echo "** Running Mono with $MONO_OPTIONS **"
- fi
-
--exec -a @PACKAGE@ mono $MONO_OPTIONS $EXE_TO_RUN "$@"
-+exec mono $MONO_OPTIONS $EXE_TO_RUN "$@"
diff --git a/graphics/f-spot/pkg-plist b/graphics/f-spot/pkg-plist
index 67aaa01634e8..8b106794ecdd 100644
--- a/graphics/f-spot/pkg-plist
+++ b/graphics/f-spot/pkg-plist
@@ -1,15 +1,21 @@
bin/f-spot
bin/f-spot-import
bin/f-spot-sqlite-upgrade
+lib/f-spot/Cms.dll
+lib/f-spot/Cms.dll.config
+lib/f-spot/FSpot.Core.dll
+lib/f-spot/FSpot.JobScheduler.dll
+lib/f-spot/FSpot.Query.dll
+lib/f-spot/FSpot.Utils.dll
+lib/f-spot/FSpot.Utils.dll.config
+lib/f-spot/FSpot.Widgets.dll
lib/f-spot/FlickrNet.dll
-lib/f-spot/Mono.Google.dll
+lib/f-spot/Mono.Addins.Gui.dll
+lib/f-spot/Mono.Addins.Setup.dll
lib/f-spot/Mono.Addins.dll
lib/f-spot/Mono.Addins.dll.config
-lib/f-spot/Mono.Addins.Setup.dll
-lib/f-spot/Mono.Addins.Gui.dll
-lib/f-spot/NDesk.DBus.GLib.dll
-lib/f-spot/NDesk.DBus.GLib.dll.config
-lib/f-spot/NDesk.DBus.dll
+lib/f-spot/Mono.Google.dll
+lib/f-spot/Mono.Tabblo.dll
lib/f-spot/NDesk.Glitz.dll
lib/f-spot/SemWeb.dll
lib/f-spot/SmugMugNet.dll
@@ -19,9 +25,28 @@ lib/f-spot/Tao.OpenGl.Glu.dll
lib/f-spot/Tao.OpenGl.Glu.dll.config
lib/f-spot/Tao.OpenGl.dll
lib/f-spot/Tao.OpenGl.dll.config
+lib/f-spot/extensions/BeagleService.dll
+lib/f-spot/extensions/CDExport.dll
+lib/f-spot/extensions/ChangePhotoPath.dll
+lib/f-spot/extensions/DBusService.dll
+lib/f-spot/extensions/DefaultExporters.addin.xml
+lib/f-spot/extensions/DevelopInUFRaw.dll
+lib/f-spot/extensions/FacebookExport.dll
+lib/f-spot/extensions/FlickrExport.dll
+lib/f-spot/extensions/FolderExport.dll
+lib/f-spot/extensions/GalleryExport.dll
+lib/f-spot/extensions/HashJob.dll
+lib/f-spot/extensions/MergeDb.dll
+lib/f-spot/extensions/PicasaWebExport.dll
+lib/f-spot/extensions/RawPlusJpeg.dll
+lib/f-spot/extensions/SmugMugExport.dll
+lib/f-spot/extensions/TabbloExport.dll
+lib/f-spot/extensions/ZipExport.dll
lib/f-spot/f-spot.exe
lib/f-spot/f-spot.exe.config
lib/f-spot/f-spot.global.addins
+lib/f-spot/gio-sharp.dll
+lib/f-spot/gio-sharp.dll.config
lib/f-spot/gnome-keyring-sharp.dll
lib/f-spot/libfspot.a
lib/f-spot/libfspot.la
@@ -37,12 +62,110 @@ lib/f-spot/libfspotjpegtran.so
lib/f-spot/libfspotjpegtran.so.0
lib/f-spot/libgphoto2-sharp.dll
lib/f-spot/libgphoto2-sharp.dll.config
-lib/f-spot/extensions/DefaultExporters.addin.xml
+lib/gio-sharp-unstable/gio-sharp.dll
+lib/gio-sharp-unstable/gio-sharp.dll.config
libdata/pkgconfig/f-spot.pc
+libdata/pkgconfig/gio-sharp-unstable.pc
libexec/gnome-screensaver/f-spot-screensaver
-share/gnome-screensaver/themes/f-spot-screensaver.desktop
+share/applications/f-spot-import.desktop
share/applications/f-spot-view.desktop
share/applications/f-spot.desktop
+share/applications/screensavers/f-spot-screensaver.desktop
+%%DATADIR%%/icons/hicolor/16x16/actions/adjust-colors.png
+%%DATADIR%%/icons/hicolor/16x16/actions/align-horizon.png
+%%DATADIR%%/icons/hicolor/16x16/actions/autocolor.png
+%%DATADIR%%/icons/hicolor/16x16/actions/color-desaturate.png
+%%DATADIR%%/icons/hicolor/16x16/actions/color-sepia.png
+%%DATADIR%%/icons/hicolor/16x16/actions/crop.png
+%%DATADIR%%/icons/hicolor/16x16/actions/filter-soft-focus.png
+%%DATADIR%%/icons/hicolor/16x16/actions/object-rotate-left.png
+%%DATADIR%%/icons/hicolor/16x16/actions/object-rotate-right.png
+%%DATADIR%%/icons/hicolor/16x16/actions/rating-blank.png
+%%DATADIR%%/icons/hicolor/16x16/actions/rating-rated-gray.png
+%%DATADIR%%/icons/hicolor/16x16/actions/rating-rated.png
+%%DATADIR%%/icons/hicolor/16x16/actions/red-eye-remove.png
+%%DATADIR%%/icons/hicolor/16x16/actions/tag-new.png
+%%DATADIR%%/icons/hicolor/16x16/actions/tag.png
+%%DATADIR%%/icons/hicolor/16x16/actions/view-far.png
+%%DATADIR%%/icons/hicolor/16x16/actions/view-fullscreen.png
+%%DATADIR%%/icons/hicolor/16x16/actions/view-near.png
+%%DATADIR%%/icons/hicolor/16x16/actions/view-restore.png
+%%DATADIR%%/icons/hicolor/16x16/apps/f-spot.png
+%%DATADIR%%/icons/hicolor/16x16/devices/camera-photo.png
+%%DATADIR%%/icons/hicolor/16x16/emblems/emblem-event.png
+%%DATADIR%%/icons/hicolor/16x16/emblems/emblem-people.png
+%%DATADIR%%/icons/hicolor/16x16/emblems/emblem-places.png
+%%DATADIR%%/icons/hicolor/16x16/emblems/emblem-readonly.png
+%%DATADIR%%/icons/hicolor/16x16/places/film-roll.png
+%%DATADIR%%/icons/hicolor/16x16/status/mode-browse.png
+%%DATADIR%%/icons/hicolor/16x16/status/mode-image-edit.png
+%%DATADIR%%/icons/hicolor/22x22/actions/adjust-colors.png
+%%DATADIR%%/icons/hicolor/22x22/actions/align-horizon.png
+%%DATADIR%%/icons/hicolor/22x22/actions/autocolor.png
+%%DATADIR%%/icons/hicolor/22x22/actions/color-desaturate.png
+%%DATADIR%%/icons/hicolor/22x22/actions/color-sepia.png
+%%DATADIR%%/icons/hicolor/22x22/actions/crop.png
+%%DATADIR%%/icons/hicolor/22x22/actions/filter-soft-focus.png
+%%DATADIR%%/icons/hicolor/22x22/actions/object-rotate-left.png
+%%DATADIR%%/icons/hicolor/22x22/actions/object-rotate-right.png
+%%DATADIR%%/icons/hicolor/22x22/actions/red-eye-remove.png
+%%DATADIR%%/icons/hicolor/22x22/actions/tag-new.png
+%%DATADIR%%/icons/hicolor/22x22/actions/tag.png
+%%DATADIR%%/icons/hicolor/22x22/actions/view-far.png
+%%DATADIR%%/icons/hicolor/22x22/actions/view-fullscreen.png
+%%DATADIR%%/icons/hicolor/22x22/actions/view-near.png
+%%DATADIR%%/icons/hicolor/22x22/actions/view-restore.png
+%%DATADIR%%/icons/hicolor/22x22/apps/f-spot.png
+%%DATADIR%%/icons/hicolor/22x22/devices/camera-photo.png
+%%DATADIR%%/icons/hicolor/22x22/emblems/emblem-event.png
+%%DATADIR%%/icons/hicolor/22x22/emblems/emblem-people.png
+%%DATADIR%%/icons/hicolor/22x22/emblems/emblem-places.png
+%%DATADIR%%/icons/hicolor/22x22/emblems/emblem-readonly.png
+%%DATADIR%%/icons/hicolor/22x22/places/film-roll.png
+%%DATADIR%%/icons/hicolor/22x22/status/mode-browse.png
+%%DATADIR%%/icons/hicolor/22x22/status/mode-image-edit.png
+%%DATADIR%%/icons/hicolor/24x24/actions/adjust-colors.png
+%%DATADIR%%/icons/hicolor/24x24/actions/align-horizon.png
+%%DATADIR%%/icons/hicolor/24x24/actions/autocolor.png
+%%DATADIR%%/icons/hicolor/24x24/actions/color-desaturate.png
+%%DATADIR%%/icons/hicolor/24x24/actions/filter-soft-focus.png
+%%DATADIR%%/icons/hicolor/24x24/actions/object-rotate-left.png
+%%DATADIR%%/icons/hicolor/24x24/actions/object-rotate-right.png
+%%DATADIR%%/icons/hicolor/24x24/actions/red-eye-remove.png
+%%DATADIR%%/icons/hicolor/24x24/actions/tag-new.png
+%%DATADIR%%/icons/hicolor/24x24/actions/view-far.png
+%%DATADIR%%/icons/hicolor/24x24/actions/view-fullscreen.png
+%%DATADIR%%/icons/hicolor/24x24/actions/view-near.png
+%%DATADIR%%/icons/hicolor/24x24/actions/view-restore.png
+%%DATADIR%%/icons/hicolor/24x24/apps/f-spot.png
+%%DATADIR%%/icons/hicolor/24x24/devices/camera-photo.png
+%%DATADIR%%/icons/hicolor/24x24/emblems/emblem-event.png
+%%DATADIR%%/icons/hicolor/24x24/emblems/emblem-people.png
+%%DATADIR%%/icons/hicolor/24x24/emblems/emblem-places.png
+%%DATADIR%%/icons/hicolor/24x24/emblems/emblem-readonly.png
+%%DATADIR%%/icons/hicolor/24x24/places/film-roll.png
+%%DATADIR%%/icons/hicolor/24x24/status/mode-browse.png
+%%DATADIR%%/icons/hicolor/24x24/status/mode-image-edit.png
+%%DATADIR%%/icons/hicolor/32x32/actions/object-rotate-left.png
+%%DATADIR%%/icons/hicolor/32x32/actions/object-rotate-right.png
+%%DATADIR%%/icons/hicolor/32x32/actions/view-fullscreen.png
+%%DATADIR%%/icons/hicolor/32x32/actions/view-restore.png
+%%DATADIR%%/icons/hicolor/32x32/apps/f-spot.png
+%%DATADIR%%/icons/hicolor/32x32/devices/camera-photo.png
+%%DATADIR%%/icons/hicolor/32x32/emblems/emblem-event.png
+%%DATADIR%%/icons/hicolor/32x32/emblems/emblem-people.png
+%%DATADIR%%/icons/hicolor/32x32/emblems/emblem-places.png
+%%DATADIR%%/icons/hicolor/32x32/emblems/emblem-readonly.png
+%%DATADIR%%/icons/hicolor/32x32/status/mode-browse.png
+%%DATADIR%%/icons/hicolor/icon-theme.cache
+%%DATADIR%%/icons/hicolor/scalable/actions/object-rotate-left.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/object-rotate-right.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/view-fullscreen.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/view-restore.svg
+%%DATADIR%%/icons/hicolor/scalable/apps/f-spot.svg
+%%DATADIR%%/icons/hicolor/scalable/emblems/emblem-event.svg
+%%DATADIR%%/icons/hicolor/scalable/emblems/emblem-places.svg
+%%DATADIR%%/icons/hicolor/scalable/status/mode-browse.svg
share/gnome/help/f-spot/C/f-spot.xml
share/gnome/help/f-spot/C/figures/f-spot-adjust-colors.png
share/gnome/help/f-spot/C/figures/f-spot-autocolor.png
@@ -98,6 +221,17 @@ share/gnome/help/f-spot/it/figures/f-spot-sepia.png
share/gnome/help/f-spot/it/figures/f-spot-slideshow.png
share/gnome/help/f-spot/it/figures/f-spot-soft-focus.png
share/gnome/help/f-spot/it/figures/f-spot-straighten.png
+share/gnome/help/f-spot/oc/f-spot.xml
+share/gnome/help/f-spot/oc/figures/f-spot-adjust-colors.png
+share/gnome/help/f-spot/oc/figures/f-spot-autocolor.png
+share/gnome/help/f-spot/oc/figures/f-spot-crop.png
+share/gnome/help/f-spot/oc/figures/f-spot-desaturate.png
+share/gnome/help/f-spot/oc/figures/f-spot-fullscreen.png
+share/gnome/help/f-spot/oc/figures/f-spot-red-eye.png
+share/gnome/help/f-spot/oc/figures/f-spot-sepia.png
+share/gnome/help/f-spot/oc/figures/f-spot-slideshow.png
+share/gnome/help/f-spot/oc/figures/f-spot-soft-focus.png
+share/gnome/help/f-spot/oc/figures/f-spot-straighten.png
share/gnome/help/f-spot/pt_BR/f-spot.xml
share/gnome/help/f-spot/pt_BR/figures/f-spot-adjust-colors.png
share/gnome/help/f-spot/pt_BR/figures/f-spot-autocolor.png
@@ -109,6 +243,17 @@ share/gnome/help/f-spot/pt_BR/figures/f-spot-sepia.png
share/gnome/help/f-spot/pt_BR/figures/f-spot-slideshow.png
share/gnome/help/f-spot/pt_BR/figures/f-spot-soft-focus.png
share/gnome/help/f-spot/pt_BR/figures/f-spot-straighten.png
+share/gnome/help/f-spot/ru/f-spot.xml
+share/gnome/help/f-spot/ru/figures/f-spot-adjust-colors.png
+share/gnome/help/f-spot/ru/figures/f-spot-autocolor.png
+share/gnome/help/f-spot/ru/figures/f-spot-crop.png
+share/gnome/help/f-spot/ru/figures/f-spot-desaturate.png
+share/gnome/help/f-spot/ru/figures/f-spot-fullscreen.png
+share/gnome/help/f-spot/ru/figures/f-spot-red-eye.png
+share/gnome/help/f-spot/ru/figures/f-spot-sepia.png
+share/gnome/help/f-spot/ru/figures/f-spot-slideshow.png
+share/gnome/help/f-spot/ru/figures/f-spot-soft-focus.png
+share/gnome/help/f-spot/ru/figures/f-spot-straighten.png
share/gnome/help/f-spot/sv/f-spot.xml
share/gnome/help/f-spot/sv/figures/f-spot-adjust-colors.png
share/gnome/help/f-spot/sv/figures/f-spot-autocolor.png
@@ -120,23 +265,13 @@ share/gnome/help/f-spot/sv/figures/f-spot-sepia.png
share/gnome/help/f-spot/sv/figures/f-spot-slideshow.png
share/gnome/help/f-spot/sv/figures/f-spot-soft-focus.png
share/gnome/help/f-spot/sv/figures/f-spot-straighten.png
-share/omf/f-spot/f-spot-C.omf
-share/omf/f-spot/f-spot-da.omf
-share/omf/f-spot/f-spot-es.omf
-share/omf/f-spot/f-spot-fr.omf
-share/omf/f-spot/f-spot-it.omf
-share/omf/f-spot/f-spot-pt_BR.omf
-share/omf/f-spot/f-spot-sv.omf
share/icons/hicolor/16x16/apps/f-spot.png
-share/icons/hicolor/16x16/apps/f-spot.svg
share/icons/hicolor/22x22/apps/f-spot.png
-share/icons/hicolor/22x22/apps/f-spot.svg
share/icons/hicolor/24x24/apps/f-spot.png
share/icons/hicolor/32x32/apps/f-spot.png
-share/icons/hicolor/32x32/apps/f-spot.svg
-share/icons/hicolor/48x48/apps/f-spot.png
-share/icons/hicolor/48x48/apps/f-spot.svg
+share/icons/hicolor/scalable/apps/f-spot.svg
share/locale/ar/LC_MESSAGES/f-spot.mo
+share/locale/be@latin/LC_MESSAGES/f-spot.mo
share/locale/bg/LC_MESSAGES/f-spot.mo
share/locale/ca/LC_MESSAGES/f-spot.mo
share/locale/cs/LC_MESSAGES/f-spot.mo
@@ -153,37 +288,53 @@ share/locale/fa/LC_MESSAGES/f-spot.mo
share/locale/fi/LC_MESSAGES/f-spot.mo
share/locale/fr/LC_MESSAGES/f-spot.mo
share/locale/gl/LC_MESSAGES/f-spot.mo
+share/locale/he/LC_MESSAGES/f-spot.mo
share/locale/hi/LC_MESSAGES/f-spot.mo
share/locale/hu/LC_MESSAGES/f-spot.mo
share/locale/it/LC_MESSAGES/f-spot.mo
share/locale/ja/LC_MESSAGES/f-spot.mo
+share/locale/ka/LC_MESSAGES/f-spot.mo
+share/locale/ko/LC_MESSAGES/f-spot.mo
share/locale/lt/LC_MESSAGES/f-spot.mo
share/locale/lv/LC_MESSAGES/f-spot.mo
share/locale/mk/LC_MESSAGES/f-spot.mo
share/locale/nb/LC_MESSAGES/f-spot.mo
share/locale/nl/LC_MESSAGES/f-spot.mo
+share/locale/oc/LC_MESSAGES/f-spot.mo
share/locale/pa/LC_MESSAGES/f-spot.mo
share/locale/pl/LC_MESSAGES/f-spot.mo
share/locale/pt/LC_MESSAGES/f-spot.mo
share/locale/pt_BR/LC_MESSAGES/f-spot.mo
share/locale/ru/LC_MESSAGES/f-spot.mo
share/locale/rw/LC_MESSAGES/f-spot.mo
+share/locale/sk/LC_MESSAGES/f-spot.mo
share/locale/sr/LC_MESSAGES/f-spot.mo
-share/locale/sr@Latn/LC_MESSAGES/f-spot.mo
+share/locale/sr@latin/LC_MESSAGES/f-spot.mo
share/locale/sv/LC_MESSAGES/f-spot.mo
share/locale/th/LC_MESSAGES/f-spot.mo
+share/locale/uk/LC_MESSAGES/f-spot.mo
share/locale/vi/LC_MESSAGES/f-spot.mo
share/locale/zh_CN/LC_MESSAGES/f-spot.mo
+share/locale/zh_HK/LC_MESSAGES/f-spot.mo
share/locale/zh_TW/LC_MESSAGES/f-spot.mo
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
+share/omf/f-spot/f-spot-C.omf
+share/omf/f-spot/f-spot-da.omf
+share/omf/f-spot/f-spot-es.omf
+share/omf/f-spot/f-spot-fr.omf
+share/omf/f-spot/f-spot-it.omf
+share/omf/f-spot/f-spot-oc.omf
+share/omf/f-spot/f-spot-pt_BR.omf
+share/omf/f-spot/f-spot-ru.omf
+share/omf/f-spot/f-spot-sv.omf
@dirrm share/omf/f-spot
@dirrm share/gnome/help/f-spot/sv/figures
@dirrm share/gnome/help/f-spot/sv
+@dirrm share/gnome/help/f-spot/ru/figures
+@dirrm share/gnome/help/f-spot/ru
@dirrm share/gnome/help/f-spot/pt_BR/figures
@dirrm share/gnome/help/f-spot/pt_BR
+@dirrm share/gnome/help/f-spot/oc/figures
+@dirrm share/gnome/help/f-spot/oc
@dirrm share/gnome/help/f-spot/it/figures
@dirrm share/gnome/help/f-spot/it
@dirrm share/gnome/help/f-spot/fr/figures
@@ -195,9 +346,43 @@ share/locale/zh_TW/LC_MESSAGES/f-spot.mo
@dirrm share/gnome/help/f-spot/C/figures
@dirrm share/gnome/help/f-spot/C
@dirrm share/gnome/help/f-spot
-@dirrmtry share/gnome-screensaver/themes
-@dirrmtry share/gnome-screensaver
+@dirrm %%DATADIR%%/icons/hicolor/scalable/status
+@dirrm %%DATADIR%%/icons/hicolor/scalable/emblems
+@dirrm %%DATADIR%%/icons/hicolor/scalable/apps
+@dirrm %%DATADIR%%/icons/hicolor/scalable/actions
+@dirrm %%DATADIR%%/icons/hicolor/scalable
+@dirrm %%DATADIR%%/icons/hicolor/32x32/status
+@dirrm %%DATADIR%%/icons/hicolor/32x32/emblems
+@dirrm %%DATADIR%%/icons/hicolor/32x32/devices
+@dirrm %%DATADIR%%/icons/hicolor/32x32/apps
+@dirrm %%DATADIR%%/icons/hicolor/32x32/actions
+@dirrm %%DATADIR%%/icons/hicolor/32x32
+@dirrm %%DATADIR%%/icons/hicolor/24x24/status
+@dirrm %%DATADIR%%/icons/hicolor/24x24/places
+@dirrm %%DATADIR%%/icons/hicolor/24x24/emblems
+@dirrm %%DATADIR%%/icons/hicolor/24x24/devices
+@dirrm %%DATADIR%%/icons/hicolor/24x24/apps
+@dirrm %%DATADIR%%/icons/hicolor/24x24/actions
+@dirrm %%DATADIR%%/icons/hicolor/24x24
+@dirrm %%DATADIR%%/icons/hicolor/22x22/status
+@dirrm %%DATADIR%%/icons/hicolor/22x22/places
+@dirrm %%DATADIR%%/icons/hicolor/22x22/emblems
+@dirrm %%DATADIR%%/icons/hicolor/22x22/devices
+@dirrm %%DATADIR%%/icons/hicolor/22x22/apps
+@dirrm %%DATADIR%%/icons/hicolor/22x22/actions
+@dirrm %%DATADIR%%/icons/hicolor/22x22
+@dirrm %%DATADIR%%/icons/hicolor/16x16/status
+@dirrm %%DATADIR%%/icons/hicolor/16x16/places
+@dirrm %%DATADIR%%/icons/hicolor/16x16/emblems
+@dirrm %%DATADIR%%/icons/hicolor/16x16/devices
+@dirrm %%DATADIR%%/icons/hicolor/16x16/apps
+@dirrm %%DATADIR%%/icons/hicolor/16x16/actions
+@dirrm %%DATADIR%%/icons/hicolor/16x16
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
+@dirrmtry share/applications/screensavers
@dirrmtry libexec/gnome-screensaver
+@dirrm lib/gio-sharp-unstable
@dirrm lib/f-spot/extensions
@dirrm lib/f-spot
-@dirrmtry share/applications
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 03566e2a3ec6..4e207cafb967 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -3,33 +3,35 @@
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
-# $Id: Makefile,v 1.94 2007/10/03 01:34:13 killfill Exp $
+# $Id: Makefile,v 1.98 2007/12/13 19:31:45 killfill Exp $
#
PORTNAME= mono
-PORTVERSION= 1.2.5.1
-PORTREVISION= 1
+PORTVERSION= 2.0.1
+PORTREVISION= 6
CATEGORIES= lang
-MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
+MASTER_SITES= ftp://ftp.novell.com/pub/mono/sources/${PORTNAME}/
-MAINTAINER= bsd-sharp@googlegroups.com
+MAINTAINER= mono@FreeBSD.org
COMMENT= An open source implementation of .NET Development Framework
-CONFLICTS= mono-devel-[0-9]* mono-svn-[0-9]*
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
USE_BZIP2= yes
USE_BISON= build
USE_GNOME= gnomehack glib20
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
+USE_PERL5_BUILD= yes
LIBTOOLFILES= configure libgc/configure
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --program-transform-name=\'\' \
- --with-gc=included \
- --with-tls=pthread \
+ --with-moonlinght=no \
+ --with-preview=yes \
+ --with-sigaltstack=no \
--mandir=${PREFIX}/man
MAKE_ARGS= EXTERNAL_MCS=false
@@ -39,25 +41,25 @@ MONO_SHARED_DIR=${WRKDIR}
# LC_ALL is set in order to work around issues people are having when using
# other languages. This has shown itself in build fails and possibly other
# strange crashes.
-MAKE_ENV= LC_ALL=C
+MAKE_ENV= MONO_SHARED_DIR="${MONO_SHARED_DIR}" \
+ LC_ALL=C
-# Removed amd64 arch because builds are exhibiting semaphore problems on
-# pointyhat runs causing failure to build.
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 \
- mint.1 mkbundle.1 mono-service.1 mono-shlib-cop.1 mono.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 vbnc.1 resgen.1 monolinker.1
+ gacutil.1 genxs.1 httpcfg.1 ilasm.1 jay.1 macpack.1 makecert.1 \
+ mconfig.1 mcs.1 mint.1 mkbundle.1 mono-service.1 mono-shlib-cop.1 \
+ mono-xmltool.1 mono.1 monoburg.1 monodis.1 monolinker.1 monop.1 \
+ monostyle.1 mozroots.1 oldmono.1 permview.1 prj2make.1 secutil.1 \
+ setreg.1 sgen.1 signcode.1 sn.1 soapsuds.1 sqlsharp.1 vbnc.1 \
+ wsdl.1 xsd.1 resgen.1
MAN5= mono-config.5
.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64"
USE_FAM= yes
+MAKE_ARGS+= MONO_GENERIC_SHARING=none #https://bugzilla.novell.com/show_bug.cgi?id=434457
.endif
pre-everything::
@@ -77,7 +79,21 @@ post-patch:
${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
+ ${WRKSRC}/mcs/class/Managed.Windows.Forms/build-csproj2k5 \
+ ${WRKSRC}/mcs/class/Mono.WebBrowser/build-csproj2k5 \
+ ${WRKSRC}/mcs/class/Mono.Cairo/Samples/gtk/compile.sh \
+ ${WRKSRC}/mcs/class/Mono.Cairo/Samples/png/compile.sh \
+ ${WRKSRC}/mcs/class/Mono.Cairo/Samples/win32/compile.sh \
+ ${WRKSRC}/mcs/class/Mono.Cairo/Samples/x11/compile.sh
+ @${REINPLACE_CMD} -e 's|^#!/bin/perl|#!/usr/bin/env perl|g' \
+ ${WRKSRC}/mcs/errors/do-tests.pl \
+ ${WRKSRC}/mcs/tools/scan-tests.pl \
+ ${WRKSRC}/msvc/create-windef.pl \
+ ${WRKSRC}/mono/benchmark/test-driver \
+ ${WRKSRC}/mono/cil/make-opcodes-def.pl \
+ ${WRKSRC}/mono/metadata/make-bundle.pl \
+ ${WRKSRC}/mono/mini/genmdesc.pl \
+ ${WRKSRC}/mono/tests/stress-runner.pl
.if ${OSVERSION} >= 700000 && ${OSVERSION} < 800000
@${REINPLACE_CMD} -e 's|freebsd6|freebsd7|g' \
diff --git a/lang/mono/bsd.mono.mk b/lang/mono/bsd.mono.mk
index 01d72df0dc2b..ed202ad57cf3 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.25 2007/08/19 19:35:30 killfill Exp $
+# $Id: bsd.mono.mk,v 1.27 2007/11/22 15:31:04 killfill Exp $
#
# USE_NANT - If set, the port uses nant.
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 8c8b10176ea3..0e4d777f0099 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (mono-2.0.1.tar.bz2) = 60ab4d1d1990826578891e90cd560fa0
+SHA256 (mono-2.0.1.tar.bz2) = 7089e8591ce793940d8a30f3ff5414437c32fc346fa918ec7f186516dab3e212
+SIZE (mono-2.0.1.tar.bz2) = 19385815
diff --git a/lang/mono/files/patch-configure b/lang/mono/files/patch-configure
index ab55b91f0be2..07571a8fc782 100644
--- a/lang/mono/files/patch-configure
+++ b/lang/mono/files/patch-configure
@@ -1,6 +1,30 @@
---- configure.orig Sun Aug 26 00:12:42 2007
-+++ configure Sun Aug 26 00:12:59 2007
-@@ -39673,8 +39673,8 @@
+--- configure.orig 2008-12-09 19:49:56.000000000 -0300
++++ configure 2008-12-09 19:50:22.000000000 -0300
+@@ -3003,7 +3003,8 @@
+ LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
+ libmono_ldflags="$PTHREAD_LIBS"
+ fi
+- CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD -DPLATFORM_BSD6"
++ CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD -DPLATFORM_BSD6 -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP"
++ libmono_cflags="$libmono_cflags -D_REENTRANT"
+ need_link_unlink=yes
+ cat >>confdefs.h <<\_ACEOF
+ #define PTHREAD_POINTER_ID 1
+@@ -3011,11 +3012,11 @@
+
+ libdl=
+ libgc_threads=pthreads
+- with_sigaltstack=yes
++# with_sigaltstack=yes
+ # TLS is only partially implemented on -CURRENT (compiler support
+ # but NOT library support)
+ #
+- with_tls=pthread
++# with_tls=pthread
+ ;;
+ *-*-*openbsd*)
+ platform_win32=no
+@@ -38211,8 +38212,8 @@
INTERP_SUPPORTED=no
LIBC="libc.so.6"
INTL="libc.so.6"
diff --git a/lang/mono/files/patch-libgc_configure b/lang/mono/files/patch-libgc_configure
new file mode 100644
index 000000000000..b4bf4f00806a
--- /dev/null
+++ b/lang/mono/files/patch-libgc_configure
@@ -0,0 +1,18 @@
+--- libgc/configure.orig 2008-10-22 14:20:06.000000000 -0300
++++ libgc/configure 2008-12-10 10:40:48.000000000 -0300
+@@ -4669,7 +4669,14 @@
+ cat >>confdefs.h <<\_ACEOF
+ #define GC_FREEBSD_THREADS 1
+ _ACEOF
+-
++ if test "${enable_parallel_mark}" = yes; then
++ cat >>confdefs.h <<\_ACEOF
++#define PARALLEL_MARK 1
++_ACEOF
++ fi
++ cat >>confdefs.h <<\_ACEOF
++#define THREAD_LOCAL_ALLOC 1 //only for tls=__thread. delete for pthread.
++_ACEOF
+ if test "x$PTHREAD_CFLAGS" != "x"; then
+ INCLUDES="$INCLUDES $PTHREAD_CFLAGS"
+ fi
diff --git a/lang/mono/files/patch-mcs_class_System_System.Net.Sockets_Socket.cs b/lang/mono/files/patch-mcs_class_System_System.Net.Sockets_Socket.cs
new file mode 100644
index 000000000000..368a6a71e7c3
--- /dev/null
+++ b/lang/mono/files/patch-mcs_class_System_System.Net.Sockets_Socket.cs
@@ -0,0 +1,30 @@
+--- mcs/class/System/System.Net.Sockets/Socket.cs.orig 2008-11-01 00:35:55.000000000 -0300
++++ mcs/class/System/System.Net.Sockets/Socket.cs 2008-11-01 00:38:16.000000000 -0300
+@@ -1552,7 +1552,7 @@
+ }
+
+ int error = 0;
+- if (!blocking) {
++// if (!blocking) {
+ SocketAddress serial = end_point.Serialize ();
+ Connect_internal (socket, serial, out error);
+ if (error == 0) {
+@@ -1564,15 +1564,16 @@
+ connected = false;
+ req.Complete (new SocketException (error), true);
+ }
+- }
++// }
+
+- if (blocking || error == (int) SocketError.InProgress || error == (int) SocketError.WouldBlock) {
++/* if (blocking || error == (int) SocketError.InProgress || error == (int) SocketError.WouldBlock) {
+ // continue asynch
+ connected = false;
+ Worker worker = new Worker (req);
+ SocketAsyncCall sac = new SocketAsyncCall (worker.Connect);
+ sac.BeginInvoke (null, req);
+ }
++*/
+
+ return(req);
+ }
diff --git a/lang/mono/files/patch-mcs_tools_gensources.sh b/lang/mono/files/patch-mcs_tools_gensources.sh
new file mode 100644
index 000000000000..f111a86093c4
--- /dev/null
+++ b/lang/mono/files/patch-mcs_tools_gensources.sh
@@ -0,0 +1,8 @@
+--- mcs/tools/gensources.sh.orig 2008-04-03 11:08:16.000000000 -0400
++++ mcs/tools/gensources.sh 2008-04-03 11:08:24.000000000 -0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/env sh
+
+ includefile=$1
+ excludefile=$2
diff --git a/lang/mono/files/patch-mono_metadata_class.c b/lang/mono/files/patch-mono_metadata_class.c
new file mode 100644
index 000000000000..5150caa94ea0
--- /dev/null
+++ b/lang/mono/files/patch-mono_metadata_class.c
@@ -0,0 +1,14 @@
+--- mono/metadata/class.c.orig 2008-11-01 01:58:37.000000000 -0300
++++ mono/metadata/class.c 2008-11-01 02:01:35.000000000 -0300
+@@ -7449,7 +7449,10 @@
+ gboolean
+ mono_class_generic_sharing_enabled (MonoClass *class)
+ {
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__FreeBSD__) && defined(__x86_64__)
++/* https://bugzilla.novell.com/show_bug.cgi?id=434457 */
++ static gboolean supported = FALSE;
++#elif defined(__i386__) || defined(__x86_64__)
+ static gboolean supported = TRUE;
+ #else
+ /* Not supported by the JIT backends */
diff --git a/lang/mono/files/patch-mono_metadata_marshal.c b/lang/mono/files/patch-mono_metadata_marshal.c
new file mode 100644
index 000000000000..4f84717b26e3
--- /dev/null
+++ b/lang/mono/files/patch-mono_metadata_marshal.c
@@ -0,0 +1,29 @@
+--- mono/metadata/marshal.c.orig 2008-12-19 17:11:03.000000000 -0300
++++ mono/metadata/marshal.c 2009-01-04 12:43:13.000000000 -0300
+@@ -1022,8 +1022,7 @@
+ mono_string_builder_to_utf8 (MonoStringBuilder *sb)
+ {
+ GError *error = NULL;
+- glong *res;
+- gchar *tmp;
++ gchar *tmp, *res = NULL;
+
+ if (!sb)
+ return NULL;
+@@ -1037,14 +1036,12 @@
+ sb->cached_str = NULL;
+ }
+
+- res = mono_marshal_alloc (mono_stringbuilder_capacity (sb) + 1);
+-
+- tmp = g_utf16_to_utf8 (mono_string_chars (sb->str), sb->length, NULL, res, &error);
++ tmp = g_utf16_to_utf8 (mono_string_chars (sb->str), sb->length, NULL, NULL, &error);
+ if (error) {
+ g_error_free (error);
+- mono_marshal_free (res);
+ mono_raise_exception (mono_get_exception_execution_engine ("Failed to convert StringBuilder from utf16 to utf8"));
+ } else {
++ res = mono_marshal_alloc (mono_stringbuilder_capacity (sb) + 1);
+ memcpy (res, tmp, sb->length + 1);
+ g_free (tmp);
+ }
diff --git a/lang/mono/files/patch-mono_mini_mini-x86.h b/lang/mono/files/patch-mono_mini_mini-x86.h
new file mode 100644
index 000000000000..c907d59837b9
--- /dev/null
+++ b/lang/mono/files/patch-mono_mini_mini-x86.h
@@ -0,0 +1,11 @@
+--- mono/mini/mini-x86.h.orig 2008-12-11 21:27:14.000000000 -0300
++++ mono/mini/mini-x86.h 2008-12-11 21:27:35.000000000 -0300
+@@ -43,7 +43,7 @@
+
+ #endif /* PLATFORM_WIN32 */
+
+-#if defined( __linux__) || defined(__sun) || defined(__APPLE__) || defined(__NetBSD__)
++#if defined( __linux__) || defined(__sun) || defined(__APPLE__) || defined(__NetBSD__) || defined(__FreeBSD__)
+ #define MONO_ARCH_USE_SIGACTION
+ #endif
+
diff --git a/lang/mono/files/patch-mono_mini_mini.c b/lang/mono/files/patch-mono_mini_mini.c
new file mode 100644
index 000000000000..616d7002cd7c
--- /dev/null
+++ b/lang/mono/files/patch-mono_mini_mini.c
@@ -0,0 +1,14 @@
+--- ./mono/mini/mini.c.orig 2008-10-20 13:53:02.000000000 -0300
++++ ./mono/mini/mini.c 2008-12-09 15:04:17.000000000 -0300
+@@ -78,6 +78,11 @@
+
+ #include "debug-mini.h"
+
++// https://bugzilla.novell.com/show_bug.cgi?id=448131
++#if defined(__FreeBSD__)
++#undef MONO_ARCH_SIGSEGV_ON_ALTSTACK
++#endif
++
+ #define BRANCH_COST 100
+ #define INLINE_LENGTH_LIMIT 20
+ #define INLINE_FAILURE do {\
diff --git a/lang/mono/files/patch-mono_tests_libtest.c b/lang/mono/files/patch-mono_tests_libtest.c
new file mode 100644
index 000000000000..0f8af2fa9a16
--- /dev/null
+++ b/lang/mono/files/patch-mono_tests_libtest.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- mono/tests/libtest.c.orig
++++ mono/tests/libtest.c
+@@ -2943,7 +2943,7 @@
+ * mono_method_get_unmanaged_thunk tests
+ */
+
+-#if defined(__GNUC__) && defined(__i386__) && (defined(__linux__) || defined (__APPLE__))
++#if defined(__GNUC__) && defined(__i386__) && (defined(__linux__) || defined (__APPLE__) || defined (__FreeBSD__))
+ #define ALIGN(size) __attribute__ ((aligned(size)))
+ #else
+ #define ALIGN(size)
diff --git a/lang/mono/pkg-plist b/lang/mono/pkg-plist
index 4ee0104111c4..47c63e163990 100644
--- a/lang/mono/pkg-plist
+++ b/lang/mono/pkg-plist
@@ -1,4 +1,5 @@
bin/al
+bin/al1
bin/al2
bin/caspol
bin/cert2spc
@@ -9,34 +10,43 @@ bin/disco
bin/dtd2rng
bin/dtd2xsd
bin/gacutil
+bin/gacutil2
bin/genxs
+bin/genxs1
+bin/genxs2
bin/gmcs
bin/httpcfg
bin/ilasm
+bin/ilasm1
bin/ilasm2
bin/installvst
bin/jay
bin/macpack
bin/makecert
-bin/mbas
+bin/mconfig
bin/mcs
+bin/mcs1
bin/mjs
bin/mkbundle
+bin/mkbundle1
bin/mkbundle2
bin/mono
bin/mono-api-diff
bin/mono-api-info
+bin/mono-api-info1
bin/mono-api-info2
bin/mono-find-provides
bin/mono-find-requires
bin/mono-service
bin/mono-service2
bin/mono-shlib-cop
+bin/mono-test-install
bin/mono-xmltool
bin/monodis
bin/monograph
bin/monolinker
bin/monop
+bin/monop1
bin/monop2
bin/mozroots
bin/nunit-console
@@ -45,6 +55,7 @@ bin/pedump
bin/permview
bin/prj2make
bin/resgen
+bin/resgen1
bin/resgen2
bin/secutil
bin/setreg
@@ -55,16 +66,21 @@ bin/sn
bin/soapsuds
bin/sqlsharp
bin/wsdl
+bin/wsdl1
bin/wsdl2
bin/xbuild
bin/xsd
+bin/xsd2
etc/mono/1.0/DefaultWsdlHelpGenerator.aspx
etc/mono/1.0/machine.config
+etc/mono/2.0/Browsers/Compat.browser
etc/mono/2.0/DefaultWsdlHelpGenerator.aspx
etc/mono/2.0/machine.config
+etc/mono/2.0/settings.map
etc/mono/2.0/web.config
etc/mono/browscap.ini
etc/mono/config
+etc/mono/mconfig/config.xml
include/mono-1.0/mono/cil/opcode.def
include/mono-1.0/mono/interpreter/embed.h
include/mono-1.0/mono/io-layer/access.h
@@ -79,6 +95,7 @@ include/mono-1.0/mono/io-layer/io-layer.h
include/mono-1.0/mono/io-layer/io-portability.h
include/mono-1.0/mono/io-layer/io.h
include/mono-1.0/mono/io-layer/macros.h
+include/mono-1.0/mono/io-layer/messages.h
include/mono-1.0/mono/io-layer/mono-mutex.h
include/mono-1.0/mono/io-layer/mutexes.h
include/mono-1.0/mono/io-layer/processes.h
@@ -123,9 +140,9 @@ 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-membar.h
include/mono-1.0/mono/utils/mono-path.h
include/mono-1.0/mono/utils/mono-poll.h
include/mono-1.0/mono/utils/mono-stdlib.h
@@ -182,6 +199,7 @@ lib/mono/1.0/Mono.Http.dll
lib/mono/1.0/Mono.Posix.dll
lib/mono/1.0/Mono.Security.Win32.dll
lib/mono/1.0/Mono.Security.dll
+lib/mono/1.0/Mono.WebBrowser.dll
lib/mono/1.0/Novell.Directory.Ldap.dll
lib/mono/1.0/Npgsql.dll
lib/mono/1.0/OpenSystem.C.dll
@@ -219,9 +237,9 @@ 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/cscompmgd.dll
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
lib/mono/1.0/dtd2rng.exe
@@ -236,6 +254,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/installutil.exe
+lib/mono/1.0/installutil.exe.mdb
lib/mono/1.0/installvst.exe
lib/mono/1.0/installvst.exe.mdb
lib/mono/1.0/macpack.exe
@@ -291,6 +311,7 @@ lib/mono/1.0/soapsuds.exe
lib/mono/1.0/soapsuds.exe.mdb
lib/mono/1.0/sqlsharp.exe
lib/mono/1.0/sqlsharp.exe.mdb
+lib/mono/1.0/transform.exe
lib/mono/1.0/wsdl.exe
lib/mono/1.0/wsdl.exe.mdb
lib/mono/1.0/xsd.exe
@@ -305,6 +326,7 @@ lib/mono/2.0/I18N.Other.dll
lib/mono/2.0/I18N.Rare.dll
lib/mono/2.0/I18N.West.dll
lib/mono/2.0/I18N.dll
+lib/mono/2.0/IBM.Data.DB2.dll
lib/mono/2.0/ICSharpCode.SharpZipLib.dll
lib/mono/2.0/MSBuild/Microsoft.Build.CommonTypes.xsd
lib/mono/2.0/MSBuild/Microsoft.Build.Core.xsd
@@ -334,13 +356,17 @@ lib/mono/2.0/Mono.Http.dll
lib/mono/2.0/Mono.Posix.dll
lib/mono/2.0/Mono.Security.Win32.dll
lib/mono/2.0/Mono.Security.dll
+lib/mono/2.0/Mono.Web.dll
+lib/mono/2.0/Mono.WebBrowser.dll
lib/mono/2.0/Novell.Directory.Ldap.dll
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.Core.dll
+lib/mono/2.0/System.Data.DataSetExtensions.dll
+lib/mono/2.0/System.Data.Linq.dll
lib/mono/2.0/System.Data.OracleClient.dll
lib/mono/2.0/System.Data.dll
lib/mono/2.0/System.Design.dll
@@ -355,14 +381,19 @@ lib/mono/2.0/System.Runtime.Serialization.Formatters.Soap.dll
lib/mono/2.0/System.Security.dll
lib/mono/2.0/System.ServiceProcess.dll
lib/mono/2.0/System.Transactions.dll
+lib/mono/2.0/System.Web.Extensions.Design.dll
+lib/mono/2.0/System.Web.Extensions.dll
lib/mono/2.0/System.Web.Services.dll
lib/mono/2.0/System.Web.dll
lib/mono/2.0/System.Windows.Forms.dll
+lib/mono/2.0/System.Xml.Linq.dll
lib/mono/2.0/System.Xml.dll
lib/mono/2.0/System.dll
lib/mono/2.0/al.exe
lib/mono/2.0/al.exe.mdb
lib/mono/2.0/cscompmgd.dll
+lib/mono/2.0/gacutil.exe
+lib/mono/2.0/gacutil.exe.mdb
lib/mono/2.0/gmcs.exe
lib/mono/2.0/gmcs.exe.config
lib/mono/2.0/gmcs.exe.mdb
@@ -370,6 +401,10 @@ 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/installutil.exe
+lib/mono/2.0/installutil.exe.mdb
+lib/mono/2.0/mconfig.exe
+lib/mono/2.0/mconfig.exe.mdb
lib/mono/2.0/mkbundle.exe
lib/mono/2.0/mkbundle.exe.mdb
lib/mono/2.0/mono-api-info.exe
@@ -382,6 +417,10 @@ lib/mono/2.0/mscorlib.dll.mdb
lib/mono/2.0/nunit-console.exe
lib/mono/2.0/nunit-console.exe.config
lib/mono/2.0/nunit-console.exe.mdb
+lib/mono/2.0/nunit.core.dll
+lib/mono/2.0/nunit.framework.dll
+lib/mono/2.0/nunit.mocks.dll
+lib/mono/2.0/nunit.util.dll
lib/mono/2.0/resgen.exe
lib/mono/2.0/resgen.exe.mdb
lib/mono/2.0/sgen.exe
@@ -391,6 +430,18 @@ lib/mono/2.0/wsdl.exe.mdb
lib/mono/2.0/xbuild.exe
lib/mono/2.0/xbuild.exe.mdb
lib/mono/2.0/xbuild.rsp
+lib/mono/2.0/xsd.exe
+lib/mono/2.0/xsd.exe.mdb
+lib/mono/2.1/System.Core.dll
+lib/mono/2.1/System.Net.dll
+lib/mono/2.1/System.Xml.dll
+lib/mono/2.1/System.dll
+lib/mono/2.1/mscorlib.dll
+lib/mono/2.1/mscorlib.dll.mdb
+lib/mono/2.1/smcs.exe
+lib/mono/2.1/smcs.exe.mdb
+lib/mono/3.5/System.Web.Extensions.Design.dll
+lib/mono/3.5/System.Web.Extensions.dll
lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll
lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll
lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a/Accessibility.dll
@@ -471,8 +522,10 @@ 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.Cecil.Mdb/0.2.0.0__0738eb9f132ed756/Mono.Cecil.Mdb.dll
+lib/mono/gac/Mono.Cecil.Mdb/0.2.0.0__0738eb9f132ed756/Mono.Cecil.Mdb.dll.mdb
+lib/mono/gac/Mono.Cecil/0.6.8.8607__0738eb9f132ed756/Mono.Cecil.dll
+lib/mono/gac/Mono.Cecil/0.6.8.8607__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
@@ -521,6 +574,10 @@ lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756/Mono.Security.dll
lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756/Mono.Security.dll.mdb
lib/mono/gac/Mono.Security/2.0.0.0__0738eb9f132ed756/Mono.Security.dll
lib/mono/gac/Mono.Security/2.0.0.0__0738eb9f132ed756/Mono.Security.dll.mdb
+lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll
+lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll.mdb
+lib/mono/gac/Mono.WebBrowser/0.5.0.0__0738eb9f132ed756/Mono.WebBrowser.dll
+lib/mono/gac/Mono.WebBrowser/0.5.0.0__0738eb9f132ed756/Mono.WebBrowser.dll.mdb
lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756/Novell.Directory.Ldap.dll
lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756/Novell.Directory.Ldap.dll.mdb
lib/mono/gac/Novell.Directory.Ldap/2.0.0.0__0738eb9f132ed756/Novell.Directory.Ldap.dll
@@ -543,8 +600,14 @@ 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.Core/2.0.5.0__7cec85d7bea7798e/System.Core.dll
+lib/mono/gac/System.Core/2.0.5.0__7cec85d7bea7798e/System.Core.dll.mdb
+lib/mono/gac/System.Core/3.5.0.0__b77a5c561934e089/System.Core.dll
+lib/mono/gac/System.Core/3.5.0.0__b77a5c561934e089/System.Core.dll.mdb
+lib/mono/gac/System.Data.DataSetExtensions/3.5.0.0__b77a5c561934e089/System.Data.DataSetExtensions.dll
+lib/mono/gac/System.Data.DataSetExtensions/3.5.0.0__b77a5c561934e089/System.Data.DataSetExtensions.dll.mdb
+lib/mono/gac/System.Data.Linq/3.5.0.0__b77a5c561934e089/System.Data.Linq.dll
+lib/mono/gac/System.Data.Linq/3.5.0.0__b77a5c561934e089/System.Data.Linq.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
@@ -581,6 +644,8 @@ lib/mono/gac/System.Messaging/1.0.5000.0__b03f5f7f11d50a3a/System.Messaging.dll
lib/mono/gac/System.Messaging/1.0.5000.0__b03f5f7f11d50a3a/System.Messaging.dll.mdb
lib/mono/gac/System.Messaging/2.0.0.0__b03f5f7f11d50a3a/System.Messaging.dll
lib/mono/gac/System.Messaging/2.0.0.0__b03f5f7f11d50a3a/System.Messaging.dll.mdb
+lib/mono/gac/System.Net/2.0.5.0__7cec85d7bea7798e/System.Net.dll
+lib/mono/gac/System.Net/2.0.5.0__7cec85d7bea7798e/System.Net.dll.mdb
lib/mono/gac/System.Runtime.Remoting/1.0.5000.0__b77a5c561934e089/System.Runtime.Remoting.dll
lib/mono/gac/System.Runtime.Remoting/1.0.5000.0__b77a5c561934e089/System.Runtime.Remoting.dll.mdb
lib/mono/gac/System.Runtime.Remoting/2.0.0.0__b77a5c561934e089/System.Runtime.Remoting.dll
@@ -599,6 +664,14 @@ lib/mono/gac/System.ServiceProcess/2.0.0.0__b03f5f7f11d50a3a/System.ServiceProce
lib/mono/gac/System.ServiceProcess/2.0.0.0__b03f5f7f11d50a3a/System.ServiceProcess.dll.mdb
lib/mono/gac/System.Transactions/2.0.0.0__b77a5c561934e089/System.Transactions.dll
lib/mono/gac/System.Transactions/2.0.0.0__b77a5c561934e089/System.Transactions.dll.mdb
+lib/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.Design.dll
+lib/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.Design.dll.mdb
+lib/mono/gac/System.Web.Extensions.Design/3.5.0.0__31bf3856ad364e35/System.Web.Extensions.Design.dll
+lib/mono/gac/System.Web.Extensions.Design/3.5.0.0__31bf3856ad364e35/System.Web.Extensions.Design.dll.mdb
+lib/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.dll
+lib/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.dll.mdb
+lib/mono/gac/System.Web.Extensions/3.5.0.0__31bf3856ad364e35/System.Web.Extensions.dll
+lib/mono/gac/System.Web.Extensions/3.5.0.0__31bf3856ad364e35/System.Web.Extensions.dll.mdb
lib/mono/gac/System.Web.Services/1.0.5000.0__b03f5f7f11d50a3a/System.Web.Services.dll
lib/mono/gac/System.Web.Services/1.0.5000.0__b03f5f7f11d50a3a/System.Web.Services.dll.mdb
lib/mono/gac/System.Web.Services/2.0.0.0__b03f5f7f11d50a3a/System.Web.Services.dll
@@ -611,14 +684,20 @@ lib/mono/gac/System.Windows.Forms/1.0.5000.0__b77a5c561934e089/System.Windows.Fo
lib/mono/gac/System.Windows.Forms/1.0.5000.0__b77a5c561934e089/System.Windows.Forms.dll.mdb
lib/mono/gac/System.Windows.Forms/2.0.0.0__b77a5c561934e089/System.Windows.Forms.dll
lib/mono/gac/System.Windows.Forms/2.0.0.0__b77a5c561934e089/System.Windows.Forms.dll.mdb
+lib/mono/gac/System.Xml.Linq/3.5.0.0__b77a5c561934e089/System.Xml.Linq.dll
+lib/mono/gac/System.Xml.Linq/3.5.0.0__b77a5c561934e089/System.Xml.Linq.dll.mdb
lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089/System.Xml.dll
lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089/System.Xml.dll.mdb
lib/mono/gac/System.Xml/2.0.0.0__b77a5c561934e089/System.Xml.dll
lib/mono/gac/System.Xml/2.0.0.0__b77a5c561934e089/System.Xml.dll.mdb
+lib/mono/gac/System.Xml/2.0.5.0__7cec85d7bea7798e/System.Xml.dll
+lib/mono/gac/System.Xml/2.0.5.0__7cec85d7bea7798e/System.Xml.dll.mdb
lib/mono/gac/System/1.0.5000.0__b77a5c561934e089/System.dll
lib/mono/gac/System/1.0.5000.0__b77a5c561934e089/System.dll.mdb
lib/mono/gac/System/2.0.0.0__b77a5c561934e089/System.dll
lib/mono/gac/System/2.0.0.0__b77a5c561934e089/System.dll.mdb
+lib/mono/gac/System/2.0.5.0__7cec85d7bea7798e/System.dll
+lib/mono/gac/System/2.0.5.0__7cec85d7bea7798e/System.dll.mdb
lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/cscompmgd.dll
lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/cscompmgd.dll.mdb
lib/mono/gac/cscompmgd/8.0.0.0__b03f5f7f11d50a3a/cscompmgd.dll
@@ -635,10 +714,13 @@ lib/mono/gac/nunit.mocks/2.2.8.0__96d09a1eb7f44a77/nunit.mocks.dll
lib/mono/gac/nunit.mocks/2.2.8.0__96d09a1eb7f44a77/nunit.mocks.dll.mdb
lib/mono/gac/nunit.util/2.2.0.0__96d09a1eb7f44a77/nunit.util.dll
lib/mono/gac/nunit.util/2.2.0.0__96d09a1eb7f44a77/nunit.util.dll.mdb
+libdata/pkgconfig/cecil.pc
libdata/pkgconfig/dotnet.pc
+libdata/pkgconfig/dotnet35.pc
libdata/pkgconfig/mono-cairo.pc
libdata/pkgconfig/mono-nunit.pc
libdata/pkgconfig/mono.pc
+libdata/pkgconfig/smcs.pc
share/jay/ACKNOWLEDGEMENTS
share/jay/NEW_FEATURES
share/jay/NOTES
@@ -678,10 +760,10 @@ share/libgc-mono/leak.html
share/libgc-mono/scale.html
share/libgc-mono/simple_example.html
share/libgc-mono/tree.html
-share/mono-1.0/mono/cil/cil-opcodes.xml
-@dirrm share/mono-1.0/mono/cil
-@dirrm share/mono-1.0/mono
-@dirrm share/mono-1.0
+%%DATADIR%%-1.0/mono/cil/cil-opcodes.xml
+@dirrm %%DATADIR%%-1.0/mono/cil
+@dirrm %%DATADIR%%-1.0/mono
+@dirrm %%DATADIR%%-1.0
@dirrm share/libgc-mono
@dirrm share/jay
@dirrm lib/mono/gac/nunit.util/2.2.0.0__96d09a1eb7f44a77
@@ -698,10 +780,14 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
@dirrm lib/mono/gac/cscompmgd/8.0.0.0__b03f5f7f11d50a3a
@dirrm lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a
@dirrm lib/mono/gac/cscompmgd
+@dirrm lib/mono/gac/System/2.0.5.0__7cec85d7bea7798e
@dirrm lib/mono/gac/System/2.0.0.0__b77a5c561934e089
@dirrm lib/mono/gac/System/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Xml/2.0.5.0__7cec85d7bea7798e
@dirrm lib/mono/gac/System.Xml/2.0.0.0__b77a5c561934e089
@dirrm lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Xml.Linq/3.5.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Xml.Linq
@dirrm lib/mono/gac/System.Xml
@dirrm lib/mono/gac/System.Windows.Forms/2.0.0.0__b77a5c561934e089
@dirrm lib/mono/gac/System.Windows.Forms/1.0.5000.0__b77a5c561934e089
@@ -711,6 +797,12 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
@dirrm lib/mono/gac/System.Web.Services/2.0.0.0__b03f5f7f11d50a3a
@dirrm lib/mono/gac/System.Web.Services/1.0.5000.0__b03f5f7f11d50a3a
@dirrm lib/mono/gac/System.Web.Services
+@dirrm lib/mono/gac/System.Web.Extensions/3.5.0.0__31bf3856ad364e35
+@dirrm lib/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35
+@dirrm lib/mono/gac/System.Web.Extensions.Design/3.5.0.0__31bf3856ad364e35
+@dirrm lib/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35
+@dirrm lib/mono/gac/System.Web.Extensions.Design
+@dirrm lib/mono/gac/System.Web.Extensions
@dirrm lib/mono/gac/System.Web
@dirrm lib/mono/gac/System.Transactions/2.0.0.0__b77a5c561934e089
@dirrm lib/mono/gac/System.Transactions
@@ -726,6 +818,8 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
@dirrm lib/mono/gac/System.Runtime.Remoting/2.0.0.0__b77a5c561934e089
@dirrm lib/mono/gac/System.Runtime.Remoting/1.0.5000.0__b77a5c561934e089
@dirrm lib/mono/gac/System.Runtime.Remoting
+@dirrm lib/mono/gac/System.Net/2.0.5.0__7cec85d7bea7798e
+@dirrm lib/mono/gac/System.Net
@dirrm lib/mono/gac/System.Messaging/2.0.0.0__b03f5f7f11d50a3a
@dirrm lib/mono/gac/System.Messaging/1.0.5000.0__b03f5f7f11d50a3a
@dirrm lib/mono/gac/System.Messaging
@@ -752,14 +846,19 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
@dirrm lib/mono/gac/System.Data.OracleClient/2.0.0.0__b77a5c561934e089
@dirrm lib/mono/gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089
@dirrm lib/mono/gac/System.Data.OracleClient
+@dirrm lib/mono/gac/System.Data.Linq/3.5.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Data.Linq
+@dirrm lib/mono/gac/System.Data.DataSetExtensions/3.5.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Data.DataSetExtensions
@dirrm lib/mono/gac/System.Data
+@dirrm lib/mono/gac/System.Core/3.5.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Core/2.0.5.0__7cec85d7bea7798e
+@dirrm lib/mono/gac/System.Core
@dirrm lib/mono/gac/System.Configuration/2.0.0.0__b03f5f7f11d50a3a
@dirrm lib/mono/gac/System.Configuration.Install/2.0.0.0__b03f5f7f11d50a3a
@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
@@ -773,6 +872,10 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
@dirrm lib/mono/gac/Novell.Directory.Ldap/2.0.0.0__0738eb9f132ed756
@dirrm lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756
@dirrm lib/mono/gac/Novell.Directory.Ldap
+@dirrm lib/mono/gac/Mono.WebBrowser/0.5.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.WebBrowser
+@dirrm lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Web
@dirrm lib/mono/gac/Mono.Security/2.0.0.0__0738eb9f132ed756
@dirrm lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756
@dirrm lib/mono/gac/Mono.Security.Win32/2.0.0.0__0738eb9f132ed756
@@ -799,17 +902,19 @@ 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
+@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
@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/0.6.8.8607__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Cecil.Mdb/0.2.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Cecil.Mdb
@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
@@ -872,13 +977,15 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
@dirrm lib/mono/gac/Accessibility/2.0.0.0__b03f5f7f11d50a3a
@dirrm lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a
@dirrm lib/mono/gac/Accessibility
-@dirrmtry lib/mono/gac
-@dirrmtry lib/mono/compat-2.0
-@dirrmtry lib/mono/compat-1.0
-@dirrmtry lib/mono/2.0/MSBuild
-@dirrmtry lib/mono/2.0
-@dirrmtry lib/mono/1.0
-@dirrmtry lib/mono
+@dirrm lib/mono/gac
+@dirrm lib/mono/compat-2.0
+@dirrm lib/mono/compat-1.0
+@dirrm lib/mono/3.5
+@dirrm lib/mono/2.1
+@dirrm lib/mono/2.0/MSBuild
+@dirrm lib/mono/2.0
+@dirrm lib/mono/1.0
+@dirrm lib/mono
@dirrm include/mono-1.0/mono/utils
@dirrm include/mono-1.0/mono/metadata
@dirrm include/mono-1.0/mono/jit
@@ -887,6 +994,8 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
@dirrm include/mono-1.0/mono/cil
@dirrm include/mono-1.0/mono
@dirrm include/mono-1.0
+@dirrm etc/mono/mconfig
+@dirrm etc/mono/2.0/Browsers
@dirrm etc/mono/2.0
@dirrm etc/mono/1.0
@dirrm etc/mono
diff --git a/mail/Makefile b/mail/Makefile
index 4b4c11b410de..3803d1f24e16 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -160,6 +160,8 @@
SUBDIR += gmime
SUBDIR += gmime2
SUBDIR += gmime2-sharp
+ SUBDIR += gmime24
+ SUBDIR += gmime24-sharp
SUBDIR += gnarwl
SUBDIR += gnubiff
SUBDIR += gnome-gmail-notifier
diff --git a/mail/gmime2-sharp/Makefile b/mail/gmime2-sharp/Makefile
index 512f4beefb93..ac251f76f64b 100644
--- a/mail/gmime2-sharp/Makefile
+++ b/mail/gmime2-sharp/Makefile
@@ -10,9 +10,11 @@ PORTREVISION= 1
CATEGORIES= mail
PKGNAMESUFFIX= -sharp
-MAINTAINER= bsd-sharp@googlegroups.com
+MAINTAINER= mono@FreeBSD.org
COMMENT= Mono bindings for gmime
+IGNORE= try to install weaked-named assembly into the GAC.
+
LIB_DEPENDS= gmime-2.0.4:${PORTSDIR}/mail/gmime2
MASTERDIR= ${.CURDIR}/../gmime2
diff --git a/mail/gmime2-sharp/pkg-plist b/mail/gmime2-sharp/pkg-plist
index 6a669e68e0ec..45d1443ec31c 100644
--- a/mail/gmime2-sharp/pkg-plist
+++ b/mail/gmime2-sharp/pkg-plist
@@ -1,8 +1,8 @@
-lib/mono/gac/gmime-sharp/2.2.0.0__677013d4cb5910f0/gmime-sharp.dll
-lib/mono/gac/gmime-sharp/2.2.0.0__677013d4cb5910f0/gmime-sharp.dll.config
-lib/mono/gmime-sharp/gmime-sharp.dll
-libdata/pkgconfig/gmime-sharp.pc
-share/gapi-2.0/gmime-api.xml
-@dirrm lib/mono/gmime-sharp
-@dirrm lib/mono/gac/gmime-sharp/2.2.0.0__677013d4cb5910f0
-@dirrm lib/mono/gac/gmime-sharp
+@comment $FreeBSD$
+lib/mono/gac/gmime-sharp/2.4.0.0__2b75c2ad004c52e4/gmime-sharp.dll
+lib/mono/gac/gmime-sharp/2.4.0.0__2b75c2ad004c52e4/gmime-sharp.dll.config
+lib/mono/gmime-sharp-2.4/gmime-sharp.dll
+libdata/pkgconfig/gmime-sharp-2.4.pc
+@dirrm lib/mono/gmime-sharp-2.4
+@dirrmtry lib/mono/gac/gmime-sharp/2.4.0.0__2b75c2ad004c52e4
+@dirrmtry lib/mono/gac/gmime-sharp
diff --git a/mail/gmime24-sharp/Makefile b/mail/gmime24-sharp/Makefile
new file mode 100644
index 000000000000..5cdf9609afae
--- /dev/null
+++ b/mail/gmime24-sharp/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: gmime2-sharp
+# Date Created: 20050513
+# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
+#
+# $FreeBSD$
+# $Id: Makefile,v 1.17 2006/10/26 18:37:29 tmclau02 Exp $
+#
+
+CATEGORIES= mail
+PKGNAMESUFFIX= -24-sharp
+
+MAINTAINER= bsd-sharp@googlegroups.com
+COMMENT= Mono bindings for gmime
+
+LIB_DEPENDS= gmime-2.4:${PORTSDIR}/mail/gmime24
+
+MASTERDIR= ${.CURDIR}/../gmime24
+BUILD_WRKSRC= ${WRKSRC}/mono
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
+
+USE_GNOME= gnomehack gnometarget glib20 gtksharp20
+CONFIGURE_ARGS= --enable-mono=yes
+
+LATEST_LINK= gmime24-sharp
+
+# Else we conflict with mail/gmime24
+NOPORTDOCS= yes
+
+# Done in pre-configure because master port has a post-patch target already.
+pre-configure:
+ @${REINPLACE_CMD} -e 's|.@GMIME_VERSION@||g' \
+ ${WRKSRC}/mono/gmime-sharp.dll.config.in
+
+.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/gmime24-sharp/pkg-descr b/mail/gmime24-sharp/pkg-descr
new file mode 100644
index 000000000000..a2b58ba7ef0f
--- /dev/null
+++ b/mail/gmime24-sharp/pkg-descr
@@ -0,0 +1,3 @@
+C# assemblies for gmime
+
+WWW: http://spruce.sourceforge.net/gmime/
diff --git a/mail/gmime24-sharp/pkg-plist b/mail/gmime24-sharp/pkg-plist
new file mode 100644
index 000000000000..45d1443ec31c
--- /dev/null
+++ b/mail/gmime24-sharp/pkg-plist
@@ -0,0 +1,8 @@
+@comment $FreeBSD$
+lib/mono/gac/gmime-sharp/2.4.0.0__2b75c2ad004c52e4/gmime-sharp.dll
+lib/mono/gac/gmime-sharp/2.4.0.0__2b75c2ad004c52e4/gmime-sharp.dll.config
+lib/mono/gmime-sharp-2.4/gmime-sharp.dll
+libdata/pkgconfig/gmime-sharp-2.4.pc
+@dirrm lib/mono/gmime-sharp-2.4
+@dirrmtry lib/mono/gac/gmime-sharp/2.4.0.0__2b75c2ad004c52e4
+@dirrmtry lib/mono/gac/gmime-sharp
diff --git a/mail/gmime24/Makefile b/mail/gmime24/Makefile
new file mode 100644
index 000000000000..763b1585e338
--- /dev/null
+++ b/mail/gmime24/Makefile
@@ -0,0 +1,48 @@
+# New ports collection makefile for: gmime2
+# Date created: 16 Apr 2001
+# Whom: Kirill Ponomarew <ponomarew@oberon.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= gmime
+PORTVERSION= 2.4.3
+PORTREVISION?= 0
+CATEGORIES?= mail
+MASTER_SITES= GNOME
+PKGNAMESUFFIX?= -24
+
+MAINTAINER?= mnag@FreeBSD.org
+COMMENT?= Library (written in C) for parsing and creating messages using MIME
+
+CONFLICTS= gmime-1.0.*
+
+SLAVEDIRS= mail/gmime2-sharp
+
+USE_ICONV= yes
+USE_GMAKE= yes
+USE_GNOME?= gnomehack gnometarget glib20
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS?= --with-libiconv=${LOCALBASE} \
+ --with-html-dir=${PREFIX}/share/doc \
+ --enable-mono=no
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+ LIBS="-L${LOCALBASE}/lib"
+
+LATEST_LINK?= ${PORTNAME}2
+
+PORTDOCS= *
+
+post-patch:
+ @${REINPLACE_CMD} -e "s|stdint.h|inttypes.h|" ${WRKSRC}/zentimer.h
+
+post-install:
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}24
+.for i in docs/reference/html/*
+ ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}24
+.endfor
+.endif
+
+.include <bsd.port.mk>
diff --git a/mail/gmime24/distinfo b/mail/gmime24/distinfo
new file mode 100644
index 000000000000..ec2206f3d3b4
--- /dev/null
+++ b/mail/gmime24/distinfo
@@ -0,0 +1,3 @@
+MD5 (gmime-2.4.3.tar.gz) = fdf4fa9a859dc080fa9d50142835dbac
+SHA256 (gmime-2.4.3.tar.gz) = 90ca4135f3abf1c5986d3bb1492cd3447272fe51602b65c7981a617c4c1141e2
+SIZE (gmime-2.4.3.tar.gz) = 1110738
diff --git a/mail/gmime24/files/patch-Makefile.in b/mail/gmime24/files/patch-Makefile.in
new file mode 100644
index 000000000000..4d516817313e
--- /dev/null
+++ b/mail/gmime24/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig
++++ Makefile.in
+@@ -231,7 +231,7 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = util gmime src $(am__append_1) tests docs $(am__append_2) \
++SUBDIRS = util gmime $(am__append_1) tests docs $(am__append_2) \
+ tools .
+ DISTCLEANFILES = iconv-detect.h
+ EXTRA_DIST = \
diff --git a/mail/gmime24/files/patch-docs_Makefile.in b/mail/gmime24/files/patch-docs_Makefile.in
new file mode 100644
index 000000000000..d0cc6906ca1a
--- /dev/null
+++ b/mail/gmime24/files/patch-docs_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- docs/Makefile.in.orig
++++ docs/Makefile.in
+@@ -201,7 +201,7 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = reference tutorial
++SUBDIRS =
+ EXTRA_DIST = gtkdocs_fix
+ all: all-recursive
+
diff --git a/mail/gmime24/files/patch-gmime-2.4.pc.in b/mail/gmime24/files/patch-gmime-2.4.pc.in
new file mode 100644
index 000000000000..1192ad41e49c
--- /dev/null
+++ b/mail/gmime24/files/patch-gmime-2.4.pc.in
@@ -0,0 +1,10 @@
+--- gmime-2.4.pc.in.orig Tue May 3 19:34:20 2005
++++ gmime-2.4.pc.in Wed Feb 1 00:51:53 2006
+@@ -7,6 +7,6 @@
+ Name: GMime
+ Version: @VERSION@
+ Description: MIME parser and utility library
+-Requires: glib-2.0,gobject-2.0
++Requires: glib-2.0,gobject-2.0,gthread-2.0
+ Libs: -L${libdir} @GMIME_LIBS@ @LIBS@
+ Cflags: -I${includedir}/gmime-2.0 @GMIME_CFLAGS@
diff --git a/mail/gmime24/files/patch-mono_Makefile.in b/mail/gmime24/files/patch-mono_Makefile.in
new file mode 100644
index 000000000000..299831f92557
--- /dev/null
+++ b/mail/gmime24/files/patch-mono_Makefile.in
@@ -0,0 +1,21 @@
+
+$FreeBSD$
+
+--- mono/Makefile.in.orig
++++ mono/Makefile.in
+@@ -471,11 +471,11 @@
+ install-data-local:
+ @if test -n '$(TARGET)'; then \
+ if test -n '$(DESTDIR)'; then \
+- echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib"; \
+- $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib || exit 1; \
++ echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(libdir)"; \
++ $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(libdir) || exit 1; \
+ else \
+- echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(prefix)/lib"; \
+- $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(prefix)/lib || exit 1; \
++ echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(libdir)"; \
++ $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(libdir) || exit 1; \
+ fi; \
+ fi
+
diff --git a/mail/gmime24/files/patch-src_Makefile.in b/mail/gmime24/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..e5c0b5b59f3a
--- /dev/null
+++ b/mail/gmime24/files/patch-src_Makefile.in
@@ -0,0 +1,33 @@
+#
+# http://www.freebsd.org/cgi/query-pr.cgi?pr=118092
+#
+# Rename uudecode and uuencode to gmime-* to not conflict with userland
+#
+--- src/Makefile.in.orig 2008-07-19 20:57:47.000000000 -0300
++++ src/Makefile.in 2008-07-20 21:29:18.000000000 -0300
+@@ -24,6 +24,7 @@
+ install_sh_SCRIPT = $(install_sh) -c
+ INSTALL_HEADER = $(INSTALL_DATA)
+ transform = $(program_transform_name)
++add_gmime = s/^/gmime-/
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+@@ -293,7 +294,7 @@
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
++ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/;$(add_gmime)'`; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ else :; fi; \
+@@ -302,7 +303,7 @@
+ uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
++ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/;$(add_gmime)'`; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ done
diff --git a/mail/gmime24/files/patch-tests__test-mbox.c b/mail/gmime24/files/patch-tests__test-mbox.c
new file mode 100644
index 000000000000..bba86048372d
--- /dev/null
+++ b/mail/gmime24/files/patch-tests__test-mbox.c
@@ -0,0 +1,10 @@
+--- tests/test-mbox.c.orig Mon Feb 12 15:48:22 2007
++++ tests/test-mbox.c Mon Feb 12 15:48:54 2007
+@@ -26,6 +26,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+
++#include <config.h>
+ #include <gmime/gmime.h>
+
+ #ifndef G_OS_WIN32
diff --git a/mail/gmime24/files/patch-tests__test-mime.c b/mail/gmime24/files/patch-tests__test-mime.c
new file mode 100644
index 000000000000..35067da0afa6
--- /dev/null
+++ b/mail/gmime24/files/patch-tests__test-mime.c
@@ -0,0 +1,10 @@
+--- tests/test-mime.c.orig Mon Feb 12 15:48:32 2007
++++ tests/test-mime.c Mon Feb 12 15:49:04 2007
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <string.h>
+
++#include <config.h>
+ #include <gmime/gmime.h>
+
+ #ifndef G_OS_WIN32
diff --git a/mail/gmime24/files/patch-tests__test-parser.c b/mail/gmime24/files/patch-tests__test-parser.c
new file mode 100644
index 000000000000..a408ff684cfe
--- /dev/null
+++ b/mail/gmime24/files/patch-tests__test-parser.c
@@ -0,0 +1,10 @@
+--- tests/test-parser.c.orig Mon Feb 12 15:48:38 2007
++++ tests/test-parser.c Mon Feb 12 15:49:14 2007
+@@ -26,6 +26,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+
++#include <config.h>
+ #include <gmime/gmime.h>
+
+ #ifndef G_OS_WIN32
diff --git a/mail/gmime24/pkg-descr b/mail/gmime24/pkg-descr
new file mode 100644
index 000000000000..ebf3e2ce1115
--- /dev/null
+++ b/mail/gmime24/pkg-descr
@@ -0,0 +1,19 @@
+GMime is a set of utilities for parsing and creating messages using
+the Multipurpose Internet Mail Extension (MIME) as defined by the
+following RFCs:
+
+ * 0822: Standard for the Format of Arpa Internet Text Messages
+ * 2045: Multipurpose Internet Mail Extensions (MIME) Part One:
+ Format of Internet Message Bodies
+ * 2046: Multipurpose Internet Mail Extensions (MIME) Part Two:
+ Media Types
+ * 2047: Multipurpose Internet Mail Extensions (MIME) Part Three:
+ Message Header Extensions for Non-ASCII Text
+ * 2048: Multipurpose Internet Mail Extensions (MIME) Part Four:
+ Registration Procedures
+ * 2049: Multipurpose Internet Mail Extensions (MIME) Part Five:
+ Conformance Criteria and Examples
+ * 2183: Communicating Presentation Information in Internet Messages:
+ The Content-Disposition Header Field
+
+WWW: http://spruce.sourceforge.net/gmime/
diff --git a/mail/gmime24/pkg-plist b/mail/gmime24/pkg-plist
new file mode 100644
index 000000000000..7d2059b53c49
--- /dev/null
+++ b/mail/gmime24/pkg-plist
@@ -0,0 +1,140 @@
+include/gmime-2.4/gmime/gmime.h
+include/gmime-2.4/gmime/gmime-charset.h
+include/gmime-2.4/gmime/gmime-cipher-context.h
+include/gmime-2.4/gmime/gmime-content-type.h
+include/gmime-2.4/gmime/gmime-data-wrapper.h
+include/gmime-2.4/gmime/gmime-disposition.h
+include/gmime-2.4/gmime/gmime-encodings.h
+include/gmime-2.4/gmime/gmime-error.h
+include/gmime-2.4/gmime/gmime-filter.h
+include/gmime-2.4/gmime/gmime-filter-basic.h
+include/gmime-2.4/gmime/gmime-filter-best.h
+include/gmime-2.4/gmime/gmime-filter-charset.h
+include/gmime-2.4/gmime/gmime-filter-crlf.h
+include/gmime-2.4/gmime/gmime-filter-enriched.h
+include/gmime-2.4/gmime/gmime-filter-from.h
+include/gmime-2.4/gmime/gmime-filter-gzip.h
+include/gmime-2.4/gmime/gmime-filter-html.h
+include/gmime-2.4/gmime/gmime-filter-md5.h
+include/gmime-2.4/gmime/gmime-filter-strip.h
+include/gmime-2.4/gmime/gmime-filter-windows.h
+include/gmime-2.4/gmime/gmime-filter-yenc.h
+include/gmime-2.4/gmime/gmime-gpg-context.h
+include/gmime-2.4/gmime/gmime-header.h
+include/gmime-2.4/gmime/gmime-iconv.h
+include/gmime-2.4/gmime/gmime-iconv-utils.h
+include/gmime-2.4/gmime/gmime-message.h
+include/gmime-2.4/gmime/gmime-message-part.h
+include/gmime-2.4/gmime/gmime-message-partial.h
+include/gmime-2.4/gmime/gmime-multipart.h
+include/gmime-2.4/gmime/gmime-multipart-encrypted.h
+include/gmime-2.4/gmime/gmime-multipart-signed.h
+include/gmime-2.4/gmime/gmime-object.h
+include/gmime-2.4/gmime/gmime-param.h
+include/gmime-2.4/gmime/gmime-parse-utils.h
+include/gmime-2.4/gmime/gmime-parser.h
+include/gmime-2.4/gmime/gmime-part.h
+include/gmime-2.4/gmime/gmime-session.h
+include/gmime-2.4/gmime/gmime-session-simple.h
+include/gmime-2.4/gmime/gmime-stream.h
+include/gmime-2.4/gmime/gmime-stream-buffer.h
+include/gmime-2.4/gmime/gmime-stream-cat.h
+include/gmime-2.4/gmime/gmime-stream-file.h
+include/gmime-2.4/gmime/gmime-stream-filter.h
+include/gmime-2.4/gmime/gmime-stream-fs.h
+include/gmime-2.4/gmime/gmime-stream-mem.h
+include/gmime-2.4/gmime/gmime-stream-mmap.h
+include/gmime-2.4/gmime/gmime-stream-null.h
+include/gmime-2.4/gmime/gmime-utils.h
+include/gmime-2.4/gmime/internet-address.h
+lib/libgmime-2.4.so.6
+lib/libgmime-2.4.so
+lib/libgmime-2.4.la
+lib/libgmime-2.4.a
+libdata/pkgconfig/gmime-2.4.pc
+%%DOCSDIR%%24/CipherContexts.html
+%%DOCSDIR%%24/DataWrappers.html
+%%DOCSDIR%%24/Filters.html
+%%DOCSDIR%%24/Headers.html
+%%DOCSDIR%%24/InternetAddresses.html
+%%DOCSDIR%%24/MimeParts.html
+%%DOCSDIR%%24/Parsers.html
+%%DOCSDIR%%24/Sessions.html
+%%DOCSDIR%%24/Streams.html
+%%DOCSDIR%%24/ch01.html
+%%DOCSDIR%%24/classes.html
+%%DOCSDIR%%24/core.html
+%%DOCSDIR%%24/fundamentals.html
+%%DOCSDIR%%24/gmime-building.html
+%%DOCSDIR%%24/gmime-changes-2-0.html
+%%DOCSDIR%%24/gmime-changes-2-2.html
+%%DOCSDIR%%24/gmime-changes-2-4.html
+%%DOCSDIR%%24/gmime-compiling.html
+%%DOCSDIR%%24/gmime-data-wrappers.html
+%%DOCSDIR%%24/gmime-filters.html
+%%DOCSDIR%%24/gmime-gmime-charset.html
+%%DOCSDIR%%24/gmime-gmime-cipher-context.html
+%%DOCSDIR%%24/gmime-gmime-content-type.html
+%%DOCSDIR%%24/gmime-gmime-data-wrapper.html
+%%DOCSDIR%%24/gmime-gmime-disposition.html
+%%DOCSDIR%%24/gmime-gmime-encodings.html
+%%DOCSDIR%%24/gmime-gmime-filter-basic.html
+%%DOCSDIR%%24/gmime-gmime-filter-best.html
+%%DOCSDIR%%24/gmime-gmime-filter-charset.html
+%%DOCSDIR%%24/gmime-gmime-filter-crlf.html
+%%DOCSDIR%%24/gmime-gmime-filter-enriched.html
+%%DOCSDIR%%24/gmime-gmime-filter-from.html
+%%DOCSDIR%%24/gmime-gmime-filter-gzip.html
+%%DOCSDIR%%24/gmime-gmime-filter-html.html
+%%DOCSDIR%%24/gmime-gmime-filter-md5.html
+%%DOCSDIR%%24/gmime-gmime-filter-strip.html
+%%DOCSDIR%%24/gmime-gmime-filter-windows.html
+%%DOCSDIR%%24/gmime-gmime-filter-yenc.html
+%%DOCSDIR%%24/gmime-gmime-filter.html
+%%DOCSDIR%%24/gmime-gmime-gpg-context.html
+%%DOCSDIR%%24/gmime-gmime-header.html
+%%DOCSDIR%%24/gmime-gmime-iconv-utils.html
+%%DOCSDIR%%24/gmime-gmime-iconv.html
+%%DOCSDIR%%24/gmime-gmime-message-part.html
+%%DOCSDIR%%24/gmime.html
+%%DOCSDIR%%24/gmime-gmime-message-partial.html
+%%DOCSDIR%%24/gmime-gmime-message.html
+%%DOCSDIR%%24/gmime-gmime-multipart-encrypted.html
+%%DOCSDIR%%24/gmime-gmime-multipart-signed.html
+%%DOCSDIR%%24/gmime-gmime-multipart.html
+%%DOCSDIR%%24/gmime-gmime-object.html
+%%DOCSDIR%%24/gmime-gmime-param.html
+%%DOCSDIR%%24/gmime-gmime-parser.html
+%%DOCSDIR%%24/gmime-gmime-part.html
+%%DOCSDIR%%24/gmime-gmime-session-simple.html
+%%DOCSDIR%%24/gmime-gmime-session.html
+%%DOCSDIR%%24/gmime-gmime-stream-buffer.html
+%%DOCSDIR%%24/gmime-gmime-stream-cat.html
+%%DOCSDIR%%24/gmime.devhelp
+%%DOCSDIR%%24/gmime-gmime-stream-file.html
+%%DOCSDIR%%24/gmime-gmime-stream-filter.html
+%%DOCSDIR%%24/gmime-gmime-stream-fs.html
+%%DOCSDIR%%24/gmime-gmime-stream-mem.html
+%%DOCSDIR%%24/gmime-gmime-stream-mmap.html
+%%DOCSDIR%%24/gmime-gmime-stream-null.html
+%%DOCSDIR%%24/gmime-gmime-stream.html
+%%DOCSDIR%%24/gmime-gmime-utils.html
+%%DOCSDIR%%24/gmime-gmime.html
+%%DOCSDIR%%24/gmime-internet-address-group.html
+%%DOCSDIR%%24/gmime-internet-address-list.html
+%%DOCSDIR%%24/gmime-internet-address-mailbox.html
+%%DOCSDIR%%24/gmime-internet-address.html
+%%DOCSDIR%%24/home.png
+%%DOCSDIR%%24/gmime-question-index.html
+%%DOCSDIR%%24/gmime-resources.html
+%%DOCSDIR%%24/gmime-streams.html
+%%DOCSDIR%%24/gmime.devhelp2
+%%DOCSDIR%%24/index.html
+%%DOCSDIR%%24/index.sgml
+%%DOCSDIR%%24/left.png
+%%DOCSDIR%%24/right.png
+%%DOCSDIR%%24/style.css
+%%DOCSDIR%%24/up.png
+@dirrm %%DOCSDIR%%24
+@dirrm include/gmime-2.4/gmime
+@dirrm include/gmime-2.4
diff --git a/net/blam/Makefile b/net/blam/Makefile
index 627f8b90f386..ef64d5d28757 100644
--- a/net/blam/Makefile
+++ b/net/blam/Makefile
@@ -7,39 +7,26 @@
#
PORTNAME= blam
-PORTVERSION= 1.8.4
-PORTREVISION= 2
-CATEGORIES= net gnome
-MASTER_SITES= http://www.cmartin.tk/blam/
+PORTVERSION= 1.8.6
+PORTREVISION= 1
+CATEGORIES= net
+MASTER_SITES= http://www.cmartin.tk/${PORTNAME}/
-MAINTAINER= bsd-sharp@googlegroups.com
-COMMENT= Mono based RSS feed reader
+MAINTAINER= mono@FreeBSD.org
+COMMENT= A simple feed reader for GNOME
-BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gecko-sharp-2.0.pc:${PORTSDIR}/www/gecko-sharp20
-RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gecko-sharp-2.0.pc:${PORTSDIR}/www/gecko-sharp20
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext \
+ ${LOCALBASE}/libdata/pkgconfig/webkit-sharp-1.0.pc:${PORTSDIR}/www/webkit-sharp
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/webkit-sharp-1.0.pc:${PORTSDIR}/www/webkit-sharp
-USE_GECKO= firefox mozilla
-USE_GNOME= gnomeprefix gnomehack intlhack intltool libgnomeui gnomesharp20
-USE_BZIP2= yes
-USE_GETTEXT= yes
-USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-mozilla=${GECKO}
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
-MAN1= blam.1
-
+USE_GMAKE= yes
+CONFIGURE_ENV= GMSGFMT="${LOCALBASE}/bin/msgfmt" DATADIRNAME="share"
+USE_GNOME= gnomesharp20
+USE_GETTEXT= yes
+INSTALLS_ICONS= yes
GCONF_SCHEMAS= blam.schemas
-post-patch:
- @${REINPLACE_CMD} 's|img src="|img src="file://${PREFIX}/share/blam/themes/blam/|g' \
- ${WRKSRC}/themes/blam/theme.html
- @${REINPLACE_CMD} 's|img src="|img src="file://${PREFIX}/share/blam/themes/pimped/|g' \
- ${WRKSRC}/themes/pimped/theme.html
-
+MAN1= blam.1
-.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/blam/distinfo b/net/blam/distinfo
index 29bd42e955f1..8154dd287444 100644
--- a/net/blam/distinfo
+++ b/net/blam/distinfo
@@ -1,3 +1,3 @@
-MD5 (blam-1.8.4.tar.bz2) = 7ec48fece9994ed71dbb53ffa35b633e
-SHA256 (blam-1.8.4.tar.bz2) = c867ce3638d31705d484538f0cd18ff7f8209eea56466b430db63267adde1c13
-SIZE (blam-1.8.4.tar.bz2) = 517873
+MD5 (blam-1.8.6.tar.gz) = 5f7da752c6646a10655f19dda528e7c4
+SHA256 (blam-1.8.6.tar.gz) = f20c061371c4ec4f7f730a117f1285e3391b3d0c5c8ecdd34affa2c6d324f63f
+SIZE (blam-1.8.6.tar.gz) = 310503
diff --git a/net/blam/files/patch-blam.exe.config b/net/blam/files/patch-blam.exe.config
deleted file mode 100644
index a8ce8acc93ac..000000000000
--- a/net/blam/files/patch-blam.exe.config
+++ /dev/null
@@ -1,8 +0,0 @@
---- blam.exe.config.orig Sat Jun 18 20:38:30 2005
-+++ blam.exe.config Sat Feb 4 21:12:35 2006
-@@ -1,4 +1,4 @@
- <configuration>
- <dllmap dll="gdk-x11-2.0" target="libgdk-x11-2.0.so.0"/>
-- <dllmap dll="libX11" target="libX11.so.6"/>
-+ <dllmap dll="libX11" target="libX11.so"/>
- </configuration>
diff --git a/net/blam/files/patch-blam.in b/net/blam/files/patch-blam.in
deleted file mode 100644
index 1ea7ec1c8e2c..000000000000
--- a/net/blam/files/patch-blam.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- blam.in.orig Sun Apr 15 16:58:55 2007
-+++ blam.in Sun Apr 15 16:59:02 2007
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- LD_LIBRARY_PATH="@prefix@/lib/blam:@MOZILLA_HOME@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" MOZILLA_FIVE_HOME=@MOZILLA_HOME@ \
--MOZILLA_HOME=@MOZILLA_HOME@ exec -a 'blam' mono @prefix@/lib/blam/blam.exe $@
-+MOZILLA_HOME=@MOZILLA_HOME@ exec mono @prefix@/lib/blam/blam.exe $@
diff --git a/net/blam/files/patch-src-Application.cs b/net/blam/files/patch-src-Application.cs
deleted file mode 100644
index bfde3504220a..000000000000
--- a/net/blam/files/patch-src-Application.cs
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/Application.cs.orig Sun Apr 15 16:59:40 2007
-+++ src/Application.cs Sun Apr 15 17:00:45 2007
-@@ -23,8 +23,7 @@
- public class Application : Program {
-
- [DllImport("libc")]
-- private static extern int prctl(int option, byte [] arg2, ulong arg3,
-- ulong arg4, ulong arg5);
-+ private static extern void setproctitle(byte [] fmt, byte [] str_arg);
-
- public static Application TheApp;
-
-@@ -723,11 +722,7 @@
-
- public static void SetProcessName(string name)
- {
-- if(prctl(15 /* PR_SET_NAME */, Encoding.ASCII.GetBytes(name + "\0"),
-- 0, 0, 0) != 0) {
-- throw new ApplicationException("Error setting process name: " +
-- Mono.Unix.Native.Stdlib.GetLastError());
-- }
-+ setproctitle(Encoding.ASCII.GetBytes("%s\0"), Encoding.ASCII.GetBytes(name + "\0"));
- }
-
- public static void Main(string[] args)
diff --git a/net/blam/pkg-descr b/net/blam/pkg-descr
index 2641a920cbaf..2dc687b62728 100644
--- a/net/blam/pkg-descr
+++ b/net/blam/pkg-descr
@@ -2,7 +2,7 @@ Blam is a tool that helps you keep track of the growing number of news
feeds distributed as RSS. Blam lets you subscribe to any number of feeds
and provides an easy to use and clean interface to stay up to date. It
is written in C# and uses Mono, GTK#, and RSS.NET.
-
+
Among the features are:
* Support for RSS and RDF feeds
@@ -10,4 +10,4 @@ Among the features are:
* Print the news entries you like
* Automatically update the feeds at regular intervals
-WWW: http://www.cmartin.tk/blam.html
+WWW: http://www.cmartin.tk/blam2.html
diff --git a/net/blam/pkg-plist b/net/blam/pkg-plist
index 9cbf238201c8..48a23ac7098d 100644
--- a/net/blam/pkg-plist
+++ b/net/blam/pkg-plist
@@ -1,43 +1,48 @@
+@comment $FreeBSD$
bin/blam
-lib/blam/Atom.NET.dll
-lib/blam/RSS.NET.dll
+lib/blam/AtomFeed.dll
+lib/blam/RSSFeed.dll
lib/blam/blam.exe
lib/blam/blam.exe.config
-lib/blam/libblam.a
-lib/blam/libblam.la
-lib/blam/libblam.so
-lib/blam/libblam.so.0
share/applications/blam.desktop
-share/blam/themes/planet/theme.html
-share/blam/themes/planet/planet.css
-share/blam/themes/planet/bubble-top.png
-share/blam/themes/planet/bubble-top-right.png
-share/blam/themes/planet/bubble-top-left.png
-share/blam/themes/planet/bubble-right.png
-share/blam/themes/planet/bubble-nipple.png
-share/blam/themes/planet/bubble-left.png
-share/blam/themes/planet/bubble-bottom.png
-share/blam/themes/planet/bubble-bottom-right.png
-share/blam/themes/planet/bubble-bottom-left.png
-share/blam/themes/pimped/theme.html
-share/blam/themes/pimped/pimped.css
-share/blam/themes/pimped/news.png
-share/blam/themes/pimped/blam.png
-share/blam/themes/blam/theme.html
-share/blam/themes/blam/blam-box-top-right.png
-share/blam/themes/blam/blam-box-top-left.png
-share/blam/themes/blam/blam-box-pad.png
-share/blam/themes/blam/blam-box-bottom-right.png
-share/blam/themes/blam/blam-box-bottom-left.png
-share/blam/themes/akregator/theme.html
-share/blam/collection.xml
-share/pixmaps/blam.png
+%%DATADIR%%/collection.xml
+%%DATADIR%%/themes/akregator/theme.html
+%%DATADIR%%/themes/blam/blam-box-bottom-left.png
+%%DATADIR%%/themes/blam/blam-box-bottom-right.png
+%%DATADIR%%/themes/blam/blam-box-pad.png
+%%DATADIR%%/themes/blam/blam-box-top-left.png
+%%DATADIR%%/themes/blam/blam-box-top-right.png
+%%DATADIR%%/themes/blam/blam.css
+%%DATADIR%%/themes/blam/theme.html
+%%DATADIR%%/themes/pimped/blam.png
+%%DATADIR%%/themes/pimped/news.png
+%%DATADIR%%/themes/pimped/pimped.css
+%%DATADIR%%/themes/pimped/theme.html
+%%DATADIR%%/themes/planet/bubble-bottom-left.png
+%%DATADIR%%/themes/planet/bubble-bottom-right.png
+%%DATADIR%%/themes/planet/bubble-bottom.png
+%%DATADIR%%/themes/planet/bubble-left.png
+%%DATADIR%%/themes/planet/bubble-nipple.png
+%%DATADIR%%/themes/planet/bubble-right.png
+%%DATADIR%%/themes/planet/bubble-top-left.png
+%%DATADIR%%/themes/planet/bubble-top-right.png
+%%DATADIR%%/themes/planet/bubble-top.png
+%%DATADIR%%/themes/planet/planet.css
+%%DATADIR%%/themes/planet/theme.html
+share/icons/hicolor/16x16/apps/blam.png
+share/icons/hicolor/22x22/apps/blam.png
+share/icons/hicolor/24x24/apps/blam.png
+share/icons/hicolor/32x32/apps/blam.png
+share/icons/hicolor/48x48/apps/blam.png
+share/icons/hicolor/scalable/apps/blam.svg
+share/locale/ar/LC_MESSAGES/blam.mo
share/locale/bg/LC_MESSAGES/blam.mo
share/locale/bs/LC_MESSAGES/blam.mo
share/locale/ca/LC_MESSAGES/blam.mo
share/locale/cs/LC_MESSAGES/blam.mo
share/locale/da/LC_MESSAGES/blam.mo
share/locale/de/LC_MESSAGES/blam.mo
+share/locale/dz/LC_MESSAGES/blam.mo
share/locale/el/LC_MESSAGES/blam.mo
share/locale/en_CA/LC_MESSAGES/blam.mo
share/locale/en_GB/LC_MESSAGES/blam.mo
@@ -57,36 +62,29 @@ share/locale/lv/LC_MESSAGES/blam.mo
share/locale/nb/LC_MESSAGES/blam.mo
share/locale/ne/LC_MESSAGES/blam.mo
share/locale/nl/LC_MESSAGES/blam.mo
+share/locale/oc/LC_MESSAGES/blam.mo
share/locale/pa/LC_MESSAGES/blam.mo
share/locale/pl/LC_MESSAGES/blam.mo
share/locale/pt/LC_MESSAGES/blam.mo
share/locale/pt_BR/LC_MESSAGES/blam.mo
-share/locale/rw/LC_MESSAGES/blam.mo
share/locale/ru/LC_MESSAGES/blam.mo
+share/locale/rw/LC_MESSAGES/blam.mo
+share/locale/sk/LC_MESSAGES/blam.mo
+share/locale/sl/LC_MESSAGES/blam.mo
share/locale/sq/LC_MESSAGES/blam.mo
share/locale/sr/LC_MESSAGES/blam.mo
share/locale/sr@Latn/LC_MESSAGES/blam.mo
share/locale/sv/LC_MESSAGES/blam.mo
-share/locale/sk/LC_MESSAGES/blam.mo
share/locale/tr/LC_MESSAGES/blam.mo
share/locale/uk/LC_MESSAGES/blam.mo
share/locale/vi/LC_MESSAGES/blam.mo
share/locale/zh_CN/LC_MESSAGES/blam.mo
share/locale/zh_HK/LC_MESSAGES/blam.mo
share/locale/zh_TW/LC_MESSAGES/blam.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrm share/blam/themes/planet
-@dirrm share/blam/themes/pimped
-@dirrm share/blam/themes/blam
-@dirrm share/blam/themes/akregator
-@dirrm share/blam/themes
-@dirrm share/blam
+@dirrm %%DATADIR%%/themes/planet
+@dirrm %%DATADIR%%/themes/pimped
+@dirrm %%DATADIR%%/themes/blam
+@dirrm %%DATADIR%%/themes/akregator
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%
@dirrm lib/blam
-@dirrmtry share/applications
diff --git a/www/Makefile b/www/Makefile
index 39a641334814..f285af41cb46 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1544,6 +1544,7 @@
SUBDIR += webglimpse
SUBDIR += webinject
SUBDIR += webkit-gtk2
+ SUBDIR += webkit-sharp
SUBDIR += weblint
SUBDIR += weblint++
SUBDIR += webobjects
diff --git a/www/gecko-sharp20/Makefile b/www/gecko-sharp20/Makefile
index 228d0e812de7..352ca913a1ca 100644
--- a/www/gecko-sharp20/Makefile
+++ b/www/gecko-sharp20/Makefile
@@ -7,13 +7,12 @@
#
PORTNAME= gecko-sharp
-PORTVERSION= 0.12
-PORTREVISION= 2
+PORTVERSION= 0.13
CATEGORIES= www
-MASTER_SITES= http://ftp.novell.com/pub/mono/sources/gecko-sharp-2.0/
-DISTNAME= gecko-sharp-2.0-${PORTVERSION}
+MASTER_SITES= ftp://ftp.novell.com/pub/mono/sources/${PORTNAME}2/
+DISTNAME= ${PORTNAME}-2.0-${PORTVERSION}
-MAINTAINER= bsd-sharp@googlegroups.com
+MAINTAINER= mono@FreeBSD.org
COMMENT= Mono bindings for embeding mozilla
USE_GECKO= firefox mozilla
@@ -21,6 +20,7 @@ USE_GNOME= gnometarget gtksharp20
LATEST_LINK= gecko-sharp20
GNU_CONFIGURE= yes
USE_GMAKE= yes
+USE_BZIP2= yes
post-patch:
@${REINPLACE_CMD} -e 's|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in
diff --git a/www/gecko-sharp20/distinfo b/www/gecko-sharp20/distinfo
index a9c477f393c9..6a3f93a4e7d4 100644
--- a/www/gecko-sharp20/distinfo
+++ b/www/gecko-sharp20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gecko-sharp-2.0-0.12.tar.gz) = 226470d7be5150f9a8c4d119f61cc385
-SHA256 (gecko-sharp-2.0-0.12.tar.gz) = 6694f9520f3a1a64acb339cd4fcfe33b3580f542999521ec274ca890f51eea8f
-SIZE (gecko-sharp-2.0-0.12.tar.gz) = 177455
+MD5 (gecko-sharp-2.0-0.13.tar.bz2) = f88eaa06e71f8d8fa34cf59a3e034a6b
+SHA256 (gecko-sharp-2.0-0.13.tar.bz2) = bebeedccfa4c6bdf9cc465b0ecb80008b1dfb46980e90d59a3915a28f5186639
+SIZE (gecko-sharp-2.0-0.13.tar.bz2) = 166456
diff --git a/www/webkit-sharp/Makefile b/www/webkit-sharp/Makefile
new file mode 100644
index 000000000000..035dbfaf3e1a
--- /dev/null
+++ b/www/webkit-sharp/Makefile
@@ -0,0 +1,35 @@
+# New ports collection makefile for: webkit-sharp
+# Date created: 2008-09-01
+# Whom: Romain Tartiere <romain@blogreen.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= webkit-sharp
+PORTVERSION= 0.2
+#PORTREVISION= 0
+#PORTEPOCH= 0
+CATEGORIES= www
+MASTER_SITES= ftp://ftp.novell.com/pub/mono/sources/${PORTNAME}/
+#MASTER_SITE_SUBDIR=
+#PKGNAMEPREFIX=
+#PKGNAMESUFFIX=
+#DISTNAME=
+#EXTRACT_SUFX=
+#DISTFILES=
+#DIST_SUBDIR= ${PORTNAME}
+#EXTRACT_ONLY=
+
+MAINTAINER= mono@FreeBSD.org
+COMMENT= Mono bindings for Webkit
+
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/webkit-1.0.pc:${PORTSDIR}/www/webkit-gtk2
+RUN_DEPENDS= ${BUILD_DEPENDS}
+
+USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_GMAKE= yes
+USE_GNOME= gnomehack gtksharp20
+
+.include <bsd.port.pre.mk>
+.include <bsd.port.post.mk>
diff --git a/www/webkit-sharp/distinfo b/www/webkit-sharp/distinfo
new file mode 100644
index 000000000000..2ca0ba27206e
--- /dev/null
+++ b/www/webkit-sharp/distinfo
@@ -0,0 +1,3 @@
+MD5 (webkit-sharp-0.2.tar.bz2) = 8041fba941b7299e432380c86b6dddf8
+SHA256 (webkit-sharp-0.2.tar.bz2) = ce0f87546d0a8c0a7f8d2c23075c80e109aa6c5fc30480b42f4c3c14ff5562a9
+SIZE (webkit-sharp-0.2.tar.bz2) = 81853
diff --git a/www/webkit-sharp/pkg-descr b/www/webkit-sharp/pkg-descr
new file mode 100644
index 000000000000..8c4b1875eda4
--- /dev/null
+++ b/www/webkit-sharp/pkg-descr
@@ -0,0 +1,3 @@
+WebKit# is a .NET language binding for the WebKit rendering engine.
+
+WWW: http://webkit.org
diff --git a/www/webkit-sharp/pkg-plist b/www/webkit-sharp/pkg-plist
new file mode 100644
index 000000000000..02d65e613ef0
--- /dev/null
+++ b/www/webkit-sharp/pkg-plist
@@ -0,0 +1,12 @@
+@comment $FreeBSD$
+lib/mono/gac/webkit-sharp/1.0.0.0__eaa1d335d2e19745/webkit-sharp.dll
+lib/mono/gac/webkit-sharp/1.0.0.0__eaa1d335d2e19745/webkit-sharp.dll.config
+lib/mono/webkit-sharp/webkit-sharp.dll
+lib/monodoc/sources/webkit-sharp-docs.source
+lib/monodoc/sources/webkit-sharp-docs.tree
+lib/monodoc/sources/webkit-sharp-docs.zip
+libdata/pkgconfig/webkit-sharp-1.0.pc
+@dirrm lib/pkgconfig
+@dirrm lib/mono/webkit-sharp
+@dirrm lib/mono/gac/webkit-sharp/1.0.0.0__eaa1d335d2e19745
+@dirrm lib/mono/gac/webkit-sharp
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 9f557603300d..5ae7c93afd22 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -42,6 +42,7 @@
SUBDIR += gdl
SUBDIR += gigi
SUBDIR += gnocl
+ SUBDIR += gnome-desktop-sharp20
SUBDIR += gnome-sharp20
SUBDIR += gnomemm
SUBDIR += gnustep-art
diff --git a/x11-toolkits/gnome-desktop-sharp20/Makefile b/x11-toolkits/gnome-desktop-sharp20/Makefile
new file mode 100644
index 000000000000..67d925300c0a
--- /dev/null
+++ b/x11-toolkits/gnome-desktop-sharp20/Makefile
@@ -0,0 +1,30 @@
+# New ports collection makefile for: gnome-sharp
+# Date created: 20070531
+# Whom: pneumann@gmail.com
+#
+# $FreeBSD$
+#
+
+PORTNAME= gnome-desktop-sharp
+PORTVERSION= 2.24.0
+PORTREVISION= 3
+CATEGORIES= x11-toolkits
+MASTER_SITES= GNOME
+
+MAINTAINER= mono@FreeBSD.org
+COMMENT= GNOME desktop interfaces for the .NET runtime
+
+USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+USE_GMAKE= yes
+USE_PERL5_RUN= yes
+USE_GNOME= gnomehack gnomepanel gtkhtml3 gtksharp20 gnomesharp20 librsvg2 vte \
+ libgnomeprintui gtksourceview2 gnomepanel libwnck nautiluscdburner
+
+post-patch:
+ @${FIND} ${WRKSRC} -name '*.pl' | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|^#!/usr/bin/perl|#!${PERL}|'
+
+.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/gnome-desktop-sharp20/distinfo b/x11-toolkits/gnome-desktop-sharp20/distinfo
new file mode 100644
index 000000000000..b1c2f7de01ce
--- /dev/null
+++ b/x11-toolkits/gnome-desktop-sharp20/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome-desktop-sharp-2.24.0.tar.bz2) = 2d36f04223a52e09908ddbdc1c767f5e
+SHA256 (gnome-desktop-sharp-2.24.0.tar.bz2) = fc66b3663b61b38c4d53cdee7ea6ace713feba333e022532e9a6933a7a1fef1c
+SIZE (gnome-desktop-sharp-2.24.0.tar.bz2) = 309256
diff --git a/x11-toolkits/gnome-desktop-sharp20/files/patch-configure b/x11-toolkits/gnome-desktop-sharp20/files/patch-configure
new file mode 100644
index 000000000000..e62d40648107
--- /dev/null
+++ b/x11-toolkits/gnome-desktop-sharp20/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig 2008-09-08 11:37:34.000000000 -0400
++++ configure 2008-11-01 20:55:53.000000000 -0300
+@@ -22168,7 +22168,7 @@
+
+
+ ## Versions of dependencies
+-GNOME_REQUIRED_VERSION=2.23.0
++GNOME_REQUIRED_VERSION=2.22.0
+ GNOME_SHARP_REQUIRED_VERSION=2.24.0
+
+
+@@ -22537,7 +22537,7 @@
+
+
+
+-GTKHTML_REQUIRED_VERSION=3.23.5
++GTKHTML_REQUIRED_VERSION=3.18.3
+
+
+ pkg_failed=no
diff --git a/x11-toolkits/gnome-desktop-sharp20/pkg-descr b/x11-toolkits/gnome-desktop-sharp20/pkg-descr
new file mode 100644
index 000000000000..99d44d6e100a
--- /dev/null
+++ b/x11-toolkits/gnome-desktop-sharp20/pkg-descr
@@ -0,0 +1,3 @@
+Gnome# provides C# bindings for Gnome libraries to the .NET runtime.
+
+WWW: http://www.mono-project.com/Gtk
diff --git a/x11-toolkits/gnome-desktop-sharp20/pkg-plist b/x11-toolkits/gnome-desktop-sharp20/pkg-plist
new file mode 100644
index 000000000000..c0cea7c03011
--- /dev/null
+++ b/x11-toolkits/gnome-desktop-sharp20/pkg-plist
@@ -0,0 +1,109 @@
+@comment $FreeBSD$
+lib/libgnomepanelsharpglue-2.a
+lib/libgnomepanelsharpglue-2.la
+lib/libgnomepanelsharpglue-2.so
+lib/libgtksourceview2sharpglue-2.so
+lib/libgtksourceview2sharpglue-2.la
+lib/libgtksourceview2sharpglue-2.a
+lib/libnautilusburnsharpglue-2.so
+lib/libnautilusburnsharpglue-2.la
+lib/libnautilusburnsharpglue-2.a
+lib/libgtkhtmlsharpglue-2.a
+lib/libgtkhtmlsharpglue-2.la
+lib/libgtkhtmlsharpglue-2.so
+lib/libvtesharpglue-2.a
+lib/libvtesharpglue-2.la
+lib/libvtesharpglue-2.so
+lib/libwncksharpglue-2.a
+lib/libwncksharpglue-2.la
+lib/libwncksharpglue-2.so
+lib/mono/gac/gnome-panel-sharp/2.24.0.0__35e10195dab3c99f/gnome-panel-sharp.dll
+lib/mono/gac/gnome-panel-sharp/2.24.0.0__35e10195dab3c99f/gnome-panel-sharp.dll.config
+lib/mono/gac/gnome-print-sharp/2.18.0.0__35e10195dab3c99f/gnome-print-sharp.dll
+lib/mono/gac/gnome-print-sharp/2.18.0.0__35e10195dab3c99f/gnome-print-sharp.dll.config
+lib/mono/gac/gnomedesktop-sharp/2.20.0.0__35e10195dab3c99f/gnomedesktop-sharp.dll
+lib/mono/gac/gnomedesktop-sharp/2.20.0.0__35e10195dab3c99f/gnomedesktop-sharp.dll.config
+lib/mono/gac/gtkhtml-sharp/3.16.0.0__35e10195dab3c99f/gtkhtml-sharp.dll
+lib/mono/gac/gtkhtml-sharp/3.16.0.0__35e10195dab3c99f/gtkhtml-sharp.dll.config
+lib/mono/gac/gtksourceview2-sharp/2.0.0.0__35e10195dab3c99f/gtksourceview2-sharp.dll
+lib/mono/gac/gtksourceview2-sharp/2.0.0.0__35e10195dab3c99f/gtksourceview2-sharp.dll.config
+lib/mono/gac/nautilusburn-sharp/2.20.0.0__35e10195dab3c99f/nautilusburn-sharp.dll
+lib/mono/gac/nautilusburn-sharp/2.20.0.0__35e10195dab3c99f/nautilusburn-sharp.dll.config
+lib/mono/gac/rsvg2-sharp/2.18.0.0__35e10195dab3c99f/rsvg2-sharp.dll
+lib/mono/gac/rsvg2-sharp/2.18.0.0__35e10195dab3c99f/rsvg2-sharp.dll.config
+lib/mono/gac/vte-sharp/0.16.0.0__35e10195dab3c99f/vte-sharp.dll
+lib/mono/gac/vte-sharp/0.16.0.0__35e10195dab3c99f/vte-sharp.dll.config
+lib/mono/gac/wnck-sharp/2.20.0.0__35e10195dab3c99f/wnck-sharp.dll
+lib/mono/gac/wnck-sharp/2.20.0.0__35e10195dab3c99f/wnck-sharp.dll.config
+lib/mono/gnome-panel-sharp-2.24/gnome-panel-sharp.dll
+lib/mono/gnome-print-sharp-2.18/gnome-print-sharp.dll
+lib/mono/gnomedesktop-sharp-2.20/gnomedesktop-sharp.dll
+lib/mono/gtkhtml-sharp-3.14/gtkhtml-sharp.dll
+lib/mono/gtksourceview2-sharp-2.0/gtksourceview2-sharp.dll
+lib/mono/nautilusburn-sharp-2.20/nautilusburn-sharp.dll
+lib/mono/rsvg2-sharp-2.0/rsvg2-sharp.dll
+lib/mono/vte-sharp-0.16/vte-sharp.dll
+lib/mono/wnck-sharp-2.20/wnck-sharp.dll
+libdata/pkgconfig/gnome-desktop-sharp-2.0.pc
+libdata/pkgconfig/gnome-panel-sharp-2.24.pc
+libdata/pkgconfig/gnome-print-sharp-2.18.pc
+libdata/pkgconfig/gtkhtml-sharp-3.14.pc
+libdata/pkgconfig/gtksourceview2-sharp.pc
+libdata/pkgconfig/nautilusburn-sharp.pc
+libdata/pkgconfig/rsvg2-sharp-2.0.pc
+libdata/pkgconfig/vte-sharp-0.16.pc
+libdata/pkgconfig/wnck-sharp-1.0.pc
+share/gnome-panel-sharp/2.24/gnome-panel-api.xml
+share/gnome-print-sharp/2.18/gnome-print-api.xml
+share/gnomedesktop-sharp/2.20/gnomedesktop-api.xml
+share/gtkhtml-sharp/3.14/gtkhtml-api.xml
+share/gtksourceview2-sharp/2.0/gtksourceview2-api.xml
+share/nautilusburn-sharp/2.20/nautilusburn-api.xml
+share/rsvg2-sharp/2.0/rsvg2-api.xml
+share/vte-sharp/0.16/vte-api.xml
+share/wnck-sharp/2.20/wnck-api.xml
+@dirrm share/wnck-sharp/2.20
+@dirrm share/wnck-sharp
+@dirrm share/vte-sharp/0.16
+@dirrm share/vte-sharp
+@dirrm share/rsvg2-sharp/2.0
+@dirrm share/rsvg2-sharp
+@dirrm share/nautilusburn-sharp/2.20
+@dirrm share/nautilusburn-sharp
+@dirrm share/gtksourceview2-sharp/2.0
+@dirrm share/gtksourceview2-sharp
+@dirrm share/gtkhtml-sharp/3.14
+@dirrm share/gtkhtml-sharp
+@dirrm share/gnomedesktop-sharp/2.20
+@dirrm share/gnomedesktop-sharp
+@dirrm share/gnome-print-sharp/2.18
+@dirrm share/gnome-print-sharp
+@dirrm share/gnome-panel-sharp/2.24
+@dirrm share/gnome-panel-sharp
+@dirrm lib/mono/wnck-sharp-2.20
+@dirrm lib/mono/vte-sharp-0.16
+@dirrm lib/mono/rsvg2-sharp-2.0
+@dirrm lib/mono/nautilusburn-sharp-2.20
+@dirrm lib/mono/gtksourceview2-sharp-2.0
+@dirrm lib/mono/gtkhtml-sharp-3.14
+@dirrm lib/mono/gnomedesktop-sharp-2.20
+@dirrm lib/mono/gnome-print-sharp-2.18
+@dirrm lib/mono/gnome-panel-sharp-2.24
+@dirrm lib/mono/gac/wnck-sharp/2.20.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/wnck-sharp
+@dirrm lib/mono/gac/vte-sharp/0.16.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/vte-sharp
+@dirrm lib/mono/gac/rsvg2-sharp/2.18.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/rsvg2-sharp
+@dirrm lib/mono/gac/nautilusburn-sharp/2.20.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/nautilusburn-sharp
+@dirrm lib/mono/gac/gtksourceview2-sharp/2.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gtksourceview2-sharp
+@dirrm lib/mono/gac/gtkhtml-sharp/3.16.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gtkhtml-sharp
+@dirrm lib/mono/gac/gnomedesktop-sharp/2.20.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnomedesktop-sharp
+@dirrm lib/mono/gac/gnome-print-sharp/2.18.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnome-print-sharp
+@dirrm lib/mono/gac/gnome-panel-sharp/2.24.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnome-panel-sharp
diff --git a/x11-toolkits/gnome-sharp20/Makefile b/x11-toolkits/gnome-sharp20/Makefile
index 1a27b7f2bedf..920bdd2da93c 100644
--- a/x11-toolkits/gnome-sharp20/Makefile
+++ b/x11-toolkits/gnome-sharp20/Makefile
@@ -7,12 +7,12 @@
#
PORTNAME= gnome-sharp
-PORTVERSION= 2.16.0
-PORTREVISION= 5
+PORTVERSION= 2.24.0
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
-MAINTAINER= bsd-sharp@googlegroups.com
+MAINTAINER= mono@FreeBSD.org
COMMENT= GNOME interfaces for the .NET runtime
LATEST_LINK= gnome-sharp20
@@ -21,15 +21,11 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GMAKE= yes
USE_PERL5_RUN= yes
-USE_GNOME= gnomehack gnomepanel gtkhtml3 gtksharp20 librsvg2 vte \
- libgnomeprintui
+USE_GNOME= gnomehack gnomepanel gtksharp20 librsvg2 vte libgnomeprintui
post-patch:
@${FIND} ${WRKSRC} -name '*.pl' | ${XARGS} ${REINPLACE_CMD} -e \
's|^#!/usr/bin/perl|#!${PERL}|'
- @${REINPLACE_CMD} -e 's|libgtkhtml-3.8|libgtkhtml-3.14|g' \
- -e 's|GTKHTML_VERSION=3.8|GTKHTML_VERSION=3.14|g' \
- ${WRKSRC}/configure
.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
.include <bsd.port.mk>
diff --git a/x11-toolkits/gnome-sharp20/distinfo b/x11-toolkits/gnome-sharp20/distinfo
index 5c327543cd4f..1ffe9683d787 100644
--- a/x11-toolkits/gnome-sharp20/distinfo
+++ b/x11-toolkits/gnome-sharp20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-sharp-2.16.0.tar.bz2) = 09034669acec52f9d9818d9a31c032d5
-SHA256 (gnome-sharp-2.16.0.tar.bz2) = ab7757f6bda0791b4b3abe5cc7a82fee6d1321b2a10db4c3764cce0f41268e4a
-SIZE (gnome-sharp-2.16.0.tar.bz2) = 483532
+MD5 (gnome-sharp-2.24.0.tar.bz2) = 30af2dfb153f417e44b5ac80501685ca
+SHA256 (gnome-sharp-2.24.0.tar.bz2) = 59321848af8c15b83008d8d6a19c2970bed6ccb8072b5089924ce0c398c1dbc6
+SIZE (gnome-sharp-2.24.0.tar.bz2) = 440050
diff --git a/x11-toolkits/gnome-sharp20/files/patch-art_art-sharp.dll.config.in b/x11-toolkits/gnome-sharp20/files/patch-art_art-sharp.dll.config.in
deleted file mode 100644
index aec3f7b74d59..000000000000
--- a/x11-toolkits/gnome-sharp20/files/patch-art_art-sharp.dll.config.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- art/art-sharp.dll.config.in.orig Fri Sep 16 00:07:02 2005
-+++ art/art-sharp.dll.config.in Fri Sep 16 00:07:13 2005
-@@ -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_2@LIB_PREFIX@@LIB_SUFFIX@"/>
- </configuration>
diff --git a/x11-toolkits/gnome-sharp20/files/patch-configure b/x11-toolkits/gnome-sharp20/files/patch-configure
new file mode 100644
index 000000000000..56122d10f831
--- /dev/null
+++ b/x11-toolkits/gnome-sharp20/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig 2008-09-08 11:29:02.000000000 -0400
++++ configure 2008-11-01 12:21:49.000000000 -0300
+@@ -21789,7 +21789,7 @@
+ { (exit 1); exit 1; }; }
+ fi
+
+-GTK_REQUIRED_VERSION=2.13.0
++GTK_REQUIRED_VERSION=2.12.0
+ GTK_SHARP_REQUIRED_VERSION=2.12.2
+
+
+@@ -22247,7 +22247,7 @@
+
+
+ ## Versions of dependencies
+-GNOME_REQUIRED_VERSION=2.23.0
++GNOME_REQUIRED_VERSION=2.22.0
+ GNOMEVFS_REQUIRED_VERSION=2.22.0
+ ART_REQUIRED_VERSION=2.3.20
+
diff --git a/x11-toolkits/gnome-sharp20/files/patch-gconf_GConf_gconf-sharp.dll.config.in b/x11-toolkits/gnome-sharp20/files/patch-gconf_GConf_gconf-sharp.dll.config.in
deleted file mode 100644
index fbf4fe877fc0..000000000000
--- a/x11-toolkits/gnome-sharp20/files/patch-gconf_GConf_gconf-sharp.dll.config.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- gconf/GConf/gconf-sharp.dll.config.in.orig Wed Jul 14 21:54:59 2004
-+++ gconf/GConf/gconf-sharp.dll.config.in Wed Jul 14 21:57:00 2004
-@@ -1,3 +1,3 @@
- <configuration>
-- <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@.4@LIB_SUFFIX@"/>
-+ <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@@LIB_SUFFIX@"/>
- </configuration>
diff --git a/x11-toolkits/gnome-sharp20/files/patch-gtkhtml_gtkhtml-sharp.dll.config.in b/x11-toolkits/gnome-sharp20/files/patch-gtkhtml_gtkhtml-sharp.dll.config.in
deleted file mode 100644
index fd58687875d3..000000000000
--- a/x11-toolkits/gnome-sharp20/files/patch-gtkhtml_gtkhtml-sharp.dll.config.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- gtkhtml/gtkhtml-sharp.dll.config.in.orig Fri Oct 29 16:33:07 2004
-+++ gtkhtml/gtkhtml-sharp.dll.config.in Sat Feb 4 16:29:34 2006
-@@ -1,4 +1,4 @@
- <configuration>
- <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-- <dllmap dll="gtkhtml-3.0" target="libgtkhtml-@GTKHTML_VERSION@@LIB_PREFIX@.@GTKHTML_SOVERSION@@LIB_SUFFIX@"/>
-+ <dllmap dll="gtkhtml-3.0" target="libgtkhtml-@GTKHTML_VERSION@@LIB_PREFIX@@LIB_SUFFIX@"/>
- </configuration>
diff --git a/x11-toolkits/gnome-sharp20/files/patch-rsvg_rsvg-sharp.dll.config.in b/x11-toolkits/gnome-sharp20/files/patch-rsvg_rsvg-sharp.dll.config.in
deleted file mode 100644
index 1cc50160b1fe..000000000000
--- a/x11-toolkits/gnome-sharp20/files/patch-rsvg_rsvg-sharp.dll.config.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- rsvg/rsvg-sharp.dll.config.in.orig Wed Jul 14 22:28:11 2004
-+++ rsvg/rsvg-sharp.dll.config.in Wed Jul 14 22:28:29 2004
-@@ -1,3 +1,3 @@
- <configuration>
-- <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
-+ <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@@LIB_SUFFIX@"/>
- </configuration>
diff --git a/x11-toolkits/gnome-sharp20/files/patch-vte_vte-sharp.dll.config.in b/x11-toolkits/gnome-sharp20/files/patch-vte_vte-sharp.dll.config.in
deleted file mode 100644
index b95db2ec4f12..000000000000
--- a/x11-toolkits/gnome-sharp20/files/patch-vte_vte-sharp.dll.config.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- vte/vte-sharp.dll.config.in.orig Fri Oct 29 16:33:07 2004
-+++ vte/vte-sharp.dll.config.in Sat Feb 4 16:29:34 2006
-@@ -1,5 +1,5 @@
- <configuration>
- <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
- <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-- <dllmap dll="vte" target="libvte@LIB_PREFIX@.4@LIB_SUFFIX@"/>
-+ <dllmap dll="vte" target="libvte@LIB_PREFIX@@LIB_SUFFIX@"/>
- </configuration>
diff --git a/x11-toolkits/gnome-sharp20/pkg-plist b/x11-toolkits/gnome-sharp20/pkg-plist
index 63905195ecaf..6edf0bf66dc2 100644
--- a/x11-toolkits/gnome-sharp20/pkg-plist
+++ b/x11-toolkits/gnome-sharp20/pkg-plist
@@ -1,180 +1,38 @@
+@comment $FreeBSD$
bin/gconfsharp2-schemagen
lib/gtk-sharp-2.0/gconfsharp-schemagen.exe
lib/libgnomesharpglue-2.a
lib/libgnomesharpglue-2.la
lib/libgnomesharpglue-2.so
-lib/libvtesharpglue-2.a
-lib/libvtesharpglue-2.la
-lib/libvtesharpglue-2.so
-lib/mono/gac/art-sharp/2.16.0.0__35e10195dab3c99f/art-sharp.dll
-lib/mono/gac/art-sharp/2.16.0.0__35e10195dab3c99f/art-sharp.dll.config
-lib/mono/gac/gconf-sharp-peditors/2.16.0.0__35e10195dab3c99f/gconf-sharp-peditors.dll
-lib/mono/gac/gconf-sharp/2.16.0.0__35e10195dab3c99f/gconf-sharp.dll
-lib/mono/gac/gconf-sharp/2.16.0.0__35e10195dab3c99f/gconf-sharp.dll.config
-lib/mono/gac/gnome-sharp/2.16.0.0__35e10195dab3c99f/gnome-sharp.dll
-lib/mono/gac/gnome-sharp/2.16.0.0__35e10195dab3c99f/gnome-sharp.dll.config
-lib/mono/gac/gnome-vfs-sharp/2.16.0.0__35e10195dab3c99f/gnome-vfs-sharp.dll
-lib/mono/gac/gnome-vfs-sharp/2.16.0.0__35e10195dab3c99f/gnome-vfs-sharp.dll.config
-lib/mono/gac/gtkhtml-sharp/2.16.0.0__35e10195dab3c99f/gtkhtml-sharp.dll
-lib/mono/gac/gtkhtml-sharp/2.16.0.0__35e10195dab3c99f/gtkhtml-sharp.dll.config
-lib/mono/gac/policy.2.4.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.art-sharp.dll
-lib/mono/gac/policy.2.4.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
-lib/mono/gac/policy.2.4.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.4.config
-lib/mono/gac/policy.2.4.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.4.gconf-sharp-peditors.dll
-lib/mono/gac/policy.2.4.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
-lib/mono/gac/policy.2.4.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.gconf-sharp.dll
-lib/mono/gac/policy.2.4.gnome-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
-lib/mono/gac/policy.2.4.gnome-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.gnome-sharp.dll
-lib/mono/gac/policy.2.4.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
-lib/mono/gac/policy.2.4.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.gnome-vfs-sharp.dll
-lib/mono/gac/policy.2.4.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
-lib/mono/gac/policy.2.4.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.gtkhtml-sharp.dll
-lib/mono/gac/policy.2.4.rsvg-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
-lib/mono/gac/policy.2.4.rsvg-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.rsvg-sharp.dll
-lib/mono/gac/policy.2.4.vte-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
-lib/mono/gac/policy.2.4.vte-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.vte-sharp.dll
-lib/mono/gac/policy.2.6.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.art-sharp.dll
-lib/mono/gac/policy.2.6.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
-lib/mono/gac/policy.2.6.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.6.config
-lib/mono/gac/policy.2.6.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.6.gconf-sharp-peditors.dll
-lib/mono/gac/policy.2.6.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
-lib/mono/gac/policy.2.6.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.gconf-sharp.dll
-lib/mono/gac/policy.2.6.gnome-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
-lib/mono/gac/policy.2.6.gnome-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.gnome-sharp.dll
-lib/mono/gac/policy.2.6.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
-lib/mono/gac/policy.2.6.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.gnome-vfs-sharp.dll
-lib/mono/gac/policy.2.6.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
-lib/mono/gac/policy.2.6.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.gtkhtml-sharp.dll
-lib/mono/gac/policy.2.6.rsvg-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
-lib/mono/gac/policy.2.6.rsvg-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.rsvg-sharp.dll
-lib/mono/gac/policy.2.6.vte-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
-lib/mono/gac/policy.2.6.vte-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.vte-sharp.dll
-lib/mono/gac/policy.2.8.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.art-sharp.dll
-lib/mono/gac/policy.2.8.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.config
-lib/mono/gac/policy.2.8.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.8.config
-lib/mono/gac/policy.2.8.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.8.gconf-sharp-peditors.dll
-lib/mono/gac/policy.2.8.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.config
-lib/mono/gac/policy.2.8.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.gconf-sharp.dll
-lib/mono/gac/policy.2.8.gnome-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.config
-lib/mono/gac/policy.2.8.gnome-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.gnome-sharp.dll
-lib/mono/gac/policy.2.8.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.config
-lib/mono/gac/policy.2.8.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.gnome-vfs-sharp.dll
-lib/mono/gac/policy.2.8.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.config
-lib/mono/gac/policy.2.8.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.gtkhtml-sharp.dll
-lib/mono/gac/policy.2.8.rsvg-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.config
-lib/mono/gac/policy.2.8.rsvg-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.rsvg-sharp.dll
-lib/mono/gac/policy.2.8.vte-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.config
-lib/mono/gac/policy.2.8.vte-sharp/0.0.0.0__35e10195dab3c99f/policy.2.8.vte-sharp.dll
-lib/mono/gac/rsvg-sharp/2.16.0.0__35e10195dab3c99f/rsvg-sharp.dll
-lib/mono/gac/rsvg-sharp/2.16.0.0__35e10195dab3c99f/rsvg-sharp.dll.config
-lib/mono/gac/vte-sharp/2.16.0.0__35e10195dab3c99f/vte-sharp.dll
-lib/mono/gac/vte-sharp/2.16.0.0__35e10195dab3c99f/vte-sharp.dll.config
+lib/mono/gac/art-sharp/2.24.0.0__35e10195dab3c99f/art-sharp.dll
+lib/mono/gac/art-sharp/2.24.0.0__35e10195dab3c99f/art-sharp.dll.config
+lib/mono/gac/gconf-sharp-peditors/2.24.0.0__35e10195dab3c99f/gconf-sharp-peditors.dll
+lib/mono/gac/gconf-sharp/2.24.0.0__35e10195dab3c99f/gconf-sharp.dll
+lib/mono/gac/gconf-sharp/2.24.0.0__35e10195dab3c99f/gconf-sharp.dll.config
+lib/mono/gac/gnome-sharp/2.24.0.0__35e10195dab3c99f/gnome-sharp.dll
+lib/mono/gac/gnome-sharp/2.24.0.0__35e10195dab3c99f/gnome-sharp.dll.config
+lib/mono/gac/gnome-vfs-sharp/2.24.0.0__35e10195dab3c99f/gnome-vfs-sharp.dll
+lib/mono/gac/gnome-vfs-sharp/2.24.0.0__35e10195dab3c99f/gnome-vfs-sharp.dll.config
lib/mono/gtk-sharp-2.0/art-sharp.dll
lib/mono/gtk-sharp-2.0/gconf-sharp-peditors.dll
lib/mono/gtk-sharp-2.0/gconf-sharp.dll
lib/mono/gtk-sharp-2.0/gnome-sharp.dll
lib/mono/gtk-sharp-2.0/gnome-vfs-sharp.dll
-lib/mono/gtk-sharp-2.0/gtkhtml-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.4.art-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.4.gconf-sharp-peditors.dll
-lib/mono/gtk-sharp-2.0/policy.2.4.gconf-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.4.gnome-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.4.gnome-vfs-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.4.gtkhtml-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.4.rsvg-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.4.vte-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.6.art-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.6.gconf-sharp-peditors.dll
-lib/mono/gtk-sharp-2.0/policy.2.6.gconf-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.6.gnome-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.6.gnome-vfs-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.6.gtkhtml-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.6.rsvg-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.6.vte-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.8.art-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.8.gconf-sharp-peditors.dll
-lib/mono/gtk-sharp-2.0/policy.2.8.gconf-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.8.gnome-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.8.gnome-vfs-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.8.gtkhtml-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.8.rsvg-sharp.dll
-lib/mono/gtk-sharp-2.0/policy.2.8.vte-sharp.dll
-lib/mono/gtk-sharp-2.0/rsvg-sharp.dll
-lib/mono/gtk-sharp-2.0/vte-sharp.dll
libdata/pkgconfig/art-sharp-2.0.pc
libdata/pkgconfig/gconf-sharp-2.0.pc
+libdata/pkgconfig/gconf-sharp-peditors-2.0.pc
libdata/pkgconfig/gnome-sharp-2.0.pc
libdata/pkgconfig/gnome-vfs-sharp-2.0.pc
-libdata/pkgconfig/gtkhtml-sharp-2.0.pc
-libdata/pkgconfig/rsvg-sharp-2.0.pc
-libdata/pkgconfig/vte-sharp-2.0.pc
share/gapi-2.0/art-api.xml
share/gapi-2.0/gnome-api.xml
share/gapi-2.0/gnome-vfs-api.xml
-share/gapi-2.0/gtkhtml-api.xml
-share/gapi-2.0/rsvg-api.xml
-share/gapi-2.0/vte-api.xml
-@dirrm lib/mono/gac/vte-sharp/2.16.0.0__35e10195dab3c99f
-@dirrmtry lib/mono/gac/vte-sharp
-@dirrm lib/mono/gac/rsvg-sharp/2.16.0.0__35e10195dab3c99f
-@dirrmtry lib/mono/gac/rsvg-sharp
-@dirrm lib/mono/gac/policy.2.8.vte-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.8.vte-sharp
-@dirrm lib/mono/gac/policy.2.8.rsvg-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.8.rsvg-sharp
-@dirrm lib/mono/gac/policy.2.8.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.8.gtkhtml-sharp
-@dirrm lib/mono/gac/policy.2.8.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.8.gnome-vfs-sharp
-@dirrm lib/mono/gac/policy.2.8.gnome-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.8.gnome-sharp
-@dirrm lib/mono/gac/policy.2.8.gconf-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.8.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.8.gconf-sharp-peditors
-@dirrm lib/mono/gac/policy.2.8.gconf-sharp
-@dirrm lib/mono/gac/policy.2.8.art-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.8.art-sharp
-@dirrm lib/mono/gac/policy.2.6.vte-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.6.vte-sharp
-@dirrm lib/mono/gac/policy.2.6.rsvg-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.6.rsvg-sharp
-@dirrm lib/mono/gac/policy.2.6.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.6.gtkhtml-sharp
-@dirrm lib/mono/gac/policy.2.6.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.6.gnome-vfs-sharp
-@dirrm lib/mono/gac/policy.2.6.gnome-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.6.gnome-sharp
-@dirrm lib/mono/gac/policy.2.6.gconf-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.6.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.6.gconf-sharp-peditors
-@dirrm lib/mono/gac/policy.2.6.gconf-sharp
-@dirrm lib/mono/gac/policy.2.6.art-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.6.art-sharp
-@dirrm lib/mono/gac/policy.2.4.vte-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.4.vte-sharp
-@dirrm lib/mono/gac/policy.2.4.rsvg-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.4.rsvg-sharp
-@dirrm lib/mono/gac/policy.2.4.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.4.gtkhtml-sharp
-@dirrm lib/mono/gac/policy.2.4.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.4.gnome-vfs-sharp
-@dirrm lib/mono/gac/policy.2.4.gnome-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.4.gnome-sharp
-@dirrm lib/mono/gac/policy.2.4.gconf-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.4.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.4.gconf-sharp-peditors
-@dirrm lib/mono/gac/policy.2.4.gconf-sharp
-@dirrm lib/mono/gac/policy.2.4.art-sharp/0.0.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/policy.2.4.art-sharp
-@dirrm lib/mono/gac/gtkhtml-sharp/2.16.0.0__35e10195dab3c99f
-@dirrmtry lib/mono/gac/gtkhtml-sharp
-@dirrm lib/mono/gac/gnome-vfs-sharp/2.16.0.0__35e10195dab3c99f
-@dirrmtry lib/mono/gac/gnome-vfs-sharp
-@dirrm lib/mono/gac/gnome-sharp/2.16.0.0__35e10195dab3c99f
-@dirrmtry lib/mono/gac/gnome-sharp
-@dirrm lib/mono/gac/gconf-sharp/2.16.0.0__35e10195dab3c99f
-@dirrm lib/mono/gac/gconf-sharp-peditors/2.16.0.0__35e10195dab3c99f
-@dirrmtry lib/mono/gac/gconf-sharp-peditors
-@dirrmtry lib/mono/gac/gconf-sharp
-@dirrm lib/mono/gac/art-sharp/2.16.0.0__35e10195dab3c99f
-@dirrmtry lib/mono/gac/art-sharp
+@dirrm lib/mono/gac/gnome-vfs-sharp/2.24.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnome-vfs-sharp
+@dirrm lib/mono/gac/gnome-sharp/2.24.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gnome-sharp
+@dirrm lib/mono/gac/gconf-sharp/2.24.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gconf-sharp
+@dirrm lib/mono/gac/gconf-sharp-peditors/2.24.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gconf-sharp-peditors
+@dirrm lib/mono/gac/art-sharp/2.24.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/art-sharp
diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index 99c63b84102a..55143dfc8f86 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -7,12 +7,11 @@
#
PORTNAME= gtk-sharp
-PORTVERSION= 2.10.2
-PORTREVISION= 2
+PORTVERSION= 2.12.5
CATEGORIES= x11-toolkits
-MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
+MASTER_SITES= GNOME
-MAINTAINER= bsd-sharp@googlegroups.com
+MAINTAINER= mono@FreeBSD.org
COMMENT= GTK+ and GNOME interfaces for the .NET runtime
BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono \
diff --git a/x11-toolkits/gtk-sharp20/distinfo b/x11-toolkits/gtk-sharp20/distinfo
index 01114a3ad522..a80f4bf81cd9 100644
--- a/x11-toolkits/gtk-sharp20/distinfo
+++ b/x11-toolkits/gtk-sharp20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtk-sharp-2.10.2.tar.bz2) = 7d509a677c58b2e6a8c85db51d0b1451
-SHA256 (gtk-sharp-2.10.2.tar.bz2) = 8dc7f6180109a529b3216b6527f34a01e1e4484e42ebbd28d551e8f6ce0c243d
-SIZE (gtk-sharp-2.10.2.tar.bz2) = 1475426
+MD5 (gtk-sharp-2.12.5.tar.bz2) = db9acf888ff88dcd1e3813487a07481d
+SHA256 (gtk-sharp-2.12.5.tar.bz2) = e3ee4ac155b4fad467b7101c37c7fe9ec7109bf73751cef320adb5d5678138ac
+SIZE (gtk-sharp-2.12.5.tar.bz2) = 1578668
diff --git a/x11-toolkits/gtk-sharp20/pkg-plist b/x11-toolkits/gtk-sharp20/pkg-plist
index 1435afc417b4..3811a35ff4c1 100644
--- a/x11-toolkits/gtk-sharp20/pkg-plist
+++ b/x11-toolkits/gtk-sharp20/pkg-plist
@@ -6,6 +6,9 @@ lib/gtk-sharp-2.0/gapi-parser.exe
lib/gtk-sharp-2.0/gapi2xml.pl
lib/gtk-sharp-2.0/gapi_codegen.exe
lib/gtk-sharp-2.0/gapi_pp.pl
+lib/libatksharpglue-2.a
+lib/libatksharpglue-2.la
+lib/libatksharpglue-2.so
lib/libgdksharpglue-2.a
lib/libgdksharpglue-2.la
lib/libgdksharpglue-2.so
@@ -21,20 +24,34 @@ lib/libgtksharpglue-2.so
lib/libpangosharpglue-2.a
lib/libpangosharpglue-2.la
lib/libpangosharpglue-2.so
-lib/mono/gac/atk-sharp/2.10.0.0__35e10195dab3c99f/atk-sharp.dll
-lib/mono/gac/atk-sharp/2.10.0.0__35e10195dab3c99f/atk-sharp.dll.config
-lib/mono/gac/gdk-sharp/2.10.0.0__35e10195dab3c99f/gdk-sharp.dll
-lib/mono/gac/gdk-sharp/2.10.0.0__35e10195dab3c99f/gdk-sharp.dll.config
-lib/mono/gac/glade-sharp/2.10.0.0__35e10195dab3c99f/glade-sharp.dll
-lib/mono/gac/glade-sharp/2.10.0.0__35e10195dab3c99f/glade-sharp.dll.config
-lib/mono/gac/glib-sharp/2.10.0.0__35e10195dab3c99f/glib-sharp.dll
-lib/mono/gac/glib-sharp/2.10.0.0__35e10195dab3c99f/glib-sharp.dll.config
-lib/mono/gac/gtk-dotnet/2.10.0.0__35e10195dab3c99f/gtk-dotnet.dll
-lib/mono/gac/gtk-dotnet/2.10.0.0__35e10195dab3c99f/gtk-dotnet.dll.config
-lib/mono/gac/gtk-sharp/2.10.0.0__35e10195dab3c99f/gtk-sharp.dll
-lib/mono/gac/gtk-sharp/2.10.0.0__35e10195dab3c99f/gtk-sharp.dll.config
-lib/mono/gac/pango-sharp/2.10.0.0__35e10195dab3c99f/pango-sharp.dll
-lib/mono/gac/pango-sharp/2.10.0.0__35e10195dab3c99f/pango-sharp.dll.config
+lib/mono/gac/atk-sharp/2.12.0.0__35e10195dab3c99f/atk-sharp.dll
+lib/mono/gac/atk-sharp/2.12.0.0__35e10195dab3c99f/atk-sharp.dll.config
+lib/mono/gac/gdk-sharp/2.12.0.0__35e10195dab3c99f/gdk-sharp.dll
+lib/mono/gac/gdk-sharp/2.12.0.0__35e10195dab3c99f/gdk-sharp.dll.config
+lib/mono/gac/glade-sharp/2.12.0.0__35e10195dab3c99f/glade-sharp.dll
+lib/mono/gac/glade-sharp/2.12.0.0__35e10195dab3c99f/glade-sharp.dll.config
+lib/mono/gac/glib-sharp/2.12.0.0__35e10195dab3c99f/glib-sharp.dll
+lib/mono/gac/glib-sharp/2.12.0.0__35e10195dab3c99f/glib-sharp.dll.config
+lib/mono/gac/gtk-dotnet/2.12.0.0__35e10195dab3c99f/gtk-dotnet.dll
+lib/mono/gac/gtk-dotnet/2.12.0.0__35e10195dab3c99f/gtk-dotnet.dll.config
+lib/mono/gac/gtk-sharp/2.12.0.0__35e10195dab3c99f/gtk-sharp.dll
+lib/mono/gac/gtk-sharp/2.12.0.0__35e10195dab3c99f/gtk-sharp.dll.config
+lib/mono/gac/pango-sharp/2.12.0.0__35e10195dab3c99f/pango-sharp.dll
+lib/mono/gac/pango-sharp/2.12.0.0__35e10195dab3c99f/pango-sharp.dll.config
+lib/mono/gac/policy.2.10.atk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.10.atk-sharp.dll
+lib/mono/gac/policy.2.10.atk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.10.config
+lib/mono/gac/policy.2.10.gdk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.10.config
+lib/mono/gac/policy.2.10.gdk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.10.gdk-sharp.dll
+lib/mono/gac/policy.2.10.glade-sharp/0.0.0.0__35e10195dab3c99f/policy.2.10.config
+lib/mono/gac/policy.2.10.glade-sharp/0.0.0.0__35e10195dab3c99f/policy.2.10.glade-sharp.dll
+lib/mono/gac/policy.2.10.glib-sharp/0.0.0.0__35e10195dab3c99f/policy.2.10.config
+lib/mono/gac/policy.2.10.glib-sharp/0.0.0.0__35e10195dab3c99f/policy.2.10.glib-sharp.dll
+lib/mono/gac/policy.2.10.gtk-dotnet/0.0.0.0__35e10195dab3c99f/policy.2.10.config
+lib/mono/gac/policy.2.10.gtk-dotnet/0.0.0.0__35e10195dab3c99f/policy.2.10.gtk-dotnet.dll
+lib/mono/gac/policy.2.10.gtk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.10.config
+lib/mono/gac/policy.2.10.gtk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.10.gtk-sharp.dll
+lib/mono/gac/policy.2.10.pango-sharp/0.0.0.0__35e10195dab3c99f/policy.2.10.config
+lib/mono/gac/policy.2.10.pango-sharp/0.0.0.0__35e10195dab3c99f/policy.2.10.pango-sharp.dll
lib/mono/gac/policy.2.4.atk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.atk-sharp.dll
lib/mono/gac/policy.2.4.atk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
lib/mono/gac/policy.2.4.gdk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
@@ -84,6 +101,13 @@ lib/mono/gtk-sharp-2.0/glib-sharp.dll
lib/mono/gtk-sharp-2.0/gtk-dotnet.dll
lib/mono/gtk-sharp-2.0/gtk-sharp.dll
lib/mono/gtk-sharp-2.0/pango-sharp.dll
+lib/mono/gtk-sharp-2.0/policy.2.10.atk-sharp.dll
+lib/mono/gtk-sharp-2.0/policy.2.10.gdk-sharp.dll
+lib/mono/gtk-sharp-2.0/policy.2.10.glade-sharp.dll
+lib/mono/gtk-sharp-2.0/policy.2.10.glib-sharp.dll
+lib/mono/gtk-sharp-2.0/policy.2.10.gtk-dotnet.dll
+lib/mono/gtk-sharp-2.0/policy.2.10.gtk-sharp.dll
+lib/mono/gtk-sharp-2.0/policy.2.10.pango-sharp.dll
lib/mono/gtk-sharp-2.0/policy.2.4.atk-sharp.dll
lib/mono/gtk-sharp-2.0/policy.2.4.gdk-sharp.dll
lib/mono/gtk-sharp-2.0/policy.2.4.glade-sharp.dll
@@ -116,9 +140,9 @@ libdata/pkgconfig/gtk-sharp-2.0.pc
share/gapi-2.0/atk-api.xml
share/gapi-2.0/gdk-api.xml
share/gapi-2.0/glade-api.xml
+share/gapi-2.0/glib-api.xml
share/gapi-2.0/gtk-api.xml
share/gapi-2.0/pango-api.xml
-@dirrmtry share/gapi-2.0
@dirrmtry lib/mono/gtk-sharp-2.0
@dirrm lib/mono/gac/policy.2.8.pango-sharp/0.0.0.0__35e10195dab3c99f
@dirrm lib/mono/gac/policy.2.8.pango-sharp
@@ -162,18 +186,33 @@ share/gapi-2.0/pango-api.xml
@dirrm lib/mono/gac/policy.2.4.gdk-sharp
@dirrm lib/mono/gac/policy.2.4.atk-sharp/0.0.0.0__35e10195dab3c99f
@dirrm lib/mono/gac/policy.2.4.atk-sharp
-@dirrm lib/mono/gac/pango-sharp/2.10.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/policy.2.10.pango-sharp/0.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/policy.2.10.pango-sharp
+@dirrm lib/mono/gac/policy.2.10.gtk-sharp/0.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/policy.2.10.gtk-sharp
+@dirrm lib/mono/gac/policy.2.10.gtk-dotnet/0.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/policy.2.10.gtk-dotnet
+@dirrm lib/mono/gac/policy.2.10.glib-sharp/0.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/policy.2.10.glib-sharp
+@dirrm lib/mono/gac/policy.2.10.glade-sharp/0.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/policy.2.10.glade-sharp
+@dirrm lib/mono/gac/policy.2.10.gdk-sharp/0.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/policy.2.10.gdk-sharp
+@dirrm lib/mono/gac/policy.2.10.atk-sharp/0.0.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/policy.2.10.atk-sharp
+@dirrm lib/mono/gac/pango-sharp/2.12.0.0__35e10195dab3c99f
@dirrmtry lib/mono/gac/pango-sharp
-@dirrm lib/mono/gac/gtk-sharp/2.10.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gtk-sharp/2.12.0.0__35e10195dab3c99f
@dirrmtry lib/mono/gac/gtk-sharp
-@dirrm lib/mono/gac/gtk-dotnet/2.10.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gtk-dotnet/2.12.0.0__35e10195dab3c99f
@dirrmtry lib/mono/gac/gtk-dotnet
-@dirrm lib/mono/gac/glib-sharp/2.10.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/glib-sharp/2.12.0.0__35e10195dab3c99f
@dirrmtry lib/mono/gac/glib-sharp
-@dirrm lib/mono/gac/glade-sharp/2.10.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/glade-sharp/2.12.0.0__35e10195dab3c99f
@dirrmtry lib/mono/gac/glade-sharp
-@dirrm lib/mono/gac/gdk-sharp/2.10.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/gdk-sharp/2.12.0.0__35e10195dab3c99f
@dirrmtry lib/mono/gac/gdk-sharp
-@dirrm lib/mono/gac/atk-sharp/2.10.0.0__35e10195dab3c99f
+@dirrm lib/mono/gac/atk-sharp/2.12.0.0__35e10195dab3c99f
@dirrmtry lib/mono/gac/atk-sharp
@dirrmtry lib/gtk-sharp-2.0
+@dirrmtry share/gapi-2.0
diff --git a/x11-toolkits/gtksourceview-sharp/Makefile b/x11-toolkits/gtksourceview-sharp/Makefile
index 74074946fea7..7029bf1be5fe 100644
--- a/x11-toolkits/gtksourceview-sharp/Makefile
+++ b/x11-toolkits/gtksourceview-sharp/Makefile
@@ -7,13 +7,12 @@
#
PORTNAME= gtksourceview-sharp
-PORTVERSION= 0.11
-PORTREVISION= 2
+PORTVERSION= 0.12
CATEGORIES= x11-toolkits
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/gtksourceview-sharp-2.0/
DISTNAME= ${PORTNAME}-2.0-${PORTVERSION}
-MAINTAINER= bsd-sharp@googlegroups.com
+MAINTAINER= mono@FreeBSD.org
COMMENT= gtksourview bindings for Mono.
BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono \
diff --git a/x11-toolkits/gtksourceview-sharp/distinfo b/x11-toolkits/gtksourceview-sharp/distinfo
index 1bdbcdcc27b3..5c088fc28629 100644
--- a/x11-toolkits/gtksourceview-sharp/distinfo
+++ b/x11-toolkits/gtksourceview-sharp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtksourceview-sharp-2.0-0.11.tar.bz2) = a8f56f02378b9b97e927748b099854a7
-SHA256 (gtksourceview-sharp-2.0-0.11.tar.bz2) = f2daf57c24d30dbc2fec60bbc0d0acfbf42e6acf7c6814debf585e9eebe8615f
-SIZE (gtksourceview-sharp-2.0-0.11.tar.bz2) = 133609
+MD5 (gtksourceview-sharp-2.0-0.12.tar.bz2) = f0c9c6dc24b677d9208b0c8c38e769a4
+SHA256 (gtksourceview-sharp-2.0-0.12.tar.bz2) = fa4c6797927d203659d7f9639b13fbb3821da2735ddd535b9e094e2c0cca1812
+SIZE (gtksourceview-sharp-2.0-0.12.tar.bz2) = 137252
diff --git a/x11-toolkits/gtksourceview-sharp/files/patch-Makefile.in b/x11-toolkits/gtksourceview-sharp/files/patch-Makefile.in
index 387799c3e6fc..31f9fe134cc9 100644
--- a/x11-toolkits/gtksourceview-sharp/files/patch-Makefile.in
+++ b/x11-toolkits/gtksourceview-sharp/files/patch-Makefile.in
@@ -1,38 +1,14 @@
---- Makefile.in.orig Sun Jul 17 17:55:59 2005
-+++ Makefile.in Sun Jul 17 18:26:33 2005
-@@ -178,9 +178,9 @@
- SUBDIRS = gtksourceview sample doc
+
+$FreeBSD$
+
+--- Makefile.in.orig
++++ Makefile.in
+@@ -185,7 +185,7 @@
+ target_vendor = @target_vendor@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = gtksourceview sample doc
++SUBDIRS = gtksourceview doc
DISTCLEANFILES = gtksourceview-sharp-2.0.pc
EXTRA_DIST = nemerle.lang vbnet.lang gtksourceview-sharp-2.0.pc.in gtk-sharp.snk
--extra_langdir = $(gtksourceview_prefix)/share/gtksourceview-1.0/language-specs
-+extra_langdir = $(prefix)/share/gtksourceview-1.0/language-specs
- extra_lang_DATA = nemerle.lang vbnet.lang
- pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = gtksourceview-sharp-2.0.pc
- all: all-recursive
-
-@@ -221,15 +221,15 @@
- gtksourceview-sharp-2.0.pc: $(top_builddir)/config.status $(srcdir)/gtksourceview-sharp-2.0.pc.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
- uninstall-info-am:
--install-extra_langDATA: $(extra_lang_DATA)
-- @$(NORMAL_INSTALL)
-- test -z "$(extra_langdir)" || $(mkdir_p) "$(DESTDIR)$(extra_langdir)"
-- @list='$(extra_lang_DATA)'; for p in $$list; do \
-- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(extra_langDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(extra_langdir)/$$f'"; \
-- $(extra_langDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(extra_langdir)/$$f"; \
-- done
-+#install-extra_langDATA: $(extra_lang_DATA)
-+# @$(NORMAL_INSTALL)
-+# test -z "$(extra_langdir)" || $(mkdir_p) "$(DESTDIR)$(extra_langdir)"
-+# @list='$(extra_lang_DATA)'; for p in $$list; do \
-+# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+# f=$(am__strip_dir) \
-+# echo " $(extra_langDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(extra_langdir)/$$f'"; \
-+# $(extra_langDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(extra_langdir)/$$f"; \
-+# done
-
- uninstall-extra_langDATA:
- @$(NORMAL_UNINSTALL)
+ extra_langdir = $(gtksourceview_prefix)/share/gtksourceview-1.0/language-specs
diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile
index e17062559ffe..ff3cf89305b0 100644
--- a/x11-toolkits/libgdiplus/Makefile
+++ b/x11-toolkits/libgdiplus/Makefile
@@ -3,29 +3,26 @@
# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
#
# $FreeBSD$
-# $Id: Makefile,v 1.42 2007/09/08 22:11:12 killfill Exp $
+# $Id: Makefile,v 1.46 2007/12/13 19:37:18 killfill Exp $
#
PORTNAME= libgdiplus
-PORTVERSION= 1.2.5
-PORTREVISION= 3
+PORTVERSION= 2.0
CATEGORIES= x11-toolkits
-MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
+MASTER_SITES= ftp://ftp.novell.com/pub/mono/sources/${PORTNAME}/
-MAINTAINER= bsd-sharp@googlegroups.com
+MAINTAINER= mono@FreeBSD.org
COMMENT= GDI+ API for System.Windows.Forms in Mono
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
ungif.5:${PORTSDIR}/graphics/libungif \
- png.5:${PORTSDIR}/graphics/png \
- fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
- freetype.9:${PORTSDIR}/print/freetype2
+ png.5:${PORTSDIR}/graphics/png
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget glib20
USE_GMAKE= yes
-USE_XORG= x11 xrender
-USE_LDCONFIG= yes
+USE_XLIB= yes
+USE_LDCONFIG= yes
LIBTOOLFILES= configure cairo/configure
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/libgdiplus/distinfo b/x11-toolkits/libgdiplus/distinfo
index 5f4c5dbcca96..5674ca423fe5 100644
--- a/x11-toolkits/libgdiplus/distinfo
+++ b/x11-toolkits/libgdiplus/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgdiplus-1.2.5.tar.bz2) = 82bbf6ca86b85e5148a15d8d88c6e548
-SHA256 (libgdiplus-1.2.5.tar.bz2) = 28edc21bc49f3791438ea70b5de944c4118a6daa557425f3209102379042e926
-SIZE (libgdiplus-1.2.5.tar.bz2) = 2942165
+MD5 (libgdiplus-2.0.tar.bz2) = dc732fb2d996b54405c27645cb8642d9
+SHA256 (libgdiplus-2.0.tar.bz2) = 0a308dc3a8d1a91f036502ed45b8debc3c6f838d86cf6e15430c6969ab4a33b1
+SIZE (libgdiplus-2.0.tar.bz2) = 1971529