From nobody Wed Jun 7 07:25:18 2023 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 4Qbf4v1dzsz4ZpBB; Wed, 7 Jun 2023 07:25:19 +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 4Qbf4v15YJz3G5p; Wed, 7 Jun 2023 07:25:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686122719; 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=uGVtb3oIq4tj7rXDq7ulRa1W1ioaXCC7VdESn7JiypE=; b=qnqLpaVQNAtEJjLpP8w2htzw03BeXxLfVp7AhzJicwZpSQ6/5ftl1BH54f25fAB2VB7QYN xB7RqMs93xzH1MtxlUq+3cJenvO+DHhFbVihcQdCSZUCWE/CGgTM3uQbVOtUsZd5dT2HMs HvyrFN5P2ZXJpteAuJ1BVgnMtUIQQs7397+IivyGrMmQQBXn0IzcBMXOEjlIexKojh/fBV M8DGdNYkgD7GfVVk8IFw0ek+ASEqL6h+N9VIZPVvQd43ym3LPTWg9W5rFi5ItKIm0thunA EkqtJsIVPwviGhXLANqwcMZP64z5OnBKxSc+93+X8FP8BApDmCwsTWGTTZvcEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686122719; 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=uGVtb3oIq4tj7rXDq7ulRa1W1ioaXCC7VdESn7JiypE=; b=E2mzQHmAU6AtIucTd6N+JBgitGeRqgWPfCn4J8QPma/M+W5D4yDPJNW2StqWdlesscUPHp 3ivU4AQG7nJDCK9isbERcGvPJkXN0xJ2ZM+IpRSWfcK6flj545iZimB7WGC5VSHEqj4o/8 rH2Jq7wObtRHJwhKD/kw4/ZdEoC3qjB+8bo9rJvXldSNTQ8iXoE4KZKruDyadyH6yC9bMc 0e10g/JA9bjVMmo1wh6s3sYpI/eqYD8EGdJx+iFYHOWQbEYyNJeTK3glvXh5eWmb9/pHL6 rudAAnjKgvSxnhJUU1t7UcMZJ62HPxKtmMUb+tT8HLRwAIcjg7QasMBE1FCX1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686122719; a=rsa-sha256; cv=none; b=KSAAX5yaD8a51Fd/rDorvt/UB7Sts1qHhPzEkuPtF1ro3fbAcx0ML4fNtXaGiC7aPAtTXb vTVA+O/scFH6I7KwcAnolSNorXRYA6XY7t/aHU2DY1W0zP138X3X0J+jjfSTA2BIVln3J8 1lEHO6NjnUgaasr60elGF3Unfrbcd8RqRzSqs+7PV1BxaQcBZeGW2GXf38cXu4l2fE1wJO gPBYmDy5BrmvswfcIn0L//voyx9y/jHNptcmOF9q5smuVcH6n16FBq/1qokqggSD+fCb2Z +gxeJF++j8dLYFEZRfSuP8SpQUYZXU3yxcYV45XEP9dOxIpdDb0AXv6eMxTXXg== 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 4Qbf4v036yz13DH; Wed, 7 Jun 2023 07:25:19 +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 3577PIaC084945; Wed, 7 Jun 2023 07:25:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3577PIVA084944; Wed, 7 Jun 2023 07:25:18 GMT (envelope-from git) Date: Wed, 7 Jun 2023 07:25:18 GMT Message-Id: <202306070725.3577PIVA084944@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: fada8f3ec8dc - main - textproc/kmfl-european-latin: Fix build on 14 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fada8f3ec8dcc8f0bb9adbd3fdadce73dd59f670 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=fada8f3ec8dcc8f0bb9adbd3fdadce73dd59f670 commit fada8f3ec8dcc8f0bb9adbd3fdadce73dd59f670 Author: Muhammad Moinur Rahman AuthorDate: 2023-06-07 05:41:35 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-06-07 07:25:08 +0000 textproc/kmfl-european-latin: Fix build on 14 - base64 is available in the base system from 14 so conditionally change base64 call - Pet portclippy Approved by: portmgr (blanket) --- textproc/kmfl-european-latin/Makefile | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/textproc/kmfl-european-latin/Makefile b/textproc/kmfl-european-latin/Makefile index 90ddce39b2f0..7740d970282f 100644 --- a/textproc/kmfl-european-latin/Makefile +++ b/textproc/kmfl-european-latin/Makefile @@ -11,26 +11,35 @@ MAINTAINER= nikola.lecic@anthesphoria.net COMMENT= Paneuropean Latin KMFL keyboard covering 120 languages WWW= http://eurolatin.keymankeyboards.com/ -BUILD_DEPENDS= base64:converters/base64 RUN_DEPENDS= kmflcomp:textproc/kmflcomp -WRKSRC= ${WRKDIR}/EuroLatin\ Source\ Files USES= dos2unix zip DOS2UNIX_FILES= european.kmn -OPTIONS_DEFINE= DOCS DOCSDIR= ${PREFIX}/share/doc/kmfl/${PORTNAME} +SUB_FILES= pkg-message + +WRKSRC= ${WRKDIR}/EuroLatin\ Source\ Files + +OPTIONS_DEFINE= DOCS + DOCSLIST= EuroLatin\ Keyman\ Desktop\ Keyboard\ Files/eurolatin1.6.pdf \ EuroLatin\ KeymanWeb\ Keyboard\ Files/european.html \ licence.txt - KMFL_DIR= share/kmfl KMFL_ICONS_DIR= share/kmfl/icons -SUB_FILES= pkg-message +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079 +BASE64= /usr/bin/base64 +.else +BUILD_DEPENDS= base64:converters/base64 +BASE64= ${LOCALBASE}/bin/base64 +.endif do-build: - ${LOCALBASE}/bin/base64 -d ${FILESDIR}/latin.png.base64.txt > ${WRKSRC}/latin.png + ${BASE64} -d ${FILESDIR}/latin.png.base64.txt > ${WRKSRC}/latin.png do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${KMFL_DIR} ${STAGEDIR}${PREFIX}/${KMFL_ICONS_DIR} @@ -41,4 +50,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/"$$doc" ${STAGEDIR}${DOCSDIR} ; \ done -.include +.include