aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--korean/imhangul/Makefile33
-rw-r--r--korean/imhangul/pkg-plist10
2 files changed, 15 insertions, 28 deletions
diff --git a/korean/imhangul/Makefile b/korean/imhangul/Makefile
index 013c28cac071..a42bc79a9086 100644
--- a/korean/imhangul/Makefile
+++ b/korean/imhangul/Makefile
@@ -3,7 +3,7 @@
PORTNAME= imhangul
PORTVERSION= ${GTKVER}.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= korean
MASTER_SITES= GOOGLE_CODE
@@ -15,30 +15,19 @@ LICENSE= GPLv2
LIB_DEPENDS= libhangul.so:${PORTSDIR}/korean/libhangul
GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
+PLIST_SUB= GTKVER=${GTKVER}.0
+USE_GNOME= gtk${GTKVER}0
USES= gmake libtool pkgconfig tar:bzip2
OPTIONS_DEFINE= GTK3 NLS
+OPTIONS_SUB= yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGTK3}
-USE_GNOME= gtk30
-GTKVER= 3
-PLIST_SUB= GTK2="@comment " GTK3=""
-.else
-USE_GNOME= gtk20
-GTKVER= 2
-PLIST_SUB= GTK2="" GTK3="@comment "
-.endif
-PLIST_SUB+= GTKVER="${GTKVER}.0"
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-PLIST_SUB+= NLS=""
-.else
-PLIST_SUB+= NLS="@comment "
-.endif
+GTK3_VARS= GTKVER=3
+GTK3_VARS_OFF= GTKVER=2
+
+NLS_CPPFLAGS= -I${LOCALBASE}/include
+NLS_LDFLAGS= -L${LOCALBASE}/lib
+NLS_USES= gettext
.include <bsd.port.mk>
diff --git a/korean/imhangul/pkg-plist b/korean/imhangul/pkg-plist
index 5738a85d015b..360911f5a8c6 100644
--- a/korean/imhangul/pkg-plist
+++ b/korean/imhangul/pkg-plist
@@ -1,7 +1,5 @@
lib/gtk-%%GTKVER%%/immodules/im-hangul.so
-%%GTK2%%%%NLS%%share/locale/ko/LC_MESSAGES/im-hangul.mo
-%%GTK2%%@exec %D/bin/gtk-query-immodules-2.0 --update-cache
-%%GTK2%%@unexec %D/bin/gtk-query-immodules-2.0 --update-cache
-%%GTK3%%%%NLS%%share/locale/ko/LC_MESSAGES/im-hangul-3.0.mo
-%%GTK3%%@exec %D/bin/gtk-query-immodules-3.0 --update-cache
-%%GTK3%%@unexec %D/bin/gtk-query-immodules-3.0 --update-cache
+%%NO_GTK3%%%%NLS%%share/locale/ko/LC_MESSAGES/im-hangul.mo
+%%GTK3%%%%NLS%%share/locale/ko/LC_MESSAGES/im-hangul-%%GTKVER%%.mo
+@exec %D/bin/gtk-query-immodules-%%GTKVER%% --update-cache
+@unexec %D/bin/gtk-query-immodules-%%GTKVER%% --update-cache