From be43f10a6c1f249db56cea11bfa9090305e3f23e Mon Sep 17 00:00:00 2001 From: Guangyuan Yang Date: Tue, 29 Dec 2020 17:30:25 +0000 Subject: 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 Approved by: lwhsu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D27737 --- chinese/Makefile | 1 - chinese/ibus-rime/Makefile | 11 +++++++++-- chinese/rime-data/Makefile | 21 --------------------- chinese/rime-data/pkg-descr | 5 ----- 4 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 chinese/rime-data/Makefile delete mode 100644 chinese/rime-data/pkg-descr (limited to 'chinese') diff --git a/chinese/Makefile b/chinese/Makefile index f71d505b5034..14cb763cb03b 100644 --- a/chinese/Makefile +++ b/chinese/Makefile @@ -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 diff --git a/chinese/ibus-rime/Makefile b/chinese/ibus-rime/Makefile index b7c1bba769b2..175818283aa0 100644 --- a/chinese/ibus-rime/Makefile +++ b/chinese/ibus-rime/Makefile @@ -3,6 +3,7 @@ PORTNAME= ibus-rime DISTVERSION= 1.4.0-14 +PORTREVISION= 1 CATEGORIES= chinese MAINTAINER= khng300@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 @@ -26,4 +27,10 @@ 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 diff --git a/chinese/rime-data/Makefile b/chinese/rime-data/Makefile deleted file mode 100644 index 425a5f147000..000000000000 --- a/chinese/rime-data/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Created by: Ka Ho Ng -# $FreeBSD$ - -PORTNAME= rime-data -PORTVERSION= g20201216 -CATEGORIES= chinese textproc - -MAINTAINER= khng300@gmail.com -COMMENT= Rime data files preset - -LICENSE= LGPL3 - -RUN_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 - -USES= localbase metaport - -.include diff --git a/chinese/rime-data/pkg-descr b/chinese/rime-data/pkg-descr deleted file mode 100644 index 857d24587381..000000000000 --- a/chinese/rime-data/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Rime data files. This is a metaport that provides an essential set of -configuration ports and a preset of IME schema ports for the Rime IME -framework. - -WWW: https://github.com/rime/plum -- cgit v1.2.3