CVS commit: pkgsrc/net/syncthing-gtk

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed May 27 11:10:19 UTC 2020

Modified Files:
        pkgsrc/net/syncthing-gtk: Makefile

Log Message:
syncthing-gtk: Overhaul SUBST of /usr paths

This had a SUBST block to fix /usr/share to ${PREFIX}/share.  It was
doing this to files where the pattern didn't match, and also missed
fixin up /usr/bin.  Split into a bin and a share SUBST, and loosen the
regexp (specifically, to match /syncthing rather than just
/syncthing-gtk).  Tested to basically work on NetBSD 8.  Desktop files
etc. appear much better than before.

(Found by newish SUBST noop check.)


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/syncthing-gtk/Makefile

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

Modified files:

Index: pkgsrc/net/syncthing-gtk/Makefile
diff -u pkgsrc/net/syncthing-gtk/Makefile:1.18 pkgsrc/net/syncthing-gtk/Makefile:1.19
--- pkgsrc/net/syncthing-gtk/Makefile:1.18      Tue Mar 10 22:10:48 2020
+++ pkgsrc/net/syncthing-gtk/Makefile   Wed May 27 11:10:19 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2020/03/10 22:10:48 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2020/05/27 11:10:19 gdt Exp $
 
 DISTNAME=      syncthing-gtk-0.9.2.3
-PKGREVISION=   11
+PKGREVISION=   12
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=syncthing/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -21,15 +21,22 @@ EGG_NAME=   ${DISTNAME:S/0/v0/:S/-/_/}
 
 REPLACE_PYTHON+=               *.py scripts/*.py syncthing_gtk/*.py
 
-SUBST_CLASSES+=                paths
-SUBST_STAGE.paths=     pre-build
-SUBST_MESSAGE.paths=   Fixing hard-coded paths
-SUBST_FILES.paths=     scripts/syncthing-gtk
-SUBST_FILES.paths+=    syncthing-gtk.desktop
-SUBST_FILES.paths+=    syncthing_gtk/app.py
-SUBST_FILES.paths+=    syncthing_gtk/uisettingsdialog.py
-SUBST_FILES.paths+=    syncthing_gtk/wizard.py
-SUBST_SED.paths=       -e 's|/usr/share/syncthing-gtk|${PREFIX}/share/syncthing-gtk|'
+SUBST_CLASSES+=                path_s
+SUBST_STAGE.path_s=    pre-build
+SUBST_MESSAGE.path_s=  Fixing hard-coded paths to /usr/share
+SUBST_FILES.path_s=    scripts/syncthing-gtk
+SUBST_FILES.path_s+=   syncthing_gtk/app.py
+SUBST_FILES.path_s+=   syncthing_gtk/uisettingsdialog.py
+SUBST_FILES.path_s+=   syncthing_gtk/wizard.py
+SUBST_SED.path_s=      -e 's|/usr/share/syncthing-gtk|${PREFIX}/share/syncthing-gtk|'
+
+SUBST_CLASSES+=                path_b
+SUBST_STAGE.path_b=    pre-build
+SUBST_MESSAGE.path_b=  Fixing hard-coded paths to /usr/bin
+SUBST_FILES.path_b=    syncthing-gtk.desktop
+SUBST_FILES.path_b+=   syncthing_gtk/configuration.py
+SUBST_SED.path_b=      -e 's|/usr/bin/syncthing|${PREFIX}/bin/syncthing|'
+# \todo Extend to /usr/bin for command paths in app.py
 
 BUILDLINK_ABI_DEPENDS.libnotify+=      libnotify>=0.7.6nb4
 .include "../../sysutils/libnotify/buildlink3.mk"