Sync w/ FreeBSD ports's mono stuff.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9859 df743ca5-7f9a-e211-a948-0013205c9059

18 files changed, 249 insertions, 249 deletions

diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index 8a873c4b0..e449aa459 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $Id: Makefile,v 1.11 2007-05-19 21:36:04 marcus Exp $
+#   $Id: Makefile,v 1.12 2007-10-23 21:25:44 mezz Exp $
 #
 
 PORTNAME=	tomboy
-PORTVERSION=	0.6.3
-PORTREVISION=	2
+PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -32,7 +32,8 @@ INSTALLS_OMF=	yes
 
 CONFIGURE_ARGS+=--enable-evolution=yes \
 		--enable-dbus=yes \
-		--enable-dbus-service-dir-check=no
+		--enable-dbus-service-dir-check=no \
+		--with-dbus-service-dir=${PREFIX}/share/dbus-1/services
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		DBUS_SERVICE_DIR="${PREFIX}/share/dbus-1/services"
@@ -48,9 +49,5 @@ post-patch:
 	s|PANELAPPLET_SERVER_DIR="$$PANELAPPLET_LIBDIR|PANELAPPLET_SERVER_DIR="$$prefix/libdata|g' \
 		${WRKSRC}/configure
 
-post-install:
-	${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE} ${WRKSRC}/Tomboy/Plugins/FixedWidth.dll ${PREFIX}/lib/tomboy/Plugins
-	${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE} ${WRKSRC}/Tomboy/Plugins/NoteOfTheDay.dll ${PREFIX}/lib/tomboy/Plugins
-
 .include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
 .include <bsd.port.post.mk>
diff --git a/deskutils/tomboy/distinfo b/deskutils/tomboy/distinfo
index d2293f9ab..bca254995 100644
--- a/deskutils/tomboy/distinfo
+++ b/deskutils/tomboy/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/tomboy-0.6.3.tar.bz2) = ebf93b189c7db91037e351c1f7c33ba3
-SHA256 (gnome2/tomboy-0.6.3.tar.bz2) = d76e45fd38e66de2f18a431420cfffab2a234b01da7db6f14fd9280f0afd2c2c
-SIZE (gnome2/tomboy-0.6.3.tar.bz2) = 1486273
+MD5 (gnome2/tomboy-0.8.0.tar.bz2) = b95c8ce7da7571583f33e80d25ac87e6
+SHA256 (gnome2/tomboy-0.8.0.tar.bz2) = 45cd1e66b699e3e021db3138aa11e7dc5fe9a05f20ccb290d3e04bb35fbbc958
+SIZE (gnome2/tomboy-0.8.0.tar.bz2) = 1863811
diff --git a/deskutils/tomboy/pkg-plist b/deskutils/tomboy/pkg-plist
index 2c4035bd6..1bde9307f 100644
--- a/deskutils/tomboy/pkg-plist
+++ b/deskutils/tomboy/pkg-plist
@@ -1,112 +1,171 @@
 bin/tomboy
-lib/tomboy/Plugins/Backlinks.dll
-lib/tomboy/Plugins/Bugzilla.dll
-lib/tomboy/Plugins/Evolution.dll
-lib/tomboy/Plugins/ExportToHTML.dll
-lib/tomboy/Plugins/FixedWidth.dll
-lib/tomboy/Plugins/NoteOfTheDay.dll
-lib/tomboy/Plugins/PrintNotes.dll
-lib/tomboy/Plugins/StickyNoteImport.dll
+bin/tomboy-panel
+lib/tomboy/addins/Backlinks.dll
+lib/tomboy/addins/Bugzilla.dll
+lib/tomboy/addins/Evolution.dll
+lib/tomboy/addins/ExportToHtml.dll
+lib/tomboy/addins/FileSystemSyncService.dll
+lib/tomboy/addins/FixedWidth.dll
+lib/tomboy/addins/NoteOfTheDay.dll
+lib/tomboy/addins/PrintNotes.dll
+lib/tomboy/addins/SshSyncServiceAddin.dll
+lib/tomboy/addins/StickyNoteImport.dll
+lib/tomboy/addins/WebDavSyncService.dll
+lib/tomboy/Mono.Addins.dll
+lib/tomboy/Mono.Addins.dll.config
+lib/tomboy/Mono.Addins.Setup.dll
+lib/tomboy/Mono.Addins.Gui.dll
 lib/tomboy/Tomboy.exe
 lib/tomboy/Tomboy.exe.config
+lib/tomboy/libprintnotes.la
+lib/tomboy/libprintnotes.so
 lib/tomboy/libtomboy.la
 lib/tomboy/libtomboy.so
 libdata/bonobo/servers/GNOME_TomboyApplet.server
