3 files changed, 36 insertions, 25 deletions

diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 0557d068d7fc..877b23656b45 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gucharmap/Makefile,v 1.35 2007/03/13 00:40:44 mezz Exp $
+#   $MCom: ports/deskutils/gucharmap/Makefile,v 1.41 2007/09/18 12:13:31 ahze Exp $
 #
 
 PORTNAME=	gucharmap
-PORTVERSION=	1.10.0
-PORTREVISION=	1
+PORTVERSION=	1.10.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,8 +16,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A Unicode/ISO10646 character map and font viewer
 
-BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+LIB_DEPENDS=	rarian.0:${PORTSDIR}/textproc/rarian
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo
index e8520ec22c29..3bcd38f10d98 100644
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gucharmap-1.10.0.tar.bz2) = a0e01bcff2bc5e35ec88f60a383051d3
-SHA256 (gnome2/gucharmap-1.10.0.tar.bz2) = 67efc04e6c70db7a342315a291a49869aff4c262b83233e3e4d1dd654a2d753b
-SIZE (gnome2/gucharmap-1.10.0.tar.bz2) = 2506883
+MD5 (gnome2/gucharmap-1.10.1.tar.bz2) = 2b65ae7bef1b11048e77b287a2051020
+SHA256 (gnome2/gucharmap-1.10.1.tar.bz2) = 0069a72299a68048c06466b68fec2abc3974bcf0b5331bfc56f02f64dca40dc8
+SIZE (gnome2/gucharmap-1.10.1.tar.bz2) = 2561279
diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist
index d6a03d9cd255..d2acb4c48b89 100644
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@@ -17,7 +17,7 @@ lib/libgucharmap.la
 lib/libgucharmap.so
 lib/libgucharmap.so.6
 libdata/pkgconfig/gucharmap.pc
-share/gnome/applications/gucharmap.desktop
+share/applications/gucharmap.desktop
 share/gnome/help/gucharmap/C/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/C/figures/gucharmap_window.png
 share/gnome/help/gucharmap/C/gucharmap.xml
@@ -25,9 +25,9 @@ share/gnome/help/gucharmap/C/legal.xml
 share/gnome/help/gucharmap/bg/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/bg/figures/gucharmap_window.png
 share/gnome/help/gucharmap/bg/gucharmap.xml
+share/gnome/help/gucharmap/de/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/de/figures/gucharmap_window.png
 share/gnome/help/gucharmap/de/gucharmap.xml
-share/gnome/help/gucharmap/de/legal.xml
 share/gnome/help/gucharmap/en_GB/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/en_GB/figures/gucharmap_window.png
 share/gnome/help/gucharmap/en_GB/gucharmap.xml
@@ -49,6 +49,9 @@ share/gnome/help/gucharmap/ja/legal.xml
 share/gnome/help/gucharmap/ko/figures/gucharmap_window.png
 share/gnome/help/gucharmap/ko/gucharmap.xml
 share/gnome/help/gucharmap/ko/legal.xml
+share/gnome/help/gucharmap/oc/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/oc/figures/gucharmap_window.png
+share/gnome/help/gucharmap/oc/gucharmap.xml
 share/gnome/help/gucharmap/ru/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/ru/figures/gucharmap_window.png
 share/gnome/help/gucharmap/ru/gucharmap.xml
@@ -61,20 +64,6 @@ share/gnome/help/gucharmap/zh_CN/legal.xml
 share/gnome/help/gucharmap/zh_TW/figures/gucharmap_window.png
 share/gnome/help/gucharmap/zh_TW/gucharmap.xml
 share/gnome/help/gucharmap/zh_TW/legal.xml
