Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 Jul 2024 21:18:18 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: cc960c2ff3d7 - main - textproc/asciidoc: Clean up Makefile
Message-ID:  <202407242118.46OLIIPb064735@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cc960c2ff3d7081ae07f0f9cc63087fc6a5341ac

commit cc960c2ff3d7081ae07f0f9cc63087fc6a5341ac
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-07-24 21:16:02 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-07-24 21:16:02 +0000

    textproc/asciidoc: Clean up Makefile
    
    a2x.1.txt and asciidoc.1.txt are added to sdist.
    
    Reference:      https://github.com/asciidoc-py/asciidoc-py/commit/400cbe7fc90227a5dcce759d8c22d3bbe31a60eb
---
 textproc/asciidoc/Makefile | 16 ++++------------
 textproc/asciidoc/distinfo |  6 +-----
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile
index 038369d41f98..71644710f751 100644
--- a/textproc/asciidoc/Makefile
+++ b/textproc/asciidoc/Makefile
@@ -1,12 +1,7 @@
 PORTNAME=	asciidoc
 PORTVERSION=	10.2.1
 CATEGORIES=	textproc
-MASTER_SITES=	PYPI \
-		https://github.com/asciidoc-py/asciidoc-py/raw/${PORTVERSION}/doc/:manpage
-DISTFILES=	asciidoc-${PORTVERSION}${EXTRACT_SUFX} \
-		a2x.1.txt:manpage \
-		asciidoc.1.txt:manpage
-EXTRACT_ONLY=	asciidoc-${PORTVERSION}${EXTRACT_SUFX}
+MASTER_SITES=	PYPI
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Text document format for writing short documents and man pages
@@ -32,15 +27,12 @@ PLIST_FILES=	share/man/man1/a2x.1.gz \
 SHEBANG_FILES=	asciidoc/resources/filters/*.py \
 		asciidoc/resources/filters/*/*.py
 
-post-patch:
-	@${CP} ${DISTDIR}/a2x.1.txt ${WRKSRC}/a2x.1.txt
-	@${CP} ${DISTDIR}/asciidoc.1.txt ${WRKSRC}/asciidoc.1.txt
 
 post-build:
-	@cd ${WRKSRC} && ${PYTHON_CMD} -m asciidoc.a2x -f manpage a2x.1.txt
-	@cd ${WRKSRC} && ${PYTHON_CMD} -m asciidoc.a2x -f manpage asciidoc.1.txt
+	@cd ${WRKSRC}/doc && ${PYTHON_CMD} -m asciidoc.a2x -f manpage a2x.1.txt
+	@cd ${WRKSRC}/doc && ${PYTHON_CMD} -m asciidoc.a2x -f manpage asciidoc.1.txt
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/a2x.1 ${WRKSRC}/asciidoc.1 ${STAGEDIR}${PREFIX}/share/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/a2x.1 ${WRKSRC}/doc/asciidoc.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 .include <bsd.port.mk>
diff --git a/textproc/asciidoc/distinfo b/textproc/asciidoc/distinfo
index 42024668e257..cce866ab8ecc 100644
--- a/textproc/asciidoc/distinfo
+++ b/textproc/asciidoc/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1721280202
+TIMESTAMP = 1721823004
 SHA256 (asciidoc-10.2.1.tar.gz) = d9f13c285981b3c7eb660d02ca0a2779981e88d48105de81bb40445e60dddb83
 SIZE (asciidoc-10.2.1.tar.gz) = 230179
-SHA256 (a2x.1.txt) = 51b05d6be98531ec6c7ff0459dc82fdd103bc43ae682b954c98943ead4d03de7
-SIZE (a2x.1.txt) = 13050
-SHA256 (asciidoc.1.txt) = 3e412b938b51d88948e7713b5026425b15babcb8e3899ec0e2c769e10baf8d31
-SIZE (asciidoc.1.txt) = 7485



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407242118.46OLIIPb064735>