-libdata/pkgconfig/tomboy-plugins.pc
+libdata/pkgconfig/tomboy-addins.pc
 share/dbus-1/services/org.gnome.Tomboy.service
-share/applications/DefaultPlugins.desktop
 share/applications/tomboy.desktop
+share/gnome/help/tomboy/C/legal.xml
+share/gnome/help/tomboy/C/tomboy.xml
 share/gnome/help/tomboy/C/figures/tomboy-main-menu.png
 share/gnome/help/tomboy/C/figures/tomboy-new-note.png
 share/gnome/help/tomboy/C/figures/tomboy-panel.png
 share/gnome/help/tomboy/C/figures/tomboy-pindown.png
 share/gnome/help/tomboy/C/figures/tomboy-pinup.png
+share/gnome/help/tomboy/C/figures/tomboy-preferences-add-ins.png
 share/gnome/help/tomboy/C/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/C/figures/tomboy-preferences-hotkeys.png
-share/gnome/help/tomboy/C/figures/tomboy-preferences-plugins.png
+share/gnome/help/tomboy/C/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/C/figures/tomboy-tools.png
-share/gnome/help/tomboy/C/legal.xml
-share/gnome/help/tomboy/C/tomboy.xml
+share/gnome/help/tomboy/ca/tomboy.xml
+share/gnome/help/tomboy/ca/legal.xml
+share/gnome/help/tomboy/ca/figures/tomboy-main-menu.png
+share/gnome/help/tomboy/ca/figures/tomboy-new-note.png
+share/gnome/help/tomboy/ca/figures/tomboy-panel.png
+share/gnome/help/tomboy/ca/figures/tomboy-pindown.png
+share/gnome/help/tomboy/ca/figures/tomboy-pinup.png
+share/gnome/help/tomboy/ca/figures/tomboy-preferences-add-ins.png
+share/gnome/help/tomboy/ca/figures/tomboy-preferences-editing.png
+share/gnome/help/tomboy/ca/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/ca/figures/tomboy-preferences-synchronization.png
+share/gnome/help/tomboy/ca/figures/tomboy-tools.png
+share/gnome/help/tomboy/en_GB/tomboy.xml
+share/gnome/help/tomboy/en_GB/legal.xml
 share/gnome/help/tomboy/en_GB/figures/tomboy-main-menu.png
 share/gnome/help/tomboy/en_GB/figures/tomboy-new-note.png
 share/gnome/help/tomboy/en_GB/figures/tomboy-panel.png
 share/gnome/help/tomboy/en_GB/figures/tomboy-pindown.png
 share/gnome/help/tomboy/en_GB/figures/tomboy-pinup.png
+share/gnome/help/tomboy/en_GB/figures/tomboy-preferences-add-ins.png
 share/gnome/help/tomboy/en_GB/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/en_GB/figures/tomboy-preferences-hotkeys.png
-share/gnome/help/tomboy/en_GB/figures/tomboy-preferences-plugins.png
+share/gnome/help/tomboy/en_GB/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/en_GB/figures/tomboy-tools.png
-share/gnome/help/tomboy/en_GB/legal.xml
-share/gnome/help/tomboy/en_GB/tomboy.xml
+share/gnome/help/tomboy/es/tomboy.xml
+share/gnome/help/tomboy/es/legal.xml
 share/gnome/help/tomboy/es/figures/tomboy-main-menu.png
 share/gnome/help/tomboy/es/figures/tomboy-new-note.png
 share/gnome/help/tomboy/es/figures/tomboy-panel.png
 share/gnome/help/tomboy/es/figures/tomboy-pindown.png
 share/gnome/help/tomboy/es/figures/tomboy-pinup.png
+share/gnome/help/tomboy/es/figures/tomboy-preferences-add-ins.png
 share/gnome/help/tomboy/es/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/es/figures/tomboy-preferences-hotkeys.png
-share/gnome/help/tomboy/es/figures/tomboy-preferences-plugins.png
+share/gnome/help/tomboy/es/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/es/figures/tomboy-tools.png
-share/gnome/help/tomboy/es/legal.xml
-share/gnome/help/tomboy/es/tomboy.xml
+share/gnome/help/tomboy/fr/tomboy.xml
+share/gnome/help/tomboy/fr/legal.xml
 share/gnome/help/tomboy/fr/figures/tomboy-main-menu.png
 share/gnome/help/tomboy/fr/figures/tomboy-new-note.png
 share/gnome/help/tomboy/fr/figures/tomboy-panel.png
 share/gnome/help/tomboy/fr/figures/tomboy-pindown.png
 share/gnome/help/tomboy/fr/figures/tomboy-pinup.png
+share/gnome/help/tomboy/fr/figures/tomboy-preferences-add-ins.png
 share/gnome/help/tomboy/fr/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/fr/figures/tomboy-preferences-hotkeys.png
