SET prefix and suffix binary: skip conflits

[K.I.A.Derouiche <kamelderouiche%yahoo.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	K.I.A.Derouiche <kamelderouiche%yahoo.com@localhost>
Pushed By:	jihbed
Date:		Sat Nov 26 20:41:57 2022 +0000
Changeset:	ee59785bd6dd6a18ca202c845a6ff26c428513a6

Modified Files:
	xapps/Makefile
	xapps/PLIST
	xapps/distinfo
Added Files:
	xapps/patches/patch-scripts_meson.build

Log Message:
SET prefix and suffix binary: skip conflits

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ee59785bd6dd6a18ca202c845a6ff26c428513a6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 xapps/Makefile                          | 23 ++++++++++++++---------
 xapps/PLIST                             |  4 ++--
 xapps/distinfo                          |  1 +
 xapps/patches/patch-scripts_meson.build | 10 ++++++++++
 4 files changed, 27 insertions(+), 11 deletions(-)

diffs:
diff --git a/xapps/Makefile b/xapps/Makefile
index 694c5c868b..945fa98f2d 100644
--- a/xapps/Makefile
+++ b/xapps/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-VERSION= 2.4.1
+VERSION=	2.4.1
 GITHUB_PROJECT=	xapp
 GITHUB_TAG=	refs/tags/master.mint21
 DISTNAME=	master.mint21
@@ -16,12 +16,13 @@ LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
 
 WRKSRC=		${WRKDIR}/xapp-master.mint21
 
-USE_TOOLS=	bash pkg-config intltool gdbus-codegen
+USE_TOOLS=		bash pkg-config intltool gdbus-codegen
 USE_PKGLOCALEDIR=	yes
 
-PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
-DEPENDS+=	inxi-[0-9]*:../../wip/inxi
-DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+PYTHON_FOR_BUILD_ONLY=	yes
+PLIST_SUBST+=		PYSITELIB=${PYSITELIB}
+DEPENDS+=		inxi-[0-9]*:../../wip/inxi
+DEPENDS+=		${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
 # Adjust meson.build
 SUBST_CLASSES+=		meson
@@ -32,14 +33,18 @@ SUBST_SED.meson=	-e 's,python3,python${PYVERSSUFFIX},g'
 
 # Adjust scripts
 SUBST_CLASSES+=		scripts
-SUBST_STAGE.scripts=	pre-configure
+SUBST_STAGE.scripts=	post-extract
 SUBST_MESSAGE.scripts=	Fixing scripts
 SUBST_FILES.scripts=	scripts/upload-system-info
-SUBST_SED.scripts=	-e 's,/usr/bin/pastebin,${PREFIX}/pastebin,g'
+SUBST_SED.scripts=	-e 's,/usr/bin/pastebin,${PREFIX}/bin/pastebin${PYVERSSUFFIX},g'
 
-REPLACE_BASH+=	 scripts/xfce4-set-wallpaper  data/80xapp-gtk3-module.sh
+REPLACE_BASH+=	scripts/xfce4-set-wallpaper  data/80xapp-gtk3-module.sh
 
-REPLACE_PYTHON+= scripts/pastebin scripts/upload-system-info status-applets/mate/mate-xapp-status-applet.py
+REPLACE_PYTHON+=	scripts/pastebin${PYVERSSUFFIX} scripts/upload-system-info status-applets/mate/mate-xapp-status-applet.py
+
+post-extract:
+	${MV} ${WRKSRC}/scripts/pastebin \
+		${WRKSRC}/scripts/pastebin${PYVERSSUFFIX}
 
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/libdbusmenu-gtk3/buildlink3.mk"
diff --git a/xapps/PLIST b/xapps/PLIST
index 0382384169..44d1bf2765 100644
--- a/xapps/PLIST
+++ b/xapps/PLIST
@@ -1,5 +1,5 @@
 @comment $NetBSD$
-bin/pastebin
+bin/pastebin3.10
 bin/upload-system-info
 bin/xfce4-set-wallpaper
 etc/X11/xinit/xinitrc.d/80xapp-gtk3-module.sh
@@ -22,7 +22,7 @@ lib/girepository-1.0/XApp-1.0.typelib
 lib/gtk-3.0/modules/libxapp-gtk3-module.so
 lib/libxapp.so
 lib/libxapp.so.1
-lib/libxapp.so.2.4.1
+lib/libxapp.so.${PKGVERSION}
 lib/pkgconfig/xapp.pc
 ${PYSITELIB}/gi/overrides/XApp.py
 libexec/xapps/applet_constants.py
diff --git a/xapps/distinfo b/xapps/distinfo
index e0a561f328..91e72deb78 100644
--- a/xapps/distinfo
+++ b/xapps/distinfo
@@ -3,3 +3,4 @@ $NetBSD$
 BLAKE2s (xapp/master.mint21.tar.gz) = 4a0ec225f804333bf83ef53c5ac0956760b69c5b6f2cd5bcf10df17aad4abd70
 SHA512 (xapp/master.mint21.tar.gz) = 15ad0074d11216f9def8afc77d7baee1a67febc56ed7fc638cc8883a1abe5884c1a7def978e1c09fdd4d93a8e41ede454f09d1cc05fe37ed4164d3e967d3d53b
 Size (xapp/master.mint21.tar.gz) = 251877 bytes
+SHA1 (patch-scripts_meson.build) = 7fe7130a3bc0518dadfee2247c05caa2e8da3f79
diff --git a/xapps/patches/patch-scripts_meson.build b/xapps/patches/patch-scripts_meson.build
new file mode 100644
index 0000000000..7a7ad07f0b
--- /dev/null
+++ b/xapps/patches/patch-scripts_meson.build
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- scripts/meson.build.orig	2022-11-16 10:52:09.000000000 +0000
++++ scripts/meson.build
+@@ -1,4 +1,4 @@
+-scripts = files('pastebin', 'upload-system-info', 'xfce4-set-wallpaper')
++scripts = files('pastebin3.10', 'upload-system-info', 'xfce4-set-wallpaper')
+ 
+ install_data(scripts,
+     install_dir: join_paths(get_option('prefix'), get_option('bindir')),