11 files changed, 64 insertions, 139 deletions
diff --git a/japanese/ebview-gtk2/Makefile b/japanese/ebview-gtk2/Makefile
index 8c2d3ca4932e..c6a70bd02c3b 100644
--- a/japanese/ebview-gtk2/Makefile
+++ b/japanese/ebview-gtk2/Makefile
@@ -33,6 +33,8 @@ SUB_FILES=	ebview.desktop
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|-pthread|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|#define GTK_DISABLE_DEPRECATED 1||g' \
+		${WRKSRC}/src/ebview.c
 
 post-install:
 	${MKDIR} ${PREFIX}/share/applications
diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile
index c0ebf2476e96..ab00a04a871e 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	im-ja
 PORTVERSION=	1.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-toolkits
 MASTER_SITES=	http://im-ja.sourceforge.net/
 
diff --git a/japanese/im-ja/files/patch-configure b/japanese/im-ja/files/patch-configure
deleted file mode 100644
index 951243475473..000000000000
--- a/japanese/im-ja/files/patch-configure
+++ /dev/null
@@ -1,36 +0,0 @@
-*** configure.orig	Mon Apr 12 09:41:56 2004
---- configure	Mon Apr 12 09:42:55 2004
-***************
-*** 14905,14911 ****
-  #define IM_JA_BINDIR "$IM_JA_BINDIR"
-  _ACEOF
-  
-! IM_JA_DATADIR="$im_ja_prefix/share/im-ja"
-  
-  cat >>confdefs.h <<_ACEOF
-  #define IM_JA_DATADIR "$IM_JA_DATADIR"
---- 14906,14912 ----
-  #define IM_JA_BINDIR "$IM_JA_BINDIR"
-  _ACEOF
-  
-! IM_JA_DATADIR="$im_ja_prefix/share/gnome/im-ja"
-  
-  cat >>confdefs.h <<_ACEOF
-  #define IM_JA_DATADIR "$IM_JA_DATADIR"
-***************
-*** 14918,14924 ****
-  _ACEOF
-  
-  
-! PIXMAPDIR="$im_ja_prefix/share/pixmaps"
-  
-  cat >>confdefs.h <<_ACEOF
-  #define PIXMAPDIR "$PIXMAPDIR"
---- 14919,14925 ----
-  _ACEOF
-  
-  
-! PIXMAPDIR="$im_ja_prefix/share/gnome/pixmaps"
-  
-  cat >>confdefs.h <<_ACEOF
-  #define PIXMAPDIR "$PIXMAPDIR"
diff --git a/japanese/im-ja/pkg-plist b/japanese/im-ja/pkg-plist
index 9d1b44174217..9110c82b5afe 100644
--- a/japanese/im-ja/pkg-plist
+++ b/japanese/im-ja/pkg-plist
@@ -6,43 +6,44 @@ lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ja.so
 %%GNOMEPANEL%%libexec/im-ja/im-ja-applet
 libexec/im-ja/im-ja-helper
 libexec/im-ja/kpengine