-share/gnome/help/tomboy/fr/figures/tomboy-preferences-plugins.png
+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/ru/figures/tomboy-tools.png
-share/gnome/help/tomboy/ru/figures/tomboy-preferences-plugins.png
-share/gnome/help/tomboy/ru/figures/tomboy-preferences-hotkeys.png
-share/gnome/help/tomboy/ru/figures/tomboy-preferences-editing.png
-share/gnome/help/tomboy/ru/figures/tomboy-pinup.png
-share/gnome/help/tomboy/ru/figures/tomboy-pindown.png
-share/gnome/help/tomboy/ru/figures/tomboy-panel.png
-share/gnome/help/tomboy/ru/figures/tomboy-new-note.png
-share/gnome/help/tomboy/ru/figures/tomboy-main-menu.png
+share/gnome/help/tomboy/oc/tomboy.xml
+share/gnome/help/tomboy/oc/legal.xml
+share/gnome/help/tomboy/oc/figures/tomboy-main-menu.png
+share/gnome/help/tomboy/oc/figures/tomboy-new-note.png
+share/gnome/help/tomboy/oc/figures/tomboy-panel.png
+share/gnome/help/tomboy/oc/figures/tomboy-pindown.png
+share/gnome/help/tomboy/oc/figures/tomboy-pinup.png
+share/gnome/help/tomboy/oc/figures/tomboy-preferences-add-ins.png
+share/gnome/help/tomboy/oc/figures/tomboy-preferences-editing.png
+share/gnome/help/tomboy/oc/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/oc/figures/tomboy-preferences-synchronization.png
+share/gnome/help/tomboy/oc/figures/tomboy-tools.png
+share/gnome/help/tomboy/pt_BR/tomboy.xml
+share/gnome/help/tomboy/pt_BR/legal.xml
+share/gnome/help/tomboy/pt_BR/figures/tomboy-main-menu.png
+share/gnome/help/tomboy/pt_BR/figures/tomboy-new-note.png
+share/gnome/help/tomboy/pt_BR/figures/tomboy-panel.png
+share/gnome/help/tomboy/pt_BR/figures/tomboy-pindown.png
+share/gnome/help/tomboy/pt_BR/figures/tomboy-pinup.png
+share/gnome/help/tomboy/pt_BR/figures/tomboy-preferences-add-ins.png
+share/gnome/help/tomboy/pt_BR/figures/tomboy-preferences-editing.png
+share/gnome/help/tomboy/pt_BR/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/pt_BR/figures/tomboy-preferences-synchronization.png
+share/gnome/help/tomboy/pt_BR/figures/tomboy-tools.png
 share/gnome/help/tomboy/ru/tomboy.xml
 share/gnome/help/tomboy/ru/legal.xml
+share/gnome/help/tomboy/ru/figures/tomboy-main-menu.png
+share/gnome/help/tomboy/ru/figures/tomboy-new-note.png
+share/gnome/help/tomboy/ru/figures/tomboy-panel.png
+share/gnome/help/tomboy/ru/figures/tomboy-pindown.png
+share/gnome/help/tomboy/ru/figures/tomboy-pinup.png
+share/gnome/help/tomboy/ru/figures/tomboy-preferences-add-ins.png
+share/gnome/help/tomboy/ru/figures/tomboy-preferences-editing.png
+share/gnome/help/tomboy/ru/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/ru/figures/tomboy-preferences-synchronization.png
+share/gnome/help/tomboy/ru/figures/tomboy-tools.png
+share/gnome/help/tomboy/sv/tomboy.xml
+share/gnome/help/tomboy/sv/legal.xml
 share/gnome/help/tomboy/sv/figures/tomboy-main-menu.png
 share/gnome/help/tomboy/sv/figures/tomboy-new-note.png
 share/gnome/help/tomboy/sv/figures/tomboy-panel.png
 share/gnome/help/tomboy/sv/figures/tomboy-pindown.png
 share/gnome/help/tomboy/sv/figures/tomboy-pinup.png
+share/gnome/help/tomboy/sv/figures/tomboy-preferences-add-ins.png
 share/gnome/help/tomboy/sv/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/sv/figures/tomboy-preferences-hotkeys.png
