6 files changed, 28 insertions, 18 deletions

diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 2860b09bff38..9d644df3629b 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	gucharmap
-PORTVERSION=	0.6.1
+PORTVERSION=	0.8.0
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
 DIST_SUBDIR=	gnome2
 
-MAINTAINER=	marcus@FreeBSD.org
+MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A Unicode/ISO10646 character map and font viewer
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
@@ -37,8 +37,4 @@ PKGNAMESUFFIX=	-gnome
 CONFIGURE_ARGS=	--disable-gnome
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo
index 0f752dc647eb..eec92461cc6b 100644
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gucharmap-0.6.1.tar.bz2) = b71c8875e37276a3e197d88d2a920ec5
+MD5 (gnome2/gucharmap-0.8.0.tar.bz2) = bef018936d47019990fe84ce7e8e23bc
diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist
index a77a2edd177d..faea4e849b4a 100644
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@@ -1,14 +1,21 @@
 bin/charmap
+@unexec if test -L %D/bin/gnome-character-map; then rm -f %D/bin/gnome-character-map; fi
 bin/gucharmap
 include/gucharmap/charmap.h
 include/gucharmap/chartable.h
+include/gucharmap/gucharmap-charmap.h
+include/gucharmap/gucharmap-mini-fontsel.h
+include/gucharmap/gucharmap-table.h
+include/gucharmap/gucharmap-unicode-info.h
+include/gucharmap/gucharmap-window.h
+include/gucharmap/gucharmap.h
 include/gucharmap/gucharmap_window.h
 include/gucharmap/mini_fontsel.h
 include/gucharmap/unicode_info.h
 lib/gtk-2.0/2.2.0/immodules/im-gucharmap.so
 lib/libgucharmap.a
 lib/libgucharmap.so
-lib/libgucharmap.so.2
+lib/libgucharmap.so.3
 libdata/pkgconfig/gucharmap.pc
 share/gnome/applications/gucharmap.desktop
 share/gnome/pixmaps/gucharmap.png
@@ -27,10 +34,12 @@ share/locale/ga/LC_MESSAGES/gucharmap.mo
 share/locale/it/LC_MESSAGES/gucharmap.mo
 share/locale/ja/LC_MESSAGES/gucharmap.mo
 share/locale/ko/LC_MESSAGES/gucharmap.mo
+share/locale/ms/LC_MESSAGES/gucharmap.mo
 share/locale/nl/LC_MESSAGES/gucharmap.mo
 share/locale/pl/LC_MESSAGES/gucharmap.mo
 share/locale/pt/LC_MESSAGES/gucharmap.mo
 share/locale/pt_BR/LC_MESSAGES/gucharmap.mo
+share/locale/ru/LC_MESSAGES/gucharmap.mo
 share/locale/sv/LC_MESSAGES/gucharmap.mo
 share/locale/uk/LC_MESSAGES/gucharmap.mo
 share/locale/zh_CN/LC_MESSAGES/gucharmap.mo
diff --git a/misc/gucharmap/Makefile b/misc/gucharmap/Makefile
index 2860b09bff38..9d644df3629b 100644
--- a/misc/gucharmap/Makefile
+++ b/misc/gucharmap/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	gucharmap
-PORTVERSION=	0.6.1
+PORTVERSION=	0.8.0
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
 DIST_SUBDIR=	gnome2
 
-MAINTAINER=	marcus@FreeBSD.org
+MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A Unicode/ISO10646 character map and font viewer
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
@@ -37,8 +37,4 @@ PKGNAMESUFFIX=	-gnome
 CONFIGURE_ARGS=	--disable-gnome
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
diff --git a/misc/gucharmap/distinfo b/misc/gucharmap/distinfo
index 0f752dc647eb..eec92461cc6b 100644
--- a/misc/gucharmap/distinfo
+++ b/misc/gucharmap/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gucharmap-0.6.1.tar.bz2) = b71c8875e37276a3e197d88d2a920ec5
+MD5 (gnome2/gucharmap-0.8.0.tar.bz2) = bef018936d47019990fe84ce7e8e23bc
diff --git a/misc/gucharmap/pkg-plist b/misc/gucharmap/pkg-plist
index a77a2edd177d..faea4e849b4a 100644
--- a/misc/gucharmap/pkg-plist
+++ b/misc/gucharmap/pkg-plist
@@ -1,14 +1,21 @@
 bin/charmap
+@unexec if test -L %D/bin/gnome-character-map; then rm -f %D/bin/gnome-character-map; fi
 bin/gucharmap
 include/gucharmap/charmap.h
 include/gucharmap/chartable.h
+include/gucharmap/gucharmap-charmap.h
+include/gucharmap/gucharmap-mini-fontsel.h
+include/gucharmap/gucharmap-table.h
+include/gucharmap/gucharmap-unicode-info.h
+include/gucharmap/gucharmap-window.h
+include/gucharmap/gucharmap.h
 include/gucharmap/gucharmap_window.h
 include/gucharmap/mini_fontsel.h
 include/gucharmap/unicode_info.h
 lib/gtk-2.0/2.2.0/immodules/im-gucharmap.so
 lib/libgucharmap.a
 lib/libgucharmap.so
-lib/libgucharmap.so.2
+lib/libgucharmap.so.3
 libdata/pkgconfig/gucharmap.pc
 share/gnome/applications/gucharmap.desktop
 share/gnome/pixmaps/gucharmap.png
@@ -27,10 +34,12 @@ share/locale/ga/LC_MESSAGES/gucharmap.mo
 share/locale/it/LC_MESSAGES/gucharmap.mo
 share/locale/ja/LC_MESSAGES/gucharmap.mo
 share/locale/ko/LC_MESSAGES/gucharmap.mo
+share/locale/ms/LC_MESSAGES/gucharmap.mo
 share/locale/nl/LC_MESSAGES/gucharmap.mo
 share/locale/pl/LC_MESSAGES/gucharmap.mo
 share/locale/pt/LC_MESSAGES/gucharmap.mo
 share/locale/pt_BR/LC_MESSAGES/gucharmap.mo
+share/locale/ru/LC_MESSAGES/gucharmap.mo
 share/locale/sv/LC_MESSAGES/gucharmap.mo
 share/locale/uk/LC_MESSAGES/gucharmap.mo
 share/locale/zh_CN/LC_MESSAGES/gucharmap.mo