pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

vis-editor: Avoid to use DISTBASE/PKGBASE for s/vis/vis-editor/ renames



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sat Jan 23 12:13:36 2021 +0100
Changeset:	5599b1f6976105c3543072f00372183480872352

Modified Files:
	vis-editor/Makefile

Log Message:
vis-editor: Avoid to use DISTBASE/PKGBASE for s/vis/vis-editor/ renames

The renaming will probably stay and not subjected to possible further
changes so hardcode it to ease readability.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5599b1f6976105c3543072f00372183480872352

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 vis-editor/Makefile | 47 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diffs:
diff --git a/vis-editor/Makefile b/vis-editor/Makefile
index 4c6fd45c6d..bd3535f55a 100644
--- a/vis-editor/Makefile
+++ b/vis-editor/Makefile
@@ -4,17 +4,14 @@ DISTNAME=		vis-0.7
 PKGNAME=		${DISTNAME:S/vis/vis-editor/}
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_GITHUB:=martanne/}
+GITHUB_PROJECT=		vis
+GITHUB_TAG=		v${PKGVERSION_NOREV}
 
 MAINTAINER=		erig%erig.me@localhost
 HOMEPAGE=		https://github.com/martanne/vis/
 COMMENT=		Vim like text editor
 LICENSE=		isc
 
-GITHUB_PROJECT=		${DISTBASE}
-GITHUB_TAG=		v${PKGVERSION_NOREV}
-
-DISTBASE=		${DISTNAME:C/(.*)-${PKGVERSION}/\1/}
-
 WRKSRC=			${WRKDIR}/${DISTNAME}
 
 LUA_VERSIONS_ACCEPTED=	52 53
@@ -33,9 +30,9 @@ SUBST_STAGE.fix-paths=		pre-build
 SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
 SUBST_FILES.fix-paths=		vis-lua.c man/vis.1 Makefile
 SUBST_SED.fix-paths=		-e 's,/usr/local,${PREFIX},g'
-SUBST_SED.fix-paths+=		-e 's,/share/${DISTBASE},/share/${PKGBASE},g'
-SUBST_SED.fix-paths+=		-e 's,$${SHAREPREFIX}/${DISTBASE},$${SHAREPREFIX}/${PKGBASE},g'
-SUBST_SED.fix-paths+=		-e 's,$${DOCPREFIX}/${DISTBASE},$${DOCPREFIX}/${PKGBASE},g'
+SUBST_SED.fix-paths+=		-e 's,/share/vis,/share/vis-editor,g'
+SUBST_SED.fix-paths+=		-e 's,$${SHAREPREFIX}/vis,$${SHAREPREFIX}/vis-editor,g'
+SUBST_SED.fix-paths+=		-e 's,$${DOCPREFIX}/vis,$${DOCPREFIX}/vis-editor,g'
 
 SUBST_CLASSES+=			binary-names
 SUBST_STAGE.binary-names=	pre-build
@@ -44,25 +41,25 @@ SUBST_FILES.binary-names+=	man/*.1
 SUBST_FILES.binary-names+=	lua/plugins/*.lua
 SUBST_FILES.binary-names+=	main.c vis-menu.c vis-registers.c vis.h
 SUBST_FILES.binary-names+=	vis-complete vis-open
-SUBST_SED.binary-names=		-e 's,'${DISTBASE}'-\(open\),'${PKGBASE}'-\1,g'
-SUBST_SED.binary-names+=	-e 's,'${DISTBASE}'-\(clipboard\),'${PKGBASE}'-\1,g'
-SUBST_SED.binary-names+=	-e 's,'${DISTBASE}'-\(complete\),'${PKGBASE}'-\1,g'
-SUBST_SED.binary-names+=	-e 's,'${DISTBASE}'-\(digraph\),'${PKGBASE}'-\1,g'
-SUBST_SED.binary-names+=	-e 's,'${DISTBASE}'-\(menu\),'${PKGBASE}'-\1,g'
+SUBST_SED.binary-names=		-e 's,vis-\(open\),vis-editor-\1,g'
+SUBST_SED.binary-names+=	-e 's,vis-\(clipboard\),vis-editor-\1,g'
+SUBST_SED.binary-names+=	-e 's,vis-\(complete\),vis-editor-\1,g'
+SUBST_SED.binary-names+=	-e 's,vis-\(digraph\),vis-editor-\1,g'
+SUBST_SED.binary-names+=	-e 's,vis-\(menu\),vis-editor-\1,g'
 
 post-install:
-	${MV} ${DESTDIR}${PREFIX}/bin/${DISTBASE} ${DESTDIR}${PREFIX}/bin/${PKGBASE}
-	${MV} ${DESTDIR}${PREFIX}/bin/${DISTBASE}-open ${DESTDIR}${PREFIX}/bin/${PKGBASE}-open
-	${MV} ${DESTDIR}${PREFIX}/bin/${DISTBASE}-clipboard ${DESTDIR}${PREFIX}/bin/${PKGBASE}-clipboard
-	${MV} ${DESTDIR}${PREFIX}/bin/${DISTBASE}-complete ${DESTDIR}${PREFIX}/bin/${PKGBASE}-complete
-	${MV} ${DESTDIR}${PREFIX}/bin/${DISTBASE}-digraph ${DESTDIR}${PREFIX}/bin/${PKGBASE}-digraph
-	${MV} ${DESTDIR}${PREFIX}/bin/${DISTBASE}-menu ${DESTDIR}${PREFIX}/bin/${PKGBASE}-menu
-	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${DISTBASE}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${PKGBASE}.1
-	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${DISTBASE}-open.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${PKGBASE}-open.1
-	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${DISTBASE}-clipboard.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${PKGBASE}-clipboard.1
-	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${DISTBASE}-complete.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${PKGBASE}-complete.1
-	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${DISTBASE}-digraph.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${PKGBASE}-digraph.1
-	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${DISTBASE}-menu.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${PKGBASE}-menu.1
+	${MV} ${DESTDIR}${PREFIX}/bin/vis ${DESTDIR}${PREFIX}/bin/vis-editor
+	${MV} ${DESTDIR}${PREFIX}/bin/vis-open ${DESTDIR}${PREFIX}/bin/vis-editor-open
+	${MV} ${DESTDIR}${PREFIX}/bin/vis-clipboard ${DESTDIR}${PREFIX}/bin/vis-editor-clipboard
+	${MV} ${DESTDIR}${PREFIX}/bin/vis-complete ${DESTDIR}${PREFIX}/bin/vis-editor-complete
+	${MV} ${DESTDIR}${PREFIX}/bin/vis-digraph ${DESTDIR}${PREFIX}/bin/vis-editor-digraph
+	${MV} ${DESTDIR}${PREFIX}/bin/vis-menu ${DESTDIR}${PREFIX}/bin/vis-editor-menu
+	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vis.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vis-editor.1
+	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vis-open.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vis-editor-open.1
+	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vis-clipboard.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vis-editor-clipboard.1
+	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vis-complete.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vis-editor-complete.1
+	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vis-digraph.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vis-editor-digraph.1
+	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vis-menu.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vis-editor-menu.1
 
 DEPENDS+=	${LUA_PKGPREFIX}-lpeg-[0-9]*:../../devel/lua-lpeg
 .include "../../lang/lua/buildlink3.mk"


Home | Main Index | Thread Index | Old Index