enlightenment16: update to 1.0.25

e16 v1.0.25 - 2022-06-13
------------------------
- 1.0.25
- arrange: Keep upper left corner on screen when centering window
- Danish translation update
- Update po
- ipc: Improve help for win_op target specification
- bindings.cfg: Add bindings for pinning
- Update config/e16keyedit.db (pinning)
- Update docs/e16.asc (desktops.names)
- xprop: Drop setting default desktop names in ex_netwm_desk_names_set()
- desktops: Enable setting desktop names
- desktops: Introduce DesksGetNames()
- desktops: Cosmetics
- Introduce HintsSetDesktopNames()
- Introduce EobjSetName()
- docs: Corrections after conversion, remove obsolete stuff, updates
- docs: Convert xml to asciidoc
- Menu and bindings cleanups
- iclass: Remove unneeded header
- iclass: Make active state more visible in fallback icon class
- ewins: Fix ewin area calculation
- GSOD: Fix repaint after quit by button press
- GSOD: Some refactoring
- containers: Fix creating new iconboxes
- containers: Cosmetics
- French translation update (Philippe J. Guillaumie)
- background: Discard broken backgrounds when opening configuration dialog
- Update winter theme
- autofoo: Invert no-container option logic
- moveresize: Fix screen edge resistance for grouped windows
- moveresize: Move SnapEwin() to where it is used.
- moveresize: Enable configuring edge restistance in dialog
- arrange: Introduce screen struts
- arrange: Refactor SnapEwin()
- session: Fix broken session id handling
- pinning: Remember across restart
- menus: Drop (edox) Help
- main: Don't start edox on first startup
- French translation update (Philippe J. Guillaumie)
- Clamp window position on move
- CM: Adjust shadowing conditions some more
- CM: Fix sharp shadows when window is shaped
- place-pagers.pl: Behave properly when pagers have borders
- ipc: Add custom format window_list
- Danish translation update
- po: Patch po files in accordance with text changes
- config/menus: Text cleanups
- dialogs: Text cleanups
- Update config/strings.c and po
- po: On Top -> Highest
- dialogs: Fixup after recent layout changes
- Fix C++ build
- arrange: Fix C++ build
- epp: Fix potential compiler warning
- focus: IPC help tweaks
- menus: Add pass_ptr option to winops menu
- place-pagers.pl: Only optionally stack below(or above)
- ipc: Debug tweaks
- dialogs: Drop re-centering combined dialog on item change
- Dialog layout adjustments
- moveresize: Refactor some conditions for readability
- moveresize: Remove long time unused constrained move code
- moveresize: Remove long time unused swapmove code
- moveresize: Remove disabled nogroup move functions
- containers: Configuration saving tweaks - fixup
- Fix some problems with resize-by-keyboard
- Winops layer menu: Add "Lowest"
- ipc: win_op help updates
- French translation update (Philippe J. Guillaumie)
- Add window option to pass-through pointer events
- arrange: Disable ARRANGE_BY_POSITION mode
- arrange: Simplify/speed up by using qsort(), cosmetics
- arrange: Minor tweak in SnapEwin()
- arrange: Use object order list when arranging
- arrange: Remove pointless call to EwinListGetAll()
- stacking: Hold all objects in the order list
- stacking: Cache EWin lists
- stacking: Refactor EwinListStackGet()
- stacking: Cosmetics, preparing for other changes
- stacking: Rename EwinListStack to EobjListStack
- stacking: Remove unused EwinListStackGetTop()
- Update winder theme
- CM: Adjust shadowing conditions some more
- e_gen_menu: Fix breakage when PATH contains non-existing directory
- Fix imageclass flip/rotate for real
- focus list: Fix a couple of glitches with outline window
- Accept client window events a bit earlier
- Remove stray quote in help text
- CM: Adjust shadowing conditions
- CM: Fix initial shaped state on OR windows
- Danish translation update.
- Update po
- backgrounds: Drop 'use_bg' IPC command (but not entirely)
- backgrounds: Drop most calls to autosave()
- ipc: Return error message on unknown command
- session: Do call module exit functions on X disconnect
- glwin: Drop close on exit
- containers: Configuration saving tweaks
- Move XFontSet based text rendering module to separate file
- Drop XFontStruct based font handling
- Simplify src/Makefile.am
- Add python versions of perl sample-scripts
- Sample script fixes and tweaks
- sample-scripts: Tabs -> spaces
- e_gen_menu: Some icon search updates
- e_gen_menu: Drop old gnome/kde stuff
- e_gen_menu: New python version
- e_gen_menu: Rename to e_gen_menu.pl
- config: Convert string update script to python and update
- menus: No longer need to pass through shell
- Remove now unused usershell()
- Drop using shell to run menu (ipc exec) commands
- Introduce EnvSubst()
- actions.c: Drop elaborate GSOD messages on ipc exec errors
- actions.c: Let Eexec() use ExecSetupEnv() too
- ipc: Only include dialog_ok if ENABLE_DIALOGS
- Disable setting internal window title via ipc (properly)
- ipc: Enable setting dialog_ok title
- Update COMPLIANCE
- Remove gnome1 hint support
- extinitwin: Fix errors in window mode when using old window cursor mode
- New feature - Making windows stick on specific desks/areas
- snaps.c: Cosmetics
- Introduce Ememdup()
- 1.0.24.000
- edox: Don't try rendering text outside edox window
- Do focus windows to be manually placed
- matches.cfg: Correct help text regarding size matching
- Implement matchregexp() using fnmatch()

