From 917deb3146136669994b6caffe011442df2b2b63 Mon Sep 17 00:00:00 2001 From: gutteridge Date: Tue, 8 Oct 2019 02:59:59 +0000 Subject: blackbox70: update to 0.75 (a minor maintenance release) pkgsrc-specific changes: we are now using upstream's formal release archive, which means a configure script is provided, so we aren't pulling in a bunch of tool dependencies just to generate such. Change log: Brian Bidulock (16): reformat TODO generate NEWS better update for gettext 0.20.1 to fix issue #23 update release notes generate NOTES and TODO place filename last in sed command update build process have better defaults now gcc 9.1 too agressive on array-bounds warnings ignore release products generate release notes on dist handle annotated tags better when generating NEWS update po files ignore lz files update release files update release files --- wm/blackbox70/DESCR | 2 +- wm/blackbox70/Makefile | 13 +++++-------- wm/blackbox70/distinfo | 19 +++++++++---------- wm/blackbox70/patches/patch-autogen.sh | 19 ------------------- wm/blackbox70/patches/patch-doc_fr__FR_Makefile.am | 11 ----------- wm/blackbox70/patches/patch-doc_fr__FR_Makefile.in | 15 +++++++++++++++ wm/blackbox70/patches/patch-doc_ja__JP_Makefile.am | 11 ----------- wm/blackbox70/patches/patch-doc_ja__JP_Makefile.in | 15 +++++++++++++++ wm/blackbox70/patches/patch-doc_nl__NL_Makefile.am | 11 ----------- wm/blackbox70/patches/patch-doc_nl__NL_Makefile.in | 15 +++++++++++++++ wm/blackbox70/patches/patch-doc_sl__SI_Makefile.am | 11 ----------- wm/blackbox70/patches/patch-doc_sl__SI_Makefile.in | 15 +++++++++++++++ 12 files changed, 75 insertions(+), 82 deletions(-) delete mode 100644 wm/blackbox70/patches/patch-autogen.sh delete mode 100644 wm/blackbox70/patches/patch-doc_fr__FR_Makefile.am create mode 100644 wm/blackbox70/patches/patch-doc_fr__FR_Makefile.in delete mode 100644 wm/blackbox70/patches/patch-doc_ja__JP_Makefile.am create mode 100644 wm/blackbox70/patches/patch-doc_ja__JP_Makefile.in delete mode 100644 wm/blackbox70/patches/patch-doc_nl__NL_Makefile.am create mode 100644 wm/blackbox70/patches/patch-doc_nl__NL_Makefile.in delete mode 100644 wm/blackbox70/patches/patch-doc_sl__SI_Makefile.am create mode 100644 wm/blackbox70/patches/patch-doc_sl__SI_Makefile.in diff --git a/wm/blackbox70/DESCR b/wm/blackbox70/DESCR index 9013f97a774..c4014976586 100644 --- a/wm/blackbox70/DESCR +++ b/wm/blackbox70/DESCR @@ -1,4 +1,4 @@ -Blackbox is yet another addition to the list of window managers For X11R6. +Blackbox is yet another addition to the list of window managers For X11. Blackbox is built with C++, sharing no common code with any other window manager. It is designed to be small and fast, with a built in graphics class, near complete ICCCM compliance, and support for multple desktop environments. diff --git a/wm/blackbox70/Makefile b/wm/blackbox70/Makefile index e1874d43bda..6f1c8bef6f6 100644 --- a/wm/blackbox70/Makefile +++ b/wm/blackbox70/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.20 2019/06/14 02:09:03 gutteridge Exp $ +# $NetBSD: Makefile,v 1.21 2019/10/08 02:59:59 gutteridge Exp $ -VERSION= 0.74 -PKGREVISION= 1 +VERSION= 0.75 DISTNAME= blackbox-${VERSION} PKGNAME= blackbox70-${VERSION} CATEGORIES= wm x11 MASTER_SITES= ${MASTER_SITE_GITHUB:=bbidulock/} GITHUB_PROJECT= blackboxwm -GITHUB_TAG= ${VERSION} +GITHUB_RELEASE= ${VERSION} +EXTRACT_SUFX= .tar.lz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/bbidulock/blackboxwm @@ -19,7 +19,7 @@ CONFLICTS+= blackbox-[0-9]* USE_LANGUAGES= c c++03 USE_LIBTOOL= yes -USE_TOOLS+= autoconf automake autopoint gettext-m4 gsed pkg-config +USE_TOOLS+= pkg-config GNU_CONFIGURE= YES CXXFLAGS.Linux+= -fpermissive @@ -30,9 +30,6 @@ BROKEN_GETTEXT_DETECTION=yes BUILDLINK_DEPMETHOD.libXt?= build -pre-configure: - cd ${WRKSRC}; ${SH} ./autogen.sh - .include "../../devel/gettext-lib/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" diff --git a/wm/blackbox70/distinfo b/wm/blackbox70/distinfo index c99df05bf85..b4266d81afd 100644 --- a/wm/blackbox70/distinfo +++ b/wm/blackbox70/distinfo @@ -1,14 +1,13 @@ -$NetBSD: distinfo,v 1.14 2019/06/14 02:09:03 gutteridge Exp $ +$NetBSD: distinfo,v 1.15 2019/10/08 02:59:59 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 -SHA1 (patch-doc_sl__SI_Makefile.am) = b348b43e5c8064cd4b46212d3bd609a2f41c7f02 +SHA1 (blackbox-0.75.tar.lz) = 65713441b2b5d0f496729ca65d6d609d40e1fcc4 +RMD160 (blackbox-0.75.tar.lz) = cc1362a45e292dccfbcaf03bc0a508a27bf64980 +SHA512 (blackbox-0.75.tar.lz) = 0e5e57c57408627af59fea6e6c74d081fce913c2c33005652f5c309edb6b8368f8cf4c80999134db35d1c80b0895476057d02c903210143c9411792d1fa381f1 +Size (blackbox-0.75.tar.lz) = 562326 bytes +SHA1 (patch-doc_fr__FR_Makefile.in) = 39af7e28c397bd4201f85d4d13a48892024d274b +SHA1 (patch-doc_ja__JP_Makefile.in) = bd79553e6bd5368a8b21cf463056a35c84e2e8e0 +SHA1 (patch-doc_nl__NL_Makefile.in) = 5f7df3158b59633fd9633656237f4fd5cdace897 +SHA1 (patch-doc_sl__SI_Makefile.in) = d116093a717a14d8e0b252f0254f7fb03e37f0a1 SHA1 (patch-lib_Image.cc) = ab49da02853b670843f4884517f0727d4569d50a SHA1 (patch-lib_Menu.cc) = b16a7439fa5db1d287e5353ec5986a9c3ffd6cfb SHA1 (patch-lib_Unicode.cc) = b2936e86dab0e4d0104312b5a387081a3fa02134 diff --git a/wm/blackbox70/patches/patch-autogen.sh b/wm/blackbox70/patches/patch-autogen.sh deleted file mode 100644 index 4cd5c0a02bc..00000000000 --- a/wm/blackbox70/patches/patch-autogen.sh +++ /dev/null @@ -1,19 +0,0 @@ -$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 diff --git a/wm/blackbox70/patches/patch-doc_fr__FR_Makefile.am b/wm/blackbox70/patches/patch-doc_fr__FR_Makefile.am deleted file mode 100644 index 2ca0a9c2288..00000000000 --- a/wm/blackbox70/patches/patch-doc_fr__FR_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-doc_fr__FR_Makefile.am,v 1.1 2018/10/12 18:00:55 he Exp $ - ---- doc/fr_FR/Makefile.am.orig 2018-10-10 08:41:59.978660422 +0000 -+++ doc/fr_FR/Makefile.am -@@ -21,5 +21,5 @@ blackbox.1: blackbox.1.in - $(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \ - -e "s,@pkgdatadir@,$(pkgdatadir)," \ - -e "s,@version@,$(VERSION)," \ -- $< > $@ -+ blackbox.1.in > $@ - diff --git a/wm/blackbox70/patches/patch-doc_fr__FR_Makefile.in b/wm/blackbox70/patches/patch-doc_fr__FR_Makefile.in new file mode 100644 index 00000000000..1ae171accfd --- /dev/null +++ b/wm/blackbox70/patches/patch-doc_fr__FR_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-doc_fr__FR_Makefile.in,v 1.1 2019/10/08 02:59:59 gutteridge Exp $ + +Avoid a variable specific to GNU make. + +--- doc/fr_FR/Makefile.in.orig 2019-09-06 09:55:03.000000000 +0000 ++++ doc/fr_FR/Makefile.in +@@ -588,7 +588,7 @@ blackbox.1: blackbox.1.in + $(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \ + -e "s,@pkgdatadir@,$(pkgdatadir)," \ + -e "s,@version@,$(VERSION)," \ +- $< > $@ ++ blackbox.1.in > $@ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/wm/blackbox70/patches/patch-doc_ja__JP_Makefile.am b/wm/blackbox70/patches/patch-doc_ja__JP_Makefile.am deleted file mode 100644 index c4e012dea1f..00000000000 --- a/wm/blackbox70/patches/patch-doc_ja__JP_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-doc_ja__JP_Makefile.am,v 1.1 2018/10/12 18:00:55 he Exp $ - ---- doc/ja_JP/Makefile.am.orig 2018-10-10 08:42:03.331555177 +0000 -+++ doc/ja_JP/Makefile.am -@@ -21,5 +21,5 @@ blackbox.1: blackbox.1.in - $(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \ - -e "s,@pkgdatadir@,$(pkgdatadir)," \ - -e "s,@version@,$(VERSION)," \ -- $< > $@ -+ blackbox.1.in > $@ - diff --git a/wm/blackbox70/patches/patch-doc_ja__JP_Makefile.in b/wm/blackbox70/patches/patch-doc_ja__JP_Makefile.in new file mode 100644 index 00000000000..d0f019abf04 --- /dev/null +++ b/wm/blackbox70/patches/patch-doc_ja__JP_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-doc_ja__JP_Makefile.in,v 1.1 2019/10/08 02:59:59 gutteridge Exp $ + +Avoid a variable specific to GNU make. + +--- doc/ja_JP/Makefile.in.orig 2019-09-06 09:55:04.000000000 +0000 ++++ doc/ja_JP/Makefile.in +@@ -588,7 +588,7 @@ blackbox.1: blackbox.1.in + $(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \ + -e "s,@pkgdatadir@,$(pkgdatadir)," \ + -e "s,@version@,$(VERSION)," \ +- $< > $@ ++ blackbox.1.in > $@ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/wm/blackbox70/patches/patch-doc_nl__NL_Makefile.am b/wm/blackbox70/patches/patch-doc_nl__NL_Makefile.am deleted file mode 100644 index 3c3bafb45da..00000000000 --- a/wm/blackbox70/patches/patch-doc_nl__NL_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-doc_nl__NL_Makefile.am,v 1.1 2018/10/12 18:00:55 he Exp $ - ---- doc/nl_NL/Makefile.am.orig 2018-10-10 08:42:06.624393977 +0000 -+++ doc/nl_NL/Makefile.am -@@ -21,5 +21,5 @@ blackbox.1: blackbox.1.in - $(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \ - -e "s,@pkgdatadir@,$(pkgdatadir)," \ - -e "s,@version@,$(VERSION)," \ -- $< > $@ -+ blackbox.1.in > $@ - diff --git a/wm/blackbox70/patches/patch-doc_nl__NL_Makefile.in b/wm/blackbox70/patches/patch-doc_nl__NL_Makefile.in new file mode 100644 index 00000000000..6f188f78b1e --- /dev/null +++ b/wm/blackbox70/patches/patch-doc_nl__NL_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-doc_nl__NL_Makefile.in,v 1.1 2019/10/08 02:59:59 gutteridge Exp $ + +Avoid a variable specific to GNU make. + +--- doc/nl_NL/Makefile.in.orig 2019-09-06 09:55:04.000000000 +0000 ++++ doc/nl_NL/Makefile.in +@@ -588,7 +588,7 @@ blackbox.1: blackbox.1.in + $(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \ + -e "s,@pkgdatadir@,$(pkgdatadir)," \ + -e "s,@version@,$(VERSION)," \ +- $< > $@ ++ blackbox.1.in > $@ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/wm/blackbox70/patches/patch-doc_sl__SI_Makefile.am b/wm/blackbox70/patches/patch-doc_sl__SI_Makefile.am deleted file mode 100644 index 2269767daa0..00000000000 --- a/wm/blackbox70/patches/patch-doc_sl__SI_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-doc_sl__SI_Makefile.am,v 1.1 2018/10/12 18:00:55 he Exp $ - ---- doc/sl_SI/Makefile.am.orig 2018-10-10 08:42:10.007327109 +0000 -+++ doc/sl_SI/Makefile.am -@@ -20,5 +20,5 @@ blackbox.1: blackbox.1.in - $(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \ - -e "s,@pkgdatadir@,$(pkgdatadir)," \ - -e "s,@version@,$(VERSION)," \ -- $< > $@ -+ blackbox.1.in > $@ - diff --git a/wm/blackbox70/patches/patch-doc_sl__SI_Makefile.in b/wm/blackbox70/patches/patch-doc_sl__SI_Makefile.in new file mode 100644 index 00000000000..d112edaa418 --- /dev/null +++ b/wm/blackbox70/patches/patch-doc_sl__SI_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-doc_sl__SI_Makefile.in,v 1.1 2019/10/08 02:59:59 gutteridge Exp $ + +Avoid a variable specific to GNU make. + +--- doc/sl_SI/Makefile.in.orig 2019-09-06 09:55:04.000000000 +0000 ++++ doc/sl_SI/Makefile.in +@@ -587,7 +587,7 @@ blackbox.1: blackbox.1.in + $(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \ + -e "s,@pkgdatadir@,$(pkgdatadir)," \ + -e "s,@version@,$(VERSION)," \ +- $< > $@ ++ blackbox.1.in > $@ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. -- cgit v1.2.3