diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-09-22 13:42:47 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-09-22 13:42:47 +0800 |
| commit | 4fcc9eac08d98006aa69adf1aa6b417ae8bc862c (patch) | |
| tree | c9663c6f6e88d7c596fb254c57ad37e24876b15c | |
| parent | e2463b03031ba72d1a1372b47026ef69b52ec28f (diff) | |
| download | marcuscom-ports-4fcc9eac08d98006aa69adf1aa6b417ae8bc862c.tar marcuscom-ports-4fcc9eac08d98006aa69adf1aa6b417ae8bc862c.tar.gz marcuscom-ports-4fcc9eac08d98006aa69adf1aa6b417ae8bc862c.tar.bz2 marcuscom-ports-4fcc9eac08d98006aa69adf1aa6b417ae8bc862c.tar.lz marcuscom-ports-4fcc9eac08d98006aa69adf1aa6b417ae8bc862c.tar.xz marcuscom-ports-4fcc9eac08d98006aa69adf1aa6b417ae8bc862c.tar.zst marcuscom-ports-4fcc9eac08d98006aa69adf1aa6b417ae8bc862c.zip | |
Protect the icon scanning code with INSTALLS_ICONS. We need this so we
do not pollute all {USE,WANT}_GNOME ports with a post-install target
potentially breaking index.
Reported by: Scott I. Remick <scott@sremick.net>
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4858 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | Mk/bsd.gnome.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index b453f893f..bf6543136 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -3,7 +3,7 @@ # # $FreeBSD$ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.330 2005/09/17 19:47:05 marcus Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.331 2005/09/19 04:07:42 marcus Exp $ # # Please view me with 4 column tabs! @@ -717,10 +717,10 @@ PLIST_SUB+= GNOMEDESKTOP:="@comment " NOGNOMEDESKTOP:="" CONFIGURE_FAIL_MESSAGE= "Please run 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 build failure to the FreeBSD GNOME team at ${MAINTAINER}, and attach (a) \"${CONFIGURE_WRKSRC}/${CONFIGURE_LOG}\", (b) the output of the failure of the make command, and (c) the gnomelogalyzer output. Also, it might be a good idea to provide an overview of all packages installed on your system (i.e. an \`ls ${PKG_DBDIR}\`)." .endif -post-install: gnome-post-install -.if defined(GCONF_SCHEMAS) || defined(INSTALLS_OMF) +.if defined(GCONF_SCHEMAS) || defined(INSTALLS_OMF) || defined(INSTALLS_ICONS) pre-su-install: gnome-pre-su-install +post-install: gnome-post-install gnome-pre-su-install: .if defined(GCONF_SCHEMAS) @@ -728,7 +728,6 @@ gnome-pre-su-install: .else @${DO_NADA} .endif -.endif gnome-post-install: . if defined(GCONF_SCHEMAS) @@ -750,6 +749,7 @@ gnome-post-install: done . endif +. if defined(INSTALLS_ICONS) @${RM} -f ${TMPPLIST}.icons1 @for i in `${GREP} "^share/icons/.*/" ${TMPPLIST} | ${CUT} -d / -f 1-3 | ${SORT} -u`; do \ ${ECHO_CMD} "@unexec /bin/rm %D/$${i}/icon-theme.cache 2>/dev/null || /usr/bin/true" \ @@ -765,6 +765,8 @@ gnome-post-install: ${RM} -f ${TMPPLIST}.icons1; \ ${MV} -f ${TMPPLIST}.icons2 ${TMPPLIST}; \ fi +. endif +.endif .endif # End of use part. |