CVS commit: pkgsrc/wm/blackbox70

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Fri Jun 14 02:09:03 UTC 2019

Modified Files:
        pkgsrc/wm/blackbox70: Makefile distinfo
Added Files:
        pkgsrc/wm/blackbox70/patches: patch-autogen.sh

Log Message:
blackbox70: fix build with gettext-0.20.1


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/wm/blackbox70/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/wm/blackbox70/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/wm/blackbox70/patches/patch-autogen.sh

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

Modified files:

Index: pkgsrc/wm/blackbox70/Makefile
diff -u pkgsrc/wm/blackbox70/Makefile:1.19 pkgsrc/wm/blackbox70/Makefile:1.20
--- pkgsrc/wm/blackbox70/Makefile:1.19  Sat Jan 19 21:21:04 2019
+++ pkgsrc/wm/blackbox70/Makefile       Fri Jun 14 02:09:03 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2019/01/19 21:21:04 gutteridge Exp $
+# $NetBSD: Makefile,v 1.20 2019/06/14 02:09:03 gutteridge Exp $
 
 VERSION=       0.74
+PKGREVISION=   1
 DISTNAME=      blackbox-${VERSION}
 PKGNAME=       blackbox70-${VERSION}
 CATEGORIES=    wm x11

Index: pkgsrc/wm/blackbox70/distinfo
diff -u pkgsrc/wm/blackbox70/distinfo:1.13 pkgsrc/wm/blackbox70/distinfo:1.14
--- pkgsrc/wm/blackbox70/distinfo:1.13  Sat Jan 19 21:21:04 2019
+++ pkgsrc/wm/blackbox70/distinfo       Fri Jun 14 02:09:03 2019
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.13 2019/01/19 21:21:04 gutteridge Exp $
+$NetBSD: distinfo,v 1.14 2019/06/14 02:09:03 gutteridge Exp $
 
 SHA1 (blackbox-0.74.tar.gz) = b252f052c590f092ae0e9c381c6c7e823fd83654
 RMD160 (blackbox-0.74.tar.gz) = 5c124739cbf1098341378c3bae1b7a461ec22dd4
 SHA512 (blackbox-0.74.tar.gz) = 7d67fe2fe6c0c2e9cd18d494fbba885ab7ca8c7aadcfe5ceada97c1280633b575f3f47a36dc5393c61ae0baf50eef61e56683899913fa58859148148e5041389
 Size (blackbox-0.74.tar.gz) = 395732 bytes
+SHA1 (patch-autogen.sh) = bdf1efbddf09d0e457390aaf9f2e621204175540
 SHA1 (patch-doc_fr__FR_Makefile.am) = 77fdac4d552af2ef0e8d43c5f6f8aeb0f8e20862
 SHA1 (patch-doc_ja__JP_Makefile.am) = e5dcdf4da59f805547cbf0cc9eb5d28468685e2b
 SHA1 (patch-doc_nl__NL_Makefile.am) = 951a4babc59a7a237cf662c7c3a2d2b865d9495b

Added files:

Index: pkgsrc/wm/blackbox70/patches/patch-autogen.sh
diff -u /dev/null pkgsrc/wm/blackbox70/patches/patch-autogen.sh:1.3
--- /dev/null   Fri Jun 14 02:09:03 2019
+++ pkgsrc/wm/blackbox70/patches/patch-autogen.sh       Fri Jun 14 02:09:03 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-autogen.sh,v 1.3 2019/06/14 02:09:03 gutteridge Exp $
+
+Work around gettext version mismatches (e.g., 0.20.1 would cause this to
+break, because there are no infrastructure files for that version number
+for autopoint to locate). The intent to override seems unnecessary for
+pkgsrc's purposes.
+
+--- autogen.sh.orig    2018-10-31 08:44:56.000000000 +0000
++++ autogen.sh
+@@ -26,9 +26,6 @@ if [ -x "`which git 2>/dev/null`" -a -d 
+              s:%%VERSION%%:$VERSION:g
+              s:%%DATE%%:$DATE:g
+              s:%%BRANCH%%:$BRANCH:g"
+-else
+-      sed -i.bak configure.ac -r \
+-              -e "s:^AM_GNU_GETTEXT_VERSION.*:AM_GNU_GETTEXT_VERSION([$GTVERSION]):"
+ fi
+ 
+ mkdir m4 2>/dev/null