5 files changed, 81 insertions, 166 deletions

diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index 2c7641dd5678..05f6fd62f43b 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	ami
-PORTVERSION=	1.2.2
-PORTREVISION=	10
+PORTVERSION=	1.2.3
 CATEGORIES=	korean x11
-MASTER_SITES=	http://download.kldp.net/ami/ \
+MASTER_SITES=	http://kldp.net/frs/download.php/942/ \
 		http://www.kr.freebsd.org/~hwang/ami/:hjdic \
 		ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/:amidic
 DISTFILES=	${DISTNAME}.tar.gz hanja.dic.gz:hjdic ami.dic:amidic
@@ -18,32 +17,38 @@ EXTRACT_ONLY=	${DISTNAME}.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Well-known Korean X11 Input Method
 
-USE_GETTEXT=	yes
+LICENSE=	GPLv2
+
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12 gdkpixbuf
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-hangul-keyboard=2 --datadir=${PREFIX}/${DATADIR} \
-		--with-libiconv-prefix=${LOCALBASE} \
-		--with-gdk-pixbuf-prefix=${LOCALBASE} \
-		--with-libintl-prefix=${LOCALBASE}
-DATADIR=	share
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	"-I${LOCALBASE}/include"
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+PORTDOCS=	AUTHORS ChangeLog NEWS README README.en
 
 .include <bsd.port.pre.mk>
 
 post-build:
-	@cd ${WRKSRC}/hanjadic; \
-	${MAKE_ENV} ${MAKE} ${MAKE_ARGS}
+	( cd ${WRKSRC}/hanjadic && ${SETENV} ${MAKE_ENV} ${MAKE} )
+	${GUNZIP_CMD} -cd ${DISTDIR}/hanja.dic.gz > ${WRKDIR}/hanja.dic
+	${CAT} ${DISTDIR}/ami.dic >> ${WRKDIR}/hanja.dic
 
 post-install:
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/ami
-.for NAME in AUTHORS README README.en NEWS ChangeLog
-	${INSTALL_DATA} ${WRKSRC}/${NAME} \
-		${PREFIX}/share/doc/ami
-.endfor
-	${GUNZIP_CMD} -cd ${DISTDIR}/hanja.dic.gz > \
-			${PREFIX}/${DATADIR}/ami/hanja.dic
-	${CAT} ${DISTDIR}/ami.dic >> ${PREFIX}/${DATADIR}/ami/hanja.dic
+	( cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} )
+.endif
+	${INSTALL_DATA} ${WRKDIR}/hanja.dic ${DATADIR}
 
 .include <bsd.port.post.mk>
diff --git a/korean/ami/distinfo b/korean/ami/distinfo
index 23da078f27e1..c28c76eec8d0 100644
--- a/korean/ami/distinfo
+++ b/korean/ami/distinfo
@@ -1,5 +1,5 @@
-SHA256 (ami-1.2.2.tar.gz) = 3335d16e275d38b80f9c4913b48697ef1b72599acb4a380f50fb1b43efd2b74f
-SIZE (ami-1.2.2.tar.gz) = 553529
+SHA256 (ami-1.2.3.tar.gz) = a23a52f50201c4500da823842e2c24e7b77689a70a47022ac4c5e3de745ea313
+SIZE (ami-1.2.3.tar.gz) = 579506
 SHA256 (hanja.dic.gz) = d228aebe515bc7bfafbd9036a14e2baa8dcf9c5d2d2dac8ff050becbbb5eb01d
 SIZE (hanja.dic.gz) = 10809
 SHA256 (ami.dic) = 8c3b71776cdcf433973083d80c2187ff6e815d72b7755496daaed2c434e49e30
