Presenting GNOME 2.20.1 and all related works for FreeBSD. The official

GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338

8 files changed, 211 insertions, 210 deletions

diff --git a/chinese/srecite/Makefile b/chinese/srecite/Makefile
index 8f4af8587f6a..6631dafe8489 100644
--- a/chinese/srecite/Makefile
+++ b/chinese/srecite/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	srecite
 PORTVERSION=	0.6.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	chinese textproc
 MASTER_SITES=	SF
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
@@ -25,10 +25,10 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 
-WORDBOOKS_PATH=	${PREFIX}/share/gnome/${PORTNAME}/wordbooks
+WORDBOOKS_PATH=	${PREFIX}/share/${PORTNAME}/wordbooks
 
 post-install:
 	cd ${WRKDIR}/wordbooks && ${INSTALL_DATA} * ${WORDBOOKS_PATH}
-	${INSTALL_DATA} ${FILESDIR}/srecite.desktop ${PREFIX}/share/gnome/applications
+	${INSTALL_DATA} ${FILESDIR}/srecite.desktop ${PREFIX}/share/applications
 
 .include <bsd.port.mk>
diff --git a/chinese/srecite/pkg-plist b/chinese/srecite/pkg-plist
index 3016a5d012d6..922fd81069a9 100644
--- a/chinese/srecite/pkg-plist
+++ b/chinese/srecite/pkg-plist
@@ -1,124 +1,125 @@
 bin/srecite
