Update to 1.0.11

4 files changed, 19 insertions, 15 deletions

diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index 2ec5ff33671f..93450a0cd9d9 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	ami
-PORTVERSION=	1.0.10
-PORTREVISION=	1
+PORTVERSION=	1.0.11
+#PORTREVISION=	1
 CATEGORIES=	korean x11 gnome
 MASTER_SITES=	http://www.kr.freebsd.org/~hwang/ami/ \
 		http://master.debian-kr.org/~cwryu/archive/misc/
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_GNOMECTRL=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-hangul-keyboard=2
+CONFIGURE_ARGS=	--with-hangul-keyboard=2 --datadir=${PREFIX}/${DATADIR}
 
 .include <bsd.port.pre.mk>
 
diff --git a/korean/ami/distinfo b/korean/ami/distinfo
index 026bc240794b..15c6452f4d17 100644
--- a/korean/ami/distinfo
+++ b/korean/ami/distinfo
@@ -1,3 +1,3 @@
-MD5 (ami-1.0.10.tar.gz) = 9782ca72240a04735bd316759bafe965
+MD5 (ami-1.0.11.tar.gz) = bc2c27d41186f7c180bc2b720fbd7256
 MD5 (hanja.dic.gz) = 3f114405753ad0596c4127df36e35710
 MD5 (ami.dic) = 27ca7f0208f8fbf685f9496d0b435303
diff --git a/korean/ami/files/patch-aa b/korean/ami/files/patch-aa
deleted file mode 100644
index 3ef4dd578f91..000000000000
--- a/korean/ami/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in~	Mon Jun  5 15:17:45 2000
-+++ Makefile.in	Thu Jun 22 22:23:48 2000
-@@ -482,7 +482,7 @@
- 
- install-data-local:
- 	-mkdir -p $(datadir)/ami/pix
--	cp -a $(top_srcdir)/pix/* $(datadir)/ami/pix
-+	cp -R $(top_srcdir)/pix/* $(datadir)/ami/pix
- uninstall-local:
- 	chmod -R a+w $(datadir)/ami
- 	rm -rf $(datadir)/ami/pix
diff --git a/korean/ami/pkg-plist b/korean/ami/pkg-plist
index efbf73634e25..f359e97e9105 100644
--- a/korean/ami/pkg-plist
+++ b/korean/ami/pkg-plist
@@ -26,21 +26,36 @@ 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/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/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
 %%GNOME:%%share/gnome/applets/Utility/ami.desktop
 @dirrm share/doc/ami
 @dirrm %%DATADIR%%/ami/pix/Aqua
 @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