Upgrade to 0.4.1 .

PR:		ports/13491
Submitted by:	CHOI Junho <cjh@kr.FreeBSD.org>

5 files changed, 54 insertions, 31 deletions

diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index 9641399..7c7aa88 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -1,26 +1,47 @@
 # New ports collection makefile for:	ami
-# Version required:     ami-0.1.3
+# Version required:     ami-0.4.1
 # Date created:		05 Jun 1999
 # Whom:			CHOI Junho <cjh@kr.freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ami-0.1.3
-PKGNAME=	ko-ami-0.1.3
+DISTNAME=	ami-0.4.1
+PKGNAME=	ko-ami-0.4.1
 CATEGORIES=	korean x11
-MASTER_SITES=	http://www.shinbiro.com/cug/linux/pds0/A/238/ \
-		ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/
+MASTER_SITES=	http://www.kr.freebsd.org/~hwang/ami/
 
 MAINTAINER=	cjh@kr.freebsd.org
 
 LIB_DEPENDS=    gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
-WRKSRC=		${WRKDIR}/ami
+USE_X_PREFIX=	YES
+GNU_CONFIGURE=	YES
+CONFIGURE_ENV=	GLIB_CONFIG=${LOCALBASE}/bin/glib12-config \
+		GTK_CONFIG=${X11BASE}/bin/gtk12-config
 
-ALL_TARGET=	ami
+post-build:
+	@cd ${WRKSRC}/hanjadic; \
+	${MAKE}
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ami ${PREFIX}/bin/ami
+post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/hanjadic/hanja-hwp2ami ${PREFIX}/bin
+
+	# patch XLC_LOCALE for ko_KR.EUC(harmless)
+	if [ -f ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE ]; then \
+		${MV} -f ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE \
+			${PREFIX}/lib/X11/locale/ko/XLC_LOCALE.orig; \
+	fi
+	${INSTALL_DATA} ${FILESDIR}/XLC_LOCALE \
+		${PREFIX}/lib/X11/locale/ko/
+
+	${MKDIR} ${PREFIX}/share/doc/ami
+	${INSTALL_DATA} ${FILESDIR}/XLC_LOCALE \
+		${PREFIX}/share/doc/ami
+
+.for NAME in AUTHORS README NEWS COPYING ChangeLog amirc
+	${INSTALL_DATA} ${WRKSRC}/${NAME} \
+		${PREFIX}/share/doc/ami
+.endfor
 
 .include <bsd.port.mk>
diff --git a/korean/ami/distinfo b/korean/ami/distinfo
index ea48d14..91b605e 100644
--- a/korean/ami/distinfo
+++ b/korean/ami/distinfo
@@ -1 +1 @@
-MD5 (ami-0.1.3.tar.gz) = 2f18303aa24b19c92321ff0852c2aedb
+MD5 (ami-0.4.1.tar.gz) = 4705389b48be5d91e31811e1a7d932eb
diff --git a/korean/ami/files/patch-aa b/korean/ami/files/patch-aa
deleted file mode 100644
index 807ad86..0000000
--- a/korean/ami/files/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile~	Wed May 26 23:23:14 1999
-+++ Makefile	Thu Jun  3 20:02:15 1999
-@@ -2,13 +2,13 @@
- VERSION = 0.1.3
- 
- 
--CC = gcc
--CFLAGS= -I. -g -Wall `gtk-config --cflags`
--LD_FLAGS= `gtk-config --libs`
-+#CC = gcc
-+#CFLAGS= -I. -g -Wall `gtk-config --cflags`
-+#LD_FLAGS= `gtk-config --libs`
- #
- # for FreeBSD
--# CFLAGS= -I. -g -Wall `gtk12-config --cflags`
--# LD_FLAGS = `gtk12-config --libs` -lxpg4
-+CFLAGS= -I. -g -Wall `gtk12-config --cflags`
-+LD_FLAGS = `gtk12-config --libs` -lxpg4
- #
- 
- OBJ = ic.o cli.o edit.o ami.o cp.o handler.o hangulinput.o dispwin.o util.o \
diff --git a/korean/ami/files/patch-ca b/korean/ami/files/patch-ca
new file mode 100644
index 0000000..babcdfa
--- /dev/null
+++ b/korean/ami/files/patch-ca
@@ -0,0 +1,10 @@
+--- hanjadic/Makefile~	Thu Jul  1 03:31:25 1999
++++ hanjadic/Makefile	Tue Jul 13 21:16:53 1999
+@@ -1,5 +1,5 @@
+ 
+ CC = gcc
+-CFLAGS = -g -O2 `glib-config --cflags`
++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`
diff --git a/korean/ami/pkg-plist b/korean/ami/pkg-plist
index 2c71510..4b17465 100644
--- a/korean/ami/pkg-plist
+++ b/korean/ami/pkg-plist
@@ -1 +1,14 @@
 bin/ami
+bin/hanja-hwp2ami
+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
+@exec cp %D/share/doc/ami/XLC_LOCALE %D/lib/X11/locale/ko/
+@unexec if [ -f %D/lib/X11/locale/ko/XLC_LOCALE.orig ]; then mv -f %D/lib/X11/locale/ko/XLC_LOCALE.orig %D/lib/X11/locale/ko/XLC_LOCALE; fi
+share/doc/ami/AUTHORS
+share/doc/ami/README
+share/doc/ami/NEWS
+share/doc/ami/COPYING
+share/doc/ami/ChangeLog
+share/doc/ami/amirc
+@dirrm share/doc/ami