4 files changed, 45 insertions, 40 deletions

diff --git a/wm/enlightenment16/Makefile b/wm/enlightenment16/Makefile
index cea12a464ea..3d245d18b54 100644
--- a/wm/enlightenment16/Makefile
+++ b/wm/enlightenment16/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2022/03/28 10:59:30 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2022/06/14 01:50:32 gutteridge Exp $
 
-DISTNAME=	e16-1.0.24
+DISTNAME=	e16-1.0.25
 PKGNAME=	${DISTNAME:S/e/enlightenment/}
-PKGREVISION=	2
 CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
@@ -20,18 +19,16 @@ LICENSE=	enlightenment16
 CONFLICTS=	enlightenment>=1.0
 SUPERSEDES=	enlightenment>=1.0
 
-USE_TOOLS+=		gmake perl:run pkg-config
+USE_TOOLS+=		gmake pkg-config
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--disable-hints-gnome
 MAKE_ENV+=		USER=${SHAREOWN}:${SHAREGRP}
 
 INSTALL_MAKE_FLAGS+=	sesmdir=${WRKDIR}/.tmp
 
-REPLACE_PERL=		sample-scripts/bouncingball.pl
-REPLACE_PERL+=		sample-scripts/testroller.pl
-REPLACE_PERL+=		sample-scripts/shade-pagers.pl
-REPLACE_PERL+=		scripts/e_gen_menu
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
+REPLACE_PYTHON+=	scripts/e_gen_menu
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
@@ -61,6 +58,7 @@ post-install:
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../x11/xbitmaps/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXdamage/buildlink3.mk"
diff --git a/wm/enlightenment16/PLIST b/wm/enlightenment16/PLIST
index 56dd87adba5..bfa212d7b2d 100644
--- a/wm/enlightenment16/PLIST
+++ b/wm/enlightenment16/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/12/30 03:50:06 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/06/14 01:50:32 gutteridge Exp $
 bin/e16
 bin/edox
 bin/eesh
@@ -240,10 +240,14 @@ share/e16/themes/winter/dialogs/images/trough.png
 share/e16/themes/winter/dialogs/images/window-base.png
 share/e16/themes/winter/dock/dock.cfg
 share/e16/themes/winter/dragbar/dragbar.cfg
-share/e16/themes/winter/dragbar/images/a1.png
-share/e16/themes/winter/dragbar/images/a1b.png
-share/e16/themes/winter/dragbar/images/a2.png
-share/e16/themes/winter/dragbar/images/a2b.png
+share/e16/themes/winter/dragbar/images/a1_horiz.png
+share/e16/themes/winter/dragbar/images/a1_vert.png
+share/e16/themes/winter/dragbar/images/a1b_horiz.png
+share/e16/themes/winter/dragbar/images/a1b_vert.png
+share/e16/themes/winter/dragbar/images/a2_horiz.png
+share/e16/themes/winter/dragbar/images/a2_vert.png
+share/e16/themes/winter/dragbar/images/a2b_horiz.png
+share/e16/themes/winter/dragbar/images/a2b_vert.png
 share/e16/themes/winter/dragbar/images/dragbar_horiz.png
 share/e16/themes/winter/dragbar/images/dragbar_vert.png
 share/e16/themes/winter/epplets/epplets.cfg
@@ -344,6 +348,7 @@ share/e16/themes/winter/iconbox/images/button-h.png
 share/e16/themes/winter/iconbox/images/cover.png
 share/e16/themes/winter/iconbox/images/scroll-base_h.png
 share/e16/themes/winter/iconbox/images/scroll-base_v.png
+share/e16/themes/winter/iconbox/images/scroll-base_v.png.old
 share/e16/themes/winter/iconbox/images/scroll-knob.png
 share/e16/themes/winter/iconbox/images/scroll-knob_active.png
 share/e16/themes/winter/iconbox/images/scroll-knob_clicked.png
