On 01.04.2020 00:44, David H. Gutteridge wrote:
Module Name: pkgsrc Committed By: gutteridge Date: Tue Mar 31 22:44:54 UTC 2020 Modified Files: pkgsrc/sysutils/libfm: Makefile +SUBST_FILES.prefix= src/base/fm-file-info.c +SUBST_FILES.prefix+= src/modules/vfs-menu.c +# Upstream has a typo in a hard-coded path of "xgd" where they mean "xdg". +# On the next update, check vfs-menu.c, as this may be corrected to "xdg". +SUBST_SED.prefix= -e 's,/etc/xgd,${PKG_SYSCONFDIR},g' +SUBST_SED.prefix+= -e 's,/usr/share,${PREFIX}/share,g'
A minute ago I added the new user-settable variable SUBST_NOOP_OK to mk/subst.mk. When set to "no", it makes the above SUBST class fail at package build time, provided that vfs-menu.c only needs the fix for the typo and not the one for /usr/share. It might be a good idea to check for redundant SUBST_SED patterns as well. Checking for redundant SUBST_FILES was easier to begin with, though. Maybe I'll implement the SUBST_SED effectiveness check someday. Roland