-share/gnome/help/tomboy/sv/figures/tomboy-preferences-plugins.png
+share/gnome/help/tomboy/sv/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/sv/figures/tomboy-tools.png
-share/gnome/help/tomboy/sv/legal.xml
-share/gnome/help/tomboy/sv/tomboy.xml
-share/gnome/help/tomboy/uk/figures/tomboy-tools.png
-share/gnome/help/tomboy/uk/figures/tomboy-preferences-plugins.png
-share/gnome/help/tomboy/uk/figures/tomboy-preferences-hotkeys.png
-share/gnome/help/tomboy/uk/figures/tomboy-preferences-editing.png
-share/gnome/help/tomboy/uk/figures/tomboy-pinup.png
-share/gnome/help/tomboy/uk/figures/tomboy-pindown.png
-share/gnome/help/tomboy/uk/figures/tomboy-panel.png
-share/gnome/help/tomboy/uk/figures/tomboy-new-note.png
-share/gnome/help/tomboy/uk/figures/tomboy-main-menu.png
 share/gnome/help/tomboy/uk/tomboy.xml
 share/gnome/help/tomboy/uk/legal.xml
+share/gnome/help/tomboy/uk/figures/tomboy-main-menu.png
+share/gnome/help/tomboy/uk/figures/tomboy-new-note.png
+share/gnome/help/tomboy/uk/figures/tomboy-panel.png
+share/gnome/help/tomboy/uk/figures/tomboy-pindown.png
+share/gnome/help/tomboy/uk/figures/tomboy-pinup.png
+share/gnome/help/tomboy/uk/figures/tomboy-preferences-add-ins.png
+share/gnome/help/tomboy/uk/figures/tomboy-preferences-editing.png
+share/gnome/help/tomboy/uk/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/uk/figures/tomboy-preferences-synchronization.png
+share/gnome/help/tomboy/uk/figures/tomboy-tools.png
 share/omf/tomboy/tomboy-C.omf
+share/omf/tomboy/tomboy-ca.omf
 share/omf/tomboy/tomboy-en_GB.omf
 share/omf/tomboy/tomboy-es.omf
 share/omf/tomboy/tomboy-fr.omf
+share/omf/tomboy/tomboy-pt_BR.omf
 share/omf/tomboy/tomboy-ru.omf
+share/omf/tomboy/tomboy-oc.omf
 share/omf/tomboy/tomboy-sv.omf
 share/omf/tomboy/tomboy-uk.omf
 share/pixmaps/tomboy.png
+share/icons/hicolor/16x16/apps/tomboy-tag.png
 share/icons/hicolor/16x16/apps/tomboy-note.png
 share/icons/hicolor/16x16/apps/tomboy.png
+share/icons/hicolor/22x22/apps/tomboy-tag.png
 share/icons/hicolor/22x22/apps/tomboy-note.png
 share/icons/hicolor/22x22/apps/tomboy.png
+share/icons/hicolor/32x32/apps/tomboy-tag.png
 share/icons/hicolor/32x32/apps/tomboy.png
 share/icons/hicolor/48x48/apps/tomboy.png
+share/icons/hicolor/scalable/apps/tomboy-tag.svg
 share/icons/hicolor/scalable/apps/tomboy.svg
 share/locale/ar/LC_MESSAGES/tomboy.mo
 share/locale/be/LC_MESSAGES/tomboy.mo
@@ -144,6 +203,7 @@ share/locale/nb/LC_MESSAGES/tomboy.mo
 share/locale/ne/LC_MESSAGES/tomboy.mo
 share/locale/nl/LC_MESSAGES/tomboy.mo
 share/locale/or/LC_MESSAGES/tomboy.mo
+share/locale/oc/LC_MESSAGES/tomboy.mo
 share/locale/pa/LC_MESSAGES/tomboy.mo
 share/locale/pl/LC_MESSAGES/tomboy.mo
 share/locale/pt/LC_MESSAGES/tomboy.mo
@@ -164,21 +224,57 @@ share/locale/vi/LC_MESSAGES/tomboy.mo
 share/locale/zh_CN/LC_MESSAGES/tomboy.mo
 share/locale/zh_HK/LC_MESSAGES/tomboy.mo
 share/locale/zh_TW/LC_MESSAGES/tomboy.mo
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
 @dirrm share/omf/tomboy
 @dirrm share/gnome/help/tomboy/uk/figures
 @dirrm share/gnome/help/tomboy/uk
 @dirrm share/gnome/help/tomboy/sv/figures
 @dirrm share/gnome/help/tomboy/sv
+@dirrm share/gnome/help/tomboy/pt_BR/figures
+@dirrm share/gnome/help/tomboy/pt_BR
+@dirrm share/gnome/help/tomboy/oc/figures
+@dirrm share/gnome/help/tomboy/oc
 @dirrm share/gnome/help/tomboy/ru/figures
 @dirrm share/gnome/help/tomboy/ru
 @dirrm share/gnome/help/tomboy/fr/figures
@@ -187,9 +283,11 @@ share/locale/zh_TW/LC_MESSAGES/tomboy.mo
 @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/ca/figures
+@dirrm share/gnome/help/tomboy/ca
 @dirrm share/gnome/help/tomboy/C/figures
 @dirrm share/gnome/help/tomboy/C
 @dirrm share/gnome/help/tomboy