diff --git a/wm/enlightenment16/distinfo b/wm/enlightenment16/distinfo
index 9444805a1ba..9b57b45d9b6 100644
--- a/wm/enlightenment16/distinfo
+++ b/wm/enlightenment16/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2021/11/17 01:41:41 gutteridge Exp $
+$NetBSD: distinfo,v 1.8 2022/06/14 01:50:32 gutteridge Exp $
 
-BLAKE2s (e16-1.0.24.tar.gz) = 788b96ef94e810b9acce1c79b0377a627a5023bcc3caa3bf82adb3ec224949f1
-SHA512 (e16-1.0.24.tar.gz) = 0180c4d248fe0f598c19b4dcc5c770c45c26fae6f7f8cf92c39f7a626bd7613fe8c3bd560da0c950b6af9eac5a8ca52f19110bb84dd1764e35028be9a861b2f8
-Size (e16-1.0.24.tar.gz) = 2415255 bytes
-SHA1 (patch-ac) = ead8161e192ec11fe1144b41939cb136832b9d29
+BLAKE2s (e16-1.0.25.tar.gz) = 992c5e56d045f797fa2010b6bd8ffc2da7390809fc0530f7b06063405de6aca8
+SHA512 (e16-1.0.25.tar.gz) = 6c69c2e345350115281c822805a072644cf3ce6c16e5c963146924ed94af235c51c5fd846ebba9ad97a6da2c397eafc54d3ffbcd460bb14c903ef3a4bf0621b1
+Size (e16-1.0.25.tar.gz) = 2395514 bytes
+SHA1 (patch-ac) = a5a2f2b0377212178480cc94e6975dd4ff364ced
diff --git a/wm/enlightenment16/patches/patch-ac b/wm/enlightenment16/patches/patch-ac
index 7a720c7978b..ee7cb6e1b8a 100644
--- a/wm/enlightenment16/patches/patch-ac
+++ b/wm/enlightenment16/patches/patch-ac
@@ -1,27 +1,29 @@
-$NetBSD: patch-ac,v 1.2 2021/02/20 18:59:54 gutteridge Exp $
+$NetBSD: patch-ac,v 1.3 2022/06/14 01:50:32 gutteridge Exp $
 
 Apply pkgsrc-specific paths.
 
---- scripts/e_gen_menu.orig	2019-11-19 00:17:54.796424791 +0000
+--- scripts/e_gen_menu.orig	2022-06-06 10:24:22.000000000 +0000
 +++ scripts/e_gen_menu
-@@ -28,8 +28,7 @@
- #use warnings;
+@@ -362,9 +362,7 @@ for opt, val in opts:
+         dbg += 1
  
  # Likely  prefixes
--$Prefixes = "/usr/local:/usr:/opt:/opt/kde:$ENV{'KDEDIR'}";
--$Prefixes = "$Prefixes:/opt/kde3:/opt/gnome";	# SUSE
-+$Prefixes = "@PREFIX@:@X11BASE@:/usr:$ENV{'KDEDIR'}";
- $Prefixes = "$Prefixes:$ENV{'HOME'}/.local";
- $Prefixes = RemoveDuplcates($Prefixes);
- 
-@@ -59,8 +58,8 @@ $loc3 =~ s/_.*//;
- $loc1 = "" if ($loc1 eq $loc2);
- 
- $EdirUser = "$ENV{'HOME'}/.e16" unless $EdirUser;
--$EdirRoot = "/usr/share/e16" unless $EdirRoot;
--$EdirBin  = "/usr/bin" unless $EdirBin;
-+$EdirRoot = "@PREFIX@/share/e16" unless $EdirRoot;
-+$EdirBin  = "@PREFIX@/bin" unless $EdirBin;
- 
- $EdirMenus = "$EdirUser/menus";
- 
+-Prefixes  = ['/usr/local', '/usr', '/opt']
+-Prefixes += ['/opt/kde', '/opt/kde3', getenv('KDEDIR')]
+-Prefixes += ['/opt/gnome']                    # SUSE
++Prefixes = ['@PREFIX@', '@X11BASE@', '/usr', getenv('KDEDIR')]
+ Prefixes += [getenv('HOME') + '/.local']
+ D(f'Prefixes = "{Prefixes}"')
+ Prefixes = RemoveDuplicates(Prefixes)
+@@ -399,9 +397,9 @@ EdirBin  = getenv('EBIN')
+ if EdirUser == '':
+     EdirUser = getenv('HOME') + '/.e16'
+ if EdirRoot == '':
+-    EdirRoot = '/usr/share/e16'
++    EdirRoot = '@PREFIX@/share/e16'
+ if EdirBin == '':
+-    EdirBin  = '/usr/bin'
++    EdirBin  = '@PREFIX@/bin'
+ D(f'EdirUser = "{EdirUser}"')
+ D(f'EdirRoot = "{EdirRoot}"')
+ D(f'EdirBin  = "{EdirBin}"')