From nobody Mon Jan 15 13:57:13 2024 X-Original-To: dev-commits-ports-all@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 4TDDGd3G4kz5712c; Mon, 15 Jan 2024 13:57:13 +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 4TDDGd2nV3z4fGr; Mon, 15 Jan 2024 13:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705327033; 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=gfymI8OBf9H1KHVCnENFMWEgl0Zoef5DdDKB4+NRauw=; b=olUilxULk1leadLlXlx2OZcONFe5EH9Hytr7T4RhpSCLDqf8/2NdoT+1VzXbwEgFzSrazZ FrWtTYBIBv+9KDgb5X44QA/+7qPYA4b6hx3zQIHKQQbAj2mvsaGdBc/ZR6Gl9ifpzJBYMf b2IreGM84+ulKDgaSENOXT+AefjGuo7i+QJxXgf0AWOVYVW8D3/tANv0mJiH6oi6JAlusz 9si8LE2oSOuEvqV2zqIpjjDzZUHuaNvXflCsKi6pkPuLLM9edG65gmK3xgqFLLOFtp39mA Wj+vKmK0VthxRtb9SOZ4SV+Af0gfjFJKoCtwlkETezlgyWCuHlrlVThVtTnzeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705327033; 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=gfymI8OBf9H1KHVCnENFMWEgl0Zoef5DdDKB4+NRauw=; b=ZaTj4GWWbecHmZ3w3nCnZDDfyCKOmtbcKJM0df9KJdX1kfaOPv/oVEuA4n4bA42TZYe90x p0Zy/PMxHYdaPxbC5bdWvcop2OlE4MLGukg0r89BAsTWB3bx4tn+9ZYM76TLB+wkr360ph XYfJn0rD6A+21H9cLEbJN8cvUJ0nCQQNNOe3jO782vcIU8QOAkNOaOTbFQDAGfNLPAaaTp ol6AJD8vD5pv+13g+JKaVcCemPqIq98pxe3ckCTB5JRE7Sj4i73hTvfNoNxq67cgDQh6O1 myfArTiWR4QSv8AsQf+PEJeKMafIsHOOQl3MQiRrXjLct38BC4GEw5pfS6vQkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705327033; a=rsa-sha256; cv=none; b=d3ThUfOc9dx37a7j2W+GzlXLF0xY1h1t2FV5/mFQXB8vWKcXhx/c+aqjz1u8Ok6IU4maDt p2Jey03Gn3M6jz/xXXIkduxpDFXPyKw3qIOEfmyK6jrK5TsLE/oXfzB2/FpdTgUeEME6s+ a3PYY7fpsPdjhouMVbE2HaufUD8GKp/7RNC68oqGndxxySzxX0CKEa1ly7AJfMg/tHreXc yGs5cSh0us90iIFonyWZqr4jK/a0jFDTpgwlFD0or4Tl3D0aW9+Sbuhi61JWMBeMAHcP8P HV/WC1Uz/wx6+Vz9XzDVWwPUCNJbgWKgctDZdAdq+eXtfl6RqoT2U/SVh9igEA== 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 4TDDGd1rR6zyjH; Mon, 15 Jan 2024 13:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40FDvDr8059471; Mon, 15 Jan 2024 13:57:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40FDvDaw059468; Mon, 15 Jan 2024 13:57:13 GMT (envelope-from git) Date: Mon, 15 Jan 2024 13:57:13 GMT Message-Id: <202401151357.40FDvDaw059468@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: d8be971f1a4f - main - chinese/fctx: Get rid of MANPREFIX and install mans to share/man. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8be971f1a4f5c304e357e121d918f12b55f9f81 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8be971f1a4f5c304e357e121d918f12b55f9f81 commit d8be971f1a4f5c304e357e121d918f12b55f9f81 Author: Gleb Popov AuthorDate: 2024-01-13 11:53:48 +0000 Commit: Gleb Popov CommitDate: 2024-01-15 13:56:56 +0000 chinese/fctx: Get rid of MANPREFIX and install mans to share/man. To achieve this, add a temporary hacky knob KDE_MAN_PREFIX to allow ports to override the man installation dir. Once Uses/kde.mk migrates to share/man, this knob will be removed. Approved by: tcberner --- Mk/Uses/kde.mk | 6 ++++-- chinese/fcitx/Makefile | 2 +- chinese/fcitx/files/patch-CMakeLists.txt | 9 ++++----- chinese/fcitx/pkg-plist | 18 +++++++++--------- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index 47bc634ee6df..b8c4038762ca 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -249,8 +249,10 @@ CMAKE_ARGS+= -DCMAKE_MODULE_PATH="${LOCALBASE};${KDE_PREFIX}" \ -DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=true # Set man-page installation prefix. -CMAKE_ARGS+= -DKDE_INSTALL_MANDIR:PATH="${KDE_PREFIX}/man" \ - -DMAN_INSTALL_DIR:PATH="${KDE_PREFIX}/man" +# TODO: Remove the KDE_MAN_PREFIX knob once all kde ports are switched to use share/man +KDE_MAN_PREFIX?= ${KDE_PREFIX}/man +CMAKE_ARGS+= -DKDE_INSTALL_MANDIR:PATH="${KDE_MAN_PREFIX}" \ + -DMAN_INSTALL_DIR:PATH="${KDE_MAN_PREFIX}" # Disable autotests unless TEST_TARGET is defined. . if !defined(TEST_TARGET) diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile index ba6a787fba64..6c2bf55dbb81 100644 --- a/chinese/fcitx/Makefile +++ b/chinese/fcitx/Makefile @@ -64,13 +64,13 @@ TPUNC_DESC= Use traditional quotation marks .include +KDE_MAN_PREFIX= ${PREFIX}/share/man CMAKE_ARGS+= -DENABLE_XDGAUTOSTART=OFF -DFORCE_ENCHANT=ON \ -DLIBICONV_LIBC_HAS_ICONV_OPEN=OFF \ -DDATADIR=${DATADIR} \ -DDOCSDIR=${DOCSDIR} \ -DGOBJECT_INTROSPECTION_GIRDIR=${PREFIX}/share/gir-1.0 \ -DGOBJECT_INTROSPECTION_TYPELIBDIR=${PREFIX}/lib/girepository-1.0 \ - -DMANPREFIX=${MANPREFIX} \ -DPREFIX=${PREFIX} \ -DENABLE_QT=OFF -DENABLE_QT_IM_MODULE=OFF -DENABLE_QT_GUI=OFF diff --git a/chinese/fcitx/files/patch-CMakeLists.txt b/chinese/fcitx/files/patch-CMakeLists.txt index 2a0d041cbd1f..b84facf6478a 100644 --- a/chinese/fcitx/files/patch-CMakeLists.txt +++ b/chinese/fcitx/files/patch-CMakeLists.txt @@ -1,17 +1,16 @@ ---- CMakeLists.txt.orig 2015-12-12 08:02:09 UTC +--- CMakeLists.txt.orig 2020-08-01 01:40:38 UTC +++ CMakeLists.txt -@@ -206,16 +206,21 @@ if (NOT DEFINED SYSCONFDIR) +@@ -200,16 +200,21 @@ endif() set(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "sys config directory [default=PREFIX/etc/]") endif() -set(includedir "${CMAKE_INSTALL_PREFIX}/include") -set(libdir ${LIB_INSTALL_DIR}) -set(pkgconfdir ${LIBDATA_INSTALL_DIR}/pkgconfig) --set(mandir ${MAN_INSTALL_DIR}) +set(includedir "${PREFIX}/include") +set(libdir ${PREFIX}/lib) +set(pkgconfdir ${PREFIX}/libdata/pkgconfig) -+set(mandir ${MANPREFIX}/man) + set(mandir ${MAN_INSTALL_DIR}) set(addondir ${libdir}/${package} ) -set(pkgdatadir ${prefix}/share/${package}) +set(addondestdir "\${PREFIX}/lib/${package}" ) @@ -28,7 +27,7 @@ list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemPlatformLibDir) list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCxxLibDir) -@@ -228,9 +233,13 @@ endif("${_isSystemPlatformLibDir}" STREQ +@@ -222,9 +227,13 @@ set(FCITX4_ADDON_INSTALL_DIR ${addondir}) # For FcitxMacro set(FCITX4_ADDON_INSTALL_DIR ${addondir}) diff --git a/chinese/fcitx/pkg-plist b/chinese/fcitx/pkg-plist index 62e69814a2ba..0edd8d6e685a 100644 --- a/chinese/fcitx/pkg-plist +++ b/chinese/fcitx/pkg-plist @@ -126,15 +126,15 @@ libdata/pkgconfig/fcitx-config.pc libdata/pkgconfig/fcitx-gclient.pc libdata/pkgconfig/fcitx-utils.pc libdata/pkgconfig/fcitx.pc -man/man1/createPYMB.1.gz -man/man1/fcitx-remote.1.gz -man/man1/fcitx.1.gz -man/man1/mb2org.1.gz -man/man1/mb2txt.1.gz -man/man1/readPYBase.1.gz -man/man1/readPYMB.1.gz -man/man1/scel2org.1.gz -man/man1/txt2mb.1.gz +share/man/man1/createPYMB.1.gz +share/man/man1/fcitx-remote.1.gz +share/man/man1/fcitx.1.gz +share/man/man1/mb2org.1.gz +share/man/man1/mb2txt.1.gz +share/man/man1/readPYBase.1.gz +share/man/man1/readPYMB.1.gz +share/man/man1/scel2org.1.gz +share/man/man1/txt2mb.1.gz share/applications/fcitx-configtool.desktop share/applications/fcitx-skin-installer.desktop share/applications/fcitx.desktop