sawfish: update to 1.13.0

1.13.0 "Bolero"
===============

   * Bug Fixes
        - Fix random resize issues with GTK+3 [GSR]

        - Improved KDE4/5 integration, prevent Plasma and KRunner
          windows to be tiled.  [Christopher Bratusek]

        - Update KDE5 session script, use 'startx11-plasma' instead of
          'startkde' [Christpher Bratusek]

        - Make 'shring-yank' recognise screen edges when shrinking or
          yanking windows, when the window crosses screen edges [Michal
          Nazarewicz]

        - Add support for '_NET_FRAME_EXTENTS' and
          '_NET_REQUEST_FRAME_EXTENTS' properties, fixing issues with
          HTML5 data element positioning in browsers, and several more
          [GSR]

        - Fix wrong detection of GNOME because of other DEs using an old
          GNOME-related envvar [Christopher Bratusek]

   * Build and Installation
        - Make build reproducible [Bernhard M. Wiedemann]

        - Fix cross compilation [Helmut Grohne]

        - Fix compilation with GCC10 [Kim B. Heino]
             x allow overriding 'build-info' build time, hostname and
               username.
             x avoid recreating theme tarball for every single file (the
               old code was erroneously recreating theme tarballs for
               each file contained thus calling 'tar' over 200 times to
               create 8 tarballs)
             x make 'DOC' file reproducibly
             x other improvements to make builds reproducible

        - Explicitely check for 'rep' binary, not just 'librep-dev'.
          [Christopher Bratusek]

        - First check for 'libgtk2.0-dev' then for 'rep-gtk-dev'.
          [Christopher Bratusek]

        - Only create session file directories for GNOME 2, KDE 4 or KDE
          5 if actually requested by user.  [Christopher Bratusek]

        - Makefile.in 'distclean' target no longer utilizes
          debian/rules, no longer removes finalized RPM spec file or
          Gentoo ebuild.  [Christopher Bratusek]

        - Remove dead code from 'build-info' [Ulrik Haugen]

        - Revert commit '6ad175d835aee85179259d7c02b3be152d3e4b86', "The
          problem is that any sticky windows that have been focused…",
          see https://github.com/SawfishWM/sawfish/pull/49 [Mario
          Goulart]

   * New or changes features
        - Make 'match-window' allow specifying arbitrary functions as
          filter [Michal Nazarewicz]

   * Miscellaneous Changes
        - Various minor changes to the Makefiles, mostly replacing
          'gitlcean' target with 'distclean' target and adding '.PHONY'
          section.  Also move theme tarball creation into 'all' target,
          rather than 'install' target.  [Christopher Bratusek]

        - Make 'rename-window' throw an actual useful error message if
          no string (or no usable) was given.  [Christopher Bratusek]

        - Make 'resize-window-prompt' throw an actual useful error
          message if one (or both) of the input values was not given.
          [Christopher Bratusek]

        - Move several modules from 'sawfish.wm.prg' into the Sawfish
          Extras package [Christopher Bratusek]
             + 'diodon'
             + 'fehlstart'
             + 'idesk'
             + 'nm-applet'
             + 'pancake'

        - Filter out 'Trayer' in 'cabinet'.  [Christopher Bratusek]

        - Update Lumina integration.  [Christopher Bratusek]

        - Update GNOME integration and explicitely check for GNOME,
          respectively GNOME-classic [Christopher Bratusek]

        - Update KDE5 integration, check for plasma as desktop session
          [Christopher Bratusek]

        - Simplify Frame-Style README parsing.  [OpenBSD patch]

        - Update Japanese translation.  [Takeshi Hamasaki]

        - Update Korean translation.  [parkmino]

6 files changed, 73 insertions, 79 deletions

diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index 0776417f45a..a50c01e2dcf 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,24 +1,23 @@
-# $NetBSD: Makefile,v 1.99 2021/12/08 16:06:51 adam Exp $
+# $NetBSD: Makefile,v 1.100 2022/04/04 00:44:53 gutteridge Exp $
 