-share/gnome/applications/srecite.desktop
-share/gnome/srecite/srecite.rc
-share/gnome/srecite/icon/STAR_TRANSP.png
-share/gnome/srecite/icon/about.png
-share/gnome/srecite/icon/attach.png
-share/gnome/srecite/icon/back.png
-share/gnome/srecite/icon/check.png
-share/gnome/srecite/icon/configure.png
-share/gnome/srecite/icon/dict.png
-share/gnome/srecite/icon/dot.png
-share/gnome/srecite/icon/edit.png
-share/gnome/srecite/icon/edit_add.png
-share/gnome/srecite/icon/exit.png
-share/gnome/srecite/icon/exits.png
-share/gnome/srecite/icon/goto.png
-share/gnome/srecite/icon/hide.png
-share/gnome/srecite/icon/line.png
-share/gnome/srecite/icon/load.png
-share/gnome/srecite/icon/next.png
-share/gnome/srecite/icon/open.png
-share/gnome/srecite/icon/over.png
-share/gnome/srecite/icon/pencil.png
-share/gnome/srecite/icon/play.png
-share/gnome/srecite/icon/random.png
-share/gnome/srecite/icon/read.png
-share/gnome/srecite/icon/reset.png
-share/gnome/srecite/icon/right.png
-share/gnome/srecite/icon/save.png
-share/gnome/srecite/icon/search.png
-share/gnome/srecite/icon/sound.png
-share/gnome/srecite/icon/srecites.png
-share/gnome/srecite/icon/stop.png
-share/gnome/srecite/icon/style.png
-share/gnome/srecite/icon/test.png
-share/gnome/srecite/icon/wrong.png
-share/gnome/srecite/wordbooks/0.wrd
-share/gnome/srecite/wordbooks/1.wrd
-share/gnome/srecite/wordbooks/10.wrd
-share/gnome/srecite/wordbooks/11.wrd
-share/gnome/srecite/wordbooks/12.wrd
-share/gnome/srecite/wordbooks/13.wrd
-share/gnome/srecite/wordbooks/14.wrd
-share/gnome/srecite/wordbooks/15.wrd
-share/gnome/srecite/wordbooks/16.wrd
-share/gnome/srecite/wordbooks/17.wrd
-share/gnome/srecite/wordbooks/18.wrd
-share/gnome/srecite/wordbooks/19.wrd
-share/gnome/srecite/wordbooks/2.wrd
-share/gnome/srecite/wordbooks/20.wrd
-share/gnome/srecite/wordbooks/21.wrd
-share/gnome/srecite/wordbooks/22.wrd
-share/gnome/srecite/wordbooks/23.wrd
-share/gnome/srecite/wordbooks/24.wrd
-share/gnome/srecite/wordbooks/25.wrd
-share/gnome/srecite/wordbooks/26.wrd
-share/gnome/srecite/wordbooks/27.wrd
-share/gnome/srecite/wordbooks/28.wrd
-share/gnome/srecite/wordbooks/29.wrd
-share/gnome/srecite/wordbooks/3.wrd
-share/gnome/srecite/wordbooks/30.wrd
-share/gnome/srecite/wordbooks/31.wrd
-share/gnome/srecite/wordbooks/32.wrd
-share/gnome/srecite/wordbooks/33.wrd
-share/gnome/srecite/wordbooks/34.wrd
-share/gnome/srecite/wordbooks/35.wrd
-share/gnome/srecite/wordbooks/36.wrd
-share/gnome/srecite/wordbooks/37.wrd
-share/gnome/srecite/wordbooks/38.wrd
-share/gnome/srecite/wordbooks/39.wrd
-share/gnome/srecite/wordbooks/4.wrd
-share/gnome/srecite/wordbooks/40.wrd
-share/gnome/srecite/wordbooks/41.wrd
-share/gnome/srecite/wordbooks/42.wrd
-share/gnome/srecite/wordbooks/43.wrd
-share/gnome/srecite/wordbooks/44.wrd
-share/gnome/srecite/wordbooks/45.wrd
-share/gnome/srecite/wordbooks/46.wrd
-share/gnome/srecite/wordbooks/47.wrd
-share/gnome/srecite/wordbooks/48.wrd
-share/gnome/srecite/wordbooks/49.wrd
-share/gnome/srecite/wordbooks/5.wrd
-share/gnome/srecite/wordbooks/50.wrd
-share/gnome/srecite/wordbooks/51.wrd
-share/gnome/srecite/wordbooks/52.wrd
-share/gnome/srecite/wordbooks/53.wrd
-share/gnome/srecite/wordbooks/54.wrd
-share/gnome/srecite/wordbooks/55.wrd
-share/gnome/srecite/wordbooks/56.wrd
-share/gnome/srecite/wordbooks/57.wrd
-share/gnome/srecite/wordbooks/58.wrd
-share/gnome/srecite/wordbooks/59.wrd
-share/gnome/srecite/wordbooks/6.wrd
-share/gnome/srecite/wordbooks/60.wrd
-share/gnome/srecite/wordbooks/61.wrd
-share/gnome/srecite/wordbooks/62.wrd
-share/gnome/srecite/wordbooks/63.wrd
-share/gnome/srecite/wordbooks/64.wrd
-share/gnome/srecite/wordbooks/65.wrd
-share/gnome/srecite/wordbooks/66.wrd
-share/gnome/srecite/wordbooks/67.wrd
-share/gnome/srecite/wordbooks/68.wrd
-share/gnome/srecite/wordbooks/69.wrd
-share/gnome/srecite/wordbooks/7.wrd
-share/gnome/srecite/wordbooks/70.wrd
-share/gnome/srecite/wordbooks/71.wrd
-share/gnome/srecite/wordbooks/72.wrd
-share/gnome/srecite/wordbooks/73.wrd
-share/gnome/srecite/wordbooks/74.wrd
-share/gnome/srecite/wordbooks/75.wrd
-share/gnome/srecite/wordbooks/76.wrd
-share/gnome/srecite/wordbooks/77.wrd
-share/gnome/srecite/wordbooks/78.wrd
-share/gnome/srecite/wordbooks/8.wrd
-share/gnome/srecite/wordbooks/9.wrd
-share/gnome/srecite/wordbooks/README
-share/gnome/srecite/wordbooks/com
-share/gnome/srecite/wordbooks/index.txt
-share/gnome/srecite/wordbooks/readme-book.txt
-share/gnome/srecite/wordbooks/tf.wrd
+share/applications/srecite.desktop
+share/srecite/srecite.rc
+share/srecite/icon/STAR_TRANSP.png
+share/srecite/icon/about.png
+share/srecite/icon/attach.png
+share/srecite/icon/back.png
+share/srecite/icon/check.png
+share/srecite/icon/configure.png
+share/srecite/icon/dict.png
+share/srecite/icon/dot.png
+share/srecite/icon/edit.png
+share/srecite/icon/edit_add.png
+share/srecite/icon/exit.png
+share/srecite/icon/exits.png
+share/srecite/icon/goto.png
+share/srecite/icon/hide.png
+share/srecite/icon/line.png
+share/srecite/icon/load.png
+share/srecite/icon/next.png
+share/srecite/icon/open.png
+share/srecite/icon/over.png
+share/srecite/icon/pencil.png
+share/srecite/icon/play.png
+share/srecite/icon/random.png
+share/srecite/icon/read.png
+share/srecite/icon/reset.png
+share/srecite/icon/right.png
+share/srecite/icon/save.png
+share/srecite/icon/search.png
+share/srecite/icon/sound.png
+share/srecite/icon/srecites.png
+share/srecite/icon/stop.png
+share/srecite/icon/style.png
+share/srecite/icon/test.png
+share/srecite/icon/wrong.png
+share/srecite/wordbooks/0.wrd
+share/srecite/wordbooks/1.wrd
+share/srecite/wordbooks/10.wrd
+share/srecite/wordbooks/11.wrd
+share/srecite/wordbooks/12.wrd
+share/srecite/wordbooks/13.wrd
+share/srecite/wordbooks/14.wrd
+share/srecite/wordbooks/15.wrd
+share/srecite/wordbooks/16.wrd
+share/srecite/wordbooks/17.wrd
+share/srecite/wordbooks/18.wrd
+share/srecite/wordbooks/19.wrd
+share/srecite/wordbooks/2.wrd
+share/srecite/wordbooks/20.wrd
+share/srecite/wordbooks/21.wrd
+share/srecite/wordbooks/22.wrd
+share/srecite/wordbooks/23.wrd
+share/srecite/wordbooks/24.wrd
+share/srecite/wordbooks/25.wrd
+share/srecite/wordbooks/26.wrd
+share/srecite/wordbooks/27.wrd
+share/srecite/wordbooks/28.wrd
+share/srecite/wordbooks/29.wrd
+share/srecite/wordbooks/3.wrd
+share/srecite/wordbooks/30.wrd
+share/srecite/wordbooks/31.wrd
+share/srecite/wordbooks/32.wrd
+share/srecite/wordbooks/33.wrd
+share/srecite/wordbooks/34.wrd
+share/srecite/wordbooks/35.wrd
+share/srecite/wordbooks/36.wrd
+share/srecite/wordbooks/37.wrd
+share/srecite/wordbooks/38.wrd
+share/srecite/wordbooks/39.wrd
+share/srecite/wordbooks/4.wrd
+share/srecite/wordbooks/40.wrd
+share/srecite/wordbooks/41.wrd
+share/srecite/wordbooks/42.wrd
+share/srecite/wordbooks/43.wrd
+share/srecite/wordbooks/44.wrd
+share/srecite/wordbooks/45.wrd
+share/srecite/wordbooks/46.wrd
+share/srecite/wordbooks/47.wrd
+share/srecite/wordbooks/48.wrd
+share/srecite/wordbooks/49.wrd
+share/srecite/wordbooks/5.wrd
+share/srecite/wordbooks/50.wrd
+share/srecite/wordbooks/51.wrd
+share/srecite/wordbooks/52.wrd
+share/srecite/wordbooks/53.wrd
+share/srecite/wordbooks/54.wrd
+share/srecite/wordbooks/55.wrd
+share/srecite/wordbooks/56.wrd
+share/srecite/wordbooks/57.wrd
+share/srecite/wordbooks/58.wrd
+share/srecite/wordbooks/59.wrd
+share/srecite/wordbooks/6.wrd
+share/srecite/wordbooks/60.wrd
+share/srecite/wordbooks/61.wrd
+share/srecite/wordbooks/62.wrd
+share/srecite/wordbooks/63.wrd
+share/srecite/wordbooks/64.wrd
+share/srecite/wordbooks/65.wrd
+share/srecite/wordbooks/66.wrd
+share/srecite/wordbooks/67.wrd
+share/srecite/wordbooks/68.wrd
+share/srecite/wordbooks/69.wrd
+share/srecite/wordbooks/7.wrd
+share/srecite/wordbooks/70.wrd
+share/srecite/wordbooks/71.wrd
+share/srecite/wordbooks/72.wrd
+share/srecite/wordbooks/73.wrd
+share/srecite/wordbooks/74.wrd
+share/srecite/wordbooks/75.wrd
+share/srecite/wordbooks/76.wrd
+share/srecite/wordbooks/77.wrd
+share/srecite/wordbooks/78.wrd
+share/srecite/wordbooks/8.wrd
+share/srecite/wordbooks/9.wrd
+share/srecite/wordbooks/README
+share/srecite/wordbooks/com
+share/srecite/wordbooks/index.txt
+share/srecite/wordbooks/readme-book.txt
+share/srecite/wordbooks/tf.wrd
 share/icons/srecite.png
