Update to version 1.0.4.

PR:		16365
Submitted by:	maintainer

7 files changed, 48 insertions, 8 deletions

diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index 5604f75f349f..13cd980d6f96 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -6,10 +6,13 @@
 # $FreeBSD$
 #
 
-DISTNAME=	ami-0.5.2
-PKGNAME=	ko-ami-0.5.2
+DISTNAME=	ami-${AMI_VER}
+PKGNAME=	ko-ami-${AMI_VER}
 CATEGORIES=	korean x11
-MASTER_SITES=	http://www.kr.freebsd.org/~hwang/ami/
+MASTER_SITES=	http://www.kr.freebsd.org/~hwang/ami/ \
+		http://adam.kaist.ac.kr/~cwryu/archive/misc/
+DISTFILES=	${DISTNAME}.tar.gz hanja.dic.gz ami.dic
+EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	cjh@kr.freebsd.org
 
@@ -19,6 +22,22 @@ USE_X_PREFIX=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV=	GLIB_CONFIG=${LOCALBASE}/bin/glib12-config \
 		GTK_CONFIG=${X11BASE}/bin/gtk12-config
+CONFIGURE_ARGS+= --with-hangul-keyboard=2
+
+AMI_VER=	1.0.4
+
+# Korean input in dvorak keyboard
+.if defined(WITH_DVORAK)
+CONFIGURE_ARGS+= --with-english-keyboard=dvorak
+.endif
+
+# gnome support
+.if defined(WITH_GNOME_APPLET)
+PKGNAME=	ko-ami-gnome-${AMI_VER}
+RUN_DEPENDS+=	panel:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS+=	gnome.3:${PORTSDIR}/x11/gnomelibs
+CONFIGURE_ARGS+= --enable-gnome-applet
+.endif
 
 post-build:
 	@cd ${WRKSRC}/hanjadic; \
@@ -39,9 +58,14 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/XLC_LOCALE \
 		${PREFIX}/share/doc/ami
 
-.for NAME in AUTHORS README NEWS COPYING ChangeLog gtkrc
+.for NAME in AUTHORS README NEWS COPYING ChangeLog
 	${INSTALL_DATA} ${WRKSRC}/${NAME} \
 		${PREFIX}/share/doc/ami
 .endfor
 
+	# dic
+	${GUNZIP_CMD} -cd ${_DISTDIR}/hanja.dic.gz > \
+			${PREFIX}/share/ami/hanja.dic
+	${CAT} ${_DISTDIR}/ami.dic >> ${PREFIX}/share/ami/hanja.dic
+
 .include <bsd.port.mk>
diff --git a/korean/ami/distinfo b/korean/ami/distinfo
index 7744b6c7a891..5fd591fa618e 100644
--- a/korean/ami/distinfo
+++ b/korean/ami/distinfo
@@ -1 +1,3 @@
-MD5 (ami-0.5.2.tar.gz) = a14e5afd7638861428a519cf4ccf1c0a
+MD5 (ami-1.0.4.tar.gz) = e670aed5410af953aa166b45c5e703a5
+MD5 (hanja.dic.gz) = 3f114405753ad0596c4127df36e35710
+MD5 (ami.dic) = 27ca7f0208f8fbf685f9496d0b435303
diff --git a/korean/ami/files/patch-aa b/korean/ami/files/patch-aa
new file mode 100644
index 000000000000..bba07e3de134
--- /dev/null
+++ b/korean/ami/files/patch-aa
@@ -0,0 +1,11 @@
+--- Ximd/Makefile.in~	Sun Jan  2 11:49:20 2000
++++ Ximd/Makefile.in	Mon Jan 17 23:29:02 2000
+@@ -86,7 +86,7 @@
+ cflags_set = @cflags_set@
+ cxxflags_set = @cxxflags_set@
+ 
+-INCLUDES = $(IMDKIT_DEFINES) $(GTK_CFLAGS)
++INCLUDES = $(IMDKIT_DEFINES) $(GTK_CFLAGS) $(GNOME_INCLUDEDIR)
+ 
+ noinst_LIBRARIES = libXimd.a
+ 
diff --git a/korean/ami/files/patch-ca b/korean/ami/files/patch-ca
index babcdfa670a4..15cc9dfbced9 100644
--- a/korean/ami/files/patch-ca
+++ b/korean/ami/files/patch-ca
@@ -7,4 +7,4 @@
 +CFLAGS = -g -O2 `glib12-config --cflags`
  hanja-hwp2ami: hanja-hwp2ami.o
 -	$(CC) -o hanja-hwp2ami hanja-hwp2ami.o `glib-config --libs`
-+	$(CC) -o hanja-hwp2ami hanja-hwp2ami.o -lxpg4 `glib12-config --libs`
++	$(CC) -o hanja-hwp2ami hanja-hwp2ami.o `glib12-config --libs`
diff --git a/korean/ami/pkg-comment b/korean/ami/pkg-comment
index 8de24d68bf4e..d9cbe27ea7c2 100644
--- a/korean/ami/pkg-comment
+++ b/korean/ami/pkg-comment
@@ -1 +1 @@
-Just another Korean X11 Input Method
+Well-known Korean X11 Input Method
diff --git a/korean/ami/pkg-descr b/korean/ami/pkg-descr
index 50b9e9a75160..35db85cd8acd 100644
--- a/korean/ami/pkg-descr
+++ b/korean/ami/pkg-descr
@@ -7,3 +7,4 @@ ami: An X11R6 Input Method Server for the Korean Language
 
 --
 CHOI Junho <cjh@kr.freebsd.org>
+WWW: http://www.kr.freebsd.org/~hwang/ami
diff --git a/korean/ami/pkg-plist b/korean/ami/pkg-plist
index 43ca080c8828..27a80783b1c3 100644
--- a/korean/ami/pkg-plist
+++ b/korean/ami/pkg-plist
@@ -1,5 +1,7 @@
 bin/ami
 bin/hanja-hwp2ami
+share/ami/gtkrc
+share/ami/hanja.dic
 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
@@ -10,5 +12,5 @@ share/doc/ami/README
 share/doc/ami/NEWS
 share/doc/ami/COPYING
 share/doc/ami/ChangeLog
-share/doc/ami/gtkrc
+@dirrm share/ami
 @dirrm share/doc/ami