CVS commit: pkgsrc/sysutils/arm-trusted-firmware-fiptool

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Wed Jan 16 14:51:35 UTC 2019

Modified Files:
        pkgsrc/sysutils/arm-trusted-firmware-fiptool: Makefile

Log Message:
Fix PKGNAME (confusion with DISTNAME). Pointed out by Jared.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile

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

Modified files:

Index: pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile
diff -u pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile:1.1 pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile:1.2
--- pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile:1.1   Wed Jan 16 14:34:04 2019
+++ pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile       Wed Jan 16 14:51:35 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2019/01/16 14:34:04 martin Exp $
+# $NetBSD: Makefile,v 1.2 2019/01/16 14:51:35 martin Exp $
 
-VERSION=       v2.0
+VERSION=       2.0
 GITHUB_PROJECT=        arm-trusted-firmware
 # GITHUB_TAG=  ?
 
 PKGNAME=       ${GITHUB_PROJECT}-fiptool-${VERSION}
-DISTNAME=      ${PKGNAME}
+DISTNAME=      ${PKGNAME:S/-${VERSION}$/-v${VERSION}/}
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ARM-software/}
 EXTRACT_SUFX=  .zip
@@ -16,7 +16,7 @@ COMMENT=      ARM Trusted Firmware fiptool
 LICENSE=       modified-bsd
 
 USE_TOOLS+=    gmake
-WRKSRC=                ${WRKDIR}/${DISTNAME:S:-fiptool-v:-:}/tools/fiptool
+WRKSRC=                ${WRKDIR}/${PKGNAME:S:-fiptool::}/tools/fiptool
        
 do-install:
        ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin