diff options
author | Hye-Shik Chang <perky@FreeBSD.org> | 2003-02-18 09:32:54 +0000 |
---|---|---|
committer | Hye-Shik Chang <perky@FreeBSD.org> | 2003-02-18 09:32:54 +0000 |
commit | 38a562c0ac5be89a12390002678c2854c2b29e74 (patch) | |
tree | 12f338a07cc78270aafa6dd5814b7399d47dd37d /korean/ami | |
parent | Follow hier(7) more closely (second try). (diff) |
Upgrade to 1.2.1.
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=75789
Diffstat (limited to 'korean/ami')
-rw-r--r-- | korean/ami/Makefile | 16 | ||||
-rw-r--r-- | korean/ami/distinfo | 2 | ||||
-rw-r--r-- | korean/ami/files/patch-ca | 20 | ||||
-rw-r--r-- | korean/ami/files/patch-src%ami.c | 19 | ||||
-rw-r--r-- | korean/ami/pkg-plist | 28 |
5 files changed, 60 insertions, 25 deletions
diff --git a/korean/ami/Makefile b/korean/ami/Makefile index d0be8b18e374..8e4812b1885b 100644 --- a/korean/ami/Makefile +++ b/korean/ami/Makefile @@ -6,12 +6,12 @@ # PORTNAME= ami -PORTVERSION= 1.0.11 -PORTREVISION= 1 +PORTVERSION= 1.2.1 CATEGORIES= korean x11 -MASTER_SITES= http://www.kr.freebsd.org/~hwang/ami/ \ - http://master.debian.or.kr/~cwryu/archive/misc/ -DISTFILES= ${DISTNAME}.tar.gz hanja.dic.gz ami.dic +MASTER_SITES= http://download.kldp.net/ami/ \ + http://www.kr.freebsd.org/~hwang/ami/:hjdic \ + http://master.debian.or.kr/~cwryu/archive/misc/:amidic +DISTFILES= ${DISTNAME}.tar.gz hanja.dic.gz:hjdic ami.dic:amidic EXTRACT_ONLY= ${DISTNAME}.tar.gz MAINTAINER= cjh@FreeBSD.org @@ -23,7 +23,10 @@ USE_GTK= yes USE_GMAKE= yes WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-hangul-keyboard=2 --datadir=${PREFIX}/${DATADIR} +CONFIGURE_ARGS= --with-hangul-keyboard=2 --datadir=${PREFIX}/${DATADIR} \ + --with-libiconv-prefix=${LOCALBASE} \ + --with-gdk-pixbuf-prefix=${LOCALBASE} \ + --without-included-gettext DATADIR= share .include <bsd.port.pre.mk> @@ -50,7 +53,6 @@ post-build: ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/hanjadic/hanja-hwp2ami ${PREFIX}/bin ${MKDIR} ${PREFIX}/share/doc/ami .for NAME in AUTHORS README README.en NEWS ChangeLog ${INSTALL_DATA} ${WRKSRC}/${NAME} \ diff --git a/korean/ami/distinfo b/korean/ami/distinfo index 15c6452f4d17..9178a0aeb15e 100644 --- a/korean/ami/distinfo +++ b/korean/ami/distinfo @@ -1,3 +1,3 @@ -MD5 (ami-1.0.11.tar.gz) = bc2c27d41186f7c180bc2b720fbd7256 +MD5 (ami-1.2.1.tar.gz) = c0bbc803cb83bf4f46b5f8c9a799a56f MD5 (hanja.dic.gz) = 3f114405753ad0596c4127df36e35710 MD5 (ami.dic) = 27ca7f0208f8fbf685f9496d0b435303 diff --git a/korean/ami/files/patch-ca b/korean/ami/files/patch-ca index bd385d8d598d..fa508402a0a0 100644 --- a/korean/ami/files/patch-ca +++ b/korean/ami/files/patch-ca @@ -1,11 +1,11 @@ ---- hanjadic/Makefile.orig Fri Nov 26 23:20:56 1999 -+++ hanjadic/Makefile Sat Jul 1 19:44:26 2000 -@@ -1,5 +1,5 @@ +--- hanjadic/Makefile.in.orig Mon Feb 17 20:16:11 2003 ++++ hanjadic/Makefile.in Mon Feb 17 20:17:13 2003 +@@ -114,7 +114,7 @@ + cflags_set = @cflags_set@ + cxxflags_set = @cxxflags_set@ + +-CFLAGS = -g -O2 `glib-config --cflags` `glib-config --libs` ++CFLAGS = -g -O2 `${GLIB_CONFIG} --cflags` `${GLIB_CONFIG} --libs` + + bin_PROGRAMS = hanja_hwp2ami --CC = gcc --CFLAGS = -g -O2 `glib-config --cflags` -+CC ?= gcc -+CFLAGS += `$(GLIB_CONFIG) --cflags` - hanja-hwp2ami: hanja-hwp2ami.o -- $(CC) -o hanja-hwp2ami hanja-hwp2ami.o `glib-config --libs` -+ $(CC) -o hanja-hwp2ami hanja-hwp2ami.o `$(GLIB_CONFIG) --libs` diff --git a/korean/ami/files/patch-src%ami.c b/korean/ami/files/patch-src%ami.c new file mode 100644 index 000000000000..60d6a703f37c --- /dev/null +++ b/korean/ami/files/patch-src%ami.c @@ -0,0 +1,19 @@ +--- src/ami.c.orig Mon Feb 17 20:49:11 2003 ++++ src/ami.c Mon Feb 17 20:50:09 2003 +@@ -403,13 +403,14 @@ + } + + codeset=nl_langinfo(CODESET); +- if ( ! strcasecmp(codeset,"EUC-KR") ) ++ if ( ! strcasecmp(codeset,"EUC") || ++ ! strcasecmp(codeset,"eucKR") ) + ami_codeset=AMI_EUC; + else if ( ! strcasecmp(codeset,"UTF-8") ) + ami_codeset=AMI_UTF8; + else { + g_print(_("The locale codeset is %s. It must be either " +- "EUC-KR or UTF-8.\n Check your locale.\n"), ++ "eucKR or UTF-8.\n Check your locale.\n"), + codeset); + exit(1); + } diff --git a/korean/ami/pkg-plist b/korean/ami/pkg-plist index f359e97e9105..0a8c9b354df9 100644 --- a/korean/ami/pkg-plist +++ b/korean/ami/pkg-plist @@ -1,19 +1,31 @@ bin/ami %%GNOME:%%bin/ami_applet -bin/hanja-hwp2ami +bin/hanja_hwp2ami bin/wmami %%GNOME:%%etc/CORBA/servers/ami.gnorba +lib/charset.alias 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 +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 %%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 @@ -26,29 +38,31 @@ share/doc/ami/README.en %%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/ami-e.xpm -%%DATADIR%%/ami/pix/bluemarble/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/ami-e.xpm -%%DATADIR%%/ami/pix/love/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/ami-e.xpm -%%DATADIR%%/ami/pix/woody/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 %%GNOME:%%share/gnome/applets/Utility/ami.desktop @dirrm share/doc/ami +@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 |