Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 15 Sep 2016 18:12:44 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r422221 - in head: . korean korean/imhangul korean/imhangul-gtk2 korean/imhangul-gtk2/files korean/imhangul-gtk3
Message-ID:  <201609151812.u8FICikg001245@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Thu Sep 15 18:12:44 2016
New Revision: 422221
URL: https://svnweb.freebsd.org/changeset/ports/422221

Log:
  Split korean/imhangul into korean/imhangul-gtk2 and korean/imhangul-gtk3.

Added:
  head/korean/imhangul-gtk2/
     - copied from r422216, head/korean/imhangul/
  head/korean/imhangul-gtk3/
     - copied from r422216, head/korean/imhangul/
Deleted:
  head/korean/imhangul/
  head/korean/imhangul-gtk2/files/
Modified:
  head/MOVED
  head/korean/Makefile
  head/korean/imhangul-gtk2/Makefile
  head/korean/imhangul-gtk2/distinfo
  head/korean/imhangul-gtk2/pkg-descr
  head/korean/imhangul-gtk2/pkg-plist
  head/korean/imhangul-gtk3/Makefile
  head/korean/imhangul-gtk3/distinfo
  head/korean/imhangul-gtk3/pkg-descr
  head/korean/imhangul-gtk3/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Thu Sep 15 18:04:14 2016	(r422220)
+++ head/MOVED	Thu Sep 15 18:12:44 2016	(r422221)
@@ -8631,3 +8631,4 @@ textproc/asciinema|textproc/py3-asciinem
 x11-toolkits/qtada||2016-09-13|Has expired: No development since 2012, usefulness unclear
 security/letsencrypt.sh|security/dehydrated|2016-09-13|Upstream renamed the project
 devel/py-dogpile.core|devel/py-dogpile.cache|2016-09-13|EOL upstream. Merged into devel/py-dogpile.cache since 0.6.0
+korean/imhangul||2016-09-15|Split into korean/imhangul-gtk2 and korean/imhangul-gtk3

Modified: head/korean/Makefile
==============================================================================
--- head/korean/Makefile	Thu Sep 15 18:04:14 2016	(r422220)
+++ head/korean/Makefile	Thu Sep 15 18:12:44 2016	(r422221)
@@ -19,7 +19,8 @@
     SUBDIR += hpscat
     SUBDIR += hunspell
     SUBDIR += ibus-hangul
-    SUBDIR += imhangul
+    SUBDIR += imhangul-gtk2
+    SUBDIR += imhangul-gtk3
     SUBDIR += kaistfonts
     SUBDIR += kde4-l10n
     SUBDIR += ko.TeX

Modified: head/korean/imhangul-gtk2/Makefile
==============================================================================
--- head/korean/imhangul/Makefile	Thu Sep 15 16:40:17 2016	(r422216)
+++ head/korean/imhangul-gtk2/Makefile	Thu Sep 15 18:12:44 2016	(r422221)
@@ -2,37 +2,33 @@
 # $FreeBSD$
 
 PORTNAME=	imhangul
-PORTVERSION=	${GTKVER:R}.1.1
-PORTREVISION=	3
+PORTVERSION=	2.1.1
 CATEGORIES=	korean
+PKGNAMESUFFIX=	-gtk2
 
 MAINTAINER=	jkim@FreeBSD.org
-COMMENT=	GTK+ Hangul input module
+COMMENT=	Hangul input module for GTK+ 2.0
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libhangul.so:korean/libhangul
+LIB_DEPENDS=	libhangul.so:korean/libhangul \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
+
+CONFLICTS_INSTALL=	ko-imhangul-[0-2].*
 
 GH_ACCOUNT=	choehwanjin
+GH_TAGNAME=	d2f555d
 USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-PLIST_SUB=	GTKVER=${GTKVER}
-USE_GNOME=	cairo gdkpixbuf2 gtk${GTKVER:S|.||}
+USE_GNOME=	cairo gdkpixbuf2 gtk20
 USES=		autoreconf gmake libtool pkgconfig
 
 OPTIONS_DEFINE=	NLS
-OPTIONS_DEFAULT=	GTK3
-OPTIONS_SINGLE=	GTK
-OPTIONS_SINGLE_GTK=	GTK2 GTK3
 OPTIONS_SUB=	yes
