From nobody Mon Feb 20 21:56:54 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PLGTy2prLz3sFsX; Mon, 20 Feb 2023 21:56:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PLGTy2CQjz3pk3; Mon, 20 Feb 2023 21:56:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676930214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3mQZwQX7kDouhyeoJgCJ7GGcN2VjhEEaefjelvGvsGc=; b=gqJiokIlfnjHzeszYQZPtwHcP0lS/aPeqP/a0jI8S0c3a4FvPIbLSQqbmXjzJqrcxCDpKG 0hSwS6tK8T+7i+r0BIwSSwIKgUoKXpn/+Wul+IU7nsLaWiUusFIp2gkyEPVQ+jgEaZnkp4 qWhisbZhVa7sa0dKP9ZhDRhO09LblsCYSnZTDthd6F+noS7EvFPqSSoUIpaLOZzAtN2VLj aXBXA2DORJMetdNp97u4Uj6ra6VGinsRar27YPsmcB08Q0mEpUQEp6xT+3MB9uijQeqKCa W0f0Ftj9kRo/TFGTMRZs9rkn9W/4SisySYGMhbtxMlBFWvWLXD4uPyvb9y7aEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676930214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3mQZwQX7kDouhyeoJgCJ7GGcN2VjhEEaefjelvGvsGc=; b=EkxQgwFLW7mSwGEuzqwmT53SKOyFTpGp0T13mp3pMhn7+jHdFNLOMsxI9MpdfOg35p60Do YzidyhmDc7S3SeIz8pZ2LbHzyd4Elr/qWvpr2NPLUcThS+soXny7QqlwrIgzrS1LYtq4+P r9xjp8LEYwKaXNJST4XNZ/PhWdJFCCPuzNxuXki7AexseTm5Ko+fpJSpjA6ePyo5Y2q9Pp z20YhJ+bemO/4lXny+tPJuZSwVGymC0TEzPailrfFvDBvKBBMgT0FLk3oaf/Ak1s16dDqW 1iHZBZK2YHLozRhGKP33mKCs1Vf6XLMecf0arH9UXyrwO7acoKRrGeYfglBhcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676930214; a=rsa-sha256; cv=none; b=KUi7u5V0TMvz6wycCxqzvu5au9PPhUJ3eUndHg9dHaqioCY5sy1m1aGT6MS5C/eTC9RPPj v/wH595sm/BxajvGdZ0eNL0BKhLcYAqISB7Zk8bkaYByxJHQKAlsGAg+ufvHKMdiZzJcQ8 BMRWc+4LDRvaqnwgiNiBOFu5/5+x25kxVlDP66zdj9lsA0cB8VncpNLcovrerci6blyXgS UqPE3hjsoPovr3uC9kc3MPfGMhlbkR6vxU6Ston6+s+TfTYYClfoZdV/G7jda972Gm98n8 0mO49bTQE8t51fF0okLzbB43P2yAttcuJWH+/y/jG7TEIFhbmxyicBOmAQXXcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PLGTy1B0SzwhG; Mon, 20 Feb 2023 21:56:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31KLusYW038317; Mon, 20 Feb 2023 21:56:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31KLuskb038316; Mon, 20 Feb 2023 21:56:54 GMT (envelope-from git) Date: Mon, 20 Feb 2023 21:56:54 GMT Message-Id: <202302202156.31KLuskb038316@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 22522d8fcb22 - main - chinese/ibus-table-chinese: Update to 1.8.12 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22522d8fcb2215edc794f7cc1389f98bf17fdf2b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=22522d8fcb2215edc794f7cc1389f98bf17fdf2b commit 22522d8fcb2215edc794f7cc1389f98bf17fdf2b Author: Li-Wen Hsu AuthorDate: 2023-02-20 21:51:11 +0000 Commit: Li-Wen Hsu CommitDate: 2023-02-20 21:56:43 +0000 chinese/ibus-table-chinese: Update to 1.8.12 - De-DEPRECATED - Change to new upstream --- chinese/ibus-table-chinese/Makefile | 15 +++++----- chinese/ibus-table-chinese/distinfo | 6 ++-- .../ibus-table-chinese/files/patch-CMakeLists.txt | 34 ++++++++++++++++++++++ chinese/ibus-table-chinese/pkg-plist | 7 +++++ 4 files changed, 52 insertions(+), 10 deletions(-) diff --git a/chinese/ibus-table-chinese/Makefile b/chinese/ibus-table-chinese/Makefile index fc75f644bd5f..9bddf59d59de 100644 --- a/chinese/ibus-table-chinese/Makefile +++ b/chinese/ibus-table-chinese/Makefile @@ -1,18 +1,14 @@ PORTNAME= ibus-table-chinese -PORTVERSION= 1.8.3 +PORTVERSION= 1.8.12 CATEGORIES= chinese MAINTAINER= ports@FreeBSD.org COMMENT= Chinese input tables for IBus -WWW= https://github.com/definite/ibus-table-chinese +WWW= https://github.com/mike-fabian/ibus-table-chinese LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= does not build: TypeError: cannot use a string pattern on a bytes-like object -DEPRECATED= Broken since 2021 -EXPIRATION_DATE= 2023-03-21 - BUILD_DEPENDS= ${LOCALBASE}/share/cmake/Modules/ManageEnvironment.cmake:devel/cmake-fedora \ ibus-daemon:textproc/ibus \ ${LOCALBASE}/libexec/ibus-engine-table:textproc/ibus-table @@ -22,7 +18,7 @@ RUN_DEPENDS= ibus-daemon:textproc/ibus \ USES= cmake:insource,noninja pkgconfig USE_GITHUB= yes -GH_ACCOUNT= definite +GH_ACCOUNT= mike-fabian INSTALL_TARGET= install DATADIR= ${PREFIX}/share/ibus-table @@ -31,4 +27,9 @@ CMAKE_ARGS+= -DDATA_DIR:PATH="${PREFIX}/share" \ -DCMAKE_FEDORA_TMP_DIR:PATH="${WRKSRC}" MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 +post-patch: + ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \ + -e 's,%%DOCSDIR%%,${DOCSDIR},' \ + ${WRKSRC}/CMakeLists.txt + .include diff --git a/chinese/ibus-table-chinese/distinfo b/chinese/ibus-table-chinese/distinfo index 40b9f19cd1e7..192a64d9cbf9 100644 --- a/chinese/ibus-table-chinese/distinfo +++ b/chinese/ibus-table-chinese/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1608203500 -SHA256 (definite-ibus-table-chinese-1.8.3_GH0.tar.gz) = aa22c223ef26bacbc25ae756702af06dcaaff58c1d62e2375a58c5b78aa656b8 -SIZE (definite-ibus-table-chinese-1.8.3_GH0.tar.gz) = 10824912 +TIMESTAMP = 1676914416 +SHA256 (mike-fabian-ibus-table-chinese-1.8.12_GH0.tar.gz) = 41d9923bf207e2be6fb50813ad994eda6460af78c66c576591aac3da4c8c53a9 +SIZE (mike-fabian-ibus-table-chinese-1.8.12_GH0.tar.gz) = 10856736 diff --git a/chinese/ibus-table-chinese/files/patch-CMakeLists.txt b/chinese/ibus-table-chinese/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..4dbacb6fdc59 --- /dev/null +++ b/chinese/ibus-table-chinese/files/patch-CMakeLists.txt @@ -0,0 +1,34 @@ +--- CMakeLists.txt.orig 2023-02-20 21:21:01 UTC ++++ CMakeLists.txt +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 3.0.0) + + # Default CMAKE_INSTALL_PREFIX should be set before PROJECT() +-SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install dir prefix") ++SET(CMAKE_INSTALL_PREFIX "%%PREFIX%%" CACHE PATH "Install dir prefix") + + #################################################################### + # Project specific information +@@ -21,12 +21,12 @@ Input tables themselves are in subpackages." + ) + + IF(CMAKE_SYSTEM_PROCESSOR MATCHES "64") +- SET(LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib64" CACHE PATH "Library dir") ++ SET(LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Library dir") + ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "64") + SET(LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Library dir") + ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "64") + SET(LIBEXEC_DIR "${LIB_DIR}" CACHE PATH "LIBEXEC dir") +-SET(DATA_DIR "/usr/share") ++SET(DATA_DIR "%%PREFIX%%/share") + + #################################################################### + # Building +@@ -36,6 +36,6 @@ ADD_SUBDIRECTORY(tables) + #################################################################### + # Installing + # +-SET(PRJ_DOC_DIR "${DATA_DIR}/doc/ibus-table-chinese") ++SET(PRJ_DOC_DIR "%%DOCSDIR%%") + INSTALL(FILES AUTHORS README ChangeLog COPYING DESTINATION ${PRJ_DOC_DIR}) + diff --git a/chinese/ibus-table-chinese/pkg-plist b/chinese/ibus-table-chinese/pkg-plist index 755d3a6aad97..ef3d01af5fee 100644 --- a/chinese/ibus-table-chinese/pkg-plist +++ b/chinese/ibus-table-chinese/pkg-plist @@ -5,24 +5,31 @@ %%DATADIR%%/icons/array30-big.png %%DATADIR%%/icons/array30.png %%DATADIR%%/icons/cangjie-big.png +%%DATADIR%%/icons/cangjie-big.svg %%DATADIR%%/icons/cangjie3.svg %%DATADIR%%/icons/cangjie5.svg %%DATADIR%%/icons/cantonese.png +%%DATADIR%%/icons/cantonese.svg %%DATADIR%%/icons/cantonhk.png %%DATADIR%%/icons/cantonyale.png +%%DATADIR%%/icons/cantonyale.svg %%DATADIR%%/icons/easy-big.png %%DATADIR%%/icons/erbi-qs.svg %%DATADIR%%/icons/erbi.png %%DATADIR%%/icons/jyutping.png %%DATADIR%%/icons/quick-classic.png +%%DATADIR%%/icons/quick-classic.svg %%DATADIR%%/icons/quick3.png %%DATADIR%%/icons/quick5.png %%DATADIR%%/icons/scj6.svg %%DATADIR%%/icons/stroke5.png +%%DATADIR%%/icons/stroke5.svg %%DATADIR%%/icons/wu.png +%%DATADIR%%/icons/wu.svg %%DATADIR%%/icons/wubi-haifeng86.svg %%DATADIR%%/icons/wubi-jidian86.svg %%DATADIR%%/icons/yong.png +%%DATADIR%%/icons/yong.svg %%DATADIR%%/tables/array30-big.db %%DATADIR%%/tables/array30.db %%DATADIR%%/tables/cangjie-big.db