Update afterstep to 2.2.12 (released in 2013, lol).

version 2.2.12 release

* Session Management. AfterStep will utilize gnome-session for session
  management if available. Several things needs to be manually adjusted for
  full functionality :
	1) go over list of autostart application files in /etc/xdg/autostart and for
	   those that you want started and have line OnlyShowIn=  - add AfterStep to
	   the list of environments. One example is gnome-keyring* stuff -
	   by default it is only enabled in GNOME session.
	2) if session takes a long time to close after Logout dialog was shown -
	   most likely culprit is the pulseaudio. You may need to get rid of it and
	   switch to more standard and stable ALSA.
	3) It is recommended to uninstall zeitgeist daemon since its useless under
	   AfterStep anyway but wastes resources with its snooping activity.
	4) gnome-session will save any app that support session mamgement at the end
	   of the session to be restarted the next time. Unless you run UBUNTU in
	   which case this functionality my be disabled in stock gnome-session. If
	   you want it back, then it is recommended that you build your own
	   gnome-session from sources. On the other hand if you do not want this
	   functionality, again, get gnome-session source and comment out contents of
	   maybe_load_saved_session_apps() function in gnome-session/gsm-session-fill.c.
	5) If you find that your GTK apps look butt-ugly - its probably because gconfd
	   is not running. It is normally started by gnome-session, but bastardised
	   version of it that comes with Ubuntu does not do it for some reason.
* More Useless packages : ubuntu-desktop deja-dup

24 files changed, 510 insertions, 520 deletions

diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index 52614b640ab..5f36dda1b7b 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.98 2021/05/24 19:55:09 wiz Exp $
+# $NetBSD: Makefile,v 1.99 2021/07/11 12:13:17 bsiegert Exp $
 
-DISTNAME=	AfterStep-2.2.11
+DISTNAME=	AfterStep-2.2.12
 PKGNAME=	${DISTNAME:S/AfterStep/afterstep/}
-PKGREVISION=	30
 CATEGORIES=	wm
 MASTER_SITES=	ftp://ftp.afterstep.org/stable/
 EXTRACT_SUFX=	.tar.bz2
@@ -14,6 +13,8 @@ LICENSE=	mit
 
 MAKE_JOBS_SAFE=	no
 
+WRKSRC=		${WRKDIR}/afterstep-devel-${PKGVERSION_NOREV}
+
 USE_TOOLS+=		bash:run gmake perl:run pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-send-postcard-to-developer
@@ -35,6 +36,7 @@ MAKE_ENV+=	EXTRA_LIBRARIES=-lexecinfo
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/wm/afterstep/PLIST b/wm/afterstep/PLIST
index 9f6dcf7bb09..96b2a16fbaf 100644
--- a/wm/afterstep/PLIST
+++ b/wm/afterstep/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.8 2013/04/07 10:36:53 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.9 2021/07/11 12:13:17 bsiegert Exp $
 bin/ASFileBrowser
+bin/ASMount
 bin/ASRun
 bin/ASWallpaper
 bin/Animate
@@ -209,6 +210,7 @@ share/afterstep/applications/system.desktop
 share/afterstep/applications/terminals.desktop
 share/afterstep/applications/text_editors.desktop
 share/afterstep/applications/xtools.desktop
+share/afterstep/asmount
 share/afterstep/autoexec
 share/afterstep/backgrounds/.Cell
 share/afterstep/backgrounds/.CloudsOfDoubt
@@ -507,6 +509,9 @@ share/afterstep/desktop/buttons/default-switchwindow-dark
 share/afterstep/desktop/buttons/default-switchwindow-dark-pressed
 share/afterstep/desktop/buttons/default-switchwindow-light
 share/afterstep/desktop/buttons/default-switchwindow-light-pressed
+share/afterstep/desktop/buttons/eject-red
+share/afterstep/desktop/buttons/eject-red-pressed
+share/afterstep/desktop/buttons/eject-white
 share/afterstep/desktop/buttons/fuf-iconify-pressed.xpm
 share/afterstep/desktop/buttons/fuf-iconify.xpm
 share/afterstep/desktop/buttons/fuf-kill-pressed.xpm
@@ -533,6 +538,8 @@ share/afterstep/desktop/buttons/glass-switchwindow
 share/afterstep/desktop/buttons/glass-switchwindow-pressed
 share/afterstep/desktop/buttons/menu_smooth
 share/afterstep/desktop/buttons/minmax_smooth
+share/afterstep/desktop/buttons/mount-green-pressed
+share/afterstep/desktop/buttons/mount-white
 share/afterstep/desktop/buttons/qnx-close
 share/afterstep/desktop/buttons/qnx-close-pressed
 share/afterstep/desktop/buttons/qnx-iconify
@@ -555,6 +562,8 @@ share/afterstep/desktop/buttons/unity-maxmin
 share/afterstep/desktop/buttons/unity-menu
 share/afterstep/desktop/buttons/unity-shade
 share/afterstep/desktop/buttons/unity-switchwindow
+share/afterstep/desktop/buttons/unmount-red-pressed
+share/afterstep/desktop/buttons/unmount-white
 share/afterstep/desktop/cursors/cursor.xbm
 share/afterstep/desktop/cursors/cursor.xbm.mask
 share/afterstep/desktop/cursors/iconify.xbm
@@ -583,6 +592,9 @@ share/afterstep/desktop/fonts/DefaultSans.ttf
 share/afterstep/desktop/fonts/DefaultSansBold.ttf
 share/afterstep/desktop/fonts/DefaultSansBoldOblique.ttf
 share/afterstep/desktop/fonts/DefaultSansOblique.ttf
+share/afterstep/desktop/icons/128x128/Logout
+share/afterstep/desktop/icons/128x128/MusicalNote
+share/afterstep/desktop/icons/128x128/SpeechBubble
 share/afterstep/desktop/icons/3_dots.xpm
 share/afterstep/desktop/icons/3dpaint.xpm
 share/afterstep/desktop/icons/ASBBlockBlue.xpm
@@ -752,6 +764,7 @@ share/afterstep/desktop/icons/dots/arrow_tiny
 share/afterstep/desktop/icons/dots/bar_medium
 share/afterstep/desktop/icons/dots/circle_medium
 share/afterstep/desktop/icons/dots/close_smooth_white
+share/afterstep/desktop/icons/dots/eject
 share/afterstep/desktop/icons/dots/lined_arrow
 share/afterstep/desktop/icons/dots/maxmin_unity
 share/afterstep/desktop/icons/dots/menu_medium
@@ -767,6 +780,7 @@ share/afterstep/desktop/icons/dots/shade_smooth_white
 share/afterstep/desktop/icons/dots/shade_unity
 share/afterstep/desktop/icons/dots/square_medium
 share/afterstep/desktop/icons/dots/square_small
+share/afterstep/desktop/icons/dots/synchronize
 share/afterstep/desktop/icons/dots/triangle_medium
 share/afterstep/desktop/icons/dots/triangle_squared_medium
 share/afterstep/desktop/icons/dots/triangle_squared_small
@@ -868,6 +882,7 @@ share/afterstep/desktop/icons/logos/XWindow3
 share/afterstep/desktop/icons/logos/Xmms
 share/afterstep/desktop/icons/logos/aterm
 share/afterstep/desktop/icons/logos/aterm2
+share/afterstep/desktop/icons/logos/aterm3
 share/afterstep/desktop/icons/logos/gimp
 share/afterstep/desktop/icons/logos/konqueror
 share/afterstep/desktop/icons/logos/linux-penguin
@@ -896,6 +911,7 @@ share/afterstep/desktop/icons/mini/GNOMESearchTool
 share/afterstep/desktop/icons/mini/Info
 share/afterstep/desktop/icons/mini/KDESearchTool
 share/afterstep/desktop/icons/mini/KDEWallpapers
+share/afterstep/desktop/icons/mini/Logout
 share/afterstep/desktop/icons/mini/Menu
 share/afterstep/desktop/icons/mini/Mona
 share/afterstep/desktop/icons/mini/MoonInMonitor
@@ -903,8 +919,10 @@ share/afterstep/desktop/icons/mini/Mouse
 share/afterstep/desktop/icons/mini/Puzzle
 share/afterstep/desktop/icons/mini/Recycler
 share/afterstep/desktop/icons/mini/RemoteControl
+share/afterstep/desktop/icons/mini/Shutdown
 share/afterstep/desktop/icons/mini/Stopsign
 share/afterstep/desktop/icons/mini/Windows
+share/afterstep/desktop/icons/mini/ZZZ
 share/afterstep/desktop/icons/mini/applications
 share/afterstep/desktop/icons/mini/feel
 share/afterstep/desktop/icons/mini/look
@@ -1010,7 +1028,6 @@ share/afterstep/desktop/icons/normal/House2
 share/afterstep/desktop/icons/normal/House3
 share/afterstep/desktop/icons/normal/IRC
 share/afterstep/desktop/icons/normal/IRCTransparent
-share/afterstep/desktop/icons/normal/IRC_Transp
 share/afterstep/desktop/icons/normal/Info
 share/afterstep/desktop/icons/normal/InkJetPrinter
 share/afterstep/desktop/icons/normal/JFK
@@ -1029,6 +1046,7 @@ share/afterstep/desktop/icons/normal/Lightbulb
 share/afterstep/desktop/icons/normal/Lightswitch
 share/afterstep/desktop/icons/normal/LockClosed
 share/afterstep/desktop/icons/normal/LockOpen
+share/afterstep/desktop/icons/normal/Logout
 share/afterstep/desktop/icons/normal/MCInMonitor
 share/afterstep/desktop/icons/normal/MCInMonitorShadow
 share/afterstep/desktop/icons/normal/MagnifyingGlass
@@ -1351,6 +1369,7 @@ share/afterstep/doc/html/winlist_intro.html
 share/afterstep/doc/html/winlist_sticky.html
 share/afterstep/doc/html/winlist_unfocused.html
 share/afterstep/feels/feel.DEFAULT
+share/afterstep/feels/feel.Debian
 share/afterstep/feels/feel.ICCCM
 share/afterstep/gtkrc-2.0_template
 share/afterstep/gtkrc_template
@@ -1412,31 +1431,13 @@ share/afterstep/start/1_Desktop/Menu_Options/4_txtitemsind
 share/afterstep/start/1_Desktop/Menu_Options/5_recentitems
 share/afterstep/start/1_Desktop/Pictures/.include
 share/afterstep/start/1_Desktop/Pictures/AfterStep_Images/.include
-share/afterstep/start/1_Desktop/Pictures/GNOME_Images/.include
-share/afterstep/start/1_Desktop/Pictures/GNOME_Images/GNOME_Branded/.include
-share/afterstep/start/1_Desktop/Pictures/GNOME_Images/GNOME_Nature/.include
-share/afterstep/start/1_Desktop/Pictures/GNOME_Images/GNOME_Tiles/.include
-share/afterstep/start/1_Desktop/Pictures/GNOME_Images/GNOME_Translucent/.include
-share/afterstep/start/1_Desktop/Pictures/KDE_Wallpapers/.include
-share/afterstep/start/1_Desktop/Pictures/Nautilus_Patterns/.include
 share/afterstep/start/1_Desktop/Pictures/Other/.include
-share/afterstep/start/1_Desktop/Pictures/Propaganda_Images/.include
-share/afterstep/start/1_Desktop/Pictures/Propaganda_Images/For-E/.include
-share/afterstep/start/1_Desktop/Pictures/Propaganda_Images/Volume_01/.include
-share/afterstep/start/1_Desktop/Pictures/Propaganda_Images/Volume_02/.include
-share/afterstep/start/1_Desktop/Pictures/Propaganda_Images/Volume_03/.include
-share/afterstep/start/1_Desktop/Pictures/Propaganda_Images/Volume_04/.include
-share/afterstep/start/1_Desktop/Pictures/Propaganda_Images/Volume_05/.include
-share/afterstep/start/1_Desktop/Pictures/Propaganda_Images/Volume_06/.include
-share/afterstep/start/1_Desktop/Pictures/Propaganda_Images/Volume_07/.include
-share/afterstep/start/1_Desktop/Pictures/Propaganda_Images/Volume_08/.include
-share/afterstep/start/1_Desktop/Pictures/Propaganda_Images/Volume_09/.include
-share/afterstep/start/1_Desktop/Pictures/Propaganda_Images/Volume_10/.include
-share/afterstep/start/1_Desktop/Pictures/Propaganda_Images/Volume_11/.include
-share/afterstep/start/1_Desktop/Pictures/Propaganda_Images/Volume_12/.include
-share/afterstep/start/1_Desktop/Pictures/Propaganda_Images/Volume_13/.include
-share/afterstep/start/1_Desktop/Pictures/Propaganda_Images/Volume_14/.include
 share/afterstep/start/1_Desktop/Pictures/User_Backgrounds/.include
+share/afterstep/start/1_Desktop/Pictures/Web/Digital_Blasphemy
+share/afterstep/start/1_Desktop/Pictures/Web/Mountains
+share/afterstep/start/1_Desktop/Pictures/Web/Vladstudio_com
+share/afterstep/start/1_Desktop/Pictures/Web/Walk_In_Clouds
+share/afterstep/start/1_Desktop/Pictures/Web/Water
 share/afterstep/start/1_Desktop/Theme/.include
 share/afterstep/start/1_Desktop/X_Tools/.include
 share/afterstep/start/1_Desktop/X_Tools/Mouse/.include
@@ -1457,6 +1458,10 @@ share/afterstep/start/3_Screen_savers/.include
 share/afterstep/start/3_Screen_savers/With_password/.include
 share/afterstep/start/3_Screen_savers/Without_password/.include
 share/afterstep/start/3_System_Settings/.include
+share/afterstep/start/3_System_Settings/Gnome_Hardware_Settings/.include
+share/afterstep/start/3_System_Settings/Gnome_Settings_Panel/.include
+share/afterstep/start/3_System_Settings/Gnome_Settings_Panel/Other/.include
+share/afterstep/start/3_System_Settings/XFCE_Settings/.include
 share/afterstep/start/3_run
 share/afterstep/start/4_Windows/.include
 share/afterstep/start/4_Windows/0_Arrange/.include
@@ -1473,10 +1478,17 @@ share/afterstep/start/4_Windows/4_delete
 share/afterstep/start/4_Windows/5_destroy
 share/afterstep/start/4_Windows/6_winprop
 share/afterstep/start/4_Windows/7_fullscreen
+share/afterstep/start/4_xterminal
 share/afterstep/start/4_zzznop
 share/afterstep/start/5_Quit/.include
 share/afterstep/start/5_Quit/0_close
+share/afterstep/start/5_Quit/0_nop
+share/afterstep/start/5_Quit/1_shutdown
+share/afterstep/start/5_Quit/2_hibernate
+share/afterstep/start/5_Quit/2_suspend
+share/afterstep/start/5_Quit/3_nop
 share/afterstep/start/5_Quit/3_restartsession
+share/afterstep/start/5_Quit/4_quit
 share/afterstep/start/7_About_AfterStep/.include
 share/afterstep/themes/DEFAULT.tar.gz
 share/afterstep/themes/Default
@@ -1484,4 +1496,3 @@ share/afterstep/wharf
 share/afterstep/winlist
 share/afterstep/wintabs
 share/gnome/wm-properties/AfterStep.desktop
-share/xsessions/AfterStep.desktop
diff --git a/wm/afterstep/distinfo b/wm/afterstep/distinfo
index 20008bbfa49..0715582dae4 100644
--- a/wm/afterstep/distinfo
+++ b/wm/afterstep/distinfo
@@ -1,44 +1,43 @@
-$NetBSD: distinfo,v 1.23 2020/03/18 18:02:11 joerg Exp $
+$NetBSD: distinfo,v 1.24 2021/07/11 12:13:17 bsiegert Exp $
 
-SHA1 (AfterStep-2.2.11.tar.bz2) = ecfd815b659046281530441af0bc4fc42900d0da
-RMD160 (AfterStep-2.2.11.tar.bz2) = a82a4b3fddcbcd97862212669c11d14629e51a4d
-SHA512 (AfterStep-2.2.11.tar.bz2) = cf6663427656162f20cce596f63c7368c66fb336d5865dda5127f5aae123c61d647444336cc4c339ae6c64e5f25e837c0ba8889d30b1298ef26569505e0ff3d9
-Size (AfterStep-2.2.11.tar.bz2) = 6126237 bytes
-SHA1 (patch-aa) = 1103686bde4a2b9a071768f4f9447b8192eb3c46
+SHA1 (AfterStep-2.2.12.tar.bz2) = 8547ab7c11b67a82de5b4b3d7368d0b902b2f584
+RMD160 (AfterStep-2.2.12.tar.bz2) = 7893a017f95e4601dd2b21402ad51d414f99291d
+SHA512 (AfterStep-2.2.12.tar.bz2) = 5cac6ce74b24cbcc5b8e8a6f7cc9308e110f0d09597af1fa0a8730d5f5111932a23332629bc4d372fc8d9583a514d97e35f747b17decf8d4ebfe5e3f20cdbbee
+Size (AfterStep-2.2.12.tar.bz2) = 6132233 bytes
+SHA1 (patch-aa) = 208bcf8a5ec05f3916553f0763f72504ec3fd593
 SHA1 (patch-afterstep_desktop_desklets_desklet.display) = 40c5db3f72cdb7d0a0f6adc43fa9b7968176f47e
-SHA1 (patch-autoconf_Makefile.common.in) = 51f403f3b7b9d7e8a0ea4f30a72a5ff3b4ea36d8
-SHA1 (patch-autoconf_Makefile.common.lib.in) = 815e45f8d8c6117cbfb8e02759c6e6be15e6ba65
+SHA1 (patch-autoconf_Makefile.common.in) = fdf524612b92b2e818adae53c3ff46daa4b1e35f
+SHA1 (patch-autoconf_Makefile.common.lib.in) = dc14e3c43729db8a09dec3be4c1830829bd21f0d
 SHA1 (patch-autoconf_configure.in) = d89b42717506dbd096c85b07232cddca83fd59eb
-SHA1 (patch-configure) = 14a32d22e101ac43c53b7356333e13f94af5d260
+SHA1 (patch-configure) = 4e64f3f86da064a9b2bc061183afe602356e6d25
 SHA1 (patch-libAfterBase_Makefile.in) = 090ef7a135df43160d38af785a61db73e41b81d9
-SHA1 (patch-libAfterBase_ashash.c) = 12f63117a4a3187b85bbcf868483f9b95309985d
+SHA1 (patch-libAfterBase_ashash.c) = d893caaf3db1523e7e6a11f5677def3078a2c8e5
 SHA1 (patch-libAfterBase_asvector.c) = b4feb2a0f10110464d798f1ea405fd4a40490e52
 SHA1 (patch-libAfterBase_asvector.h) = f1c775e576dcdbbd8fa73a4fd362dc6e17d84b58
 SHA1 (patch-libAfterBase_output.c) = fe0d9b4cbe3c2d1eac50e4c4c0d6fbd3b8b7487f
 SHA1 (patch-libAfterBase_parse.c) = aba8ed0b11821ed09ded8833140c250abf6ea6da
 SHA1 (patch-libAfterBase_parse.h) = 5e2e0a1b3351f7d3b7d84076879e3827d47e3f24
 SHA1 (patch-libAfterBase_selfdiag.c) = 72fa80bb37f8c73bcf27eb9c0a7b65af561d2e96
-SHA1 (patch-libAfterConf_Color.c) = 346f16a2ea539cb0ff352b73ba1f60d522efea00
-SHA1 (patch-libAfterConf_DesktopEntry.c) = 57b8ff21093434434711d05ad2054c1415de0ca3
+SHA1 (patch-libAfterConf_Color.c) = fb4de950918c36cedf0b0364466f16660257f43e
+SHA1 (patch-libAfterConf_DesktopEntry.c) = e62c9cdb7fb1a05954fed56a28b5b2b38f79aa07
 SHA1 (patch-libAfterImage_Makefile.in) = 092564ab8bdd78ded9155a63a126aeda7cf205cd
 SHA1 (patch-libAfterImage_aftershow_Makefile.in) = 3d5c4f3141f51fcb4d4c8b95d244e2722e088cc6
 SHA1 (patch-libAfterImage_apps_Makefile.in) = a23ad87dcc2e0c96abc6c4896edf79f345d54acb
 SHA1 (patch-libAfterImage_asfont.c) = 4fd6498495855c2909530ac5e34accb715b48497
-SHA1 (patch-libAfterImage_export.c) = 0b450561673cb3351c2f8685ba7357cc6a1de366
-SHA1 (patch-libAfterImage_import.c) = 57fdfec498ba05aa6d52470c545d1c9958095435
-SHA1 (patch-libAfterStep_asapp.c) = 3d23d40b862aca272aac3e35574f6bf99cbc8e0a
-SHA1 (patch-libAfterStep_colorscheme.c) = cb5c06e36016d198c3508dfbec1d0743231cc7eb
-SHA1 (patch-libAfterStep_font.c) = e47477b5d0a0b54af19d603eb37937dbfa24dd19
-SHA1 (patch-libAfterStep_freestor.c) = e66249ff9edc2f7441e406aa34db923420b201d6
-SHA1 (patch-libAfterStep_functions.c) = a01482b2eff7d659afc98aa028191cca65465d0b
+SHA1 (patch-libAfterImage_import.c) = 6b1704fc631fcfdc559d0cf2aff9caf18f7137d2
+SHA1 (patch-libAfterStep_asapp.c) = b682e6a8ea7bb988cc9e35ca7d73f23a18f428bb
+SHA1 (patch-libAfterStep_colorscheme.c) = 410e7f6c91eb998769623335d23fd14ce42c50b2
+SHA1 (patch-libAfterStep_font.c) = 07c987e232f0f66e4d311651ebd7999ac6a559ca
+SHA1 (patch-libAfterStep_freestor.c) = 71e1b2de429bcbad4f9b6fb76567336336ec201b
+SHA1 (patch-libAfterStep_functions.c) = 50a2a8444a8e63bd910a2c22eb04a2f2e2b774fc
 SHA1 (patch-libAfterStep_functions.h) = 3561109e4adcffbc2052a1f2a358ffe7cc2d9147
-SHA1 (patch-libAfterStep_hints.c) = 78e336ce1350f6d98ad984fd2d7054449f0d609f
-SHA1 (patch-libAfterStep_kde.c) = 3e10900fe71d659afb99c9580f32829d1483d81f
-SHA1 (patch-libAfterStep_mylook.c) = 370a371ca60ee19247e768a5b6efc04d5dfe65ce
+SHA1 (patch-libAfterStep_hints.c) = 0a1e4c55bdb89e8ffcc91c09f75e00100c992330
+SHA1 (patch-libAfterStep_kde.c) = fae88756b6ea5cef21a97e7f4dd1cde28016a27d
+SHA1 (patch-libAfterStep_mylook.c) = 23d8fc3e94a62106080b061bbe575587112a07ec
 SHA1 (patch-libAfterStep_mylook.h) = 0ebab667d7e03f211f9b4e68ccef2452b49ff9db
-SHA1 (patch-libAfterStep_parser.c) = 668f28c566156fb627482d558d3eb2bb5707c92b
-SHA1 (patch-libAfterStep_parser__xml.c) = d78190be5f4d05b849c92870782c780e9e951d83
-SHA1 (patch-src_ASDocGen_Makefile.in) = 36185b1db36dfda33ef1503d55855e9bbf1ea286
+SHA1 (patch-libAfterStep_parser.c) = ae7ba594cf19c0001f99567f5c4a9d8754fd4ac4
+SHA1 (patch-libAfterStep_parser__xml.c) = e02a1c2399fceee2cd25e7775f0643d85a5b01c9
+SHA1 (patch-src_ASDocGen_Makefile.in) = c879bca9d2e4acf6776dfeef8557b8f72f77ab82
 SHA1 (patch-src_Animate_Makefile.in) = 5a0db32f7e6acc70cd8778b9d6c2d8d8b379acc9
-SHA1 (patch-src_afterstep_asinternals.h) = a93d68540c38880f58cecedb56119dd852323307
-SHA1 (patch-src_afterstep_misc.c) = 1e6ad6bf58bff03caf35e3fb374f9b45924bd869
+SHA1 (patch-src_afterstep_asinternals.h) = 46264bce63b9252be0731a2c864e3334ea675af5
+SHA1 (patch-src_afterstep_misc.c) = 5025169242453fb35b96adbb5e0aec1173db8447
diff --git a/wm/afterstep/patches/patch-aa b/wm/afterstep/patches/patch-aa
index f5ee8e5d1b3..f757e6a7f87 100644
--- a/wm/afterstep/patches/patch-aa
+++ b/wm/afterstep/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2016/05/01 19:30:58 dholland Exp $
+$NetBSD: patch-aa,v 1.7 2021/07/11 12:13:17 bsiegert Exp $
 
 Don't declare own errno.
 
---- src/afterstep/module.c.orig	2005-12-06 12:58:56.000000000 +0000
+--- src/afterstep/module.c.orig	2013-05-01 13:34:11.000000000 +0000
 +++ src/afterstep/module.c
 @@ -33,6 +33,7 @@
  
@@ -12,19 +12,19 @@ Don't declare own errno.
  #include <fcntl.h>
  #include <unistd.h>
  #include <sys/file.h>
