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

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan 20 17:39:05 UTC 2019

Modified Files:
        pkgsrc/sysutils/arm-trusted-firmware-fiptool: Makefile distinfo
Added Files:
        pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches: patch-Makefile

Log Message:
arm-trusted-firmware-fiptool: fix make fetch.

Simplify package, distname, honor LDFLAGS (fixes RELRO), pkglint cleanup.

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/arm-trusted-firmware-fiptool/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches/patch-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.2 pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile:1.3
--- pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile:1.2   Wed Jan 16 14:51:35 2019
+++ pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile       Sun Jan 20 17:39:05 2019
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2019/01/16 14:51:35 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/01/20 17:39:05 wiz Exp $
 
-VERSION=       2.0
 GITHUB_PROJECT=        arm-trusted-firmware
-# GITHUB_TAG=  ?
-
-PKGNAME=       ${GITHUB_PROJECT}-fiptool-${VERSION}
-DISTNAME=      ${PKGNAME:S/-${VERSION}$/-v${VERSION}/}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
+DISTNAME=      arm-trusted-firmware-2.0
+PKGNAME=       ${DISTNAME:S/firmware/firmware-fiptool/}
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ARM-software/}
 EXTRACT_SUFX=  .zip
@@ -16,10 +15,11 @@ COMMENT=    ARM Trusted Firmware fiptool
 LICENSE=       modified-bsd
 
 USE_TOOLS+=    gmake
-WRKSRC=                ${WRKDIR}/${PKGNAME:S:-fiptool::}/tools/fiptool
-       
+WRKSRC=                ${WRKDIR}/${DISTNAME}/tools/fiptool
+
+INSTALLATION_DIRS=     bin
+
 do-install:
-       ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
        ${INSTALL_PROGRAM} ${WRKSRC}/fiptool ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/arm-trusted-firmware-fiptool/distinfo
diff -u pkgsrc/sysutils/arm-trusted-firmware-fiptool/distinfo:1.1 pkgsrc/sysutils/arm-trusted-firmware-fiptool/distinfo:1.2
--- pkgsrc/sysutils/arm-trusted-firmware-fiptool/distinfo:1.1   Wed Jan 16 14:34:04 2019
+++ pkgsrc/sysutils/arm-trusted-firmware-fiptool/distinfo       Sun Jan 20 17:39:05 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2019/01/16 14:34:04 martin Exp $
+$NetBSD: distinfo,v 1.2 2019/01/20 17:39:05 wiz Exp $
 
-SHA1 (arm-trusted-firmware-fiptool-v2.0.zip) = d789e7aac0e987d8524a11587cc598bf5d894581
-RMD160 (arm-trusted-firmware-fiptool-v2.0.zip) = a7a49da9b0e27c45df867ea1de4809cb89d9b8cc
-SHA512 (arm-trusted-firmware-fiptool-v2.0.zip) = 39180d12be7532b742949f162759793e97c0a6ac835d66aaf857bd3c1d9c0ab10b7ccd5e6a47831ad909a92b4727e181c82a74c90b5d941e469f3a5cf66b0e7c
-Size (arm-trusted-firmware-fiptool-v2.0.zip) = 3949049 bytes
+SHA1 (arm-trusted-firmware-2.0.zip) = d789e7aac0e987d8524a11587cc598bf5d894581
+RMD160 (arm-trusted-firmware-2.0.zip) = a7a49da9b0e27c45df867ea1de4809cb89d9b8cc
+SHA512 (arm-trusted-firmware-2.0.zip) = 39180d12be7532b742949f162759793e97c0a6ac835d66aaf857bd3c1d9c0ab10b7ccd5e6a47831ad909a92b4727e181c82a74c90b5d941e469f3a5cf66b0e7c
+Size (arm-trusted-firmware-2.0.zip) = 3949049 bytes
+SHA1 (patch-Makefile) = b5c27e44135e6a99c1a598daec91db58d6ff894d

Added files:

Index: pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile
diff -u /dev/null pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile:1.1
--- /dev/null   Sun Jan 20 17:39:05 2019
+++ pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile Sun Jan 20 17:39:05 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2019/01/20 17:39:05 wiz Exp $
+
+Honor LDFLAGS.
+
+--- Makefile.orig      2018-10-02 13:13:37.000000000 +0000
++++ Makefile
+@@ -37,7 +37,7 @@ all: ${PROJECT}
+ 
+ ${PROJECT}: ${OBJECTS} Makefile
+       @echo "  LD      $@"
+-      ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS}
++      ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDFLAGS} ${LDLIBS}
+       @${ECHO_BLANK_LINE}
+       @echo "Built $@ successfully"
+       @${ECHO_BLANK_LINE}