-@dirrm lib/tomboy/Plugins
+@dirrm lib/tomboy/addins
 @dirrm lib/tomboy
 @dirrmtry share/applications
diff --git a/devel/monodoc/Makefile b/devel/monodoc/Makefile
deleted file mode 100644
index 73ded4b87..000000000
--- a/devel/monodoc/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for:    MonoDoc
-# Date created:         2004-08-13
-# Friday the 13th!
-# Whom:                 Christopher Nehren
-#
-# $FreeBSD$
-#   $Id: Makefile,v 1.1 2007-09-10 05:25:08 mezz Exp $
-#
-
-PORTNAME=	monodoc
-PORTVERSION=	1.2.3
-PORTREVISION=	1
-CATEGORIES=	devel gnome
-MASTER_SITES=	http://www.go-mono.com/sources/${PORTNAME}/
-
-MAINTAINER=	bsd-sharp-list@forge.novell.com
-COMMENT=	Documentation for Mono and Mono libraries
-
-BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
-RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
-
-USE_GNOME=	gnomehack gnometarget
-USE_ZIP=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-
-MAN1=		mdnormalizer.1 mdvalidator.1 monodocer.1 monodocs2html.1 \
-		mdassembler.1 mdcs2ecma.1
-
-.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
-.include <bsd.port.mk>
diff --git a/devel/monodoc/distinfo b/devel/monodoc/distinfo
deleted file mode 100644
index 1bfbdeb13..000000000
--- a/devel/monodoc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (monodoc-1.2.3.zip) = 6387e57b69a2052150398fce7c29eaea
-SHA256 (monodoc-1.2.3.zip) = b8c914c060e56ef71112a76194927dfcc14fa18f879c1185e61211a730d42d25
-SIZE (monodoc-1.2.3.zip) = 13780947
diff --git a/devel/monodoc/pkg-descr b/devel/monodoc/pkg-descr
deleted file mode 100644
index 1ebfcdc77..000000000
--- a/devel/monodoc/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is the MonoDoc module.  It contains the documentation for the Mono
-class libraries.
-
-WWW: http://www.mono-project.com/
diff --git a/devel/monodoc/pkg-plist b/devel/monodoc/pkg-plist
deleted file mode 100644
index dbd5c0242..000000000
--- a/devel/monodoc/pkg-plist
+++ /dev/null
@@ -1,46 +0,0 @@
-bin/mdassembler
-bin/mdcs2ecma
-bin/mdnormalizer
-bin/mdvalidater
-bin/mod
-bin/monodocer
-bin/monodocs2html
-bin/monodocs2slashdoc
-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/assembler.exe
-lib/monodoc/cs2ecma.exe
-lib/monodoc/mod.exe
-lib/monodoc/monodoc.xml
-lib/monodoc/monodocer.exe
-lib/monodoc/monodocer1.exe
-lib/monodoc/monodocs2html.exe
-lib/monodoc/monodocs2slashdoc.exe
-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/netdocs.source
-lib/monodoc/sources/netdocs.tree
-lib/monodoc/sources/netdocs.zip
-lib/monodoc/sources/nunit-docs.source
-lib/monodoc/sources/nunit-docs.tree
-lib/monodoc/sources/nunit-docs.zip
-lib/monodoc/validate.exe
-libdata/pkgconfig/monodoc.pc
-@dirrm lib/monodoc/sources
-@dirrm lib/monodoc
-@dirrm lib/mono/monodoc
-@dirrm lib/mono/gac/monodoc/1.0.0.0__0738eb9f132ed756
-@dirrm lib/mono/gac/monodoc
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index 298e5c2b7..7fde8429b 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -3,16 +3,16 @@
 # Whom:				Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $Id: Makefile,v 1.1 2007-07-29 21:28:17 mezz Exp $
+#   $Id: Makefile,v 1.2 2007-10-23 21:25:44 mezz Exp $
 #
 
 PORTNAME=	f-spot
-PORTVERSION=	0.3.5
-PORTREVISION=	4
+PORTVERSION=	0.4.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.3
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.4
 
 MAINTAINER=	bsd-sharp-list@forge.novell.com
 COMMENT=	Personal photo management to the GNOME desktop
diff --git a/graphics/f-spot/distinfo b/graphics/f-spot/distinfo
index 25b08f782..bbb2636d4 100644
--- a/graphics/f-spot/distinfo
+++ b/graphics/f-spot/distinfo
@@ -1,3 +1,3 @@
-MD5 (f-spot-0.3.5.tar.bz2) = dafa8ac8149b80d010cecee3629e39b5
-SHA256 (f-spot-0.3.5.tar.bz2) = 441997d27f0155ab2090b14dd6f29ccdf850f3565fa951dac5e589c75980a72b
-SIZE (f-spot-0.3.5.tar.bz2) = 1770616
+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
diff --git a/graphics/f-spot/pkg-plist b/graphics/f-spot/pkg-plist
index 0e5fe0891..67aaa0163 100644
--- a/graphics/f-spot/pkg-plist
+++ b/graphics/f-spot/pkg-plist
@@ -1,6 +1,12 @@
 bin/f-spot
 bin/f-spot-import
