svn commit: r559597 - in head: . chinese chinese/ibus-rime chinese/rime-data

[Guangyuan Yang]

Author: ygy (doc committer)
Date: Tue Dec 29 17:30:25 2020
New Revision: 559597
URL: https://svnweb.freebsd.org/changeset/ports/559597

Log:
  chinese/rime-data: Remove unneeded metaport
  
  Also change the dependency of chinese/ibus-rime to not depend on the now removed metaport. chinese/rime-data can be safely removed because no other ports depends on it from now on.
  
  Submitted by:	Ka Ho Ng <khng300 at gmail.com>
  Approved by:	lwhsu
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D27737

Deleted:
  head/chinese/rime-data/
Modified:
  head/MOVED
  head/chinese/Makefile
  head/chinese/ibus-rime/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Tue Dec 29 17:27:16 2020	(r559596)
+++ head/MOVED	Tue Dec 29 17:30:25 2020	(r559597)
@@ -15792,6 +15792,7 @@ devel/py-gobject||2020-12-12|Has expired: Uses depreca
 games/gemrb||2020-12-18|Has expired: Uses deprecated version of python
 net/iplog||2020-12-18|Has expired: Unmaintained and dead upstream. Does not build with modern compilers.
 www/rubygem-rack21|www/rubygem-rack|2020-12-18|Obsolete, please use www/rubygem-rack
+chinese/rime-data||2020-12-23|Unneeded metaport
 devel/vulkan-headers|graphics/vulkan-headers|2020-12-23|Moved to a better category, aligning with vulkan-loader
 devel/vulkan-tools|graphics/vulkan-tools|2020-12-23|Moved to a better category, aligning with vulkan-loader
 devel/vulkan-vulkan-validation-layers|graphics/vulkan-vulkan-validation-layers|2020-12-23|Moved to a better category, aligning with vulkan-loader

Modified: head/chinese/Makefile
==============================================================================
--- head/chinese/Makefile	Tue Dec 29 17:27:16 2020	(r559596)
+++ head/chinese/Makefile	Tue Dec 29 17:30:25 2020	(r559597)
@@ -100,7 +100,6 @@
     SUBDIR += rime-cangjie
     SUBDIR += rime-cantonese
     SUBDIR += rime-combo-pinyin
-    SUBDIR += rime-data
     SUBDIR += rime-data-full
     SUBDIR += rime-double-pinyin
     SUBDIR += rime-emoji

Modified: head/chinese/ibus-rime/Makefile
==============================================================================
--- head/chinese/ibus-rime/Makefile	Tue Dec 29 17:27:16 2020	(r559596)
+++ head/chinese/ibus-rime/Makefile	Tue Dec 29 17:30:25 2020	(r559597)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ibus-rime
 DISTVERSION=	1.4.0-14
+PORTREVISION=	1
 CATEGORIES=	chinese
 
 MAINTAINER=	khng300 at gmail.com
@@ -11,11 +12,11 @@ COMMENT=	IBus engine for Rime users
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	zh-rime-data>=g0:chinese/rime-data
+BUILD_DEPENDS=	${_SCHEMA_DEPENDS}
 LIB_DEPENDS=	libibus-1.0.so:textproc/ibus \
 		libnotify.so:devel/libnotify \
 		librime.so:chinese/librime
-RUN_DEPENDS=	zh-rime-data>=g0:chinese/rime-data
+RUN_DEPENDS=	${_SCHEMA_DEPENDS}
 
 USES=		cmake gnome pkgconfig
 USE_CSTD=	c99
@@ -25,5 +26,11 @@ INSTALLS_ICONS=		yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	rime
 GH_TAGNAME=	bfabe67
+
+_SCHEMA_DEPENDS=	\
+	${LOCALBASE}/share/rime-data/luna_pinyin.schema.yaml:chinese/rime-luna-pinyin	\
+	${LOCALBASE}/share/rime-data/bopomofo.schema.yaml:chinese/rime-bopomofo	\
+	${LOCALBASE}/share/rime-data/cangjie5.schema.yaml:chinese/rime-cangjie	\
+	${LOCALBASE}/share/rime-data/stroke.schema.yaml:chinese/rime-stroke
 
 .include <bsd.port.mk>