-GTK_DESC=	Select GTK+ version
-GTK2_LIB_DEPENDS=	libfreetype.so:print/freetype2
-GTK2_LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig
-GTK2_VARS=	GH_TAGNAME=d2f555d GTKVER=2.0
-GTK3_VARS=	GH_TAGNAME=85f6d10 GTKVER=3.0
 NLS_USES=	gettext localbase
 
 post-patch-NLS-off:

Modified: head/korean/imhangul-gtk2/distinfo
==============================================================================
--- head/korean/imhangul/distinfo	Thu Sep 15 16:40:17 2016	(r422216)
+++ head/korean/imhangul-gtk2/distinfo	Thu Sep 15 18:12:44 2016	(r422221)
@@ -1,5 +1,3 @@
 TIMESTAMP = 1473877928
 SHA256 (choehwanjin-imhangul-2.1.1-d2f555d_GH0.tar.gz) = e489cb293da229cb1e07d7f301e8fe4b65396cd762aca30aa54cd1555f354288
 SIZE (choehwanjin-imhangul-2.1.1-d2f555d_GH0.tar.gz) = 256752
-SHA256 (choehwanjin-imhangul-3.1.1-85f6d10_GH0.tar.gz) = a2bd9baf56c5b624c035ce6890553fb513feb6404453549a2f523691df86f2cc
-SIZE (choehwanjin-imhangul-3.1.1-85f6d10_GH0.tar.gz) = 256731

Modified: head/korean/imhangul-gtk2/pkg-descr
==============================================================================
--- head/korean/imhangul/pkg-descr	Thu Sep 15 16:40:17 2016	(r422216)
+++ head/korean/imhangul-gtk2/pkg-descr	Thu Sep 15 18:12:44 2016	(r422221)
@@ -1,6 +1,6 @@
-GTK+-2.0 Hangul Input Module
+Hangul Input Module for GTK+ 2.0
 
-Input method of gtk-2.0 widget. To select this modules, click
+Input method of GTK+ 2.0 widget. To select this modules, click
 right button in gtk20 text widget and select "Input Methods" -
 "Hangul" (not KSC5601).
 

Modified: head/korean/imhangul-gtk2/pkg-plist
==============================================================================
--- head/korean/imhangul/pkg-plist	Thu Sep 15 16:40:17 2016	(r422216)
+++ head/korean/imhangul-gtk2/pkg-plist	Thu Sep 15 18:12:44 2016	(r422221)
@@ -1,5 +1,4 @@
-lib/gtk-%%GTKVER%%/immodules/im-hangul.so
-%%GTK2%%%%NLS%%share/locale/ko/LC_MESSAGES/im-hangul.mo
-%%GTK3%%%%NLS%%share/locale/ko/LC_MESSAGES/im-hangul-%%GTKVER%%.mo
-@postexec %D/bin/gtk-query-immodules-%%GTKVER%% --update-cache
-@postunexec %D/bin/gtk-query-immodules-%%GTKVER%% --update-cache
+lib/gtk-2.0/immodules/im-hangul.so
+%%NLS%%share/locale/ko/LC_MESSAGES/im-hangul.mo
+@postexec %D/bin/gtk-query-immodules-2.0 --update-cache
+@postunexec %D/bin/gtk-query-immodules-2.0 --update-cache

Modified: head/korean/imhangul-gtk3/Makefile
==============================================================================
--- head/korean/imhangul/Makefile	Thu Sep 15 16:40:17 2016	(r422216)
+++ head/korean/imhangul-gtk3/Makefile	Thu Sep 15 18:12:44 2016	(r422221)
@@ -2,37 +2,31 @@
 # $FreeBSD$
 
 PORTNAME=	imhangul
-PORTVERSION=	${GTKVER:R}.1.1
-PORTREVISION=	3
+PORTVERSION=	3.1.1
 CATEGORIES=	korean
+PKGNAMESUFFIX=	-gtk3
 
 MAINTAINER=	jkim@FreeBSD.org
-COMMENT=	GTK+ Hangul input module
+COMMENT=	Hangul input module for GTK+ 3.0
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libhangul.so:korean/libhangul
 