-DISTNAME=		sawfish_1.12.0
-PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		6
-CATEGORIES=		wm x11
-MASTER_SITES=		http://download.tuxfamily.org/sawfish/
-EXTRACT_SUFX=		.tar.xz
+DISTNAME=	sawfish-1.13.0
+CATEGORIES=	wm x11
+MASTER_SITES=	${MASTER_SITE_GITHUB:=SawfishWM/}
+GITHUB_TAG=	refs/tags/${PKGNAME_NOREV}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		https://sawfish.tuxfamily.org/
-COMMENT=		Extensible window manager that is fully configurable in Lisp
-LICENSE=		gnu-gpl-v2
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://sawfish.tuxfamily.org/
+COMMENT=	Extensible window manager that is fully configurable in Lisp
+LICENSE=	gnu-gpl-v2 AND artistic-2.0 # for sound files
 
 GNU_CONFIGURE=		yes
 INFO_FILES=		YES
 PKGCONFIG_OVERRIDE+=	sawfish.pc.in
-USE_TOOLS+=		gmake makeinfo msgfmt pkg-config xgettext
+USE_TOOLS+=		gmake makeinfo msgfmt pkg-config xgettext autoconf automake
 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}
@@ -40,6 +39,10 @@ REP_ENV_PKGSRC=		LD_PRELOAD=/usr/lib/libpthread.so
 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 --git a/wm/sawfish/PLIST b/wm/sawfish/PLIST
index f2b89686ff4..3f9113219ce 100644
--- a/wm/sawfish/PLIST
+++ b/wm/sawfish/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2019/01/04 03:29:34 tnn Exp $
+@comment $NetBSD: PLIST,v 1.23 2022/04/04 00:44:53 gutteridge Exp $
 bin/sawfish
 bin/sawfish-about
 bin/sawfish-client
@@ -116,8 +116,6 @@ share/sawfish/lisp/decode-events.jl
 share/sawfish/lisp/decode-events.jlc
 share/sawfish/lisp/describe.jl
 share/sawfish/lisp/describe.jlc
-share/sawfish/lisp/diodon.jl
-share/sawfish/lisp/diodon.jlc
 share/sawfish/lisp/edge-actions.jl
 share/sawfish/lisp/edge-actions.jlc
 share/sawfish/lisp/edge-conf.jl
@@ -134,8 +132,6 @@ share/sawfish/lisp/edges.jl
 share/sawfish/lisp/edges.jlc
 share/sawfish/lisp/error-handler.jl
 share/sawfish/lisp/error-handler.jlc
-share/sawfish/lisp/fehlstart.jl
-share/sawfish/lisp/fehlstart.jlc
 share/sawfish/lisp/gnome-int.jl
 share/sawfish/lisp/gnome-int.jlc
 share/sawfish/lisp/group-funs.jl
@@ -148,8 +144,6 @@ share/sawfish/lisp/gtkrc.jl
 share/sawfish/lisp/gtkrc.jlc
 share/sawfish/lisp/hot-spots.jl
 share/sawfish/lisp/hot-spots.jlc
-share/sawfish/lisp/idesk.jl
-share/sawfish/lisp/idesk.jlc
 share/sawfish/lisp/kde-int.jl
 share/sawfish/lisp/kde-int.jlc
 share/sawfish/lisp/keymap.jl
@@ -174,18 +168,12 @@ share/sawfish/lisp/mousetrap.jl
 share/sawfish/lisp/mousetrap.jlc
 share/sawfish/lisp/move-resize.jl
 share/sawfish/lisp/move-resize.jlc
-share/sawfish/lisp/nm-applet.jl
-share/sawfish/lisp/nm-applet.jlc
 share/sawfish/lisp/old-window-menu.jl
 share/sawfish/lisp/old-window-menu.jlc
-share/sawfish/lisp/pancake.jl
-share/sawfish/lisp/pancake.jlc
 share/sawfish/lisp/poweroff.jl
 share/sawfish/lisp/poweroff.jlc
 share/sawfish/lisp/prompt.jl
 share/sawfish/lisp/prompt.jlc
-share/sawfish/lisp/razor-int.jl
-share/sawfish/lisp/razor-int.jlc
 share/sawfish/lisp/rects.jl
 share/sawfish/lisp/rects.jlc
 share/sawfish/lisp/sawfish/cfg/apply.jl
@@ -363,8 +351,6 @@ share/sawfish/lisp/sawfish/wm/integration/lxde.jl
 share/sawfish/lisp/sawfish/wm/integration/lxde.jlc
 share/sawfish/lisp/sawfish/wm/integration/mate.jl
 share/sawfish/lisp/sawfish/wm/integration/mate.jlc
-share/sawfish/lisp/sawfish/wm/integration/razor.jl
-share/sawfish/lisp/sawfish/wm/integration/razor.jlc
 share/sawfish/lisp/sawfish/wm/integration/xfce.jl
 share/sawfish/lisp/sawfish/wm/integration/xfce.jlc
 share/sawfish/lisp/sawfish/wm/keymaps.jl
@@ -387,16 +373,6 @@ share/sawfish/lisp/sawfish/wm/prg/compton.jl
 share/sawfish/lisp/sawfish/wm/prg/compton.jlc
 share/sawfish/lisp/sawfish/wm/prg/conky.jl
 share/sawfish/lisp/sawfish/wm/prg/conky.jlc
-share/sawfish/lisp/sawfish/wm/prg/diodon.jl
-share/sawfish/lisp/sawfish/wm/prg/diodon.jlc
-share/sawfish/lisp/sawfish/wm/prg/fehlstart.jl
-share/sawfish/lisp/sawfish/wm/prg/fehlstart.jlc
-share/sawfish/lisp/sawfish/wm/prg/idesk.jl
-share/sawfish/lisp/sawfish/wm/prg/idesk.jlc
-share/sawfish/lisp/sawfish/wm/prg/nm-applet.jl
-share/sawfish/lisp/sawfish/wm/prg/nm-applet.jlc
-share/sawfish/lisp/sawfish/wm/prg/pancake.jl
-share/sawfish/lisp/sawfish/wm/prg/pancake.jlc
 share/sawfish/lisp/sawfish/wm/prg/trayer.jl
 share/sawfish/lisp/sawfish/wm/prg/trayer.jlc
 share/sawfish/lisp/sawfish/wm/prg/xgamma.jl
diff --git a/wm/sawfish/distinfo b/wm/sawfish/distinfo
index bfd7083bc90..3e630067ad1 100644
--- a/wm/sawfish/distinfo
+++ b/wm/sawfish/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2021/10/26 11:25:17 nia Exp $
+$NetBSD: distinfo,v 1.27 2022/04/04 00:44:53 gutteridge Exp $
 
-BLAKE2s (sawfish_1.12.0.tar.xz) = 6a6d01ea6f43d9d2499475c1c22814c73f531decffebae1e34a72eaae6cfc653
-SHA512 (sawfish_1.12.0.tar.xz) = e8f831a9f6206ccf4e2a823bc3464c11b9d2d38a72ada4a142f952813a56c620b511f9cd8912bbf06e38976e54f1d9445f68d6dd24ee5ed59918c18de379e71f
-Size (sawfish_1.12.0.tar.xz) = 2814340 bytes
-SHA1 (patch-aa) = 4068c90a6e606e6f35ca39ca7fb4aca39bfc543d
+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
 SHA1 (patch-ab) = 21a89c87afa9cb5fdf3b028109b0db9c5991fb1e
-SHA1 (patch-themes_Makefile.in) = 6484654d6d1fc9126f989a075b6fbf4b5ffb045d
+SHA1 (patch-configure.ac) = 961139be928a5aa68149a219bb792c9892ead7ef
+SHA1 (patch-themes_Makefile.in) = 0584333bad4f86e2129478c2194058ea2b002181
diff --git a/wm/sawfish/patches/patch-aa b/wm/sawfish/patches/patch-aa
deleted file mode 100644
index ab9ec2395d5..00000000000
--- a/wm/sawfish/patches/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2019/01/04 03:29:34 tnn Exp $
-
-Fix PKGLOCALEDIR
-
---- configure.orig	2016-08-13 08:27:30.000000000 +0000
-+++ configure
-@@ -11386,7 +11386,7 @@ SUBDIRS="src lisp scripts themes sounds 
- 
- sawfishdir='${datadir}/sawfish'
- lispdir='${sawfishdir}/lisp'
--localedir='${datadir}/locale'
-+#localedir='${datadir}/locale'
- sawfishexecdir='${libdir}/sawfish'
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-@@ -14053,12 +14053,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 --git a/wm/sawfish/patches/patch-configure.ac b/wm/sawfish/patches/patch-configure.ac
new file mode 100644
index 00000000000..273044cd59b
--- /dev/null
+++ b/wm/sawfish/patches/patch-configure.ac
@@ -0,0 +1,33 @@
+$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,
diff --git a/wm/sawfish/patches/patch-themes_Makefile.in b/wm/sawfish/patches/patch-themes_Makefile.in
index 67c52d02a28..a68dafcd574 100644
--- a/wm/sawfish/patches/patch-themes_Makefile.in
+++ b/wm/sawfish/patches/patch-themes_Makefile.in
@@ -1,15 +1,29 @@
-$NetBSD: patch-themes_Makefile.in,v 1.1 2014/01/03 05:07:07 ryoon Exp $
+$NetBSD: patch-themes_Makefile.in,v 1.2 2022/04/04 00:44:53 gutteridge Exp $
 
+* Theme extractions expect GNU tar specific syntax
 * StyleTab.tar.gz is compressed by gzip
 
---- themes/Makefile.in.orig	2013-09-25 18:50:08.000000000 +0000
+--- themes/Makefile.in.orig	2021-12-24 09:31:19.000000000 +0000
 +++ themes/Makefile.in
-@@ -55,7 +55,7 @@ install : all installdirs
+@@ -39,9 +39,9 @@ THEMES := StyleTab absolute-e Crux micro
+ 
+ all :
+ 	for d in $(THEMES); do \
+-		( tar --help|grep -q sort= && rbopts=--sort=name ; \
+-	          tar --help|grep -q 'GNU tar' && rbopts="$$rbopts --format=gnu --mtime @1" ; \
+-		  cd $(srcdir) && LC_ALL=C tar $$rbopts -c $$d/* | gzip -n9 > $$d.tar.gz ) ; \
++		( gtar --help|grep -q sort= && rbopts=--sort=name ; \
++	          gtar --help|grep -q 'GNU tar' && rbopts="$$rbopts --format=gnu --mtime @1" ; \
++		  cd $(srcdir) && LC_ALL=C gtar $$rbopts -c $$d/* | gzip -n9 > $$d.tar.gz ) ; \
+ 	done
+ 
+ install : all installdirs
+@@ -51,7 +51,7 @@ install : all installdirs
  	done
  	@# Don't use tar for StyleTab. It's not compression, but tar
  	@# itself slows in librep.
 -	cd $(DESTDIR)$(themedir) && tar xf StyleTab.tar.gz && rm StyleTab.tar.gz
-+	cd $(DESTDIR)$(themedir) && tar zxf StyleTab.tar.gz && rm StyleTab.tar.gz
++	cd $(DESTDIR)$(themedir) && gtar zxf StyleTab.tar.gz && rm StyleTab.tar.gz
  
  installdirs : $(top_srcdir)/mkinstalldirs
  	$(SHELL) $< $(DESTDIR)$(themedir)