Update to 1.0.6.

- WITH_DVORAK option removed
- WITH_GNOME_APPLET option removed due to use of gdk_pixbuf,
  which depends on gnomelibs.

4 files changed, 42 insertions, 18 deletions

diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index 7ab2c38fbe6..acc693f7baf 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -6,35 +6,31 @@
 #
 
 PORTNAME=	ami
-PORTVERSION=	1.0.5
+PORTVERSION=	1.0.6
 CATEGORIES=	korean x11
 MASTER_SITES=	http://www.kr.freebsd.org/~hwang/ami/ \
-		http://adam.kaist.ac.kr/~cwryu/archive/misc/
+		http://master.debian-kr.org/~cwryu/archive/misc/
 DISTFILES=	${DISTNAME}.tar.gz hanja.dic.gz ami.dic
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	cjh@kr.freebsd.org
 
-LIB_DEPENDS=    gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=    gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
 USE_X_PREFIX=	YES
 GNU_CONFIGURE=	YES
+USE_GMAKE=	YES
 CONFIGURE_ENV=	GLIB_CONFIG=${LOCALBASE}/bin/glib12-config \
 		GTK_CONFIG=${X11BASE}/bin/gtk12-config
-CONFIGURE_ARGS+= --with-hangul-keyboard=2
-
-# Korean input in dvorak keyboard
-.if defined(WITH_DVORAK)
-CONFIGURE_ARGS+= --with-english-keyboard=dvorak
-.endif
+CONFIGURE_ARGS+= --with-hangul-keyboard=2 --enable-gnome-applet
 
 # gnome support
-.if defined(WITH_GNOME_APPLET)
-PKGNAMESUFFIX=	-gnome
-RUN_DEPENDS+=	panel:${PORTSDIR}/x11/gnomecore
-LIB_DEPENDS+=	gnome.4:${PORTSDIR}/x11/gnomelibs
-CONFIGURE_ARGS+= --enable-gnome-applet
-.endif
+#.if defined(WITH_GNOME_APPLET)
+#PKGNAMESUFFIX=	-gnome
+#RUN_DEPENDS+=	panel:${PORTSDIR}/x11/gnomecore
+#LIB_DEPENDS+=	gnome.4:${PORTSDIR}/x11/gnomelibs
+#CONFIGURE_ARGS+= --enable-gnome-applet
+#.endif
 
 post-build:
 	@cd ${WRKSRC}/hanjadic; \
diff --git a/korean/ami/distinfo b/korean/ami/distinfo
index 9db855d82ff..4314f06fdcc 100644
--- a/korean/ami/distinfo
+++ b/korean/ami/distinfo
@@ -1,3 +1,3 @@
-MD5 (ami-1.0.5.tar.gz) = 8ea2fd3e09988850c20653a6090d12f2
+MD5 (ami-1.0.6.tar.gz) = d0ce79673c1e1c7fb7bb02b1d44b9bcb
 MD5 (hanja.dic.gz) = 3f114405753ad0596c4127df36e35710
 MD5 (ami.dic) = 27ca7f0208f8fbf685f9496d0b435303
diff --git a/korean/ami/pkg-descr b/korean/ami/pkg-descr
index 35db85cd8ac..de6cfd1e6da 100644
--- a/korean/ami/pkg-descr
+++ b/korean/ami/pkg-descr
@@ -3,7 +3,7 @@ ami: An X11R6 Input Method Server for the Korean Language
   - OverTheSpot, OffTheSpot
   - 2-bul, 3-bul style Korean Keyboard
 
-  ami by Chi-duck, Hwang <cdhwang@sr.hei.co.kr>
+by Chi-duck, Hwang <hwang@mizi.com>
 
 --
 CHOI Junho <cjh@kr.freebsd.org>
diff --git a/korean/ami/pkg-plist b/korean/ami/pkg-plist
index 27a80783b1c..70ed3deb662 100644
--- a/korean/ami/pkg-plist
+++ b/korean/ami/pkg-plist
@@ -1,7 +1,36 @@
 bin/ami
+@exec ln -fs ami %B/wmami
+@exec ln -fs ami %B/ami_applet
 bin/hanja-hwp2ami
 share/ami/gtkrc
 share/ami/hanja.dic
+share/ami/pix/nam/ami-e.xpm
+share/ami/pix/nam/ami-h.xpm
+share/ami/pix/nam/AUTHORS
+share/ami/pix/nam/ami-d.xpm
+@dirrm share/ami/pix/nam
+share/ami/pix/arctic/ami-d.xpm
+share/ami/pix/arctic/ami-e.xpm
+share/ami/pix/arctic/ami-h.xpm
+share/ami/pix/arctic/AUTHORS
+@dirrm share/ami/pix/arctic
+share/ami/pix/OSX/ami-d.xpm
+share/ami/pix/OSX/ami-e.xpm
+share/ami/pix/OSX/ami-h.xpm
+share/ami/pix/OSX/AUTHORS
+@dirrm share/ami/pix/OSX
+share/ami/pix/Mac/ami-d.xpm
+share/ami/pix/Mac/ami-e.xpm
+share/ami/pix/Mac/ami-h.xpm
+share/ami/pix/Mac/AUTHORS
+@dirrm share/ami/pix/Mac
+share/ami/pix/Aqua/ami-d.xpm
+share/ami/pix/Aqua/ami-e.xpm
+share/ami/pix/Aqua/ami-h.xpm
+share/ami/pix/Aqua/AUTHORS
+@dirrm share/ami/pix/Aqua
+@dirrm share/ami/pix
+@dirrm share/ami
 share/doc/ami/XLC_LOCALE
 @comment copy new locale definition(no harm, so need not be uninstalled)
 @exec if [ -f %D/lib/X11/locale/ko/XLC_LOCALE ]; then mv -f %D/lib/X11/locale/ko/XLC_LOCALE %D/lib/X11/locale/ko/XLC_LOCALE.orig; fi
@@ -12,5 +41,4 @@ share/doc/ami/README
 share/doc/ami/NEWS
 share/doc/ami/COPYING
 share/doc/ami/ChangeLog
-@dirrm share/ami
 @dirrm share/doc/ami