aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits/gtk30
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2005-11-19 07:57:48 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2005-11-19 07:57:48 +0000
commitf6f5b302dc9115ac4f0c363dc38666e486adccd8 (patch)
tree7ce57f6a0eaf98ced5338b5d59060ae9bd8573fd /x11-toolkits/gtk30
parent4844e223778fb2ab55e701fd7d06f9f702e7f25b (diff)
downloadports-f6f5b302dc9115ac4f0c363dc38666e486adccd8.tar.gz
ports-f6f5b302dc9115ac4f0c363dc38666e486adccd8.zip
* Use X11BASE rather than PREFIX or %D to search for icons
* Make sure ${X11BASE}/share/icons/hicolor/icon-theme.cache exists by touching it. Otherwise, the cache file would not appear until icons were actually installed, and this was breaking some port builds on pointyhat.
Notes
Notes: svn path=/head/; revision=148773
Diffstat (limited to 'x11-toolkits/gtk30')
-rw-r--r--x11-toolkits/gtk30/Makefile5
-rw-r--r--x11-toolkits/gtk30/pkg-plist5
2 files changed, 7 insertions, 3 deletions
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 95cc7e7c63a6..ff7f9bdc0769 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gtk
PORTVERSION= 2.8.7
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.8,} \
ftp://ftp.gtk.org/pub/gtk/v2.8/ \
@@ -104,7 +105,9 @@ pre-build:
@${RM} -rf ${WRKSRC}/docs/gtk.info*
post-install:
- -@${FIND} ${PREFIX}/share/icons -type d -depth 1 -exec \
+ -@${TOUCH} -f ${X11BASE}/share/icons/hicolor/icon-theme.cache \
+ 2>/dev/null
+ -@${FIND} ${X11BASE}/share/icons -type d -depth 1 -exec \
${PREFIX}/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null
@${MKDIR} ${PREFIX}/lib/gtk-2.0/modules
@${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK_VERSION}/engines
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index a7a06be2c7d3..65901912d12f 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -479,8 +479,9 @@ share/locale/zh_TW/LC_MESSAGES/gtk20.mo
share/themes/Default/gtk-2.0-key/gtkrc
share/themes/Emacs/gtk-2.0-key/gtkrc
share/themes/Raleigh/gtk-2.0/gtkrc
-@exec /usr/bin/find %D/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true
-@unexec /usr/bin/find %D/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true
+@exec /usr/bin/touch -f %%X11BASE%%/share/icons/hicolor/icon-theme.cache 2>/dev/null || /usr/bin/true
+@exec /usr/bin/find %%X11BASE%%/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true
+@unexec /usr/bin/find %%X11BASE%%/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true
@dirrm share/themes/Raleigh/gtk-2.0
@dirrm share/themes/Raleigh
@dirrm share/themes/Emacs/gtk-2.0-key