From nobody Sun Feb 20 23:50:41 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 15C7719C1920; Sun, 20 Feb 2022 23:50:42 +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 4K22Hj4nfbz4TrB; Sun, 20 Feb 2022 23:50:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645401041; 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=oEw5nLdGETOGIOi3A1XcPZkXeHINelT5omfqGab2Op0=; b=J9BSnpNZ4YRWkkdXQHMFj+guYk0sdAMiju2L73Y1gEFE9iskYLhvxCDrCr1KjAJZTuq8Iz mpfWuJ5oy2/YlC/jZGjaPpknMGtVZt7DBgMLgKDQzVyYt0iXV7X/xiNFF5bcrKB/oGGK1X KWYzJTddETvG68nq+Rnu92LImUBci4pPQFQPkccXMr0cgzA6n7bpA9RmwieeU7d55Gmdk9 r9+CyH3Ka+kVrxrHZT5h3fFjZD9bBDtuInK6hL5ilztQJsX/vx/yoNxmqwK1MKUpiTUvIm hVBZYNELeJgSmBP9vENJg7ulQWyk5qOqSDFmIxV9dfOs2PsKj1Yk3wYYAugypA== 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 6372825D91; Sun, 20 Feb 2022 23:50:41 +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 21KNofGV077005; Sun, 20 Feb 2022 23:50:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21KNoflQ077004; Sun, 20 Feb 2022 23:50:41 GMT (envelope-from git) Date: Sun, 20 Feb 2022 23:50:41 GMT Message-Id: <202202202350.21KNoflQ077004@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: ce0bafce922e - main - devel/magit: Add PDF option and change DOCS option 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: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce0bafce922e4e62c3371ae7de4be696c8a11687 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645401041; 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=oEw5nLdGETOGIOi3A1XcPZkXeHINelT5omfqGab2Op0=; b=wWZG6WGhtuw8dzFzugseOIrwFNQXTM6ohNL15LQcfZMVyqLc58nOBh+cM0WsANHvFD6XYU 4hi7tQLvATKeJUbcviFF2sdGz6w60AEziWvp3GLFtd4fGSr/VzhLyhp9EJ5/HgZqOEcel8 hq3C8IjHHFL5s1MpZm1LyXkKdrocrXbqoDPxX28VTJC68hEUvljFPHiqQkxlCSBlnMRWGk n52znB5lbQpx1rcHY5acHeZ9Iiq5Qz9TUcvawLLo6IV7HanEZcGnCGMEeWVV1ew1pCzIEr XzeOe58UnVaPN+LBHGBIKenwiq4/HiyddsX8DjiV5IOUZFfnu5V9B5vSQe+11A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645401041; a=rsa-sha256; cv=none; b=mYf8eaguOWbC/gKzyDrotas7dSd3hSNd9tOYL8iFMpkrKAgQJoXYtxK7zZXP4fR0trN8nf 02AnMy6yIuForcbOzXLhkGb8qQFLxn9yPBTGRJwAFGVxQvHVFCmx1AD4biPC2WL+B8DrOO SHWALpEQ+X9dHvAfqjv6we4IrPCWy78y88EmEQsl66yNxAstftMpaseUJbJhhr/sIwdR8b y7/IbPdp/2waW5okIuXwyWU0a+zMBROLCJFbRLdoRvy4xoMGgOGCZal3VjSC65JzFmNBTP bir5ckRCoMdNIus3RervT/EJCA0CTrq6zYvCRZzfXnHFLv1MpuO3AXHt0ZHU7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce0bafce922e4e62c3371ae7de4be696c8a11687 commit ce0bafce922e4e62c3371ae7de4be696c8a11687 Author: Yasuhiro Kimura AuthorDate: 2022-02-20 18:31:48 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-02-20 23:30:31 +0000 devel/magit: Add PDF option and change DOCS option * Add new option PDF. If it is enabled PDF documents are built and installed. * Change DOCS option so HTML documents and release notes are installed if it is enabled. --- devel/magit/Makefile | 38 ++++++++++++++++++++++++++++++-------- devel/magit/pkg-plist | 2 ++ 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/devel/magit/Makefile b/devel/magit/Makefile index d21ebb15cafa..a5fae919396b 100644 --- a/devel/magit/Makefile +++ b/devel/magit/Makefile @@ -3,7 +3,7 @@ PORTNAME= magit DISTVERSIONPREFIX= v DISTVERSION= 3.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} @@ -26,29 +26,51 @@ USE_GITHUB= yes MAKE_ENV+= docdir=${DOCSDIR} \ infodir=${PREFIX}/${INFO_PATH} \ INSTALL_INFO=install-info \ - lispdir=${PREFIX}/${_ELISPDIR} \ + lispdir=${PREFIX}/${ELISPDIR} \ LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/ghub" \ VERSION=${PORTVERSION} # Parallel build fails if Emacs is built with native compilation enabled MAKE_JOBS_UNSAFE= yes +ALL_TARGET= lisp info +INSTALL_TARGET= install-lisp install-info CONFLICTS_INSTALL= magit-devel-emacs* NO_ARCH= yes INFO= magit magit-section -PLIST_SUB+= ELISPDIR=${_ELISPDIR} -PORTDOCS= AUTHORS.md +PLIST_SUB+= ELISPDIR=${ELISPDIR} +PORTDOCS= *.html *.md RelNotes/* -OPTIONS_DEFINE= DOCS LIBEGIT2 -OPTIONS_SUB= yes -LIBEGIT2_DESC= Use libegit2 as backend (EXPERIMENTAL) +OPTIONS_DEFINE= DOCS LIBEGIT2 PDF +OPTIONS_SUB= yes + +LIBEGIT2_DESC= Use libegit2 as backend (EXPERIMENTAL) +PDF_DESC= Build and install PDF document + +DOCS_BUILD_DEPENDS= gsed:textproc/gsed +DOCS_ALL_TARGET= html +DOCS_BINARY_ALIAS= sed=gsed LIBEGIT2_BUILD_DEPENDS= libegit2${EMACS_PKGNAMESUFFIX}>=g20200515:devel/libegit2@${EMACS_FLAVOR} LIBEGIT2_BUILD_DEPENDS_OFF= git:devel/git LIBEGIT2_RUN_DEPENDS= libegit2${EMACS_PKGNAMESUFFIX}>=g20200515:devel/libegit2@${EMACS_FLAVOR} LIBEGIT2_RUN_DEPENDS_OFF= git:devel/git LIBEGIT2_VARS_OFF= MAKE_ENV+=BUILD_MAGIT_LIBGIT=false +PDF_BUILD_DEPENDS= texi2pdf:print/texinfo +PDF_USE= TEX=dvipdfmx:build +PDF_ALL_TARGET= pdf + +ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR}/RelNotes + ${INSTALL_DATA} ${WRKSRC}/Documentation/*.md \ + ${WRKSRC}/Documentation/*.html ${STAGEDIR}${DOCSDIR} + ${COPYTREE_SHARE} ${WRKSRC}/Documentation/RelNotes \ + ${STAGEDIR}${DOCSDIR}/RelNotes -_ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} +do-install-PDF-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/Documentation/*.pdf ${STAGEDIR}${DOCSDIR} .include diff --git a/devel/magit/pkg-plist b/devel/magit/pkg-plist index 3b8478a113d2..a2a37e279314 100644 --- a/devel/magit/pkg-plist +++ b/devel/magit/pkg-plist @@ -96,3 +96,5 @@ %%ELISPDIR%%/magit-worktree.elc %%ELISPDIR%%/magit.el %%ELISPDIR%%/magit.elc +%%PDF%%%%DOCSDIR%%/magit-section.pdf +%%PDF%%%%DOCSDIR%%/magit.pdf