+CONFLICTS_INSTALL=	ko-imhangul-3.*
+
 GH_ACCOUNT=	choehwanjin
+GH_TAGNAME=	85f6d10
 USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-PLIST_SUB=	GTKVER=${GTKVER}
-USE_GNOME=	cairo gdkpixbuf2 gtk${GTKVER:S|.||}
+USE_GNOME=	cairo gdkpixbuf2 gtk30
 USES=		autoreconf gmake libtool pkgconfig
 
 OPTIONS_DEFINE=	NLS
-OPTIONS_DEFAULT=	GTK3
-OPTIONS_SINGLE=	GTK
-OPTIONS_SINGLE_GTK=	GTK2 GTK3
 OPTIONS_SUB=	yes
-GTK_DESC=	Select GTK+ version
-GTK2_LIB_DEPENDS=	libfreetype.so:print/freetype2
-GTK2_LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig
-GTK2_VARS=	GH_TAGNAME=d2f555d GTKVER=2.0
-GTK3_VARS=	GH_TAGNAME=85f6d10 GTKVER=3.0
 NLS_USES=	gettext localbase
 
 post-patch-NLS-off:

Modified: head/korean/imhangul-gtk3/distinfo
==============================================================================
--- head/korean/imhangul/distinfo	Thu Sep 15 16:40:17 2016	(r422216)
+++ head/korean/imhangul-gtk3/distinfo	Thu Sep 15 18:12:44 2016	(r422221)
@@ -1,5 +1,3 @@
 TIMESTAMP = 1473877928
-SHA256 (choehwanjin-imhangul-2.1.1-d2f555d_GH0.tar.gz) = e489cb293da229cb1e07d7f301e8fe4b65396cd762aca30aa54cd1555f354288
-SIZE (choehwanjin-imhangul-2.1.1-d2f555d_GH0.tar.gz) = 256752
 SHA256 (choehwanjin-imhangul-3.1.1-85f6d10_GH0.tar.gz) = a2bd9baf56c5b624c035ce6890553fb513feb6404453549a2f523691df86f2cc
 SIZE (choehwanjin-imhangul-3.1.1-85f6d10_GH0.tar.gz) = 256731

Modified: head/korean/imhangul-gtk3/pkg-descr
==============================================================================
--- head/korean/imhangul/pkg-descr	Thu Sep 15 16:40:17 2016	(r422216)
+++ head/korean/imhangul-gtk3/pkg-descr	Thu Sep 15 18:12:44 2016	(r422221)
@@ -1,7 +1,7 @@
-GTK+-2.0 Hangul Input Module
+Hangul Input Module for GTK+ 3.0
 
-Input method of gtk-2.0 widget. To select this modules, click
-right button in gtk20 text widget and select "Input Methods" -
+Input method of GTK+ 3.0 widget. To select this modules, click
+right button in gtk30 text widget and select "Input Methods" -
 "Hangul" (not KSC5601).
 
 WWW: http://code.google.com/p/imhangul/

Modified: head/korean/imhangul-gtk3/pkg-plist
==============================================================================
--- head/korean/imhangul/pkg-plist	Thu Sep 15 16:40:17 2016	(r422216)
+++ head/korean/imhangul-gtk3/pkg-plist	Thu Sep 15 18:12:44 2016	(r422221)
@@ -1,5 +1,4 @@
-lib/gtk-%%GTKVER%%/immodules/im-hangul.so
-%%GTK2%%%%NLS%%share/locale/ko/LC_MESSAGES/im-hangul.mo
-%%GTK3%%%%NLS%%share/locale/ko/LC_MESSAGES/im-hangul-%%GTKVER%%.mo
-@postexec %D/bin/gtk-query-immodules-%%GTKVER%% --update-cache
-@postunexec %D/bin/gtk-query-immodules-%%GTKVER%% --update-cache
+lib/gtk-3.0/immodules/im-hangul.so
+%%NLS%%share/locale/ko/LC_MESSAGES/im-hangul-3.0.mo
+@postexec %D/bin/gtk-query-immodules-3.0 --update-cache
+@postunexec %D/bin/gtk-query-immodules-3.0 --update-cache



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609151812.u8FICikg001245>