Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Jul 2024 10:41:36 GMT
From:      Vladimir Druzenko <vvd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 113198d8d9ca - main - graphics/blender-doc: replace hard-coded versions with ones calculated from DISTVERSION
Message-ID:  <202407071041.467Afa2Y051899@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by vvd:

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

commit 113198d8d9ca0eb437684a4ffca4a08a7e6d9059
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2024-07-07 10:34:32 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-07-07 10:41:03 +0000

    graphics/blender-doc: replace hard-coded versions with ones calculated from DISTVERSION
---
 graphics/blender-doc/Makefile  | 12 ++++++++----
 graphics/blender-doc/pkg-plist |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/graphics/blender-doc/Makefile b/graphics/blender-doc/Makefile
index 01b3c3aa9e61..9d69349b9796 100644
--- a/graphics/blender-doc/Makefile
+++ b/graphics/blender-doc/Makefile
@@ -17,11 +17,15 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 NO_WRKSUBDIR=	yes
-PLIST_SUB+=	VER=v410
+VER_SHORT=	${DISTVERSION:S/.//g}
+VER=		v${VER_SHORT}0
+PLIST_SUB+=	VER=${VER} VER_SHORT=${VER_SHORT}
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTNAME}*.html" ${STAGEDIR}${DOCSDIR}/
-	@cd ${WRKSRC} && ${CP} "${PORTNAME}"*.epub/*.epub      ${STAGEDIR}${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} blender_manual_${VER}_en.html \
+		${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/blender_manual_${VER}_en.epub/Blender${VER_SHORT}Manual.epub \
+		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/blender-doc/pkg-plist b/graphics/blender-doc/pkg-plist
index 630d3d8b75aa..4645b5af23f0 100644
--- a/graphics/blender-doc/pkg-plist
+++ b/graphics/blender-doc/pkg-plist
@@ -1,4 +1,4 @@
-%%DOCSDIR%%/Blender41Manual.epub
+%%DOCSDIR%%/Blender%%VER_SHORT%%Manual.epub
 %%DOCSDIR%%/blender_manual_%%VER%%_en.html/.buildinfo
 %%DOCSDIR%%/blender_manual_%%VER%%_en.html/.htaccess
 %%DOCSDIR%%/blender_manual_%%VER%%_en.html/404.html


home | help

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