[pkgsrc/trunk]: pkgsrc/wm/sawfish sawfish: re-source 1.13 archive for true re...

[gutteridge <gutteridge%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4163833a36c5
branches:  trunk
changeset: 376261:4163833a36c5
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Mon Apr 04 01:18:43 2022 +0000

description:
sawfish: re-source 1.13 archive for true release content

Not sure how I missed it, but the original archive site is still the
place to get the true release archives, as I just noticed while
comparing something. This simplifies things, as they actually do
provide a configure script, have a normal $WRKSRC by default, etc., in
that version of the archive. This change is close enough after the
original update I made to hopefully be unobtrusive, and the archive
file name differs, too.

There's an issue where upstream thinks they have an install target that
accommodates bsdtar, but it doesn't work on NetBSD (at least, 9.99.95).
Patching it could be revisited, but, since this package seems to expect
gtar as a runtime dependency, anyway, hardly pressing.

diffstat:

 wm/sawfish/Makefile                   |  17 +++++++----------
 wm/sawfish/distinfo                   |  10 +++++-----
 wm/sawfish/patches/patch-configure    |  33 +++++++++++++++++++++++++++++++++
 wm/sawfish/patches/patch-configure.ac |  33 ---------------------------------
 4 files changed, 45 insertions(+), 48 deletions(-)

diffs (134 lines):

diff -r c96bed73809f -r 4163833a36c5 wm/sawfish/Makefile
--- a/wm/sawfish/Makefile       Mon Apr 04 00:45:02 2022 +0000
+++ b/wm/sawfish/Makefile       Mon Apr 04 01:18:43 2022 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.100 2022/04/04 00:44:53 gutteridge Exp $
+# $NetBSD: Makefile,v 1.101 2022/04/04 01:18:43 gutteridge Exp $
 
-DISTNAME=      sawfish-1.13.0
+DISTNAME=      sawfish_1.13.0
+PKGNAME=       ${DISTNAME:S/_/-/}
+PKGREVISION=   1
 CATEGORIES=    wm x11
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=SawfishWM/}
-GITHUB_TAG=    refs/tags/${PKGNAME_NOREV}
+MASTER_SITES=  https://download.tuxfamily.org/sawfish/
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://sawfish.tuxfamily.org/
@@ -13,11 +15,10 @@
 GNU_CONFIGURE=         yes
 INFO_FILES=            YES
 PKGCONFIG_OVERRIDE+=   sawfish.pc.in
-USE_TOOLS+=            gmake makeinfo msgfmt pkg-config xgettext autoconf automake
+USE_TOOLS+=            gmake makeinfo msgfmt pkg-config xgettext
 USE_TOOLS+=            gtar:run        # for librep run-time theme extraction
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
-WRKSRC=                        ${WRKDIR}/${PKGBASE}-${DISTNAME}
 
 CONFIGURE_ARGS+=       --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
@@ -39,10 +40,6 @@
 REP_ENV_PKGSRC=
 .endif
 
-# The upstream presently isn't providing a pre-generated configure.
-pre-configure:
-       cd ${WRKSRC} && autoreconf -iv
-
 .include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
diff -r c96bed73809f -r 4163833a36c5 wm/sawfish/distinfo
--- a/wm/sawfish/distinfo       Mon Apr 04 00:45:02 2022 +0000
+++ b/wm/sawfish/distinfo       Mon Apr 04 01:18:43 2022 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2022/04/04 00:44:53 gutteridge Exp $
+$NetBSD: distinfo,v 1.28 2022/04/04 01:18:43 gutteridge Exp $
 
