pkgsrc-Bugs archive

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

pkg/54887: [FIX] shells/fish gets version from pkgsrc git checkout



>Number:         54887
>Category:       pkg
>Synopsis:       [FIX] shells/fish gets version from pkgsrc git checkout
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Jan 23 21:20:00 +0000 2020
>Originator:     Jonathan Schleifer
>Release:        HEAD
>Organization:
>Environment:
>Description:
fish think it's built from a git checkout when pkgsrc is checked out via git, resulting in it reporting the wrong version.
>How-To-Repeat:

>Fix:
commit 7b9e4dc532ebcdd17ef17bd7f45a985e16c1fb32
Author: Jonathan Schleifer <js%nil.im@localhost>
Date:   Thu Jan 23 22:18:41 2020 +0100

    fish: Fix version when using pkgsrc via git

diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index e24db24604f..d3f55f16cef 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.21 2019/11/09 12:02:29 nia Exp $
 
 DISTNAME=		fish-3.0.2
+PKGREVISION=		1
 CATEGORIES=		shells
 MASTER_SITES=		${MASTER_SITE_GITHUB:=fish-shell/}
 GITHUB_PROJECT=		fish-shell
@@ -47,6 +48,7 @@ PLIST.open=	yes
 .endif
 
 pre-configure:
+	${RUN} echo ${PKGVERSION_NOREV} >${WRKSRC}/version
 	${RUN} cd ${WRKSRC} && autoreconf -fiv
 
 .include "options.mk"



Home | Main Index | Thread Index | Old Index