diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-11-29 23:23:18 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-11-29 23:23:18 +0000 |
| commit | 485ac734cfba484714d62d5131cce2bcee1ccc32 (patch) | |
| tree | 9757cc3a17b5c76b3de000a6435a2e6a1e40d986 | |
| parent | Close two vulnerabilities (diff) | |
Don't always create a ${PREFIX}/etc/gconf directory if gconf is one of the
port's dependencies. Instead, only create this directory if the port will
actually install GConf schemas. Also, do the creation in pre-su-install
as we may not be root in pre-install.
Spotted by: pav
Tested by: pav
| -rw-r--r-- | Mk/bsd.gnome.mk | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 50e767e773a6..fea19b4db09b 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -635,19 +635,17 @@ PLIST_SUB+= GNOMEDESKTOP:="@comment " NOGNOMEDESKTOP:="" CONFIGURE_FAIL_MESSAGE= "Please direct the output of the failure of the make command to a file, and then feed that file to the gnomelogalyzer, available from "http://www.freebsd.org/gnome/gnomelogalyzer.sh", which will diagnose the problem and suggest a solution. If - and only if - the gnomelogalyzer cannot solve the problem, report the problem to the FreeBSD GNOME team at ${MAINTAINER}, and attach \"${CONFIGURE_WRKSRC}/${CONFIGURE_LOG}\" and the output of the failure of the make command. Also, it might be a good idea to provide an overview of all packages installed on your system (e.g. an \`ls ${PKG_DBDIR}\`)." .endif -.if defined(_USE_GNOME) -. if ${_USE_GNOME:Mgconf}!="" || ${_USE_GNOME:Mgconf2}!="" -pre-install: gnome-pre-install +.if defined(GCONF_SCHEMAS) || defined(INSTALLS_OMF) +pre-su-install: gnome-pre-su-install +post-install: gnome-post-install -gnome-pre-install: +gnome-pre-su-install: +.if defined(GCONF_SCHEMAS) @${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/ - -. endif +.else + @${DO_NADA} .endif -.if defined(GCONF_SCHEMAS) || defined(INSTALLS_OMF) -post-install: gnome-post-install - gnome-post-install: . if defined(GCONF_SCHEMAS) @for i in ${GCONF_SCHEMAS}; do \ |