CVS commit: pkgsrc/devel/elftoolchain

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Mar  6 11:40:00 UTC 2020

Modified Files:
        pkgsrc/devel/elftoolchain: PLIST distinfo
Added Files:
        pkgsrc/devel/elftoolchain/patches:
            patch-libelftc_make-toolchain-version

Log Message:
elftoolchain: Don't require svn to build, and regenerate the PLIST


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/elftoolchain/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/elftoolchain/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/elftoolchain/patches/patch-libelftc_make-toolchain-version

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

Modified files:

Index: pkgsrc/devel/elftoolchain/PLIST
diff -u pkgsrc/devel/elftoolchain/PLIST:1.3 pkgsrc/devel/elftoolchain/PLIST:1.4
--- pkgsrc/devel/elftoolchain/PLIST:1.3 Mon Oct  1 12:36:35 2018
+++ pkgsrc/devel/elftoolchain/PLIST     Fri Mar  6 11:40:00 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2018/10/01 12:36:35 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/03/06 11:40:00 nia Exp $
 bin/addr2line
 bin/ar
 bin/brandelf
@@ -27,24 +27,20 @@ lib/libdwarf.so
 lib/libdwarf.so.3
 lib/libdwarf.so.3.0
 lib/libdwarf_p.a
-lib/libdwarf_pic.a
 lib/libelf.a
 lib/libelf.so
 lib/libelf.so.1
 lib/libelf.so.1.0
 lib/libelf_p.a
-lib/libelf_pic.a
 lib/libelftc.a
 lib/libelftc.so
 lib/libelftc.so.1
 lib/libelftc.so.1.0
 lib/libelftc_p.a
-lib/libelftc_pic.a
 lib/libpe.a
 lib/libpe.so
 lib/libpe.so.1
 lib/libpe_p.a
-lib/libpe_pic.a
 man/man1/addr2line.1
 man/man1/ar.1
 man/man1/brandelf.1

Index: pkgsrc/devel/elftoolchain/distinfo
diff -u pkgsrc/devel/elftoolchain/distinfo:1.7 pkgsrc/devel/elftoolchain/distinfo:1.8
--- pkgsrc/devel/elftoolchain/distinfo:1.7      Mon Oct  1 12:36:35 2018
+++ pkgsrc/devel/elftoolchain/distinfo  Fri Mar  6 11:40:00 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2018/10/01 12:36:35 ryoon Exp $
+$NetBSD: distinfo,v 1.8 2020/03/06 11:40:00 nia Exp $
 
 SHA1 (elftoolchain-0.7.1.tar.bz2) = fdab1804543e47887bd73f1177b723af21ab47ae
 RMD160 (elftoolchain-0.7.1.tar.bz2) = 9e341f86573d80dd2b390d79cf82f239ecd279ff
@@ -9,3 +9,4 @@ SHA1 (patch-libdwarf_Makefile) = bea37cf
 SHA1 (patch-libelf_Makefile) = 29fdcead0e1d01ba2cf1d9e16e9d50bc041c9eec
 SHA1 (patch-libelftc_Makefile) = 64990e254ca3c55615cc3746fa948d7e0ca1fcb4
 SHA1 (patch-libelftc___libelftc.h) = db63ca28c25ccf92b9b15ffcaf016bf2bd3d291d
+SHA1 (patch-libelftc_make-toolchain-version) = a1c82a9bcfbf819f5712fbec4f4a3ad07f4abd11

Added files:

Index: pkgsrc/devel/elftoolchain/patches/patch-libelftc_make-toolchain-version
diff -u /dev/null pkgsrc/devel/elftoolchain/patches/patch-libelftc_make-toolchain-version:1.1
--- /dev/null   Fri Mar  6 11:40:00 2020
+++ pkgsrc/devel/elftoolchain/patches/patch-libelftc_make-toolchain-version     Fri Mar  6 11:40:00 2020
@@ -0,0 +1,32 @@
+$NetBSD: patch-libelftc_make-toolchain-version,v 1.1 2020/03/06 11:40:00 nia Exp $
+
+Avoid needing any VCS system.
+
+--- libelftc/make-toolchain-version.orig       2016-02-16 22:58:35.000000000 +0000
++++ libelftc/make-toolchain-version
+@@ -64,24 +64,7 @@ done
+ curdir=`pwd`
+ cd ${top} || usage "ERROR: Cannot change directory to \"${top}\"."
+ 
+-if [ -d CVS ]; then           # Look for CVS (NetBSD).
+-    versionstring=" cvs:unknown"
+-else                          # Try git (DragonFlyBSD).
+-    gitversion="$(git describe --all --dirty --long 2> /dev/null)"
+-    if [ -n "${gitversion}" ]; then
+-        versionstring=" git:${gitversion}"
+-    else   # Assume an SVN checkout (SourceForge or FreeBSD).
+-        svnversion="$(svnversion)"
+-        if [ -n "${svnversion}" ]; then
+-          versionstring=" svn:$(svnversion)"
+-        fi
+-    fi
+-fi
+-
+-if [ -z "${versionstring}" ]; then
+-    echo "ERROR: cannot determine a revision number." 1>&2
+-    exit 1
+-fi
++versionstring=" pkgsrc"
+ 
+ cd ${curdir} || usage "Cannot change back to ${curdir}."
+