Wed May 27 11:10:19 2020 UTC ()
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.)


(gdt)
diff -r1.18 -r1.19 pkgsrc/net/syncthing-gtk/Makefile
cvs diff -r1.18 -r1.19 pkgsrc/net/syncthing-gtk/Makefile (expand / switch to unified diff)

--- pkgsrc/net/syncthing-gtk/Makefile 2020/03/10 22:10:48 1.18
+++ pkgsrc/net/syncthing-gtk/Makefile 2020/05/27 11:10:19 1.19
@@ -1,42 +1,49 @@ @@ -1,42 +1,49 @@
1# $NetBSD: Makefile,v 1.18 2020/03/10 22:10:48 wiz Exp $ 1# $NetBSD: Makefile,v 1.19 2020/05/27 11:10:19 gdt Exp $
2 2
3DISTNAME= syncthing-gtk-0.9.2.3 3DISTNAME= syncthing-gtk-0.9.2.3
4PKGREVISION= 11 4PKGREVISION= 12
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_GITHUB:=syncthing/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=syncthing/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/syncthing/syncthing-gtk 10HOMEPAGE= https://github.com/syncthing/syncthing-gtk
11COMMENT= GTK3 & Python based GUI for Syncthing 11COMMENT= GTK3 & Python based GUI for Syncthing
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DEPENDS+= syncthing>=0.13.0:../../net/syncthing 14DEPENDS+= syncthing>=0.13.0:../../net/syncthing
15DEPENDS+= psmisc-[0-9]*:../../sysutils/psmisc # for killall 15DEPENDS+= psmisc-[0-9]*:../../sysutils/psmisc # for killall
16DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil 16DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
17DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 17DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
18 18
19PYTHON_VERSIONS_ACCEPTED= 27 19PYTHON_VERSIONS_ACCEPTED= 27
20EGG_NAME= ${DISTNAME:S/0/v0/:S/-/_/} 20EGG_NAME= ${DISTNAME:S/0/v0/:S/-/_/}
21 21
22REPLACE_PYTHON+= *.py scripts/*.py syncthing_gtk/*.py 22REPLACE_PYTHON+= *.py scripts/*.py syncthing_gtk/*.py
23 23
24SUBST_CLASSES+= paths 24SUBST_CLASSES+= path_s
25SUBST_STAGE.paths= pre-build 25SUBST_STAGE.path_s= pre-build
26SUBST_MESSAGE.paths= Fixing hard-coded paths 26SUBST_MESSAGE.path_s= Fixing hard-coded paths to /usr/share
27SUBST_FILES.paths= scripts/syncthing-gtk 27SUBST_FILES.path_s= scripts/syncthing-gtk
28SUBST_FILES.paths+= syncthing-gtk.desktop 28SUBST_FILES.path_s+= syncthing_gtk/app.py
29SUBST_FILES.paths+= syncthing_gtk/app.py 29SUBST_FILES.path_s+= syncthing_gtk/uisettingsdialog.py
30SUBST_FILES.paths+= syncthing_gtk/uisettingsdialog.py 30SUBST_FILES.path_s+= syncthing_gtk/wizard.py
31SUBST_FILES.paths+= syncthing_gtk/wizard.py 31SUBST_SED.path_s= -e 's|/usr/share/syncthing-gtk|${PREFIX}/share/syncthing-gtk|'
32SUBST_SED.paths= -e 's|/usr/share/syncthing-gtk|${PREFIX}/share/syncthing-gtk|' 32
 33SUBST_CLASSES+= path_b
 34SUBST_STAGE.path_b= pre-build
 35SUBST_MESSAGE.path_b= Fixing hard-coded paths to /usr/bin
 36SUBST_FILES.path_b= syncthing-gtk.desktop
 37SUBST_FILES.path_b+= syncthing_gtk/configuration.py
 38SUBST_SED.path_b= -e 's|/usr/bin/syncthing|${PREFIX}/bin/syncthing|'
 39# \todo Extend to /usr/bin for command paths in app.py
33 40
34BUILDLINK_ABI_DEPENDS.libnotify+= libnotify>=0.7.6nb4 41BUILDLINK_ABI_DEPENDS.libnotify+= libnotify>=0.7.6nb4
35.include "../../sysutils/libnotify/buildlink3.mk" 42.include "../../sysutils/libnotify/buildlink3.mk"
36BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.40.9nb2 # for introspection 43BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.40.9nb2 # for introspection
37.include "../../graphics/librsvg/buildlink3.mk" 44.include "../../graphics/librsvg/buildlink3.mk"
38.include "../../lang/python/application.mk" 45.include "../../lang/python/application.mk"
39.include "../../lang/python/distutils.mk" 46.include "../../lang/python/distutils.mk"
40.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 47.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
41.include "../../sysutils/desktop-file-utils/desktopdb.mk" 48.include "../../sysutils/desktop-file-utils/desktopdb.mk"
42.include "../../mk/bsd.pkg.mk" 49.include "../../mk/bsd.pkg.mk"