-@@ -380,7 +381,6 @@ LOCAL_DEBUG_OUT( "deleting buffer %p sen
- int
- FlushQueue (module_t *module)
- {
--	extern int    errno;
-     int           fd;
-     register struct queue_buff_struct *curr;
+@@ -415,7 +416,6 @@ static void DeleteQueueBuff (module_t * 
  
-@@ -471,7 +471,6 @@ FlushAllQueues()
+ int FlushQueue (module_t * module)
+ {
+-	extern int errno;
+ 	int fd;
+ 	register struct queue_buff_struct *curr;
+ LOCAL_DEBUG_OUT ("module \"%s\", active= %d, out_queue = %p", module->name, module->active, module->output_queue);
+@@ -500,7 +500,6 @@ void FlushAllQueues ()
  
  
  
 -#include <sys/errno.h>
  static inline int
- PositiveWrite (unsigned int channel, send_data_type *ptr, int size)
+ PositiveWrite (unsigned int channel, send_data_type * ptr, int size)
  {
diff --git a/wm/afterstep/patches/patch-autoconf_Makefile.common.in b/wm/afterstep/patches/patch-autoconf_Makefile.common.in
index 21707e55276..ec95b7a666f 100644
--- a/wm/afterstep/patches/patch-autoconf_Makefile.common.in
+++ b/wm/afterstep/patches/patch-autoconf_Makefile.common.in
@@ -1,13 +1,13 @@
-$NetBSD: patch-autoconf_Makefile.common.in,v 1.1 2020/03/18 18:02:11 joerg Exp $
+$NetBSD: patch-autoconf_Makefile.common.in,v 1.2 2021/07/11 12:13:17 bsiegert Exp $
 
---- autoconf/Makefile.common.in.orig	2020-03-18 14:06:28.445542718 +0000
+--- autoconf/Makefile.common.in.orig	2013-05-01 13:34:11.000000000 +0000
 +++ autoconf/Makefile.common.in
-@@ -40,7 +40,7 @@ uninstall.script:
+@@ -44,7 +44,7 @@ uninstall.script:
  
  indent:
  		@SRCS=`echo "$(OBJS) " | sed "s/.o /.c /g"`; \
 -		if test "x$$SRCS" == "x"; then exit; fi; \
 +		if test "x$$SRCS" = "x"; then exit; fi; \
  		for i in $$SRCS; do \
- 		  if (indent -di14 -ts4 -i4 -l100 -lc80 -bad -nbbb -bli0 -c48 -cd48 -ce -cli1 -ncs -nbs -nbbo -hnl < $$i > /tmp/$$i); then \
- 		    echo "indent $$i"; \
+ #		  if (indent -di14 -ts4 -i4 -l100 -lc80 -bad -nbbb -bli0 -c48 -cd48 -ce -cli1 -ncs -nbs -nbbo -hnl < $$i > /tmp/$$i); then \
+ 		  if (indent -kr -ts2 -ut -bs -hnl -i2 -lc80 -lps -nbc -nbfda -ncs -nprs -pcs -pi2 -saf -sai -saw -ss < $$i > /tmp/$$i); then \
diff --git a/wm/afterstep/patches/patch-autoconf_Makefile.common.lib.in b/wm/afterstep/patches/patch-autoconf_Makefile.common.lib.in
index 41cf63e867c..3a2f17e92b7 100644
--- a/wm/afterstep/patches/patch-autoconf_Makefile.common.lib.in
+++ b/wm/afterstep/patches/patch-autoconf_Makefile.common.lib.in
@@ -1,13 +1,13 @@
-$NetBSD: patch-autoconf_Makefile.common.lib.in,v 1.1 2020/03/18 18:02:11 joerg Exp $
+$NetBSD: patch-autoconf_Makefile.common.lib.in,v 1.2 2021/07/11 12:13:17 bsiegert Exp $
 
---- autoconf/Makefile.common.lib.in.orig	2020-03-18 14:06:31.401515544 +0000
+--- autoconf/Makefile.common.lib.in.orig	2013-05-01 13:34:11.000000000 +0000
 +++ autoconf/Makefile.common.lib.in
-@@ -170,7 +170,7 @@ distclean:
+@@ -171,7 +171,7 @@ distclean:
  
  indent:
  		@SRCS=`echo "$(LIB_OBJS) " | sed "s/.o /.c /g"`; \
 -		if test "x$$SRCS" == "x"; then exit; fi; \
 +		if test "x$$SRCS" = "x"; then exit; fi; \
  		for i in $$SRCS; do \
- 		  if (indent -di14 -ts4 -i4 -l120 -lc80 -bad -nbbb -bli0 -c48 -cd48 -ce -cli1 -ncs -nbs -nbbo -hnl < $$i > /tmp/$$i); then \
- 		    echo "indent $$i"; \
+ #		  if (indent -di14 -ts4 -i4 -l120 -lc80 -bad -nbbb -bli0 -c48 -cd48 -ce -cli1 -ncs -nbs -nbbo -hnl < $$i > /tmp/$$i); then \
+ 		  if (indent -kr -ts2 -ut -bs -hnl -i2 -lc80 -lps -nbc -nbfda -ncs -nprs -pcs -pi2 -saf -sai -saw -ss < $$i > /tmp/$$i); then \
diff --git a/wm/afterstep/patches/patch-configure b/wm/afterstep/patches/patch-configure
index 3363acba2e8..a050c70be41 100644
--- a/wm/afterstep/patches/patch-configure
+++ b/wm/afterstep/patches/patch-configure
@@ -1,15 +1,24 @@
-$NetBSD: patch-configure,v 1.2 2016/05/01 19:30:58 dholland Exp $
+$NetBSD: patch-configure,v 1.3 2021/07/11 12:13:17 bsiegert Exp $
 
 * fix bash-ism
 
---- configure.orig	2011-01-13 19:27:10.000000000 +0000
+--- configure.orig	2013-05-01 13:34:11.000000000 +0000
 +++ configure
-@@ -1810,7 +1810,7 @@ fi;
- # Check whether --enable-reuse-font or --disable-reuse-font was given.
- if test "${enable_reuse_font+set}" = set; then
-   enableval="$enable_reuse_font"
--  if test x$enableval == "xyes"; then
-+  if test x$enableval = "xyes"; then
- cat >>confdefs.h <<\_ACEOF
- #define MODULE_REUSE_LOADED_FONT 1
- _ACEOF
+@@ -2927,7 +2927,7 @@ fi
+ 
+ # Check whether --enable-reuse-font was given.
+ if test "${enable_reuse_font+set}" = set; then :
+-  enableval=$enable_reuse_font; if test x$enableval == "xyes"; then
++  enableval=$enable_reuse_font; if test x$enableval = "xyes"; then
+ $as_echo "#define MODULE_REUSE_LOADED_FONT 1" >>confdefs.h
+  fi
+ fi
+@@ -7660,7 +7660,7 @@ _ACEOF
+ 
+ fi
+ 
+-			export CFLAGS=$gio_saved_cflags
++			export CFLAGS="$gio_saved_cflags"
+ 
+ 			present_libs="$LDFLAGS $LIBS $x_libs $AFTERIMAGE_LIBS";
+ 			for l in `echo "$GIOLIB_LIBS"`; do
diff --git a/wm/afterstep/patches/patch-libAfterBase_ashash.c b/wm/afterstep/patches/patch-libAfterBase_ashash.c
index 28efb5e447d..2e06c4a1295 100644
--- a/wm/afterstep/patches/patch-libAfterBase_ashash.c
+++ b/wm/afterstep/patches/patch-libAfterBase_ashash.c
@@ -1,19 +1,19 @@
-$NetBSD: patch-libAfterBase_ashash.c,v 1.3 2016/05/01 19:30:58 dholland Exp $
+$NetBSD: patch-libAfterBase_ashash.c,v 1.4 2021/07/11 12:13:17 bsiegert Exp $
 
 Patch up gcc inline mess.
 
---- libAfterBase/ashash.c.orig	2008-03-17 22:42:32.000000000 +0000
+--- libAfterBase/ashash.c.orig	2013-05-01 13:34:11.000000000 +0000
 +++ libAfterBase/ashash.c
 @@ -39,7 +39,7 @@
  static ASHashItem*  deallocated_mem[DEALLOC_CACHE_SIZE+10] ;
  static unsigned int deallocated_used = 0 ;
  
--static inline void 
-+static void 
- free_ashash_item( ASHashItem *item ) 
+-static inline void
++static void
+ free_ashash_item( ASHashItem *item )
  {
  
-@@ -531,7 +531,7 @@ remove_curr_hash_item (ASHashIterator * 
+@@ -533,7 +533,7 @@ remove_curr_hash_item (ASHashIterator * 
  		}
  }
  
@@ -22,7 +22,7 @@ Patch up gcc inline mess.
  curr_hash_value (ASHashIterator * iterator)
  {
  	if (iterator)
-@@ -542,7 +542,7 @@ curr_hash_value (ASHashIterator * iterat
+@@ -544,7 +544,7 @@ curr_hash_value (ASHashIterator * iterat
  	return (ASHashableValue) ((char *)NULL);
  }
  
diff --git a/wm/afterstep/patches/patch-libAfterConf_Color.c b/wm/afterstep/patches/patch-libAfterConf_Color.c
index 7ce23bac2ab..af5180393f9 100644
--- a/wm/afterstep/patches/patch-libAfterConf_Color.c
+++ b/wm/afterstep/patches/patch-libAfterConf_Color.c
@@ -1,43 +1,25 @@
-$NetBSD: patch-libAfterConf_Color.c,v 1.1 2016/05/01 19:26:35 dholland Exp $
+$NetBSD: patch-libAfterConf_Color.c,v 1.2 2021/07/11 12:13:17 bsiegert Exp $
 
 Use ctype.h correctly.
 Fix some printf formats.
 
---- libAfterConf/Color.c~	2008-03-21 22:48:51.000000000 +0000
+--- libAfterConf/Color.c.orig	2013-05-01 13:34:11.000000000 +0000
 +++ libAfterConf/Color.c
-@@ -326,7 +326,7 @@ translate_gtkrc_template_file( 	const ch
- 		while( fgets( &buffer[0], MAXLINELENGTH, src_fp ) )
- 		{
- 			int i = 0; 
--			while( isspace(buffer[i]) )++i ; 
-+			while( isspace((unsigned char)buffer[i]) )++i ; 
- 			if( buffer[i] != '\n' && buffer[i] != '#' && buffer[i] != '\0' && buffer[i] != '\r' )
- 			{	
- 				++good_strings;
-@@ -342,7 +342,7 @@ translate_gtkrc_template_file( 	const ch
- 					if(buffer[i] == '\"' )
- 					{
- 					 	char *token = &buffer[i+1] ;
--						if( isalpha(token[0]) ) 
-+						if( isalpha((unsigned char)token[0]) ) 
- 						{	
- 							int len = 0 ; 
- 							while( token[len] != '\0' && token[len] != '\"' ) ++len ; 
-@@ -352,7 +352,7 @@ translate_gtkrc_template_file( 	const ch
- 								if( parse_argb_color( token, &argb ) != token ) 
- 								{	
- 						 			fwrite( &(buffer[0]), 1, i+1, dst_fp );
--									fprintf( dst_fp, "#%2.2lX%2.2lX%2.2lX", ARGB32_RED8(argb), ARGB32_GREEN8(argb), ARGB32_BLUE8(argb) );
-+									fprintf( dst_fp, "#%2.2lX%2.2lX%2.2lX", (unsigned long)ARGB32_RED8(argb), (unsigned long)ARGB32_GREEN8(argb), (unsigned long)ARGB32_BLUE8(argb) );
- 									fwrite( &(token[len]), 1, strlen(&(token[len])), dst_fp );
- 									continue;
- 								}
-@@ -398,7 +398,7 @@ translate_kcsrc_template_file( 	const ch
- 					if( parse_argb_color( parm, &argb ) != parm ) 
- 					{	
- 						char *tmp = safemalloc( 32 );
--						sprintf( tmp, "%ld,%ld,%ld", ARGB32_RED8(argb), ARGB32_GREEN8(argb), ARGB32_BLUE8(argb) );						 				   
-+						sprintf( tmp, "%ld,%ld,%ld", (unsigned long)ARGB32_RED8(argb), (unsigned long)ARGB32_GREEN8(argb), (unsigned long)ARGB32_BLUE8(argb) );						 				   
- 						free( item->child->parm );
- 						item->child->parm = tmp;
- 					}							
+@@ -339,7 +339,7 @@ translate_gtkrc_template_file (const cha
+ 		while (fgets (&buffer[0], MAXLINELENGTH, src_fp)) {
+ 			int i = 0;
+ 
+-			while (isspace (buffer[i]))
++			while (isspace ((unsigned char)buffer[i]))
+ 				++i;
+ 			if (buffer[i] != '\n' && buffer[i] != '#' && buffer[i] != '\0'
+ 					&& buffer[i] != '\r') {
+@@ -357,7 +357,7 @@ translate_gtkrc_template_file (const cha
+ 					if (buffer[i] == '\"') {
+ 						char *token = &buffer[i + 1];
+ 
+-						if (isalpha (token[0])) {
++						if (isalpha ((unsigned char)token[0])) {
+ 							int len = 0;
+ 
+ 							while (token[len] != '\0' && token[len] != '\"')
diff --git a/wm/afterstep/patches/patch-libAfterConf_DesktopEntry.c b/wm/afterstep/patches/patch-libAfterConf_DesktopEntry.c
index ead17962b57..704d646fd70 100644
--- a/wm/afterstep/patches/patch-libAfterConf_DesktopEntry.c
+++ b/wm/afterstep/patches/patch-libAfterConf_DesktopEntry.c
@@ -1,52 +1,53 @@
-$NetBSD: patch-libAfterConf_DesktopEntry.c,v 1.2 2016/05/01 19:30:58 dholland Exp $
+$NetBSD: patch-libAfterConf_DesktopEntry.c,v 1.3 2021/07/11 12:13:17 bsiegert Exp $
 
 Use ctype.h correctly.
 
---- libAfterConf/DesktopEntry.c~	2007-07-13 17:18:26.000000000 +0000
+--- libAfterConf/DesktopEntry.c.orig	2013-05-01 13:34:11.000000000 +0000
 +++ libAfterConf/DesktopEntry.c
-@@ -88,14 +88,14 @@ filter_desktop_entry_exec( const char *e
- 	char *clean_exec = mystrdup(exec); 	
+@@ -85,27 +85,27 @@ static char *filter_desktop_entry_exec (
+ 	char *clean_exec = mystrdup (exec);
  	int start = 0, ts;
  
--	while( clean_exec[start] != '\0' && !isspace(clean_exec[start]) ) ++start;
-+	while( clean_exec[start] != '\0' && !isspace((unsigned char)clean_exec[start]) ) ++start;
- 	while( clean_exec[start] != '\0')
- 	{
- 		ts = start ; 	  
--		while( isspace(clean_exec[ts]) ) ++ts;
--		if( clean_exec[ts] == '%' && isalpha(clean_exec[ts+1]) ) 
-+		while( isspace((unsigned char)clean_exec[ts]) ) ++ts;
-+		if( clean_exec[ts] == '%' && isalpha((unsigned char)clean_exec[ts+1]) ) 
- 		{	
--			while( !isspace(clean_exec[ts]) && clean_exec[ts] != '\0' ) 
-+			while( !isspace((unsigned char)clean_exec[ts]) && clean_exec[ts] != '\0' ) 
- 			{
- 				clean_exec[ts] = ' ' ;
- 				++ts ;
-@@ -104,12 +104,12 @@ filter_desktop_entry_exec( const char *e
- 		}else if( mystrncasecmp(&clean_exec[ts], "-caption ", 9 ) == 0 )
- 		{
- 			ts += 9 ;
--			while( isspace(clean_exec[ts]) ) ++ts;
-+			while( isspace((unsigned char)clean_exec[ts]) ) ++ts;
- 			if( mystrncasecmp(&clean_exec[ts], "\"%c\"", 4 ) == 0 )
- 			{
- 				ts += 3 ;	
- 				while( start < ts ) clean_exec[++start] = ' ';
--			}else if( clean_exec[ts] == '%' && isalpha(clean_exec[ts+1]) )
-+			}else if( clean_exec[ts] == '%' && isalpha((unsigned char)clean_exec[ts+1]) )
- 			{
- 				ts += 1 ;	
- 				while( start < ts ) clean_exec[++start] = ' ';
-@@ -123,9 +123,9 @@ filter_desktop_entry_exec( const char *e
- 				start = ts ;	
+-	while (clean_exec[start] != '\0' && !isspace (clean_exec[start]))
++	while (clean_exec[start] != '\0' && !isspace ((unsigned char)clean_exec[start]))
+ 		++start;
+ 	while (clean_exec[start] != '\0') {
+ 		ts = start;
+-		while (isspace (clean_exec[ts]))
++		while (isspace ((unsigned char)clean_exec[ts]))
+ 			++ts;
+-		if (clean_exec[ts] == '%' && isalpha (clean_exec[ts + 1])) {
+-			while (!isspace (clean_exec[ts]) && clean_exec[ts] != '\0') {
++		if (clean_exec[ts] == '%' && isalpha ((unsigned char)clean_exec[ts + 1])) {
++			while (!isspace ((unsigned char)clean_exec[ts]) && clean_exec[ts] != '\0') {
+ 				clean_exec[ts] = ' ';
+ 				++ts;
+ 			}
+ 			start = ts;
+ 		} else if (mystrncasecmp (&clean_exec[ts], "-caption ", 9) == 0) {
+ 			ts += 9;
+-			while (isspace (clean_exec[ts]))
++			while (isspace ((unsigned char)clean_exec[ts]))
+ 				++ts;
+ 			if (mystrncasecmp (&clean_exec[ts], "\"%c\"", 4) == 0) {
+ 				ts += 3;
+ 				while (start < ts)
+ 					clean_exec[++start] = ' ';
+-			} else if (clean_exec[ts] == '%' && isalpha (clean_exec[ts + 1])) {
++			} else if (clean_exec[ts] == '%' && isalpha ((unsigned char)clean_exec[ts + 1])) {
+ 				ts += 1;
+ 				while (start < ts)
+ 					clean_exec[++start] = ' ';
+@@ -120,10 +120,10 @@ static char *filter_desktop_entry_exec (
  			++start;
- 		}else
--			for( start = ts ; !isspace(clean_exec[start]) && clean_exec[start] != '\0'	; ++start );
-+			for( start = ts ; !isspace((unsigned char)clean_exec[start]) && clean_exec[start] != '\0'	; ++start );
+ 		} else
+ 			for (start = ts;
+-					 !isspace (clean_exec[start]) && clean_exec[start] != '\0';
++					 !isspace ((unsigned char)clean_exec[start]) && clean_exec[start] != '\0';
+ 					 ++start) ;
+ 	}
+-	while (isspace (clean_exec[start - 1])) {
++	while (isspace ((unsigned char)clean_exec[start - 1])) {
+ 		--start;
+ 		clean_exec[start] = '\0';
  	}
--	while( isspace(clean_exec[start-1]))
-+	while( isspace((unsigned char)clean_exec[start-1]))
- 	{
- 		--start ;	
- 		clean_exec[start] = '\0' ;
diff --git a/wm/afterstep/patches/patch-libAfterImage_import.c b/wm/afterstep/patches/patch-libAfterImage_import.c
index be7a5d3a6ec..b2f3052736b 100644
--- a/wm/afterstep/patches/patch-libAfterImage_import.c
+++ b/wm/afterstep/patches/patch-libAfterImage_import.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-libAfterImage_import.c,v 1.3 2016/05/01 19:26:35 dholland Exp $
+$NetBSD: patch-libAfterImage_import.c,v 1.4 2021/07/11 12:13:17 bsiegert Exp $
 
 - use ctype.h correctly
 - fix for png-1.5
 
---- libAfterImage/import.c.orig	2010-09-23 20:57:57.000000000 +0000
+--- libAfterImage/import.c.orig	2013-05-01 13:34:11.000000000 +0000
 +++ libAfterImage/import.c
-@@ -221,7 +221,7 @@ char *locate_image_file_in_path( const c
+@@ -216,7 +216,7 @@ char *locate_image_file_in_path( const c
  		if( realfilename == NULL )
  		{ /* let's try and see if we have subimage number appended */
  			for( i = filename_len-1 ; i > 0; i-- )
@@ -14,7 +14,7 @@ $NetBSD: patch-libAfterImage_import.c,v 1.3 2016/05/01 19:26:35 dholland Exp $
  					break;
  			if( i < filename_len-1 && i > 0 )
  				if( tmp[i] == '.' )                 /* we have possible subimage number */
-@@ -878,7 +878,7 @@ load_asimage_list_entry_data( ASImageLis
+@@ -1023,7 +1023,7 @@ load_asimage_list_entry_data( ASImageLis
  		int i = entry->buffer->size ; 
  		register char *ptr = entry->buffer->data ;
  		while ( --i >= 0 )	
@@ -23,7 +23,7 @@ $NetBSD: patch-libAfterImage_import.c,v 1.3 2016/05/01 19:26:35 dholland Exp $
  				break;
  		binary = (i >= 0);				
  	}else
-@@ -980,7 +980,7 @@ check_image_type( const char *realfilena
+@@ -1125,7 +1125,7 @@ check_image_type( const char *realfilena
  				type = ASIT_Gif;
  			else if (head[0] == head[1] && (head[0] == 'I' || head[0] == 'M'))
  				type = ASIT_Tiff;
@@ -32,7 +32,7 @@ $NetBSD: patch-libAfterImage_import.c,v 1.3 2016/05/01 19:26:35 dholland Exp $
  				type = (head[1]!='5' && head[1]!='6')?ASIT_Pnm:ASIT_Ppm;
  			else if (head[0] == 0xa && head[1] <= 5 && head[2] == 1)
  				type = ASIT_Pcx;
-@@ -1014,13 +1014,13 @@ check_image_type( const char *realfilena
+@@ -1159,13 +1159,13 @@ check_image_type( const char *realfilena
  				int i ;
  
  				type = ASIT_XMLScript ;
@@ -48,7 +48,7 @@ $NetBSD: patch-libAfterImage_import.c,v 1.3 2016/05/01 19:26:35 dholland Exp $
  					}
  					else if( head[i] != '<' )
  						type = ASIT_Unknown ;
-@@ -1030,7 +1030,7 @@ check_image_type( const char *realfilena
+@@ -1175,7 +1175,7 @@ check_image_type( const char *realfilena
  					}else if( mystrncasecmp( &(head[i]), "<!DOCTYPE ", 10 ) == 0 ) 
  					{	
  						type = ASIT_XML ;
@@ -57,7 +57,7 @@ $NetBSD: patch-libAfterImage_import.c,v 1.3 2016/05/01 19:26:35 dholland Exp $
  						if( i < bytes_in ) 
  						{
  					 		if( mystrncasecmp( &(head[i]), "afterstep-image-xml", 19 ) == 0 ) 			
-@@ -1044,9 +1044,9 @@ check_image_type( const char *realfilena
+@@ -1189,9 +1189,9 @@ check_image_type( const char *realfilena
  						while( bytes_in > 0 && type == ASIT_XMLScript )
  						{
  							while( ++i < bytes_in )
@@ -69,16 +69,7 @@ $NetBSD: patch-libAfterImage_import.c,v 1.3 2016/05/01 19:26:35 dholland Exp $
  									{
  										type = ASIT_Unknown ;
  										break ;
-@@ -1251,7 +1251,7 @@ png2ASImage_int( void *data, png_rw_ptr 
- 			 * the normal method of doing things with libpng).  REQUIRED unless you
- 			 * set up your own error handlers in the png_create_read_struct() earlier.
- 			 */
--			if ( !setjmp (png_ptr->jmpbuf))
-+			if ( !setjmp (png_jmpbuf(png_ptr)))
- 			{
- 				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
- 
-@@ -1447,8 +1447,8 @@ png2ASImage_int( void *data, png_rw_ptr 
+@@ -1592,8 +1592,8 @@ png2ASImage_int( void *data, png_rw_ptr 
  		}
  		/* clean up after the read, and free any memory allocated - REQUIRED */
  		png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp) NULL);
@@ -89,16 +80,7 @@ $NetBSD: patch-libAfterImage_import.c,v 1.3 2016/05/01 19:26:35 dholland Exp $
  	}
  
  #if defined(LOCAL_DEBUG) && !defined(NO_DEBUG_OUTPUT)
-@@ -1468,7 +1468,7 @@ typedef struct ASImPNGReadBuffer
- 
- static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
- {
--   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
-+   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
-    memcpy(data, buf->buffer, length);
-    buf->buffer += length;
- }
-@@ -1828,8 +1828,8 @@ ppm2ASImage( const char * path, ASImageI
+@@ -1973,8 +1973,8 @@ ppm2ASImage( const char * path, ASImageI
  						break;
  					}
  					width = atoi( &(buffer[i]) );
diff --git a/wm/afterstep/patches/patch-libAfterStep_asapp.c b/wm/afterstep/patches/patch-libAfterStep_asapp.c
index d26e3ac03ef..c63dd7039b6 100644
--- a/wm/afterstep/patches/patch-libAfterStep_asapp.c
+++ b/wm/afterstep/patches/patch-libAfterStep_asapp.c
@@ -1,33 +1,33 @@
-$NetBSD: patch-libAfterStep_asapp.c,v 1.1 2016/05/01 19:26:35 dholland Exp $
+$NetBSD: patch-libAfterStep_asapp.c,v 1.2 2021/07/11 12:13:17 bsiegert Exp $
 
 Use ctype.h correctly.
 
---- libAfterStep/asapp.c~	2009-10-05 16:32:59.000000000 +0000
+--- libAfterStep/asapp.c.orig	2013-05-01 13:34:11.000000000 +0000
 +++ libAfterStep/asapp.c
-@@ -1208,7 +1208,7 @@ spawn_child( const char *cmd, int single
+@@ -1431,7 +1431,7 @@ spawn_child (const char *cmd, int single
+ 			while (display[i])
+ 				++i;
  
-             while( display[i] ) ++i;
- 
--            while( i > 0 && isdigit(display[--i]) );
-+            while( i > 0 && isdigit((unsigned char)display[--i]) );
-             if( display[i] == '.' )
-                 display[i+1] = '\0' ;
+-			while (i > 0 && isdigit (display[--i])) ;
++			while (i > 0 && isdigit ((unsigned char)display[--i])) ;
+ 			if (display[i] == '.')
+ 				display[i + 1] = '\0';
  /*
-@@ -1288,7 +1288,7 @@ spawn_child( const char *cmd, int single
-             if( as_app_args.verbosity_level != OUTPUT_DEFAULT_THRESHOLD )
-                 ptr += sprintf( ptr, " -V %d", as_app_args.verbosity_level );
- LOCAL_DEBUG_OUT( "len = %d, cmdl = \"%s\" strlen = %d, locale = \"%s\", ptr-cmdl = %d", len, cmdl, (int)strlen(cmdl), as_app_args.locale, (int)(ptr-cmdl) );
--			if( as_app_args.locale && as_app_args.locale[0] && !isspace(as_app_args.locale[0]))
-+			if( as_app_args.locale && as_app_args.locale[0] && !isspace((unsigned char)as_app_args.locale[0]))
-                 ptr += sprintf( ptr, " -L %s", as_app_args.locale );
- 			
+@@ -1518,7 +1518,7 @@ spawn_child (const char *cmd, int single
+ 					 len, cmdl, (int)strlen (cmdl), as_app_args.locale,
+ 					 (int)(ptr - cmdl));
+ 			if (as_app_args.locale && as_app_args.locale[0]
+-					&& !isspace (as_app_args.locale[0]))
++					&& !isspace ((unsigned char)as_app_args.locale[0]))
+ 				ptr += sprintf (ptr, " -L %s", as_app_args.locale);
+ 
  #ifdef DEBUG_TRACE_X
-@@ -1314,7 +1314,7 @@ LOCAL_DEBUG_OUT( "len = %d, cmdl = \"%s\
-         if( do_fork )
-         {
-             int i = ptr-cmdl;
--            while( --i >= 0 ) if( !isspace(cmdl[i]) ) break;
-+            while( --i >= 0 ) if( !isspace((unsigned char)cmdl[i]) ) break;
-             do_fork = ( i < 0 || cmdl[i] != '&' );
-         }
- 		strcpy (ptr, do_fork?" &\n":"\n");
+@@ -1546,7 +1546,7 @@ spawn_child (const char *cmd, int single
+ 			int i = ptr - cmdl;
+ 
+ 			while (--i >= 0)
+-				if (!isspace (cmdl[i]))
++				if (!isspace ((unsigned char)cmdl[i]))
+ 					break;
+ 			do_fork = (i < 0 || cmdl[i] != '&');
+ 		}
diff --git a/wm/afterstep/patches/patch-libAfterStep_colorscheme.c b/wm/afterstep/patches/patch-libAfterStep_colorscheme.c
index 9c270b1d938..e478644a4ad 100644
--- a/wm/afterstep/patches/patch-libAfterStep_colorscheme.c
+++ b/wm/afterstep/patches/patch-libAfterStep_colorscheme.c
@@ -1,15 +1,15 @@
-$NetBSD: patch-libAfterStep_colorscheme.c,v 1.1 2017/07/14 12:52:49 joerg Exp $
+$NetBSD: patch-libAfterStep_colorscheme.c,v 1.2 2021/07/11 12:13:17 bsiegert Exp $
 
 Fix build with C99 inline.
 
---- libAfterStep/colorscheme.c.orig	2017-07-12 21:35:22.546616813 +0000
+--- libAfterStep/colorscheme.c.orig	2013-05-01 13:34:11.000000000 +0000
 +++ libAfterStep/colorscheme.c
-@@ -122,7 +122,7 @@ compare_color_lightness( ARGB32 c1, ARGB
- 	return ASCS_BLACK_O_WHITE_CRITERIA16_VAL( red1, green1, blue1 )-ASCS_BLACK_O_WHITE_CRITERIA16_VAL( red2, green2, blue2 );
+@@ -129,7 +129,7 @@ int compare_color_lightness (ARGB32 c1, 
+ 			ASCS_BLACK_O_WHITE_CRITERIA16_VAL (red2, green2, blue2);
  }
  
 -inline void
 +static inline void
- make_grad_argb( ASColorScheme *cs, int id,  ARGB32 base_alpha16, int hue360, int sat100, int val100, Bool base )
+ make_grad_argb (ASColorScheme * cs, int id, ARGB32 base_alpha16,
+ 								int hue360, int sat100, int val100, Bool base)
  {
- 	int dark_val = val100-ASCS_GRADIENT_BRIGHTNESS_OFFSET ;
diff --git a/wm/afterstep/patches/patch-libAfterStep_font.c b/wm/afterstep/patches/patch-libAfterStep_font.c
index af7c2d74025..6ad6b2a2e5b 100644
--- a/wm/afterstep/patches/patch-libAfterStep_font.c
+++ b/wm/afterstep/patches/patch-libAfterStep_font.c
@@ -1,22 +1,21 @@
-$NetBSD: patch-libAfterStep_font.c,v 1.1 2016/05/01 19:26:35 dholland Exp $
+$NetBSD: patch-libAfterStep_font.c,v 1.2 2021/07/11 12:13:17 bsiegert Exp $
 
 Use ctype.h correctly.
 
---- libAfterStep/font.c~	2007-07-10 17:48:06.000000000 +0000
+--- libAfterStep/font.c.orig	2013-05-01 13:34:11.000000000 +0000
 +++ libAfterStep/font.c
-@@ -50,12 +50,12 @@ load_font (const char *name_in, MyFont *
- 		register char *ptr = clean_name ;
- 		while( ptr[i] ) ++i ;
- 		while( --i >= 0 )
--			if( !isdigit(ptr[i]) )
-+			if( !isdigit((unsigned char)ptr[i]) )
+@@ -49,11 +49,11 @@ Bool load_font (const char *name_in, MyF
+ 		while (ptr[i])
+ 			++i;
+ 		while (--i >= 0)
+-			if (!isdigit (ptr[i]))
++			if (!isdigit ((unsigned char)ptr[i]))
  				break;
--		if( (isspace( ptr[i] ) || ptr[i] == '-') && ptr[i+1] )
-+		if( (isspace( (unsigned char)ptr[i] ) || ptr[i] == '-') && ptr[i+1] )
- 		{
- 			font_size = atoi( &(ptr[i+1]) );
--			while( i > 0 && isspace(ptr[i-1]) )	--i ;
-+			while( i > 0 && isspace((unsigned char)ptr[i-1]) )	--i ;
- 			clean_name = mystrndup( name, i );
+-		if ((isspace (ptr[i]) || ptr[i] == '-') && ptr[i + 1]) {
++		if ((isspace ((unsigned char)ptr[i]) || ptr[i] == '-') && ptr[i + 1]) {
+ 			font_size = atoi (&(ptr[i + 1]));
+-			while (i > 0 && isspace (ptr[i - 1]))
++			while (i > 0 && isspace ((unsigned char)ptr[i - 1]))
+ 				--i;
+ 			clean_name = mystrndup (name, i);
  		}
- 	}
diff --git a/wm/afterstep/patches/patch-libAfterStep_freestor.c b/wm/afterstep/patches/patch-libAfterStep_freestor.c
index b47448a6203..e6587d80f37 100644
--- a/wm/afterstep/patches/patch-libAfterStep_freestor.c
+++ b/wm/afterstep/patches/patch-libAfterStep_freestor.c
@@ -1,13 +1,13 @@
-$NetBSD: patch-libAfterStep_freestor.c,v 1.1 2016/05/01 19:26:35 dholland Exp $
+$NetBSD: patch-libAfterStep_freestor.c,v 1.2 2021/07/11 12:13:17 bsiegert Exp $
 
 Use ctype.h correctly.
 
---- libAfterStep/freestor.c~	2008-06-13 16:32:51.000000000 +0000
+--- libAfterStep/freestor.c.orig	2013-05-01 13:34:11.000000000 +0000
 +++ libAfterStep/freestor.c
-@@ -478,11 +478,11 @@ args2FreeStorage (FreeStorageElem * pele
+@@ -465,11 +465,11 @@ void args2FreeStorage (FreeStorageElem *
+ 		if (!(pelem->term->flags & TF_DONT_SPLIT)) {
  			cur = data;
- 			while (*cur)
- 			{
+ 			while (*cur) {
 -				if (!isspace ((int)*cur))
 +				if (!isspace ((unsigned char)*cur))
  					max_argc++;
@@ -18,17 +18,17 @@ Use ctype.h correctly.
 +				while (isspace ((unsigned char)*cur) && *cur)
  					cur++;
  			}
- 		} else
-@@ -501,7 +501,7 @@ args2FreeStorage (FreeStorageElem * pele
- 			while (argc < max_argc)
- 			{
+ 		} else {
+@@ -486,7 +486,7 @@ void args2FreeStorage (FreeStorageElem *
+ 			max_argc--;
+ 			while (argc < max_argc) {
  				dst = argv[argc];
--				while (!isspace ((int)*cur) && *cur)
-+				while (!isspace ((unsigned char)*cur) && *cur)
- 				{
- 					if (*cur == '"')
- 					{
-@@ -520,7 +520,7 @@ args2FreeStorage (FreeStorageElem * pele
+-				while (!isspace ((int)*cur) && *cur) {
++				while (!isspace ((unsigned char)*cur) && *cur) {
+ 					if (*cur == '"') {
+ 						register char *ptr = find_doublequotes (cur);
+ 
+@@ -503,7 +503,7 @@ void args2FreeStorage (FreeStorageElem *
  				if (++argc <= max_argc)
  					argv[argc] = dst;
  
@@ -37,57 +37,59 @@ Use ctype.h correctly.
  					cur++;
  			}
  			if (*cur && argc <= max_argc)
-@@ -576,7 +576,7 @@ LOCAL_DEBUG_OUT("argv=%p, arc=%d, sub=%p
- 	{
+@@ -557,8 +557,8 @@ FunctionData *free_storage2func (FreeSto
+ 	while (pos < stored->argc && stored->argv[pos]) {
  		register char *cur = stored->argv[pos];
  
--		if (isdigit ((int)*cur) || ((*cur == '-' || *cur == '+') && isdigit ((int)*(cur + 1))))
-+		if (isdigit ((unsigned char)*cur) || ((*cur == '-' || *cur == '+') && isdigit ((unsigned char)*(cur + 1))))
+-		if (isdigit ((int)*cur)
+-				|| ((*cur == '-' || *cur == '+') && isdigit ((int)*(cur + 1))))
++		if (isdigit ((unsigned char)*cur)
++				|| ((*cur == '-' || *cur == '+') && isdigit ((unsigned char)*(cur + 1))))
  			break;
  		pos++;
  	}
-@@ -833,14 +833,14 @@ parse_context (char *string, int *output
- 	char          tmp1;
+@@ -807,13 +807,13 @@ char *parse_context (char *string, int *
+ 	char tmp1;
  
  	*output = 0;
--	for (ptr = string; isspace (*ptr); ptr++);
--	for (; *ptr && !isspace (*ptr); ptr++)
-+	for (ptr = string; isspace ((unsigned char)*ptr); ptr++);
-+	for (; *ptr && !isspace ((unsigned char)*ptr); ptr++)
- 	{
+-	for (ptr = string; isspace (*ptr); ptr++) ;
+-	for (; *ptr && !isspace (*ptr); ptr++) {
++	for (ptr = string; isspace ((unsigned char)*ptr); ptr++) ;
++	for (; *ptr && !isspace ((unsigned char)*ptr); ptr++) {
  		/* in some BSD implementations, tolower(c) is not defined
  		 * unless isupper(c) is true */
  		tmp1 = *ptr;
--        if (islower (tmp1))
--            tmp1 = toupper (tmp1);
-+        if (islower ((unsigned char)tmp1))
-+            tmp1 = toupper ((unsigned char)tmp1);
+-		if (islower (tmp1))
+-			tmp1 = toupper (tmp1);
++		if (islower ((unsigned char)tmp1))
++			tmp1 = toupper ((unsigned char)tmp1);
  		/* end of ugly BSD patch */
  		for (j = 0; table[j].key != 0; j++)
- 			if (tmp1 == table[j].key)
-@@ -904,7 +904,7 @@ context2string (char *string, int input,
-                 string[i++] = table[j].key ;
- 	if( terminate )
-     {
--        while ( string[i] != '\0' && !isspace((int)string[i])) i++;
-+        while ( string[i] != '\0' && !isspace((unsigned char)string[i])) i++;
- 	    string[i] = '\0' ;
-     }else
- 	    string[j] = '\0' ;
-@@ -955,10 +955,10 @@ free_storage2bitlist (FreeStorageElem * 
-         ptr = stored->argv[i] ;
-         while ( *ptr )
-         {
--            while( *ptr && !isdigit((int)*ptr)) ptr++ ;
-+            while( *ptr && !isdigit((unsigned char)*ptr)) ptr++ ;
-             bit_num = 0 ;
-             valid = False ;
--            while( *ptr && isdigit((int)*ptr))
-+            while( *ptr && isdigit((unsigned char)*ptr))
-             {
-                 valid = True ;
-                 bit_num = bit_num*10+((*ptr)-'0');
-@@ -1539,7 +1539,7 @@ Path2FreeStorage (SyntaxDef * syntax, Fr
+ 			if (tmp1 == table[j].key) {
+@@ -879,7 +879,7 @@ context2string (char *string, int input,
+ 			if (input & table[j].value)
+ 				string[i++] = table[j].key;
+ 	if (terminate) {
+-		while (string[i] != '\0' && !isspace ((int)string[i]))
++		while (string[i] != '\0' && !isspace ((unsigned char)string[i]))
+ 			i++;
+ 		string[i] = '\0';
+ 	} else
+@@ -927,11 +927,11 @@ long free_storage2bitlist (FreeStorageEl
+ 	for (i = *ppos; i < stored->argc; i++) {
+ 		ptr = stored->argv[i];
+ 		while (*ptr) {
+-			while (*ptr && !isdigit ((int)*ptr))
++			while (*ptr && !isdigit ((unsigned char)*ptr))
+ 				ptr++;
+ 			bit_num = 0;
+ 			valid = False;
+-			while (*ptr && isdigit ((int)*ptr)) {
++			while (*ptr && isdigit ((unsigned char)*ptr)) {
+ 				valid = True;
+ 				bit_num = bit_num * 10 + ((*ptr) - '0');
+ 				ptr++;
+@@ -1553,7 +1553,7 @@ FreeStorageElem **Path2FreeStorage (Synt
  		register char *ptr;
  
  		for (ptr = path; *ptr; ptr++)
diff --git a/wm/afterstep/patches/patch-libAfterStep_functions.c b/wm/afterstep/patches/patch-libAfterStep_functions.c
index 4ca69310655..ec78f9da032 100644
--- a/wm/afterstep/patches/patch-libAfterStep_functions.c
+++ b/wm/afterstep/patches/patch-libAfterStep_functions.c
@@ -1,44 +1,51 @@
-$NetBSD: patch-libAfterStep_functions.c,v 1.2 2016/05/01 19:26:35 dholland Exp $
+$NetBSD: patch-libAfterStep_functions.c,v 1.3 2021/07/11 12:13:17 bsiegert Exp $
 
 - use ctype.h correctly
 - patch up gcc inline mess
 
---- libAfterStep/functions.c.orig	2009-12-11 22:38:48.000000000 +0000
+--- libAfterStep/functions.c.orig	2013-05-01 13:34:11.000000000 +0000
 +++ libAfterStep/functions.c
-@@ -52,19 +52,19 @@ txt2func (const char *text, FunctionData
+@@ -63,7 +63,7 @@ int txt2func_code (const char *text)
  {
- 	TermDef      *fterm;
+ 	TermDef *fterm;
  
--	for (; isspace (*text); text++);
-+	for (; isspace ((unsigned char)*text); text++);
+-	for (; isspace (*text); text++) ;
++	for (; isspace ((unsigned char)*text); text++) ;
+ 	fterm = txt2fterm (text, True);
+ 	return (fterm != NULL) ? fterm->id : F_FUNCTIONS_NUM;
+ }
+@@ -72,17 +72,17 @@ int txt2func (const char *text, Function
+ {
+ 	TermDef *fterm;
+ 
+-	for (; isspace (*text); text++) ;
++	for (; isspace ((unsigned char)*text); text++) ;
  	fterm = txt2fterm (text, quiet);
- 	if (fterm != NULL)
- 	{
+ 	if (fterm != NULL) {
  		init_func_data (fdata);
  		fdata->func = fterm->id;
--		for (; !isspace (*text) && *text; text++);
--		for (; isspace (*text); text++);
-+		for (; !isspace ((unsigned char)*text) && *text; text++);
-+		for (; isspace ((unsigned char)*text); text++);
- 		if (*text)
- 		{
- 			const char   *ptr = text + strlen ((char*)text);
+-		for (; !isspace (*text) && *text; text++) ;
+-		for (; isspace (*text); text++) ;
++		for (; !isspace ((unsigned char)*text) && *text; text++) ;
++		for (; isspace ((unsigned char)*text); text++) ;
+ 		if (*text) {
+ 			const char *ptr = text + strlen ((char *)text);
  
--			for (; isspace (*(ptr - 1)); ptr--);
-+			for (; isspace ((unsigned char)*(ptr - 1)); ptr--);
+-			for (; isspace (*(ptr - 1)); ptr--) ;
++			for (; isspace ((unsigned char)*(ptr - 1)); ptr--) ;
  			fdata->text = mystrndup (text, ptr - text);
  		}
  	}
-@@ -80,7 +80,7 @@ parse_func (const char *text, FunctionDa
- 	int           sign = 0;
+@@ -97,7 +97,7 @@ int parse_func (const char *text, Functi
+ 	int sign = 0;
  
  	init_func_data (data);
--	for (ptr = (char *)text; isspace (*ptr); ptr++);
-+	for (ptr = (char *)text; isspace ((unsigned char)*ptr); ptr++);
- 	if (*ptr == '\0')
- 	{
+-	for (ptr = (char *)text; isspace (*ptr); ptr++) ;
++	for (ptr = (char *)text; isspace ((unsigned char)*ptr); ptr++) ;
+ 	if (*ptr == '\0') {
  		if (!quiet)
-@@ -94,7 +94,7 @@ parse_func (const char *text, FunctionDa
+ 			show_error ("empty function specification encountered.%s");
+@@ -110,7 +110,7 @@ int parse_func (const char *text, Functi
  	if (IsInternFunc (fterm->id))
  		return 0;
  
@@ -47,44 +54,40 @@ $NetBSD: patch-libAfterStep_functions.c,v 1.2 2016/05/01 19:26:35 dholland Exp $
  		ptr++;
  	data->func = fterm->id;
  	if (fterm->flags & TF_SYNTAX_TERMINATOR)
-@@ -109,14 +109,14 @@ parse_func (const char *text, FunctionDa
- 	{										   /* we still want to strip trailing whitespaces */
- 		char         *tail = ptr + strlen (ptr) - 1;
+@@ -124,13 +124,13 @@ int parse_func (const char *text, Functi
+ 	else {												/* we still want to strip trailing whitespaces */
+ 		char *tail = ptr + strlen (ptr) - 1;
  
--		for (; isspace (*tail) && tail > ptr; tail--);
-+		for (; isspace ((unsigned char)*tail) && tail > ptr; tail--);
+-		for (; isspace (*tail) && tail > ptr; tail--) ;
++		for (; isspace ((unsigned char)*tail) && tail > ptr; tail--) ;
  		*(tail + 1) = '\0';
  	}
  	/* this function is very often called so we try to use as little
  	   calls to other function as possible */
- 	for (; *ptr; ptr++)
- 	{
--		if (!isspace (*ptr))
-+		if (!isspace ((unsigned char)*ptr))
- 		{
- 			int           is_text = 0;
+ 	for (; *ptr; ptr++) {
+-		if (!isspace (*ptr)) {
++		if (!isspace ((unsigned char)*ptr)) {
+ 			int is_text = 0;
  
-@@ -138,15 +138,15 @@ parse_func (const char *text, FunctionDa
+ 			if (*ptr == '"') {
+@@ -149,13 +149,13 @@ int parse_func (const char *text, Functi
  				else if (data->text == NULL)
  					data->text = text;
  				ptr = tail + 1;
--			} else if (isdigit (*ptr))
-+			} else if (isdigit ((unsigned char)*ptr))
- 			{
- 				int           count;
- 				char          unit = '\0';
- 				int           val = 0;
+-			} else if (isdigit (*ptr)) {
++			} else if (isdigit ((unsigned char)*ptr)) {
+ 				int count;
+ 				char unit = '\0';
+ 				int val = 0;
  
--				for (count = 1; isdigit (*(ptr + count)); count++);
+-				for (count = 1; isdigit (*(ptr + count)); count++) ;
 -				if (*(ptr + count) != '\0' && !isspace (*(ptr + count)))
--					is_text = (!isspace (*(ptr + count + 1)) && *(ptr + count + 1) != '\0') ? 1 : 0;
-+				for (count = 1; isdigit ((unsigned char)*(ptr + count)); count++);
++				for (count = 1; isdigit ((unsigned char)*(ptr + count)); count++) ;
 +				if (*(ptr + count) != '\0' && !isspace ((unsigned char)*(ptr + count)))
-+					is_text = (!isspace ((unsigned char)*(ptr + count + 1)) && *(ptr + count + 1) != '\0') ? 1 : 0;
+ 					is_text = (!isspace (*(ptr + count + 1))
+ 										 && *(ptr + count + 1) != '\0') ? 1 : 0;
  				if (is_text == 0)
- 					ptr = parse_func_args (ptr, &unit, &val) - 1;
- 				if (curr_arg < MAX_FUNC_ARGS)
-@@ -187,7 +187,7 @@ parse_func (const char *text, FunctionDa
+@@ -190,7 +190,7 @@ int parse_func (const char *text, Functi
  					}
  					ptr = parse_token (ptr, &(data->text)) - 1;
  				} else
@@ -93,12 +96,12 @@ $NetBSD: patch-libAfterStep_functions.c,v 1.2 2016/05/01 19:26:35 dholland Exp $
  						ptr++;
  			}
  			sign = 0;
-@@ -314,7 +314,7 @@ dup_func_data (FunctionData * dst, Funct
-     }
+@@ -307,7 +307,7 @@ void dup_func_data (FunctionData * dst, 
+ 	}
  }
  
--inline FunctionData *
-+FunctionData *
- create_named_function( int func, char *name)
+-inline FunctionData *create_named_function (int func, char *name)
++FunctionData *create_named_function (int func, char *name)
  {
-     FunctionData *fdata = safecalloc( 1, sizeof(FunctionData) );
+ 	FunctionData *fdata = safecalloc (1, sizeof (FunctionData));
+ 
diff --git a/wm/afterstep/patches/patch-libAfterStep_hints.c b/wm/afterstep/patches/patch-libAfterStep_hints.c
index 9b64ab57ae9..a47394f07e3 100644
--- a/wm/afterstep/patches/patch-libAfterStep_hints.c
+++ b/wm/afterstep/patches/patch-libAfterStep_hints.c
@@ -1,42 +1,42 @@
-$NetBSD: patch-libAfterStep_hints.c,v 1.1 2016/05/01 19:26:35 dholland Exp $
+$NetBSD: patch-libAfterStep_hints.c,v 1.2 2021/07/11 12:13:17 bsiegert Exp $
 
 Use ctype.h correctly.
 
---- libAfterStep/hints.c~	2009-12-31 17:40:57.000000000 +0000
+--- libAfterStep/hints.c.orig	2013-05-01 13:34:11.000000000 +0000
 +++ libAfterStep/hints.c
-@@ -144,7 +144,7 @@ merge_command_line (ASHints * clean, ASS
- 						{
+@@ -150,8 +150,8 @@ merge_command_line (ASHints * clean, ASS
+ 						if (raw->wm_cmd_argv[i + 1] != NULL) {
  							register char *g = raw->wm_cmd_argv[i + 1];
  
--							if (isdigit ((int)*g) || ((*g == '-' || *g == '+') && isdigit ((int)*(g + 1))))
-+							if (isdigit ((unsigned char)*g) || ((*g == '-' || *g == '+') && isdigit ((unsigned char)*(g + 1))))
- 								if (mystrcasecmp (raw->wm_cmd_argv[i], "-g") == 0 ||
- 									mystrcasecmp (raw->wm_cmd_argv[i], "-geometry") == 0)
- 								{
-@@ -168,7 +168,7 @@ merge_command_line (ASHints * clean, ASS
- 						register int k ;
- 						Bool add_quotes = False ;
+-							if (isdigit ((int)*g)
+-									|| ((*g == '-' || *g == '+') && isdigit ((int)*(g + 1))))
++							if (isdigit ((unsigned char)*g)
++									|| ((*g == '-' || *g == '+') && isdigit ((unsigned char)*(g + 1))))
+ 								if (mystrcasecmp (raw->wm_cmd_argv[i], "-g") == 0
+ 										|| mystrcasecmp (raw->wm_cmd_argv[i],
+ 																		 "-geometry") == 0) {
+@@ -175,13 +175,13 @@ merge_command_line (ASHints * clean, ASS
+ 						Bool add_quotes = False;
+ 
  						for (k = 0; src[k]; k++)
--							if( isspace(src[k]) || 
-+							if( isspace((unsigned char)src[k]) || 
- 								src[k] == '#' ||
- 								src[k] == '*' ||
- 								src[k] == '$' ||
-@@ -177,7 +177,7 @@ merge_command_line (ASHints * clean, ASS
- 								src[k] == '<' ||
- 								src[k] == '>' ||
- 								src[k] == '|' ||
--								iscntrl(src[k])
-+								iscntrl((unsigned char)src[k])
- 								) 
- 							{
- 								add_quotes = True ;
-@@ -2791,7 +2791,7 @@ get_client_icon_image( ScreenInfo * scr,
+-							if (isspace (src[k]) ||
++							if (isspace ((unsigned char)src[k]) ||
+ 									src[k] == '#' ||
+ 									src[k] == '*' ||
+ 									src[k] == '$' ||
+ 									src[k] == ';' ||
+ 									src[k] == '&' || src[k] == '<' || src[k] == '>'
+-									|| src[k] == '|' || iscntrl (src[k])) {
++									|| src[k] == '|' || iscntrl ((unsigned char)src[k])) {
+ 								add_quotes = True;
+ 								break;
+ 							}
+@@ -2813,7 +2813,7 @@ ASImage *get_client_icon_image (ScreenIn
  					int i = 0;
- 					char old ; 
+ 					char old;
  
--					while( name[i] && !isspace(name[i]) ) ++i ; 
-+					while( name[i] && !isspace((unsigned char)name[i]) ) ++i ; 
- 					if( i > 0 ) 
- 					{
+-					while (name[i] && !isspace (name[i]))
++					while (name[i] && !isspace ((unsigned char)name[i]))
+ 						++i;
+ 					if (i > 0) {
  						old = name[i];
diff --git a/wm/afterstep/patches/patch-libAfterStep_kde.c b/wm/afterstep/patches/patch-libAfterStep_kde.c
index b13e37c34b7..01c148d356d 100644
--- a/wm/afterstep/patches/patch-libAfterStep_kde.c
+++ b/wm/afterstep/patches/patch-libAfterStep_kde.c
@@ -1,23 +1,23 @@
-$NetBSD: patch-libAfterStep_kde.c,v 1.1 2016/05/01 19:26:35 dholland Exp $
+$NetBSD: patch-libAfterStep_kde.c,v 1.2 2021/07/11 12:13:17 bsiegert Exp $
 
 Use ctype.h correctly.
 
---- libAfterStep/kde.c~	2008-03-24 17:49:03.000000000 +0000
+--- libAfterStep/kde.c.orig	2013-05-01 13:34:11.000000000 +0000
 +++ libAfterStep/kde.c
-@@ -110,14 +110,14 @@ xml_elem_t* load_KDE_config(const char* 
- 			xml_elem_t* tag ; 
- 			int i = 0; 
+@@ -111,14 +111,14 @@ xml_elem_t *load_KDE_config (const char 
+ 			xml_elem_t *tag;
+ 			int i = 0;
  
--			while( isspace(buffer[i]) ) ++i ;
-+			while( isspace((unsigned char)buffer[i]) ) ++i ;
- 			if( buffer[i] == '#' )
- 			{
+-			while (isspace (buffer[i]))
++			while (isspace ((unsigned char)buffer[i]))
  				++i;
-  				if( (tag = make_kde_config_comment_tag()) != NULL )
- 				{	
- 					int len = strlen( &buffer[i] ) ;
--					while( len > 0 && isspace( buffer[i+len-1] ) ) --len ;
-+					while( len > 0 && isspace( (unsigned char)buffer[i+len-1] ) ) --len ;
- 					if( len > 0 ) 
- 					{
- 						tag->child = create_CDATA_tag();	  
+ 			if (buffer[i] == '#') {
+ 				++i;
+ 				if ((tag = make_kde_config_comment_tag ()) != NULL) {
+ 					int len = strlen (&buffer[i]);
+ 
+-					while (len > 0 && isspace (buffer[i + len - 1]))
++					while (len > 0 && isspace ((unsigned char)buffer[i + len - 1]))
+ 						--len;
+ 					if (len > 0) {
+ 						tag->child = create_CDATA_tag ();
diff --git a/wm/afterstep/patches/patch-libAfterStep_mylook.c b/wm/afterstep/patches/patch-libAfterStep_mylook.c
index 8fb1c2d0a40..bea16a74fc1 100644
--- a/wm/afterstep/patches/patch-libAfterStep_mylook.c
+++ b/wm/afterstep/patches/patch-libAfterStep_mylook.c
@@ -1,24 +1,24 @@
-$NetBSD: patch-libAfterStep_mylook.c,v 1.2 2016/05/01 19:30:58 dholland Exp $
+$NetBSD: patch-libAfterStep_mylook.c,v 1.3 2021/07/11 12:13:17 bsiegert Exp $
 
 Patch up gcc inline mess.
 
---- libAfterStep/mylook.c.orig	2012-05-04 14:35:51.000000000 +0000
+--- libAfterStep/mylook.c.orig	2013-05-01 13:34:11.000000000 +0000
 +++ libAfterStep/mylook.c
-@@ -813,7 +813,7 @@ mylook_get_style(MyLook *look, const cha
-     return NULL;
+@@ -843,7 +843,7 @@ MyStyle *mylook_get_style (MyLook * look
+ 	return NULL;
  }
  
--inline MyDesktopConfig *
-+MyDesktopConfig *
- mylook_get_desk_config(MyLook *look, long desk)
+-inline MyDesktopConfig *mylook_get_desk_config (MyLook * look, long desk)
++MyDesktopConfig *mylook_get_desk_config (MyLook * look, long desk)
  {
-     if( look )
-@@ -827,7 +827,7 @@ mylook_get_desk_config(MyLook *look, lon
+ 	if (look) {
+ 		ASHashData hdata = { 0 };
+@@ -856,7 +856,7 @@ inline MyDesktopConfig *mylook_get_desk_
  }
  
  
--inline MyBackground *
-+MyBackground *
- mylook_get_desk_back(MyLook *look, long desk)
+-inline MyBackground *mylook_get_desk_back (MyLook * look, long desk)
++MyBackground *mylook_get_desk_back (MyLook * look, long desk)
  {
- 	MyBackground *myback = NULL ;
+ 	MyBackground *myback = NULL;
+ 
diff --git a/wm/afterstep/patches/patch-libAfterStep_parser.c b/wm/afterstep/patches/patch-libAfterStep_parser.c
index d5f4b46e5ee..18a3501a4c1 100644
--- a/wm/afterstep/patches/patch-libAfterStep_parser.c
+++ b/wm/afterstep/patches/patch-libAfterStep_parser.c
@@ -1,88 +1,89 @@
-$NetBSD: patch-libAfterStep_parser.c,v 1.1 2016/05/01 19:26:35 dholland Exp $
+$NetBSD: patch-libAfterStep_parser.c,v 1.2 2021/07/11 12:13:17 bsiegert Exp $
 
 Use ctype.h correctly.
 
---- libAfterStep/parser.c~	2008-03-28 22:41:23.000000000 +0000
+--- libAfterStep/parser.c.orig	2013-05-01 13:34:11.000000000 +0000
 +++ libAfterStep/parser.c
-@@ -613,9 +613,9 @@ GetNextStatement (ConfigDef * config)
+@@ -602,9 +602,9 @@ char *GetNextStatement (ConfigDef * conf
  			if (*cur == file_terminator)
  				return NULL;
  #ifdef __CYGWIN__
--            if (!isspace ((int)*cur) && *cur != 0x0D)
-+            if (!isspace ((unsigned char)*cur) && *cur != 0x0D)
+-			if (!isspace ((int)*cur) && *cur != 0x0D)
++			if (!isspace ((unsigned char)*cur) && *cur != 0x0D)
  #else
--            if (!isspace ((int)*cur))
-+            if (!isspace ((unsigned char)*cur))
+-			if (!isspace ((int)*cur))
++			if (!isspace ((unsigned char)*cur))
  #endif
  			{
- 				register int  i;
-@@ -632,7 +632,7 @@ GetNextStatement (ConfigDef * config)
- 					{						   /* comments - skip entire line */
+ 				register int i;
+@@ -619,7 +619,7 @@ char *GetNextStatement (ConfigDef * conf
+ 					if (i == DISABLED_KEYWORD_SIZE) {	/* comments - skip entire line */
  						config->current_flags |= CF_DISABLED_OPTION;
  						/* let's skip few spaces here */
--						while (isspace ((int)cur[i]) && cur[i] != terminator) ++i;
-+						while (isspace ((unsigned char)cur[i]) && cur[i] != terminator) ++i;
+-						while (isspace ((int)cur[i]) && cur[i] != terminator)
++						while (isspace ((unsigned char)cur[i]) && cur[i] != terminator)
+ 							++i;
  						if (cur[i] == '\0' || cur[i] == terminator)
- 							break;				   /* not a valid option */
- 						cur = &cur[i];
-@@ -647,7 +647,7 @@ GetNextStatement (ConfigDef * config)
-                     print_trimmed_str(  "private option at", cur );
+ 							break;						/* not a valid option */
+@@ -634,7 +634,7 @@ char *GetNextStatement (ConfigDef * conf
+ 					print_trimmed_str ("private option at", cur);
  					++cur;
- 					for( i = 0 ; mname[i] != '\0' && cur[i] != '\0' ; ++i ) 
--						if (tolower (mname[i]) != tolower (cur[i]) )
-+						if (tolower ((unsigned char)mname[i]) != tolower ((unsigned char)cur[i]) )
+ 					for (i = 0; mname[i] != '\0' && cur[i] != '\0'; ++i)
+-						if (tolower (mname[i]) != tolower (cur[i]))
++						if (tolower ((unsigned char)mname[i]) != tolower ((unsigned char)cur[i]))
  							break;
- 					if (mname[i] != '\0')
- 					{						   /* that was a foreign optiion - belongs to the other executable */
-@@ -673,9 +673,9 @@ GetNextStatement (ConfigDef * config)
- 				if( *cur != COMMENTS_CHAR )
- 				{	
-                 	i = 0 ;
--                	while (cur[i] && !isspace ((int)cur[i]) && cur[i] != terminator && cur[i] != file_terminator)
-+                	while (cur[i] && !isspace ((unsigned char)cur[i]) && cur[i] != terminator && cur[i] != file_terminator)
-                     	++i;
--                	while (isspace ((int)cur[i]) && cur[i] != terminator && cur[i] != file_terminator)
-+                	while (isspace ((unsigned char)cur[i]) && cur[i] != terminator && cur[i] != file_terminator)
-                     	++i;
- 				}else
- 					i = 1;
-@@ -711,7 +711,7 @@ GetNextStatement (ConfigDef * config)
- 					{
+ 					if (mname[i] != '\0') {	/* that was a foreign optiion - belongs to the other executable */
+ 						if (get_flags (config->flags, CP_IgnoreForeign))
+@@ -657,10 +657,10 @@ char *GetNextStatement (ConfigDef * conf
+ 				   config->current_data and set current_data_len ; (unless its a comment) */
+ 				if (*cur != COMMENTS_CHAR) {
+ 					i = 0;
+-					while (cur[i] && !isspace ((int)cur[i]) && cur[i] != terminator
++					while (cur[i] && !isspace ((unsigned char)cur[i]) && cur[i] != terminator
+ 								 && cur[i] != file_terminator)
+ 						++i;
+-					while (isspace ((int)cur[i]) && cur[i] != terminator
++					while (isspace ((unsigned char)cur[i]) && cur[i] != terminator
+ 								 && cur[i] != file_terminator)
+ 						++i;
+ 				} else
+@@ -697,7 +697,7 @@ char *GetNextStatement (ConfigDef * conf
+ 					while (--i >= 0) {
  						if (config->tdata[i] == file_terminator)
- 							set_flags(config->current_flags, CF_LAST_OPTION);
+ 							set_flags (config->current_flags, CF_LAST_OPTION);
 -						if (!isspace ((int)data[i]))
 +						if (!isspace ((unsigned char)data[i]))
  							break;
  					}
  					i++;
-@@ -750,10 +750,10 @@ FindStatementTerm (char *tline, SyntaxDe
- 	if( tline[0] == COMMENTS_CHAR )
+@@ -741,10 +741,10 @@ TermDef *FindStatementTerm (char *tline,
+ 	if (tline[0] == COMMENTS_CHAR)
  		return &_as_comments_term;
  
--	if( isspace(tline[0]) )
-+	if( isspace((unsigned char)tline[0]) )
- 	{
- 		int i = 0; 
--		while( isspace(tline[i]) ) 	   ++i;
-+		while( isspace((unsigned char)tline[i]) ) 	   ++i;
- 		if( tline[i] == '~') 
- 			if( get_hash_item (syntax->term_hash, AS_HASHABLE(&tline[i]), &hdata.vptr)==ASH_Success  )
- 				return hdata.vptr;
-@@ -793,7 +793,7 @@ config2tree_storage (ConfigDef * config,
- 				{	
- 					++i;       /* it's ok - we can start with 1, since myname should have at least 1 char */
+-	if (isspace (tline[0])) {
++	if (isspace ((unsigned char)tline[0])) {
+ 		int i = 0;
+ 
+-		while (isspace (tline[i]))
++		while (isspace ((unsigned char)tline[i]))
+ 			++i;
+ 		if (tline[i] == '~')
+ 			if (get_hash_item
+@@ -786,7 +786,7 @@ int config2tree_storage (ConfigDef * con
+ 					++i;									/* it's ok - we can start with 1, since myname should have at least 1 char */
  					pterm = FindStatementTerm (&(config->tline[i]), config->syntax);
--				}while( pterm == NULL && !isspace(config->tline[i]) && config->tline[i] != '\0' );
-+				}while( pterm == NULL && !isspace((unsigned char)config->tline[i]) && config->tline[i] != '\0' );
- 			}else
+ 				}
+-				while (pterm == NULL && !isspace (config->tline[i])
++				while (pterm == NULL && !isspace ((unsigned char)config->tline[i])
+ 							 && config->tline[i] != '\0');
+ 			} else
  				pterm = FindStatementTerm (config->tline, config->syntax);
- 
-@@ -804,7 +804,7 @@ config2tree_storage (ConfigDef * config,
+@@ -798,7 +798,7 @@ int config2tree_storage (ConfigDef * con
  			config->current_term = pterm;
- 			
- 			LOCAL_DEBUG_OUT("Term:[%s]", config->current_term->keyword);
--			if( isspace(config->tline[0]) &&  pterm->keyword_len > 0 &&
-+			if( isspace((unsigned char)config->tline[0]) &&  pterm->keyword_len > 0 &&
- 				mystrncasecmp(pterm->keyword, config->current_data, pterm->keyword_len) == 0 ) 
- 			{              /* we need to skip one token in current_data :  */
- 				char *src = tokenskip( config->current_data, 1 ) ;
+ 
+ 			LOCAL_DEBUG_OUT ("Term:[%s]", config->current_term->keyword);
+-			if (isspace (config->tline[0]) && pterm->keyword_len > 0 && mystrncasecmp (pterm->keyword, config->current_data, pterm->keyword_len) == 0) {	/* we need to skip one token in current_data :  */
++			if (isspace ((unsigned char)config->tline[0]) && pterm->keyword_len > 0 && mystrncasecmp (pterm->keyword, config->current_data, pterm->keyword_len) == 0) {	/* we need to skip one token in current_data :  */
+ 				char *src = tokenskip (config->current_data, 1);
+ 				char *dst = config->current_data;
+ 
diff --git a/wm/afterstep/patches/patch-libAfterStep_parser__xml.c b/wm/afterstep/patches/patch-libAfterStep_parser__xml.c
index cf70acd8e6e..0bc6ff61d62 100644
--- a/wm/afterstep/patches/patch-libAfterStep_parser__xml.c
+++ b/wm/afterstep/patches/patch-libAfterStep_parser__xml.c
@@ -1,15 +1,15 @@
-$NetBSD: patch-libAfterStep_parser__xml.c,v 1.1 2016/05/01 19:26:35 dholland Exp $
+$NetBSD: patch-libAfterStep_parser__xml.c,v 1.2 2021/07/11 12:13:17 bsiegert Exp $
 
 Use ctype.h correctly.
 
---- libAfterStep/parser_xml.c~	2006-07-18 17:36:36.000000000 +0000
+--- libAfterStep/parser_xml.c.orig	2013-05-01 13:34:11.000000000 +0000
 +++ libAfterStep/parser_xml.c
-@@ -186,7 +186,7 @@ statement2xml_elem (ConfigDef * config)
- 		}else if (get_flags(pterm->flags, TF_INDEXED))
- 		{
- 			int i = 0 ; 
--			while( isdigit(ptr[i]) ) ++i;
-+			while( isdigit((unsigned char)ptr[i]) ) ++i;
- 			if( i > 0 ) 
- 			{	
-         		index = mystrndup(ptr, i);
+@@ -183,7 +183,7 @@ void statement2xml_elem (ConfigDef * con
+ 		} else if (get_flags (pterm->flags, TF_INDEXED)) {
+ 			int i = 0;
+ 
+-			while (isdigit (ptr[i]))
++			while (isdigit ((unsigned char)ptr[i]))
+ 				++i;
+ 			if (i > 0) {
+ 				index = mystrndup (ptr, i);
diff --git a/wm/afterstep/patches/patch-src_ASDocGen_Makefile.in b/wm/afterstep/patches/patch-src_ASDocGen_Makefile.in
index db2cef64705..b99753a2440 100644
--- a/wm/afterstep/patches/patch-src_ASDocGen_Makefile.in
+++ b/wm/afterstep/patches/patch-src_ASDocGen_Makefile.in
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_ASDocGen_Makefile.in,v 1.1 2011/05/25 13:17:37 obache Exp $
+$NetBSD: patch-src_ASDocGen_Makefile.in,v 1.2 2021/07/11 12:13:17 bsiegert Exp $
 
 * staged installation suuport.
 
---- src/ASDocGen/Makefile.in.orig	2004-11-30 22:57:13.000000000 +0000
+--- src/ASDocGen/Makefile.in.orig	2013-05-01 13:34:11.000000000 +0000
 +++ src/ASDocGen/Makefile.in
-@@ -67,7 +67,7 @@ install.data_html:  do_compile
+@@ -82,7 +82,7 @@ install.data_html:  do_compile
  			echo "Generating catalogue of installed data files ..." ; \
  			old_IMAGE_PATH=$(IMAGE_PATH); old_FONT_PATH=$(FONT_PATH); \
- 			FONT_PATH="@with_afterdir@/desktop/fonts/:@datadir@/afterstep/desktop/fonts/:/usr/share/fonts/default/TrueType/:@x_libraries@/X11/fonts/TTF"; \
--			IMAGE_PATH="@with_afterdir@/desktop/icons/:@datadir@/afterstep/desktop/icons/:@with_afterdir@/desktop/:@datadir@/afterstep/desktop/:@with_afterdir@/desktop/buttons/:@datadir@/afterstep/desktop/buttons/:@with_afterdir@/backgrounds/:@datadir@/afterstep/backgrounds/:@x_includes@/X11/pixmaps/"; \
-+			IMAGE_PATH="@with_afterdir@/desktop/icons/:$(DESTDIR)@datadir@/afterstep/desktop/icons/:@with_afterdir@/desktop/:$(DESTDIR)@datadir@/afterstep/desktop/:@with_afterdir@/desktop/buttons/:$(DESTDIR)@datadir@/afterstep/desktop/buttons/:@with_afterdir@/backgrounds/:$(DESTDIR)@datadir@/afterstep/backgrounds/:@x_includes@/X11/pixmaps/"; \
+ 			FONT_PATH="@with_afterdir@/desktop/fonts/:@datarootdir@/afterstep/desktop/fonts/:/usr/share/fonts/default/TrueType/:@x_libraries@/X11/fonts/TTF"; \
+-			IMAGE_PATH="@with_afterdir@/desktop/icons/:@datarootdir@/afterstep/desktop/icons/:@with_afterdir@/desktop/:@datarootdir@/afterstep/desktop/:@with_afterdir@/desktop/buttons/:@datarootdir@/afterstep/desktop/buttons/:@with_afterdir@/backgrounds/:@datarootdir@/afterstep/backgrounds/:@x_includes@/X11/pixmaps/"; \
++			IMAGE_PATH="@with_afterdir@/desktop/icons/:$(DESTDIR)@datarootdir@/afterstep/desktop/icons/:@with_afterdir@/desktop/:$(DESTDIR)@datarootdir@/afterstep/desktop/:@with_afterdir@/desktop/buttons/:$(DESTDIR)@datarootdir@/afterstep/desktop/buttons/:@with_afterdir@/backgrounds/:$(DESTDIR)@datarootdir@/afterstep/backgrounds/:@x_includes@/X11/pixmaps/"; \
  			export IMAGE_PATH; export FONT_PATH; \
  			./ASDocGen -t html --data --css data_html_styles.css -S $(AFTER_SHAREDIR) -D $(AFTER_DOC_DIR)/html/data -l /dev/null  ; \
  			IMAGE_PATH=$(old_IMAGE_PATH); FONT_PATH=$(old_FONT_PATH); \
diff --git a/wm/afterstep/patches/patch-src_afterstep_asinternals.h b/wm/afterstep/patches/patch-src_afterstep_asinternals.h
index 9e8b0009d0d..1f0263180c2 100644
--- a/wm/afterstep/patches/patch-src_afterstep_asinternals.h
+++ b/wm/afterstep/patches/patch-src_afterstep_asinternals.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_afterstep_asinternals.h,v 1.2 2016/05/01 19:30:58 dholland Exp $
+$NetBSD: patch-src_afterstep_asinternals.h,v 1.3 2021/07/11 12:13:17 bsiegert Exp $
 
 Patch up gcc inline mess.
 
---- src/afterstep/asinternals.h.orig	2012-05-04 14:35:02.000000000 +0000
+--- src/afterstep/asinternals.h.orig	2013-05-01 13:34:11.000000000 +0000
 +++ src/afterstep/asinternals.h
-@@ -607,8 +607,8 @@ void ParsePopupEntry (char *tline, FILE 
+@@ -689,8 +689,8 @@ void ParsePopupEntry (char *tline, FILE 
  
  
  /*************************** misc.c *********************************/
@@ -13,5 +13,5 @@ Patch up gcc inline mess.
 +void ungrab_window_buttons( Window w );
 +void ungrab_window_keys (Window w );
  void MyXGrabButton ( unsigned button, unsigned modifiers,
-                 Window grab_window, Bool owner_events, unsigned event_mask,
-                 int pointer_mode, int keyboard_mode, Window confine_to, Cursor cursor);
+ 				Window grab_window, Bool owner_events, unsigned event_mask,
+ 				int pointer_mode, int keyboard_mode, Window confine_to, Cursor cursor);
diff --git a/wm/afterstep/patches/patch-src_afterstep_misc.c b/wm/afterstep/patches/patch-src_afterstep_misc.c
index c5dbcd638fb..56aa8480f78 100644
--- a/wm/afterstep/patches/patch-src_afterstep_misc.c
+++ b/wm/afterstep/patches/patch-src_afterstep_misc.c
@@ -1,23 +1,22 @@
-$NetBSD: patch-src_afterstep_misc.c,v 1.2 2016/05/01 19:30:58 dholland Exp $
+$NetBSD: patch-src_afterstep_misc.c,v 1.3 2021/07/11 12:13:17 bsiegert Exp $
 
 Patch up gcc inline mess.
 
---- src/afterstep/misc.c.orig	2012-05-04 14:35:08.000000000 +0000
+--- src/afterstep/misc.c.orig	2013-05-01 13:34:11.000000000 +0000
 +++ src/afterstep/misc.c
-@@ -32,14 +32,14 @@
+@@ -32,13 +32,13 @@
  /****************************************************************************/
  /* window management specifics - button ungrabbing convinience functions:   */
  /****************************************************************************/
--inline void
-+void
- ungrab_window_buttons( Window w )
+-inline void ungrab_window_buttons (Window w)
++void ungrab_window_buttons (Window w)
  {
- 	LOCAL_DEBUG_OUT( "w = %lX", w );
-     XUngrabButton (dpy, AnyButton, AnyModifier, w);
+ 	LOCAL_DEBUG_OUT ("w = %lX", w);
+ 	XUngrabButton (dpy, AnyButton, AnyModifier, w);
  }
  
--inline void
-+void
- ungrab_window_keys (Window w )
+-inline void ungrab_window_keys (Window w)
++void ungrab_window_keys (Window w)
  {
-     XUngrabKey (dpy, AnyKey, AnyModifier, w);
+ 	XUngrabKey (dpy, AnyKey, AnyModifier, w);
+ }