From nobody Thu Dec 18 21:40:13 2025 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 4dXPGP71Mzz6LqrB for ; Thu, 18 Dec 2025 21:40: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dXPGP4hF3z3Xns for ; Thu, 18 Dec 2025 21:40:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766094013; 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=Wgp5DQ8Ld1zCq35TGzE5uYjbOg540OV6t0VeV9OKkeQ=; b=EVWnesSUGmbeuVwoHE5FjCGC8olEiwk+XdLiB+jQ+1PMXQqK6xiAOV2W9Bk1n6JsXwqinK 8rII7qnMWkXTslx85v/nsyrHf8wjdx33hTdgaUi+CbTACYl1+WZ8s7UJ0sjInQPY8H8CK4 saBUaCdWVH3pDM4ZMAuF+avWyj2KXkGtiX5v2DKSOJnNyp7QzitTrWP6cKVdxPL47zy7/4 ExEKfsE9d/JVY4/SlD1TNTQnAMvfaxJpayauLoTlR2rE7gSO4yiUgLXdevnPWfp5oJd6tV NnUnpneKAepR5x4RLMOjGNFlT9tBA5XQp3sy4I17TPJPdVNQpTbRgwXahO/jtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766094013; 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=Wgp5DQ8Ld1zCq35TGzE5uYjbOg540OV6t0VeV9OKkeQ=; b=eUgfKWV8SUMIQJLxZyE3dhG2r+Ebrvs9KAuWiyY1Vy2JhMCO9UUcPH3K9k85CAbNoD4FgS 7YtjbC3KbBwr6KThmNjtsoISyBfC7fx3DXTV8sFI3j9QMP6ilOBD4PXJ0jwrX7jlPW2ehT 7f3iyX18j3+vLYvAJGGFB+q/Q17DPsc92STwwU4aO6eLKmQizlAXXW/YXTTEoRzlleZ1KL Im17Oktj0TsGG9G9CzpfuGGHuTJoKim2YSKhoo6W3e53F9/3ICnGj4SeAVIXe43vxPwAXr KRB+WZ4SSDp+hmBLeAJVbBrPhyomNvrdlvWub0JjbObE/waiU5iV9C7RXLMrHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766094013; a=rsa-sha256; cv=none; b=NPwEjj7Rs+XIFUfjU2jPdCl63ZwouvM1enMXxcQeBwXePqT7EHVn/DgccyKTN1rSd5VOYc ceDg47ss2f2tM5Lpvpkz24RwtQxZtykRyrQIpqFw0C91mcIdHwzvN9pdRwQQf9s5gXr1kn zYaEA3FisxEOGVzJw1U5+1FmunasjyhrHNKmfC/WO6E24gFENiicdaaxvCMF41njVpiHTx DNmINQ+M9vk2ZA3rvtx93cBQvPm5Lxa5SeEu4i6nMsCI0DallAtr10gE6sfDNfP1bzJ++O 0tKvkr+t+xhX0wlh6BqDwBbD28j9U2B3SBXjnfTcsk1GcVb6D7RHfUgY6UQYyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dXPGP3dNGzvt6 for ; Thu, 18 Dec 2025 21:40:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42d89 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Dec 2025 21:40:13 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jason E. Hale Subject: git: ca10a1fb550e - main - comms/klog: Fix pkg-plist 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca10a1fb550ef937b2e1fffb63fabd5a73dc0c28 Auto-Submitted: auto-generated Date: Thu, 18 Dec 2025 21:40:13 +0000 Message-Id: <694474bd.42d89.424f1d83@gitrepo.freebsd.org> The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca10a1fb550ef937b2e1fffb63fabd5a73dc0c28 commit ca10a1fb550ef937b2e1fffb63fabd5a73dc0c28 Author: Jason E. Hale AuthorDate: 2025-12-07 03:28:07 +0000 Commit: Jason E. Hale CommitDate: 2025-12-18 21:38:59 +0000 comms/klog: Fix pkg-plist DESKTOP_ENTRIES automatically adds a pkg-plist entry, so the extra entry added to PLIST_FILES in b0e679ed7d1f creates a stage-qa error. This port does not consider the DESKTOP_LAUNCH_ID environment variable, so the final DESKTOP_ENTRIES sub-variable should be set to "false" (unquoted). Switch PLIST_FILES to a regular pkg-plist file, since there are 17 entries which is 11 over the 'handful' of 6 entries convention recommended in the PHB and tested for by portlint(1). Remove superfluous and commented-out PORTREVISON. We have scripts to bump PORTREVSION correctly and don't need this sort of placeholder. USE_QT=tools should be a build-only dep and USE_QT=sqldriver-sqlite should be a run-only dep. Qt 6.x requires at least C++17 and links to OpenGL, not GL. [1] With hat: kde@ [1] --- comms/klog/Makefile | 40 +++++++++++----------------------------- comms/klog/pkg-plist | 17 +++++++++++++++++ 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/comms/klog/Makefile b/comms/klog/Makefile index a2306f7fd3ca..8417de6ad609 100644 --- a/comms/klog/Makefile +++ b/comms/klog/Makefile @@ -1,7 +1,6 @@ PORTNAME= klog PORTVERSION= 2.4.2 -PORTREVISION= 1 -#PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms hamradio MAINTAINER= hamradio@FreeBSD.org @@ -12,44 +11,27 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libhamlib.so:comms/hamlib -USES= compiler:c++11-lang gl qmake qt:6 xorg +USES= compiler:c++17-lang gl qmake qt:6 xorg USE_GITHUB= yes -USE_GL= gl -USE_QT= base declarative charts location positioning serialport sqldriver-sqlite tools +USE_GL= opengl +USE_QT= base declarative charts location positioning serialport \ + sqldriver-sqlite:run tools:build GH_ACCOUNT= ea4k GH_PROJECT= klog -DESKTOP_ENTRIES= "KLog" "Simple Amateur Radio Logging Program" \ +# https://github.com/ea4k/klog/issues/419 +DESKTOP_ENTRIES="KLog" "Simple Amateur Radio Logging Program" \ "" "klog" "Network;HamRadio;" \ - true - -PLIST_FILES= bin/klog \ - ${DATADIR}/translations/klog_ca.qm \ - ${DATADIR}/translations/klog_cs.qm \ - ${DATADIR}/translations/klog_da.qm \ - ${DATADIR}/translations/klog_de.qm \ - ${DATADIR}/translations/klog_es.qm \ - ${DATADIR}/translations/klog_fi.qm \ - ${DATADIR}/translations/klog_fr.qm \ - ${DATADIR}/translations/klog_hr.qm \ - ${DATADIR}/translations/klog_it.qm \ - ${DATADIR}/translations/klog_lv.qm \ - ${DATADIR}/translations/klog_ja.qm \ - ${DATADIR}/translations/klog_nl.qm \ - ${DATADIR}/translations/klog_pl.qm \ - ${DATADIR}/translations/klog_ru.qm \ - ${DATADIR}/translations/klog_uk.qm \ - share/applications/klog.desktop \ - share/man/man1/klog.1.gz + false post-patch: @${REINPLACE_CMD} \ - 's|"\/usr\/share\/klog\/translations\/klog_"|"${DATADIR}/translations/klog_"|' \ - ${WRKSRC}/src/main.cpp + 's|"\/usr\/share\/klog\/translations\/klog_"|"${DATADIR}/translations/klog_"|' \ + ${WRKSRC}/src/main.cpp do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/build/target/klog ${STAGEDIR}${PREFIX}/bin - ${MKDIR} ${STAGEDIR}${DATADIR}/translations + @${MKDIR} ${STAGEDIR}${DATADIR}/translations ${INSTALL_DATA} ${WRKSRC}/src/build/target/translations/klog_*.qm \ ${STAGEDIR}${DATADIR}/translations ${INSTALL_MAN} ${WRKSRC}/src/klog.1 ${STAGEDIR}${PREFIX}/share/man/man1 diff --git a/comms/klog/pkg-plist b/comms/klog/pkg-plist new file mode 100644 index 000000000000..ce8c13832cb4 --- /dev/null +++ b/comms/klog/pkg-plist @@ -0,0 +1,17 @@ +bin/klog +%%DATADIR%%/translations/klog_ca.qm +%%DATADIR%%/translations/klog_cs.qm +%%DATADIR%%/translations/klog_da.qm +%%DATADIR%%/translations/klog_de.qm +%%DATADIR%%/translations/klog_es.qm +%%DATADIR%%/translations/klog_fi.qm +%%DATADIR%%/translations/klog_fr.qm +%%DATADIR%%/translations/klog_hr.qm +%%DATADIR%%/translations/klog_it.qm +%%DATADIR%%/translations/klog_ja.qm +%%DATADIR%%/translations/klog_lv.qm +%%DATADIR%%/translations/klog_nl.qm +%%DATADIR%%/translations/klog_pl.qm +%%DATADIR%%/translations/klog_ru.qm +%%DATADIR%%/translations/klog_uk.qm +share/man/man1/klog.1.gz