2 files changed, 55 insertions, 60 deletions

diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index 58713e318fa6..44ffa288fda9 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -17,24 +17,22 @@ MAINTAINER=	cjh@kr.freebsd.org
 
 LIB_DEPENDS=    gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-USE_X_PREFIX=	YES
-USE_GMAKE=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_GTK=	yes
+WANT_GNOME=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-hangul-keyboard=2
-MAKE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 
-# gnome panel applet support
-.if defined(WITH_GNOME_APPLET)
-PKGNAMESUFFIX=	-gnome
-RUN_DEPENDS+=	panel:${PORTSDIR}/x11/gnomecore
-CONFIGURE_ARGS+= --enable-gnome-applet
+.include <bsd.port.pre.mk>
+
+# gnome support
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+CONFIGURE_ARGS+=--enable-gnome-applet
+DATADIR=	share/gnome
 .else
-pre-fetch:
-	@${ECHO_MSG} "Type \"make WITH_GNOME_APPLET=YES\" if you want GNOME panel applet support."
+DATADIR=	share
 .endif
 
 post-build:
@@ -43,7 +41,6 @@ post-build:
 
 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 \
@@ -51,19 +48,15 @@ post-install:
 	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 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
 
-	# 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>
+.include <bsd.port.post.mk>
diff --git a/korean/ami/pkg-plist b/korean/ami/pkg-plist
index 3380da644829..1079c421b0dc 100644
--- a/korean/ami/pkg-plist
+++ b/korean/ami/pkg-plist
@@ -1,43 +1,45 @@
 bin/ami
-@exec ln -fs ami %B/wmami
-@unexec rm -f %B/wmami
+%%GNOME:%%bin/ami_applet
 bin/hanja-hwp2ami
-share/ami/gtkrc
-share/ami/hanja.dic
-share/ami/pix/nam/ami-e.xpm
-share/ami/pix/nam/ami-h.xpm
-share/ami/pix/nam/AUTHORS
-share/ami/pix/nam/ami-d.xpm
-@dirrm share/ami/pix/nam
-share/ami/pix/arctic/ami-d.xpm
-share/ami/pix/arctic/ami-e.xpm
-share/ami/pix/arctic/ami-h.xpm
-share/ami/pix/arctic/AUTHORS
-@dirrm share/ami/pix/arctic
-share/ami/pix/OSX/ami-d.xpm
-share/ami/pix/OSX/ami-e.xpm
-share/ami/pix/OSX/ami-h.xpm
-share/ami/pix/OSX/AUTHORS
-@dirrm share/ami/pix/OSX
-share/ami/pix/Mac/ami-d.xpm
-share/ami/pix/Mac/ami-e.xpm
-share/ami/pix/Mac/ami-h.xpm
-share/ami/pix/Mac/AUTHORS
-@dirrm share/ami/pix/Mac
-share/ami/pix/Aqua/ami-d.xpm
-share/ami/pix/Aqua/ami-e.xpm
-share/ami/pix/Aqua/ami-h.xpm
-share/ami/pix/Aqua/AUTHORS
-@dirrm share/ami/pix/Aqua
-@dirrm share/ami/pix
-@dirrm share/ami
+bin/wmami
+%%GNOME:%%etc/CORBA/servers/ami.gnorba
+share/doc/ami/AUTHORS
+share/doc/ami/ChangeLog
+share/doc/ami/NEWS
+share/doc/ami/README
 share/doc/ami/XLC_LOCALE
+%%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/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/nam/AUTHORS
+%%DATADIR%%/ami/pix/nam/ami-d.xpm
+%%DATADIR%%/ami/pix/nam/ami-e.xpm
+%%DATADIR%%/ami/pix/nam/ami-h.xpm
+%%GNOME:%%share/gnome/applets/Utility/ami.desktop
 @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/
+@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
 @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/ChangeLog
 @dirrm share/doc/ami
+@dirrm %%DATADIR%%/ami/pix/nam
+@dirrm %%DATADIR%%/ami/pix/arctic
+@dirrm %%DATADIR%%/ami/pix/OSX
+@dirrm %%DATADIR%%/ami/pix/Mac
+@dirrm %%DATADIR%%/ami/pix/Aqua
+@dirrm %%DATADIR%%/ami/pix
+@dirrm %%DATADIR%%/ami