Date: Sat, 5 Jun 2021 18:51:20 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 956fbfa5003e - main - Mk/Uses/gnome.mk: fix gconftool-2 --makefile-unistall-rule call time Message-ID: <202106051851.155IpK4f090953@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=956fbfa5003e34db2d2b1985e20073a397e697e8 commit 956fbfa5003e34db2d2b1985e20073a397e697e8 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2021-06-05 18:46:58 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2021-06-05 18:47:45 +0000 Mk/Uses/gnome.mk: fix gconftool-2 --makefile-unistall-rule call time Previously, for ports with GCONF_SCHEMAS, `gnome-post-gconf-schemas' target would add a @postunexec rule which was invoked *after* those files would be removed upon deinstallation, resulting in errors: I/O warning : failed to load external entity ".../$some.schemas" Failed to open `.../$some.schemas': No such file or directory Change it to @preunexec so that `gconftool-2 --makefile-unistall-rule' command would get called while those files still exist. PR: 210969 Timeout from: gnome (~5 years) --- Mk/Uses/gnome.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk index 4dcd840ca5aa..115b6460c24c 100644 --- a/Mk/Uses/gnome.mk +++ b/Mk/Uses/gnome.mk @@ -428,7 +428,7 @@ gnome-pre-patch: _USES_install+= 690:gnome-post-gconf-schemas gnome-post-gconf-schemas: @for i in ${GCONF_SCHEMAS}; do \ - ${ECHO_CMD} "@postunexec env GCONF_CONFIG_SOURCE=xml:${GCONF_CONFIG_OPTIONS}:%D/${GCONF_CONFIG_DIRECTORY} HOME=${WRKDIR} gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/$${i} > /dev/null || /usr/bin/true" \ + ${ECHO_CMD} "@preunexec env GCONF_CONFIG_SOURCE=xml:${GCONF_CONFIG_OPTIONS}:%D/${GCONF_CONFIG_DIRECTORY} HOME=${WRKDIR} gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/$${i} > /dev/null || /usr/bin/true" \ >> ${TMPPLIST}; \ ${ECHO_CMD} "etc/gconf/schemas/$${i}" >> ${TMPPLIST}; \ ${ECHO_CMD} "@postexec env GCONF_CONFIG_SOURCE=xml:${GCONF_CONFIG_OPTIONS}:%D/${GCONF_CONFIG_DIRECTORY} HOME=${WRKDIR} gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/$${i} > /dev/null || /usr/bin/true" \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106051851.155IpK4f090953>