-share/gnome/applications/im-ja.desktop
-%%GNOMEPANEL%%share/gnome/gnome-2.0/ui/GNOME_ImJaApplet.xml
-share/gnome/im-ja/01.unistrok
-share/gnome/im-ja/02.unistrok
-share/gnome/im-ja/03.unistrok
-share/gnome/im-ja/04.unistrok
-share/gnome/im-ja/05.unistrok
-share/gnome/im-ja/06.unistrok
-share/gnome/im-ja/07.unistrok
-share/gnome/im-ja/08.unistrok
-share/gnome/im-ja/09.unistrok
-share/gnome/im-ja/10.unistrok
-share/gnome/im-ja/11.unistrok
-share/gnome/im-ja/12.unistrok
-share/gnome/im-ja/13.unistrok
-share/gnome/im-ja/14.unistrok
-share/gnome/im-ja/15.unistrok
-share/gnome/im-ja/16.unistrok
-share/gnome/im-ja/17.unistrok
-share/gnome/im-ja/18.unistrok
-share/gnome/im-ja/19.unistrok
-share/gnome/im-ja/20.unistrok
-share/gnome/im-ja/21.unistrok
-share/gnome/im-ja/22.unistrok
-share/gnome/im-ja/23.unistrok
-share/gnome/im-ja/im-ja-conf.glade
-share/gnome/im-ja/im-ja-doc.html
-share/gnome/im-ja/im-ja-symbols.txt
-share/gnome/im-ja/radkfile.utf8
-share/gnome/pixmaps/im-ja-about.jpg
-share/gnome/pixmaps/im-ja-capplet.png
+share/applications/im-ja.desktop
+%%GNOMEPANEL%%share/gnome-2.0/ui/GNOME_ImJaApplet.xml
+share/im-ja/01.unistrok
+share/im-ja/02.unistrok
+share/im-ja/03.unistrok
+share/im-ja/04.unistrok
+share/im-ja/05.unistrok
+share/im-ja/06.unistrok
+share/im-ja/07.unistrok
+share/im-ja/08.unistrok
+share/im-ja/09.unistrok
+share/im-ja/10.unistrok
+share/im-ja/11.unistrok
+share/im-ja/12.unistrok
+share/im-ja/13.unistrok
+share/im-ja/14.unistrok
+share/im-ja/15.unistrok
+share/im-ja/16.unistrok
+share/im-ja/17.unistrok
+share/im-ja/18.unistrok
+share/im-ja/19.unistrok
+share/im-ja/20.unistrok
+share/im-ja/21.unistrok
+share/im-ja/22.unistrok
+share/im-ja/23.unistrok
+share/im-ja/im-ja-conf.glade
+share/im-ja/im-ja-doc.html
+share/im-ja/im-ja-symbols.txt
+share/im-ja/radkfile.utf8
+share/pixmaps/im-ja-about.jpg
+share/pixmaps/im-ja-capplet.png
 share/locale/ca/LC_MESSAGES/im-ja.mo
 share/locale/de/LC_MESSAGES/im-ja.mo
 share/locale/es/LC_MESSAGES/im-ja.mo
 share/locale/hu/LC_MESSAGES/im-ja.mo
 share/locale/ja/LC_MESSAGES/im-ja.mo
-@dirrm share/gnome/im-ja
+@dirrm share/im-ja
 @dirrm libexec/im-ja
 @exec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules; fi
 @unexec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules; fi
+@dirrmtry share/applications
diff --git a/japanese/ochusha/Makefile b/japanese/ochusha/Makefile
index 27ca4a918e21..b843c4002468 100644
--- a/japanese/ochusha/Makefile
+++ b/japanese/ochusha/Makefile
@@ -33,6 +33,10 @@ DESKTOP_ENTRIES="ochusha" "A GUI BBS browser for 2ch.net" \
 ACLOCAL_ARGS=	-I "${ACLOCAL_DIR}" -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	-c -a
 
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.* | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED||g'
+
 pre-configure:
 	@echo "===>  Regenerating ${WRKSRC}/libmodifiedgtk2/Makefile.in"
 	@${RM} ${WRKSRC}/libmodifiedgtk2/aclocal.m4
diff --git a/japanese/ochusha/Makefile.bak b/japanese/ochusha/Makefile.bak
deleted file mode 100644
index 95dbbdda2eb6..000000000000
--- a/japanese/ochusha/Makefile.bak
+++ /dev/null
@@ -1,46 +0,0 @@
-# New ports collection makefile for:   ochusha
-# Date created:     15 April 2006
-# Whom:             sgr
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ochusha
-PORTVERSION=	0.5.8.2
-PORTREVISION=	4
-CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=		ochusha/16560
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A GUI BBS browser for 2ch.net
-
-MAN1=		ochusha.1
-MANCOMPRESSED=	no
-
-USE_X_PREFIX=	yes
-USE_BZIP2=	yes
-USE_GNOME=	pkgconfig glib20 gtk20 libxml2
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	automake:110 autoconf:261 aclocal:110 libtool:15
-
-DESKTOP_ENTRIES="ochusha" "A GUI BBS browser for 2ch.net" \
-		"${X11BASE}/share/ochusha/ochusha32.xpm" \
-		"Ochusha" "Application;Network;" \
-		false
-
-ACLOCAL_ARGS=	-I "${ACLOCAL_DIR}" -I ${LOCALBASE}/share/aclocal
-AUTOMAKE_ARGS=	-c -a
-#CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
-
-pre-configure:
-	@echo "===>  Regenerating ${WRKSRC}/libmodifiedgtk2/Makefile.in"
-	@${RM} ${WRKSRC}/libmodifiedgtk2/aclocal.m4
-	@${RM} ${WRKSRC}/libmodifiedgtk2/Makefile.in
-	@(cd ${WRKSRC}/libmodifiedgtk2/ && \
-	${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} && \
-	${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} && \
-	${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF})
-
-.include <bsd.port.mk>
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index fdcb0c0aeb79..2f4659ffc0a8 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-tomoe
 PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=tomoe
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 LIB_DEPENDS=	tomoe.1:${PORTSDIR}/japanese/tomoe \
 		tomoe-gtk.1:${PORTSDIR}/japanese/libtomoe-gtk
 