-@dirrm share/gnome/srecite/icon
-@dirrm share/gnome/srecite/wordbooks
-@dirrm share/gnome/srecite
+@dirrm share/srecite/icon
+@dirrm share/srecite/wordbooks
+@dirrm share/srecite
+@dirrmtry share/applications
diff --git a/chinese/stardict-dict-zh_CN/Makefile b/chinese/stardict-dict-zh_CN/Makefile
index 48f7251bc624..9006090effa1 100644
--- a/chinese/stardict-dict-zh_CN/Makefile
+++ b/chinese/stardict-dict-zh_CN/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-zh_CN
 PORTVERSION=	2.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	chinese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -27,12 +27,12 @@ NO_BUILD=	yes
 USE_BZIP2=	yes
 
 do-install:
-		${MKDIR} ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-cdict-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-cedict-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-oxford-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-stardict1.3-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ce-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ec-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
+		${MKDIR} ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-cdict-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-cedict-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-oxford-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-stardict1.3-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ce-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ec-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
 
 .include <bsd.port.mk>
diff --git a/chinese/stardict-dict-zh_CN/pkg-plist b/chinese/stardict-dict-zh_CN/pkg-plist
index 2d531e97e656..08ff234deb4a 100644
--- a/chinese/stardict-dict-zh_CN/pkg-plist
+++ b/chinese/stardict-dict-zh_CN/pkg-plist
@@ -1,19 +1,19 @@
-share/gnome/stardict/dic/cdict-gb.dict.dz
-share/gnome/stardict/dic/cdict-gb.idx
-share/gnome/stardict/dic/cdict-gb.ifo
-share/gnome/stardict/dic/cedict-gb.dict.dz
-share/gnome/stardict/dic/cedict-gb.idx
-share/gnome/stardict/dic/cedict-gb.ifo
-share/gnome/stardict/dic/oxford-gb.dict.dz
-share/gnome/stardict/dic/oxford-gb.idx
-share/gnome/stardict/dic/oxford-gb.ifo
-share/gnome/stardict/dic/stardict1.3.dict.dz
-share/gnome/stardict/dic/stardict1.3.idx
-share/gnome/stardict/dic/stardict1.3.ifo
-share/gnome/stardict/dic/xdict-ce-gb.dict.dz
-share/gnome/stardict/dic/xdict-ce-gb.idx
-share/gnome/stardict/dic/xdict-ce-gb.ifo
-share/gnome/stardict/dic/xdict-ec-gb.dict.dz
-share/gnome/stardict/dic/xdict-ec-gb.idx
-share/gnome/stardict/dic/xdict-ec-gb.ifo
-@dirrmtry share/gnome/stardict/dic
+share/stardict/dic/cdict-gb.dict.dz
+share/stardict/dic/cdict-gb.idx
+share/stardict/dic/cdict-gb.ifo
+share/stardict/dic/cedict-gb.dict.dz
+share/stardict/dic/cedict-gb.idx
+share/stardict/dic/cedict-gb.ifo
+share/stardict/dic/oxford-gb.dict.dz
+share/stardict/dic/oxford-gb.idx
+share/stardict/dic/oxford-gb.ifo
+share/stardict/dic/stardict1.3.dict.dz
+share/stardict/dic/stardict1.3.idx
+share/stardict/dic/stardict1.3.ifo
+share/stardict/dic/xdict-ce-gb.dict.dz
+share/stardict/dic/xdict-ce-gb.idx
+share/stardict/dic/xdict-ce-gb.ifo
+share/stardict/dic/xdict-ec-gb.dict.dz
+share/stardict/dic/xdict-ec-gb.idx
+share/stardict/dic/xdict-ec-gb.ifo
+@dirrmtry share/stardict/dic
diff --git a/chinese/stardict2-dict-zh_CN/Makefile b/chinese/stardict2-dict-zh_CN/Makefile
index 48f7251bc624..9006090effa1 100644
--- a/chinese/stardict2-dict-zh_CN/Makefile
+++ b/chinese/stardict2-dict-zh_CN/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-zh_CN
 PORTVERSION=	2.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	chinese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -27,12 +27,12 @@ NO_BUILD=	yes
 USE_BZIP2=	yes
 
 do-install:
-		${MKDIR} ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-cdict-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-cedict-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-oxford-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-stardict1.3-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ce-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ec-gb-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
+		${MKDIR} ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-cdict-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-cedict-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-oxford-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-stardict1.3-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ce-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ec-gb-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
 
 .include <bsd.port.mk>
diff --git a/chinese/stardict2-dict-zh_CN/pkg-plist b/chinese/stardict2-dict-zh_CN/pkg-plist
index 2d531e97e656..08ff234deb4a 100644
--- a/chinese/stardict2-dict-zh_CN/pkg-plist
+++ b/chinese/stardict2-dict-zh_CN/pkg-plist
@@ -1,19 +1,19 @@
-share/gnome/stardict/dic/cdict-gb.dict.dz
-share/gnome/stardict/dic/cdict-gb.idx
-share/gnome/stardict/dic/cdict-gb.ifo
-share/gnome/stardict/dic/cedict-gb.dict.dz
-share/gnome/stardict/dic/cedict-gb.idx
-share/gnome/stardict/dic/cedict-gb.ifo
-share/gnome/stardict/dic/oxford-gb.dict.dz
-share/gnome/stardict/dic/oxford-gb.idx
-share/gnome/stardict/dic/oxford-gb.ifo
-share/gnome/stardict/dic/stardict1.3.dict.dz
-share/gnome/stardict/dic/stardict1.3.idx
-share/gnome/stardict/dic/stardict1.3.ifo
-share/gnome/stardict/dic/xdict-ce-gb.dict.dz
-share/gnome/stardict/dic/xdict-ce-gb.idx
-share/gnome/stardict/dic/xdict-ce-gb.ifo
-share/gnome/stardict/dic/xdict-ec-gb.dict.dz
-share/gnome/stardict/dic/xdict-ec-gb.idx
-share/gnome/stardict/dic/xdict-ec-gb.ifo
-@dirrmtry share/gnome/stardict/dic
+share/stardict/dic/cdict-gb.dict.dz
+share/stardict/dic/cdict-gb.idx
+share/stardict/dic/cdict-gb.ifo
+share/stardict/dic/cedict-gb.dict.dz
+share/stardict/dic/cedict-gb.idx
+share/stardict/dic/cedict-gb.ifo
+share/stardict/dic/oxford-gb.dict.dz
+share/stardict/dic/oxford-gb.idx
+share/stardict/dic/oxford-gb.ifo
+share/stardict/dic/stardict1.3.dict.dz
+share/stardict/dic/stardict1.3.idx
+share/stardict/dic/stardict1.3.ifo
+share/stardict/dic/xdict-ce-gb.dict.dz
+share/stardict/dic/xdict-ce-gb.idx
+share/stardict/dic/xdict-ce-gb.ifo
+share/stardict/dic/xdict-ec-gb.dict.dz
+share/stardict/dic/xdict-ec-gb.idx
+share/stardict/dic/xdict-ec-gb.ifo
+@dirrmtry share/stardict/dic
diff --git a/chinese/stardict2-dict-zh_TW/Makefile b/chinese/stardict2-dict-zh_TW/Makefile
index c9c9f0dfc6b5..78e56e0b60e8 100644
--- a/chinese/stardict2-dict-zh_TW/Makefile
+++ b/chinese/stardict2-dict-zh_TW/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-zh_TW
 PORTVERSION=	2.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	chinese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -28,13 +28,13 @@ NO_BUILD=	yes
 USE_BZIP2=	yes
 
 do-install:
-		${MKDIR} ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-cdict-big5-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-cedict-big5-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-langdao-ce-big5-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-langdao-ec-big5-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-oxford-big5-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ce-big5-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ec-big5-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
+		${MKDIR} ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-cdict-big5-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-cedict-big5-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-langdao-ce-big5-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-langdao-ec-big5-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-oxford-big5-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ce-big5-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ec-big5-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
 
 .include <bsd.port.mk>
diff --git a/chinese/stardict2-dict-zh_TW/pkg-plist b/chinese/stardict2-dict-zh_TW/pkg-plist
index 9eb4682250bd..0ac2fbde5199 100644
--- a/chinese/stardict2-dict-zh_TW/pkg-plist
+++ b/chinese/stardict2-dict-zh_TW/pkg-plist
@@ -1,22 +1,22 @@
-share/gnome/stardict/dic/cdict-big5.dict.dz
-share/gnome/stardict/dic/cdict-big5.idx
-share/gnome/stardict/dic/cdict-big5.ifo
-share/gnome/stardict/dic/cedict-big5.dict.dz
-share/gnome/stardict/dic/cedict-big5.idx
-share/gnome/stardict/dic/cedict-big5.ifo
-share/gnome/stardict/dic/langdao-ce-big5.dict.dz
-share/gnome/stardict/dic/langdao-ce-big5.idx
-share/gnome/stardict/dic/langdao-ce-big5.ifo
-share/gnome/stardict/dic/langdao-ec-big5.dict.dz
-share/gnome/stardict/dic/langdao-ec-big5.idx
-share/gnome/stardict/dic/langdao-ec-big5.ifo
-share/gnome/stardict/dic/oxford-big5.dict.dz
-share/gnome/stardict/dic/oxford-big5.idx
-share/gnome/stardict/dic/oxford-big5.ifo
-share/gnome/stardict/dic/xdict-ce-big5.dict.dz
-share/gnome/stardict/dic/xdict-ce-big5.idx
-share/gnome/stardict/dic/xdict-ce-big5.ifo
-share/gnome/stardict/dic/xdict-ec-big5.dict.dz
-share/gnome/stardict/dic/xdict-ec-big5.idx
-share/gnome/stardict/dic/xdict-ec-big5.ifo
-@dirrmtry share/gnome/stardict/dic
+share/stardict/dic/cdict-big5.dict.dz
+share/stardict/dic/cdict-big5.idx
+share/stardict/dic/cdict-big5.ifo
+share/stardict/dic/cedict-big5.dict.dz
+share/stardict/dic/cedict-big5.idx
+share/stardict/dic/cedict-big5.ifo
+share/stardict/dic/langdao-ce-big5.dict.dz
+share/stardict/dic/langdao-ce-big5.idx
+share/stardict/dic/langdao-ce-big5.ifo
+share/stardict/dic/langdao-ec-big5.dict.dz
+share/stardict/dic/langdao-ec-big5.idx
+share/stardict/dic/langdao-ec-big5.ifo
+share/stardict/dic/oxford-big5.dict.dz
+share/stardict/dic/oxford-big5.idx
+share/stardict/dic/oxford-big5.ifo
+share/stardict/dic/xdict-ce-big5.dict.dz
+share/stardict/dic/xdict-ce-big5.idx
+share/stardict/dic/xdict-ce-big5.ifo
+share/stardict/dic/xdict-ec-big5.dict.dz
+share/stardict/dic/xdict-ec-big5.idx
+share/stardict/dic/xdict-ec-big5.ifo
+@dirrmtry share/stardict/dic