+bin/f-spot-sqlite-upgrade
 lib/f-spot/FlickrNet.dll
+lib/f-spot/Mono.Google.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
@@ -15,8 +21,8 @@ lib/f-spot/Tao.OpenGl.dll
 lib/f-spot/Tao.OpenGl.dll.config
 lib/f-spot/f-spot.exe
 lib/f-spot/f-spot.exe.config
+lib/f-spot/f-spot.global.addins
 lib/f-spot/gnome-keyring-sharp.dll
-lib/f-spot/google-sharp.dll
 lib/f-spot/libfspot.a
 lib/f-spot/libfspot.la
 lib/f-spot/libfspot.so
@@ -31,26 +37,95 @@ 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
 libdata/pkgconfig/f-spot.pc
 libexec/gnome-screensaver/f-spot-screensaver
 share/gnome-screensaver/themes/f-spot-screensaver.desktop
 share/applications/f-spot-view.desktop
 share/applications/f-spot.desktop
 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
+share/gnome/help/f-spot/C/figures/f-spot-crop.png
+share/gnome/help/f-spot/C/figures/f-spot-desaturate.png
 share/gnome/help/f-spot/C/figures/f-spot-fullscreen.png
+share/gnome/help/f-spot/C/figures/f-spot-red-eye.png
+share/gnome/help/f-spot/C/figures/f-spot-sepia.png
 share/gnome/help/f-spot/C/figures/f-spot-slideshow.png
+share/gnome/help/f-spot/C/figures/f-spot-soft-focus.png
+share/gnome/help/f-spot/C/figures/f-spot-straighten.png
 share/gnome/help/f-spot/da/f-spot.xml
+share/gnome/help/f-spot/da/figures/f-spot-adjust-colors.png
+share/gnome/help/f-spot/da/figures/f-spot-autocolor.png
+share/gnome/help/f-spot/da/figures/f-spot-crop.png
+share/gnome/help/f-spot/da/figures/f-spot-desaturate.png
 share/gnome/help/f-spot/da/figures/f-spot-fullscreen.png
+share/gnome/help/f-spot/da/figures/f-spot-red-eye.png
+share/gnome/help/f-spot/da/figures/f-spot-sepia.png
 share/gnome/help/f-spot/da/figures/f-spot-slideshow.png
+share/gnome/help/f-spot/da/figures/f-spot-soft-focus.png
+share/gnome/help/f-spot/da/figures/f-spot-straighten.png
+share/gnome/help/f-spot/es/f-spot.xml
+share/gnome/help/f-spot/es/figures/f-spot-adjust-colors.png
+share/gnome/help/f-spot/es/figures/f-spot-autocolor.png
+share/gnome/help/f-spot/es/figures/f-spot-crop.png
+share/gnome/help/f-spot/es/figures/f-spot-desaturate.png
+share/gnome/help/f-spot/es/figures/f-spot-fullscreen.png
+share/gnome/help/f-spot/es/figures/f-spot-red-eye.png
+share/gnome/help/f-spot/es/figures/f-spot-sepia.png
+share/gnome/help/f-spot/es/figures/f-spot-slideshow.png
+share/gnome/help/f-spot/es/figures/f-spot-soft-focus.png
+share/gnome/help/f-spot/es/figures/f-spot-straighten.png
 share/gnome/help/f-spot/fr/f-spot.xml
+share/gnome/help/f-spot/fr/figures/f-spot-adjust-colors.png
+share/gnome/help/f-spot/fr/figures/f-spot-autocolor.png
+share/gnome/help/f-spot/fr/figures/f-spot-crop.png
+share/gnome/help/f-spot/fr/figures/f-spot-desaturate.png
 share/gnome/help/f-spot/fr/figures/f-spot-fullscreen.png
+share/gnome/help/f-spot/fr/figures/f-spot-red-eye.png
+share/gnome/help/f-spot/fr/figures/f-spot-sepia.png
 share/gnome/help/f-spot/fr/figures/f-spot-slideshow.png