-USE_GNOME=	lthack
+USE_GNOME=	lthack intlhack
 USE_XLIB=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
diff --git a/japanese/stardict-dict-ja/Makefile b/japanese/stardict-dict-ja/Makefile
index 479bfd404399..e771586c0d15 100644
--- a/japanese/stardict-dict-ja/Makefile
+++ b/japanese/stardict-dict-ja/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-ja
 PORTVERSION=	2.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -23,8 +23,8 @@ NO_BUILD=	yes
 USE_BZIP2=	yes
 
 do-install:
-		${MKDIR} ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-jmdict-en-ja-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-jmdict-ja-en-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
+		${MKDIR} ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-jmdict-en-ja-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-jmdict-ja-en-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
 
 .include <bsd.port.mk>
diff --git a/japanese/stardict-dict-ja/pkg-plist b/japanese/stardict-dict-ja/pkg-plist
index 3d4a873d4438..2a36f21f51c3 100644
--- a/japanese/stardict-dict-ja/pkg-plist
+++ b/japanese/stardict-dict-ja/pkg-plist
@@ -1,7 +1,7 @@
-share/gnome/stardict/dic/jmdict-en-ja.dict.dz
-share/gnome/stardict/dic/jmdict-en-ja.idx
-share/gnome/stardict/dic/jmdict-en-ja.ifo
-share/gnome/stardict/dic/jmdict-ja-en.dict.dz
-share/gnome/stardict/dic/jmdict-ja-en.idx
-share/gnome/stardict/dic/jmdict-ja-en.ifo
-@dirrmtry share/gnome/stardict/dic
+share/stardict/dic/jmdict-en-ja.dict.dz
+share/stardict/dic/jmdict-en-ja.idx
+share/stardict/dic/jmdict-en-ja.ifo
+share/stardict/dic/jmdict-ja-en.dict.dz
+share/stardict/dic/jmdict-ja-en.idx
+share/stardict/dic/jmdict-ja-en.ifo
+@dirrmtry share/stardict/dic
diff --git a/japanese/stardict2-dict-ja/Makefile b/japanese/stardict2-dict-ja/Makefile
index 479bfd404399..e771586c0d15 100644
--- a/japanese/stardict2-dict-ja/Makefile
+++ b/japanese/stardict2-dict-ja/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-ja
 PORTVERSION=	2.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -23,8 +23,8 @@ NO_BUILD=	yes
 USE_BZIP2=	yes
 
 do-install:
-		${MKDIR} ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-jmdict-en-ja-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-jmdict-ja-en-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
+		${MKDIR} ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-jmdict-en-ja-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-jmdict-ja-en-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
 
 .include <bsd.port.mk>
diff --git a/japanese/stardict2-dict-ja/pkg-plist b/japanese/stardict2-dict-ja/pkg-plist
index 3d4a873d4438..2a36f21f51c3 100644
--- a/japanese/stardict2-dict-ja/pkg-plist
+++ b/japanese/stardict2-dict-ja/pkg-plist
@@ -1,7 +1,7 @@
-share/gnome/stardict/dic/jmdict-en-ja.dict.dz
-share/gnome/stardict/dic/jmdict-en-ja.idx
-share/gnome/stardict/dic/jmdict-en-ja.ifo
-share/gnome/stardict/dic/jmdict-ja-en.dict.dz
-share/gnome/stardict/dic/jmdict-ja-en.idx
-share/gnome/stardict/dic/jmdict-ja-en.ifo
-@dirrmtry share/gnome/stardict/dic
+share/stardict/dic/jmdict-en-ja.dict.dz
+share/stardict/dic/jmdict-en-ja.idx
+share/stardict/dic/jmdict-en-ja.ifo
+share/stardict/dic/jmdict-ja-en.dict.dz
+share/stardict/dic/jmdict-ja-en.idx
+share/stardict/dic/jmdict-ja-en.ifo
+@dirrmtry share/stardict/dic