3 files changed, 34 insertions, 69 deletions

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