-share/gnome/omf/gucharmap/gucharmap-C.omf
-share/gnome/omf/gucharmap/gucharmap-bg.omf
-share/gnome/omf/gucharmap/gucharmap-de.omf
-share/gnome/omf/gucharmap/gucharmap-en_GB.omf
-share/gnome/omf/gucharmap/gucharmap-es.omf
-share/gnome/omf/gucharmap/gucharmap-fi.omf
-share/gnome/omf/gucharmap/gucharmap-fr.omf
-share/gnome/omf/gucharmap/gucharmap-it.omf
-share/gnome/omf/gucharmap/gucharmap-ja.omf
-share/gnome/omf/gucharmap/gucharmap-ko.omf
-share/gnome/omf/gucharmap/gucharmap-ru.omf
-share/gnome/omf/gucharmap/gucharmap-sv.omf
-share/gnome/omf/gucharmap/gucharmap-zh_CN.omf
-share/gnome/omf/gucharmap/gucharmap-zh_TW.omf
 share/icons/hicolor/48x48/apps/gucharmap.png
 share/locale/am/LC_MESSAGES/gucharmap.mo
 share/locale/ar/LC_MESSAGES/gucharmap.mo
@@ -124,6 +113,7 @@ share/locale/nb/LC_MESSAGES/gucharmap.mo
 share/locale/ne/LC_MESSAGES/gucharmap.mo
 share/locale/nl/LC_MESSAGES/gucharmap.mo
 share/locale/nn/LC_MESSAGES/gucharmap.mo
+share/locale/oc/LC_MESSAGES/gucharmap.mo
 share/locale/or/LC_MESSAGES/gucharmap.mo
 share/locale/pa/LC_MESSAGES/gucharmap.mo
 share/locale/pl/LC_MESSAGES/gucharmap.mo
@@ -132,6 +122,7 @@ share/locale/pt_BR/LC_MESSAGES/gucharmap.mo
 share/locale/ro/LC_MESSAGES/gucharmap.mo
 share/locale/ru/LC_MESSAGES/gucharmap.mo
 share/locale/rw/LC_MESSAGES/gucharmap.mo
+share/locale/si/LC_MESSAGES/gucharmap.mo
 share/locale/sk/LC_MESSAGES/gucharmap.mo
 share/locale/sl/LC_MESSAGES/gucharmap.mo
 share/locale/sq/LC_MESSAGES/gucharmap.mo
@@ -148,7 +139,22 @@ share/locale/xh/LC_MESSAGES/gucharmap.mo
 share/locale/zh_CN/LC_MESSAGES/gucharmap.mo
 share/locale/zh_HK/LC_MESSAGES/gucharmap.mo
 share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
-@dirrm share/gnome/omf/gucharmap
+share/omf/gucharmap/gucharmap-C.omf
+share/omf/gucharmap/gucharmap-bg.omf
+share/omf/gucharmap/gucharmap-de.omf
+share/omf/gucharmap/gucharmap-en_GB.omf
+share/omf/gucharmap/gucharmap-es.omf
+share/omf/gucharmap/gucharmap-fi.omf
+share/omf/gucharmap/gucharmap-fr.omf
+share/omf/gucharmap/gucharmap-it.omf
+share/omf/gucharmap/gucharmap-ja.omf
+share/omf/gucharmap/gucharmap-ko.omf
+share/omf/gucharmap/gucharmap-oc.omf
+share/omf/gucharmap/gucharmap-ru.omf
+share/omf/gucharmap/gucharmap-sv.omf
+share/omf/gucharmap/gucharmap-zh_CN.omf
+share/omf/gucharmap/gucharmap-zh_TW.omf
+@dirrm share/omf/gucharmap
 @dirrm share/gnome/help/gucharmap/zh_TW/figures
 @dirrm share/gnome/help/gucharmap/zh_TW
 @dirrm share/gnome/help/gucharmap/zh_CN/figures
@@ -157,6 +163,8 @@ share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
 @dirrm share/gnome/help/gucharmap/sv
 @dirrm share/gnome/help/gucharmap/ru/figures
 @dirrm share/gnome/help/gucharmap/ru
+@dirrm share/gnome/help/gucharmap/oc/figures
+@dirrm share/gnome/help/gucharmap/oc
 @dirrm share/gnome/help/gucharmap/ko/figures
 @dirrm share/gnome/help/gucharmap/ko
 @dirrm share/gnome/help/gucharmap/ja/figures
@@ -183,8 +191,12 @@ share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES
@@ -193,3 +205,4 @@ share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/applications