+share/gnome/help/f-spot/fr/figures/f-spot-soft-focus.png
+share/gnome/help/f-spot/fr/figures/f-spot-straighten.png
+share/gnome/help/f-spot/it/f-spot.xml
+share/gnome/help/f-spot/it/figures/f-spot-adjust-colors.png
+share/gnome/help/f-spot/it/figures/f-spot-autocolor.png
+share/gnome/help/f-spot/it/figures/f-spot-crop.png
+share/gnome/help/f-spot/it/figures/f-spot-desaturate.png
+share/gnome/help/f-spot/it/figures/f-spot-fullscreen.png
+share/gnome/help/f-spot/it/figures/f-spot-red-eye.png
+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/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
+share/gnome/help/f-spot/pt_BR/figures/f-spot-crop.png
+share/gnome/help/f-spot/pt_BR/figures/f-spot-desaturate.png
+share/gnome/help/f-spot/pt_BR/figures/f-spot-fullscreen.png
+share/gnome/help/f-spot/pt_BR/figures/f-spot-red-eye.png
+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/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
+share/gnome/help/f-spot/sv/figures/f-spot-crop.png
+share/gnome/help/f-spot/sv/figures/f-spot-desaturate.png
 share/gnome/help/f-spot/sv/figures/f-spot-fullscreen.png
+share/gnome/help/f-spot/sv/figures/f-spot-red-eye.png
+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
@@ -61,7 +136,6 @@ 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/bg/LC_MESSAGES/f-spot.mo
 share/locale/ca/LC_MESSAGES/f-spot.mo
@@ -84,11 +158,13 @@ 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/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/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
@@ -106,8 +182,14 @@ share/locale/zh_TW/LC_MESSAGES/f-spot.mo
 @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/pt_BR/figures
+@dirrm share/gnome/help/f-spot/pt_BR
+@dirrm share/gnome/help/f-spot/it/figures
+@dirrm share/gnome/help/f-spot/it
 @dirrm share/gnome/help/f-spot/fr/figures
 @dirrm share/gnome/help/f-spot/fr
+@dirrm share/gnome/help/f-spot/es/figures
+@dirrm share/gnome/help/f-spot/es
 @dirrm share/gnome/help/f-spot/da/figures
 @dirrm share/gnome/help/f-spot/da
 @dirrm share/gnome/help/f-spot/C/figures
@@ -116,5 +198,6 @@ share/locale/zh_TW/LC_MESSAGES/f-spot.mo
 @dirrmtry share/gnome-screensaver/themes
 @dirrmtry share/gnome-screensaver
 @dirrmtry libexec/gnome-screensaver
+@dirrm lib/f-spot/extensions
 @dirrm lib/f-spot
 @dirrmtry share/applications
diff --git a/x11-toolkits/gtksourceview-sharp/Makefile b/x11-toolkits/gtksourceview-sharp/Makefile
index d722b6b0e..b6abbe4d3 100644
--- a/x11-toolkits/gtksourceview-sharp/Makefile
+++ b/x11-toolkits/gtksourceview-sharp/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $Id: Makefile,v 1.1 2007-09-10 15:58:12 mezz Exp $
+#   $Id: Makefile,v 1.2 2007-10-23 21:25:45 mezz Exp $
 #
 
 PORTNAME=	gtksourceview-sharp
-PORTVERSION=	0.10
-PORTREVISION=	8
+PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://go-mono.com/sources/gtksourceview-sharp-2.0/
 DISTNAME=	${PORTNAME}-2.0-${PORTVERSION}
@@ -21,6 +21,7 @@ BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono \
 RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono \
 		monodoc:${PORTSDIR}/devel/mono-tools
 
