From nobody Fri Nov 18 07:37:30 2022 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 4ND7sk71Dlz4hk6b; Fri, 18 Nov 2022 07:37:30 +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 4ND7sk6Vfqz4W2p; Fri, 18 Nov 2022 07:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668757050; 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=g5HqnCENZrWOF+4JcTvSkQxx1FOogpDkHbyP/YKprdE=; b=iRpkpjACvVn5rcOPuBVhgwL3GknkLOtJp68vDDO29cehIOJHdJi0DedMMMF0zLxyWVS9pD HTlaiuPOBWN2SB/CQzICSQl2DG7ycGxM5fwCNbA64al2/QzP5PW5Uya6czaWHvoJKeYo1B c+ZWF/JGj9GI/h2JStr30THRuB3lajTRw0Hh4MpQfLTwMoWgSc+tTzmk3nKyXHXsXg3KF+ ematnUae8lOTH3HAUsqSRD6wWH5hYP2lgpJVOOwSuM+lRbrFNNpSpH+5ki/PkGDLm1mjII 7uvP20ZuJvzRDSGC907uKwXoEyherfC8ACRSkal1K1qnx+fMC2Fhs4eT9tkXqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668757050; 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=g5HqnCENZrWOF+4JcTvSkQxx1FOogpDkHbyP/YKprdE=; b=ck35zOrrIRWFwMhbh/h0xsg3WKPjF1zomrhUgeJlbkzCgG6wbhirIOPSPytNkjI+s6OyQh LoyZVq4X05jVmAJUE2z0RrHTt7Qy2D9XmwciLXLhWjeMwNxD7/Glrv5tlVYFphqA74A4bo g90eUZCgFE1LIE1+l4+ZSlO2aYxI4Z9rJ89pvTg0Cczgwv6caNDqJVSEHGrGMv2yJCFAfI lPxUXUVMx2jiiIeu/i7VP0vxrrLvIxd1G0W8ElgGGWLfUIZldEmE82dptlkUIK3JTT/XW2 mzEu+aah8XboHOFIPBohOSrlfEmvyylKwpfXC1OX/5Iwlm+LNHTojzEIx4ILrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668757050; a=rsa-sha256; cv=none; b=vRQBxyM2IPAc7vVwjqpLYM7PMlrIMz8qCm6b3ywBcOTiMHjN9T1fr0uyIB1GPtrXP8xbRt Dw6myXwUaBsTZfGTLtgqd4qxWc3V34QiO9FiBqhJzdSsgO2UGjB4eS45UNtkO6/n5Y+gpN FP0KJGcQSuZ6/unH5xoMVzSnTQfa27CLjkDz+k7+V6S6WhDxYNrICYZW0nnrEJDgCbCLR1 UMNPg6r4lLMJaVccbFkmxXD109HoFq51orKLwNMvOP/k/LYpuym4iYBdvo2MiAwIoNfSLY o7RXKGxEapPWnPcdnHWslDwPa55/gHImP5h5P7dadvIV7PRVqdcQny8kvRVdxA== 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 4ND7sk5Xscz1CXn; Fri, 18 Nov 2022 07:37:30 +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 2AI7bUCf006219; Fri, 18 Nov 2022 07:37:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AI7bUGq006218; Fri, 18 Nov 2022 07:37:30 GMT (envelope-from git) Date: Fri, 18 Nov 2022 07:37:30 GMT Message-Id: <202211180737.2AI7bUGq006218@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 0da5968b37ea - main - editors/micro: ensure that generated package has syntax highlighting 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0da5968b37ea43098886a8cd2ae80024e43879d4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=0da5968b37ea43098886a8cd2ae80024e43879d4 commit 0da5968b37ea43098886a8cd2ae80024e43879d4 Author: Alexey Dokuchaev AuthorDate: 2022-11-18 07:34:48 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-11-18 07:34:48 +0000 editors/micro: ensure that generated package has syntax highlighting Add missing build step so embedded syntax highlighting works. While here, install manual page, desktop file, and SVG icons. PR: 267122 Obtained from: Alpine package build script --- editors/micro/Makefile | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/editors/micro/Makefile b/editors/micro/Makefile index 593c5f2ce900..a24cd42ef07d 100644 --- a/editors/micro/Makefile +++ b/editors/micro/Makefile @@ -1,7 +1,7 @@ PORTNAME= micro DISTVERSIONPREFIX= v DISTVERSION= 2.0.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors MAINTAINER= lcook@FreeBSD.org @@ -11,7 +11,7 @@ WWW= https://micro-editor.github.io/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= go:modules +USES= desktop-file-utils go:modules USE_GITHUB= yes GH_ACCOUNT= zyedidia GH_TUPLE= blang:semver:v3.5.1:blang_semver/vendor/github.com/blang/semver \ @@ -55,7 +55,12 @@ GO_BUILDFLAGS= -ldflags "\ -X 'github.com/${GH_ACCOUNT}/${GH_PROJECT}/v2/internal/util.CompileDate=${_BUILD_DATE}' \ -X github.com/${GH_ACCOUNT}/${GH_PROJECT}/v2/internal/util.Debug=${_BUILD_DEBUG}" -PLIST_FILES= bin/${PORTNAME} +PLIST_FILES= bin/micro \ + share/applications/micro.desktop \ + share/man/man1/micro.1.gz \ + share/pixmaps/micro-logo-drop.svg \ + share/pixmaps/micro-logo-mark.svg \ + share/pixmaps/micro-logo.svg PORTDOCS= README.md OPTIONS_DEFINE= DEBUG DOCS @@ -63,9 +68,19 @@ OPTIONS_DEFINE= DEBUG DOCS DEBUG_DESC= Enable debug logging DEBUG_VARS= _BUILD_DEBUG=ON +pre-build: + cd ${GO_WRKSRC} && ${SETENV} ${GO_ENV} ${GO_CMD} generate ./runtime + +post-install: + ${INSTALL_DATA} ${WRKSRC}/assets/packaging/micro.1 \ + ${STAGEDIR}${MANPREFIX}/share/man/man1 + ${INSTALL_DATA} ${WRKSRC}/assets/packaging/micro.desktop \ + ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/assets/*.svg \ + ${STAGEDIR}${PREFIX}/share/pixmaps + post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} \ - ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include