diff options
author | marcus <marcus@FreeBSD.org> | 2005-11-19 15:57:48 +0800 |
---|---|---|
committer | marcus <marcus@FreeBSD.org> | 2005-11-19 15:57:48 +0800 |
commit | 4332c8c11baecdac29370657afdb3e22fae9d543 (patch) | |
tree | 217796781b01f66719ee39600873aa470f83e371 /x11-toolkits/gtk20 | |
parent | 6e730db4113bc71e14f77ded2be2c5d726aa291e (diff) | |
download | freebsd-ports-gnome-4332c8c11baecdac29370657afdb3e22fae9d543.tar.gz freebsd-ports-gnome-4332c8c11baecdac29370657afdb3e22fae9d543.tar.zst freebsd-ports-gnome-4332c8c11baecdac29370657afdb3e22fae9d543.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.
Diffstat (limited to 'x11-toolkits/gtk20')
-rw-r--r-- | x11-toolkits/gtk20/Makefile | 5 | ||||
-rw-r--r-- | x11-toolkits/gtk20/pkg-plist | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 95cc7e7c63a6..ff7f9bdc0769 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/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/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index a7a06be2c7d3..65901912d12f 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/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 |