+USE_BZIP2=	yes
 USE_GNOME=	gtksourceview gnomehack gtksharp20
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtksourceview-sharp/distinfo b/x11-toolkits/gtksourceview-sharp/distinfo
index a7a8fdbc1..1bdbcdcc2 100644
--- a/x11-toolkits/gtksourceview-sharp/distinfo
+++ b/x11-toolkits/gtksourceview-sharp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtksourceview-sharp-2.0-0.10.tar.gz) = 2179634b8931e6be849a1e1f82c834e3
-SHA256 (gtksourceview-sharp-2.0-0.10.tar.gz) = ddc86cb075f8e166028e95f6d5060676cdd448a4cb1f23dee4560fcba9ccc63a
-SIZE (gtksourceview-sharp-2.0-0.10.tar.gz) = 143608
+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
diff --git a/x11-toolkits/gtksourceview-sharp/files/patch-doc_Makefile.in b/x11-toolkits/gtksourceview-sharp/files/patch-doc_Makefile.in
deleted file mode 100644
index 2bd7d10dc..000000000
--- a/x11-toolkits/gtksourceview-sharp/files/patch-doc_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Tue Jun 29 15:13:37 2004
-+++ doc/Makefile.in	Mon Sep 20 01:06:15 2004
-@@ -181,7 +181,7 @@
- @ENABLE_MONODOC_FALSE@TARGETS = 
- @ENABLE_MONODOC_TRUE@TARGETS = gtksourceview-sharp-docs.zip gtksourceview-sharp-docs.tree gtksourceview-sharp-docs.source
- @ENABLE_MONODOC_FALSE@docsdir = $(datadir)
--@ENABLE_MONODOC_TRUE@docsdir = `$(MONODOC) --get-sourcesdir`
-+@ENABLE_MONODOC_TRUE@docsdir = $(libdir)/monodoc/sources
- @ENABLE_MONODOC_FALSE@docs_DATA = 
- @ENABLE_MONODOC_TRUE@docs_DATA = $(TARGETS)
- ASSEMBLER = $(MONODOC) --assemble
diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile
deleted file mode 100644
index ebd57fadd..000000000
--- a/x11-toolkits/libgdiplus/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# New ports collection makefile for:		libgdiplus
-# Date created:					20040820
-# Whom:				Tom McLaughlin <tmclaugh@sdf.lonestar.org>
-#
-# $FreeBSD$
-#   $Id: Makefile,v 1.1 2007-10-10 19:30:11 mezz Exp $
-#
-
-PORTNAME=	libgdiplus
-PORTVERSION=	1.2.5
-CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://www.go-mono.com/sources/${PORTNAME}/
-
-MAINTAINER=	bsd-sharp-list@forge.novell.com
-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
-
-USE_BZIP2=	yes
-USE_GNOME=	gnomehack gnometarget glib20
-USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
-USE_XLIB=	yes
-LIBTOOLFILES=	configure cairo/configure
-USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-# Included cairo does not work for us.  Enable below when Mono catches
-# up with our port.  For now, use included but patch out glitz manually.
-#CONFIGURE_ARGS+= --with-cairo=installed
-
-.include <bsd.port.pre.mk>
-
-# Avoid build error on 64-bit architectures
-.if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "sparc64")
-CFLAGS+=        -fPIC
-.endif
-
-.if ${OSVERSION} < 503000
-IGNORE= does not build and is useless without working Mono
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/x11-toolkits/libgdiplus/distinfo b/x11-toolkits/libgdiplus/distinfo
deleted file mode 100644
index 5f4c5dbcc..000000000
--- a/x11-toolkits/libgdiplus/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (libgdiplus-1.2.5.tar.bz2) = 82bbf6ca86b85e5148a15d8d88c6e548
-SHA256 (libgdiplus-1.2.5.tar.bz2) = 28edc21bc49f3791438ea70b5de944c4118a6daa557425f3209102379042e926
-SIZE (libgdiplus-1.2.5.tar.bz2) = 2942165
diff --git a/x11-toolkits/libgdiplus/files/patch-cairo_src_cairo-ft-font.c b/x11-toolkits/libgdiplus/files/patch-cairo_src_cairo-ft-font.c
deleted file mode 100644
index be7d74f47..000000000
--- a/x11-toolkits/libgdiplus/files/patch-cairo_src_cairo-ft-font.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- cairo/src/cairo-ft-font.c.orig	Mon Aug 29 14:11:27 2005
-+++ cairo/src/cairo-ft-font.c	Sun Sep 11 00:44:30 2005
-@@ -44,6 +44,11 @@
- #include <fontconfig/fontconfig.h>
- #include <fontconfig/fcfreetype.h>
- 
-+#include <sys/types.h>
-+#include <stdlib.h>
-+#include <time.h>
-+#include <unistd.h>
-+
- #include <ft2build.h>
- #include FT_FREETYPE_H
- #include FT_OUTLINE_H
-@@ -278,7 +283,12 @@
-     key->id = id;
- 
-     /* 1607 is just an arbitrary prime. */
--    hash = _cairo_hash_string (filename);
-+    if (filename != NULL) {
-+	hash = _cairo_hash_string (filename);
-+    } else {
-+	srandom(time(NULL) * getpid());
-+	hash = random();
-+    }
-     hash += ((unsigned long) id) * 1607;
- 	
-     key->base.hash_entry.hash = hash;
diff --git a/x11-toolkits/libgdiplus/pkg-descr b/x11-toolkits/libgdiplus/pkg-descr
deleted file mode 100644
index 28d73cdb2..000000000
--- a/x11-toolkits/libgdiplus/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-libgdiplus is an Open Source implementation of the GDI+ API.
-
-WWW: http://www.mono-project.com
diff --git a/x11-toolkits/libgdiplus/pkg-plist b/x11-toolkits/libgdiplus/pkg-plist
deleted file mode 100644
index 2ee543daf..000000000
--- a/x11-toolkits/libgdiplus/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/libgdiplus.a
-lib/libgdiplus.la
-lib/libgdiplus.so
-lib/libgdiplus.so.0
-libdata/pkgconfig/libgdiplus.pc