-BLAKE2s (sawfish-1.13.0.tar.gz) = 8e1b928170fc2d0a6a65004449c40aab240740b7403e3151021cd7fb22a53181
-SHA512 (sawfish-1.13.0.tar.gz) = e294f3807bcf3664f7ce6410dcddd65657a8886d1117c0bf2ca233a1deb143a8c7374a46e47e9f2b74e17816d1b526152c51b59c62ffec5b07250f6b1cd9b6af
-Size (sawfish-1.13.0.tar.gz) = 5043050 bytes
+BLAKE2s (sawfish_1.13.0.tar.xz) = 18c9d61563f22c7e1e07d5c195116bd29d89f500d6a515333f765b254144d48e
+SHA512 (sawfish_1.13.0.tar.xz) = 3f7e033e3c6fd3b8ff3ecf98b3c912299fce181cb263038def733c392c3948ec03681a8b3bdec385b950c17c9dafb14c6dd41b2b1bbc50e8eb347f45c62dd477
+Size (sawfish_1.13.0.tar.xz) = 2830924 bytes
 SHA1 (patch-ab) = 21a89c87afa9cb5fdf3b028109b0db9c5991fb1e
-SHA1 (patch-configure.ac) = 961139be928a5aa68149a219bb792c9892ead7ef
+SHA1 (patch-configure) = b3218f5e42eab3640e7db755a27e8c54b50e9b36
 SHA1 (patch-themes_Makefile.in) = 0584333bad4f86e2129478c2194058ea2b002181
diff -r c96bed73809f -r 4163833a36c5 wm/sawfish/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/sawfish/patches/patch-configure        Mon Apr 04 01:18:43 2022 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-configure,v 1.1 2022/04/04 01:18:43 gutteridge Exp $
+
+* Fix PKGLOCALEDIR
+* Avoid differing PLIST depending on whether kde4-config was in the path or not
+
+--- configure.orig     2021-12-24 19:23:47.000000000 +0000
++++ configure
+@@ -11870,7 +11870,7 @@ SUBDIRS="src lisp scripts themes sounds 
+ 
+ sawfishdir='${datadir}/sawfish'
+ lispdir='${sawfishdir}/lisp'
+-localedir='${datadir}/locale'
++#localedir='${datadir}/locale'
+ sawfishexecdir='${libdir}/sawfish'
+ 
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+@@ -14551,12 +14551,12 @@ fi
+ 
+ KDE4_SESSION="$with_kde4session"
+ 
+-if test "$with_kde4session" = "yes"; then
+-      KDED4IR="`kde4-config --install data`"
+-fi
++#if test "$with_kde4session" = "yes"; then
++#     KDED4IR="`kde4-config --install data`"
++#fi
+ 
+ if test "x$KDE4DIR" = x; then
+-       KDE4DIR="${datadir}/kde4/apps/"
++       KDE4DIR="${datadir}/kde/apps/"
+ fi
+ 
+ 
diff -r c96bed73809f -r 4163833a36c5 wm/sawfish/patches/patch-configure.ac
--- a/wm/sawfish/patches/patch-configure.ac     Mon Apr 04 00:45:02 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2022/04/04 00:44:53 gutteridge Exp $
-
-Fix PKGLOCALEDIR.
-
---- configure.ac.orig  2021-12-24 09:31:19.000000000 +0000
-+++ configure.ac
-@@ -42,7 +42,7 @@ SUBDIRS="src lisp scripts themes sounds 
- 
- sawfishdir='${datadir}/sawfish'
- lispdir='${sawfishdir}/lisp'
--localedir='${datadir}/locale'
-+dnl localedir='${datadir}/locale'
- sawfishexecdir='${libdir}/sawfish'
- 
- dnl Several checks
-@@ -295,13 +295,13 @@ AC_ARG_WITH(kde4session,
- 
- KDE4_SESSION="$with_kde4session"
- 
--if test "$with_kde4session" = "yes"; then
--      KDED4IR="`kde4-config --install data`"
--fi
-+dnl if test "$with_kde4session" = "yes"; then
-+dnl   KDED4IR="`kde4-config --install data`"
-+dnl fi
- 
- dnl fallback
- if test "x$KDE4DIR" = x; then
--       KDE4DIR="${datadir}/kde4/apps/"
-+       KDE4DIR="${datadir}/kde/apps/"
- fi
- 
- AC_ARG_WITH(kde5session,