CVS commit: pkgsrc/math/djbsort

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Aug  9 09:14:17 UTC 2018

Modified Files:
        pkgsrc/math/djbsort: Makefile distinfo
        pkgsrc/math/djbsort/patches: patch-build

Log Message:
We don't install multiple architectures, so don't build them. Bump
PKGREVISION defensively, since it's hard to be sure the binary package
hasn't changed.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/djbsort/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/djbsort/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/djbsort/patches/patch-build

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

Modified files:

Index: pkgsrc/math/djbsort/Makefile
diff -u pkgsrc/math/djbsort/Makefile:1.4 pkgsrc/math/djbsort/Makefile:1.5
--- pkgsrc/math/djbsort/Makefile:1.4    Tue Jul 31 06:34:11 2018
+++ pkgsrc/math/djbsort/Makefile        Thu Aug  9 09:14:16 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2018/07/31 06:34:11 schmonz Exp $
+# $NetBSD: Makefile,v 1.5 2018/08/09 09:14:16 schmonz Exp $
 
 DISTNAME=              djbsort-20180729
+PKGREVISION=           1
 CATEGORIES=            math
 MASTER_SITES=          ${HOMEPAGE}
 

Index: pkgsrc/math/djbsort/distinfo
diff -u pkgsrc/math/djbsort/distinfo:1.3 pkgsrc/math/djbsort/distinfo:1.4
--- pkgsrc/math/djbsort/distinfo:1.3    Tue Jul 31 06:34:11 2018
+++ pkgsrc/math/djbsort/distinfo        Thu Aug  9 09:14:16 2018
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2018/07/31 06:34:11 schmonz Exp $
+$NetBSD: distinfo,v 1.4 2018/08/09 09:14:16 schmonz Exp $
 
 SHA1 (djbsort-20180729.tar.gz) = 7b64b9c5b3c6428cb6bc16638876f57ffff3c58b
 RMD160 (djbsort-20180729.tar.gz) = 65455661524b5d2cdd21c1c329a9065cfc9b3b0d
 SHA512 (djbsort-20180729.tar.gz) = b46c36514ce0c2c1716421d4da216d2e7ddb80e8e9a1b97b274ab0b3fe7271ea946a65485e81d4dc76c080658b41ef1e2fa64a225594532f1be98dc29535b2a6
 Size (djbsort-20180729.tar.gz) = 29347 bytes
-SHA1 (patch-build) = 0f1ae219495cc63fc301aa1f9ae1c1655da3aaa3
+SHA1 (patch-build) = eab611f7868f00a92781eb5a1eed6451607fb30b
 SHA1 (patch-test) = b5ba29b15d7baa896bf9e47a1522e88e73df4c9e
 SHA1 (patch-upgrade) = 2bec25c36e1ed28c67e4967ac929780d28bb2e68

Index: pkgsrc/math/djbsort/patches/patch-build
diff -u pkgsrc/math/djbsort/patches/patch-build:1.1 pkgsrc/math/djbsort/patches/patch-build:1.2
--- pkgsrc/math/djbsort/patches/patch-build:1.1 Tue Jul 31 05:38:56 2018
+++ pkgsrc/math/djbsort/patches/patch-build     Thu Aug  9 09:14:16 2018
@@ -1,8 +1,9 @@
-$NetBSD: patch-build,v 1.1 2018/07/31 05:38:56 schmonz Exp $
+$NetBSD: patch-build,v 1.2 2018/08/09 09:14:16 schmonz Exp $
 
 Don't bake build host into binary packages.
+Don't build for multiple architectures.
 
---- build.orig 2018-07-17 14:55:25.000000000 +0000
+--- build.orig 2018-07-29 18:33:39.000000000 +0000
 +++ build
 @@ -35,6 +35,7 @@ version = readfile('version').strip()
  shorthostname = platform.node().split('.')[0].lower()
@@ -12,3 +13,18 @@ Don't bake build host into binary packag
  
  startdir = os.getcwd()
  
+@@ -98,11 +99,11 @@ def guessarchitectures(c):
+     if p.returncode:
+       lognow('dumpmachine exited %s' % (p.returncode))
+     out = out.decode()
+-    if out.startswith('x86_64'): return ['x86','amd64']
++    if out.startswith('x86_64'): return ['amd64']
+     if out.startswith('i686'): return ['x86']
+     if out.startswith('i386'): return ['x86']
+-    if out.startswith('aarch64'): return ['arm','armeabi','aarch64']
+-    if out.startswith('arm'): return ['arm','armeabi']
++    if out.startswith('aarch64'): return ['aarch64']
++    if out.startswith('arm'): return ['armeabi']
+     return
+   except Exception as e:
+     lognow('dumpmachine failed %s' % e)