diff --git a/korean/ami/files/patch-64bit b/korean/ami/files/patch-64bit
deleted file mode 100644
index d2c9e43674ae..000000000000
--- a/korean/ami/files/patch-64bit
+++ /dev/null
@@ -1,84 +0,0 @@
---- src/hanja.c~	2003-02-06 09:52:42.000000000 +1100
-+++ src/hanja.c	2009-04-21 13:43:59.000000000 +1000
-@@ -345,7 +345,7 @@
- 
-     if ( ami_codeset==AMI_UTF8) {
-         /* U+AC00 -> EAB080, U+D7A3 -> ED9EA3 */
--	int ilen,olen;
-+	size_t ilen,olen;
- 	char *iptr=word;
- 	char *optr;
-        
-@@ -399,8 +399,8 @@
-     if ( ami_codeset==AMI_EUC) 
- 	match=g_strdup(s);
-     else {
--	int ilen=strlen(s)+1;
--	int olen=ilen*2;
-+	size_t ilen=strlen(s)+1;
-+	size_t olen=ilen*2;
- 	char *iptr=s;
- 	char *optr;
- 	match=g_new(gchar,olen);
---- src/johabcode2.c~	2003-01-27 10:26:03.000000000 +1100
-+++ src/johabcode2.c	2009-04-21 13:39:56.000000000 +1000
-@@ -40,7 +40,7 @@
- int
- johab_to_wansung(char *s, int johab)
- {
--    int in_len, out_len;
-+    size_t in_len, out_len;
-     char in[2];
-     char *in_p, *out_p;
-     if (johab < 128) {
-@@ -68,8 +68,8 @@
- {
-     char *out_p = s;
-     char *in_p = johab;
--    int in_len = len;
--    int out_len = len;
-+    size_t in_len = len;
-+    size_t out_len = len;
-     if (johab_to_wan_cd == (iconv_t) -1) {
- 	johab_to_wan_cd = iconv_open(CD_EUC_KR, CD_JOHAB);
- 	if (johab_to_wan_cd == (iconv_t) -1) {
-@@ -84,7 +84,7 @@
- int
- johab_from_wansung(char *s, int wansung)
- {
--    int in_len, out_len;
-+    size_t in_len, out_len;
-     char in[2];
-     char *in_p, *out_p;
-     if (wansung < 128) {
-@@ -112,8 +112,8 @@
- {
-     char *out_p = s;
-     char *in_p = wansung;
--    int in_len = len;
--    int out_len = len;
-+    size_t in_len = len;
-+    size_t out_len = len;
-     if (wan_to_johab_cd == (iconv_t) -1) {
- 	wan_to_johab_cd = iconv_open(CD_JOHAB, CD_EUC_KR);
- 	if (wan_to_johab_cd == (iconv_t) -1) {
-@@ -155,7 +155,7 @@
- int
- johab_to_utf8(char *s, int johab)
- {
--    int in_len, out_len;
-+    size_t in_len, out_len;
-     char in[2];
-     char *in_p, *out_p;
-     if (johab < 128) {
---- src/si.c~	2003-01-27 10:26:03.000000000 +1100
-+++ src/si.c	2009-04-21 13:39:54.000000000 +1000
-@@ -174,7 +174,7 @@
-     else {
-         char tbuf[3];
- 	char *iptr,*optr;
--	int ilen,olen;
-+	size_t ilen,olen;
- 	for (i = 0; i < row*col; i++) {
- 	    tbuf[0] = first;
- 	    tbuf[1] = k++;
diff --git a/korean/ami/pkg-descr b/korean/ami/pkg-descr
index b8915f229189..2163139505a0 100644
--- a/korean/ami/pkg-descr
+++ b/korean/ami/pkg-descr
@@ -7,4 +7,4 @@ ami: An X11R6 Input Method Server for the Korean Language
   - WindowMaker, enlightenment, KDE 1.x, 2.x dock support
   - GNOME applet support
 
-WWW: http://ami.kldp.net
+WWW: http://kldp.net/projects/ami/
diff --git a/korean/ami/pkg-plist b/korean/ami/pkg-plist
index 8e20309b0d9f..25b9c4f02654 100644
--- a/korean/ami/pkg-plist
+++ b/korean/ami/pkg-plist
@@ -1,11 +1,6 @@
 bin/ami
 bin/hanja_hwp2ami
 bin/wmami
-share/doc/ami/AUTHORS
-share/doc/ami/ChangeLog
-share/doc/ami/NEWS
-share/doc/ami/README
-share/doc/ami/README.en
 share/hangul_keyboard/2bul.kbd
 share/hangul_keyboard/3bul_390.kbd
 share/hangul_keyboard/3bul_final.kbd
@@ -13,60 +8,59 @@ share/hangul_keyboard/dvorak_2bul.kbd
 share/hangul_keyboard/dvorak_3bul_390.kbd
 share/hangul_keyboard/dvorak_3bul_final.kbd
 share/hangul_keyboard/dvorak.map
-share/locale/ko/LC_MESSAGES/ami.mo
-%%DATADIR%%/ami/gtkrc
-%%DATADIR%%/ami/hanja.dic
-%%DATADIR%%/ami/pix/Aqua/AUTHORS
-%%DATADIR%%/ami/pix/Aqua/ami-d.xpm
-%%DATADIR%%/ami/pix/Aqua/ami-e.xpm
-%%DATADIR%%/ami/pix/Aqua/ami-h.xpm
-%%DATADIR%%/ami/pix/AquaG/AUTHORS
-%%DATADIR%%/ami/pix/AquaG/ami-d.xpm
-%%DATADIR%%/ami/pix/AquaG/ami-e.xpm
-%%DATADIR%%/ami/pix/AquaG/ami-h.xpm
-%%DATADIR%%/ami/pix/Mac/AUTHORS
-%%DATADIR%%/ami/pix/Mac/ami-d.xpm
-%%DATADIR%%/ami/pix/Mac/ami-e.xpm
-%%DATADIR%%/ami/pix/Mac/ami-h.xpm
-%%DATADIR%%/ami/pix/OSX/AUTHORS
-%%DATADIR%%/ami/pix/OSX/ami-d.xpm
-%%DATADIR%%/ami/pix/OSX/ami-e.xpm
-%%DATADIR%%/ami/pix/OSX/ami-h.xpm
-%%DATADIR%%/ami/pix/arctic/AUTHORS
-%%DATADIR%%/ami/pix/arctic/ami-d.xpm
-%%DATADIR%%/ami/pix/arctic/ami-e.xpm
-%%DATADIR%%/ami/pix/arctic/ami-h.xpm
-%%DATADIR%%/ami/pix/bluemarble/AUTHORS
-%%DATADIR%%/ami/pix/bluemarble/ami-d.xpm
-%%DATADIR%%/ami/pix/bluemarble/ami-e.xpm
-%%DATADIR%%/ami/pix/bluemarble/ami-h.xpm
-%%DATADIR%%/ami/pix/deepblue/AUTHORS
-%%DATADIR%%/ami/pix/deepblue/ami-d.xpm
-%%DATADIR%%/ami/pix/deepblue/ami-e.xpm
-%%DATADIR%%/ami/pix/deepblue/ami-h.xpm
-%%DATADIR%%/ami/pix/love/AUTHORS
-%%DATADIR%%/ami/pix/love/ami-d.xpm
-%%DATADIR%%/ami/pix/love/ami-e.xpm
-%%DATADIR%%/ami/pix/love/ami-h.xpm
-%%DATADIR%%/ami/pix/steelblue/AUTHORS
-%%DATADIR%%/ami/pix/steelblue/ami-d.xpm
-%%DATADIR%%/ami/pix/steelblue/ami-e.xpm
-%%DATADIR%%/ami/pix/steelblue/ami-h.xpm
-%%DATADIR%%/ami/pix/woody/AUTHORS
-%%DATADIR%%/ami/pix/woody/ami-d.xpm
-%%DATADIR%%/ami/pix/woody/ami-e.xpm
-%%DATADIR%%/ami/pix/woody/ami-h.xpm
-@dirrm share/doc/ami
+%%NLS%%share/locale/ko/LC_MESSAGES/ami.mo
+%%DATADIR%%/gtkrc
+%%DATADIR%%/hanja.dic
+%%DATADIR%%/pix/Aqua/AUTHORS
+%%DATADIR%%/pix/Aqua/ami-d.xpm
+%%DATADIR%%/pix/Aqua/ami-e.xpm
+%%DATADIR%%/pix/Aqua/ami-h.xpm
+%%DATADIR%%/pix/AquaG/AUTHORS
+%%DATADIR%%/pix/AquaG/ami-d.xpm
+%%DATADIR%%/pix/AquaG/ami-e.xpm
+%%DATADIR%%/pix/AquaG/ami-h.xpm
+%%DATADIR%%/pix/Mac/AUTHORS
+%%DATADIR%%/pix/Mac/ami-d.xpm
+%%DATADIR%%/pix/Mac/ami-e.xpm
+%%DATADIR%%/pix/Mac/ami-h.xpm
+%%DATADIR%%/pix/OSX/AUTHORS
+%%DATADIR%%/pix/OSX/ami-d.xpm
+%%DATADIR%%/pix/OSX/ami-e.xpm
+%%DATADIR%%/pix/OSX/ami-h.xpm
+%%DATADIR%%/pix/arctic/AUTHORS
+%%DATADIR%%/pix/arctic/ami-d.xpm
+%%DATADIR%%/pix/arctic/ami-e.xpm
+%%DATADIR%%/pix/arctic/ami-h.xpm
+%%DATADIR%%/pix/bluemarble/AUTHORS
+%%DATADIR%%/pix/bluemarble/ami-d.xpm
+%%DATADIR%%/pix/bluemarble/ami-e.xpm
+%%DATADIR%%/pix/bluemarble/ami-h.xpm
+%%DATADIR%%/pix/deepblue/AUTHORS
+%%DATADIR%%/pix/deepblue/ami-d.xpm
+%%DATADIR%%/pix/deepblue/ami-e.xpm
+%%DATADIR%%/pix/deepblue/ami-h.xpm
+%%DATADIR%%/pix/love/AUTHORS
+%%DATADIR%%/pix/love/ami-d.xpm
+%%DATADIR%%/pix/love/ami-e.xpm
+%%DATADIR%%/pix/love/ami-h.xpm
+%%DATADIR%%/pix/steelblue/AUTHORS
+%%DATADIR%%/pix/steelblue/ami-d.xpm
+%%DATADIR%%/pix/steelblue/ami-e.xpm
+%%DATADIR%%/pix/steelblue/ami-h.xpm
+%%DATADIR%%/pix/woody/AUTHORS
+%%DATADIR%%/pix/woody/ami-d.xpm
+%%DATADIR%%/pix/woody/ami-e.xpm
+%%DATADIR%%/pix/woody/ami-h.xpm
 @dirrm share/hangul_keyboard
-@dirrm %%DATADIR%%/ami/pix/Aqua
-@dirrm %%DATADIR%%/ami/pix/AquaG
-@dirrm %%DATADIR%%/ami/pix/Mac
-@dirrm %%DATADIR%%/ami/pix/OSX
-@dirrm %%DATADIR%%/ami/pix/arctic
-@dirrm %%DATADIR%%/ami/pix/bluemarble
-@dirrm %%DATADIR%%/ami/pix/deepblue
-@dirrm %%DATADIR%%/ami/pix/love
-@dirrm %%DATADIR%%/ami/pix/steelblue
-@dirrm %%DATADIR%%/ami/pix/woody
-@dirrm %%DATADIR%%/ami/pix
-@dirrm %%DATADIR%%/ami
+@dirrm %%DATADIR%%/pix/Aqua
+@dirrm %%DATADIR%%/pix/AquaG
+@dirrm %%DATADIR%%/pix/Mac
+@dirrm %%DATADIR%%/pix/OSX
+@dirrm %%DATADIR%%/pix/arctic
+@dirrm %%DATADIR%%/pix/bluemarble
+@dirrm %%DATADIR%%/pix/deepblue
+@dirrm %%DATADIR%%/pix/love
+@dirrm %%DATADIR%%/pix/steelblue
+@dirrm %%DATADIR%%/pix/woody
+@dirrm %%DATADIR%%/pix
+@dirrm %%DATADIR%%