diff options
| author | markd <markd@pkgsrc.org> | 2007-01-26 01:02:58 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2007-01-26 01:02:58 +0000 |
| commit | f8b9e66916bde2c59d29ac9f6b133eb9bf6643d3 (patch) | |
| tree | ab60aec16353a393a0f94bdb77778b8bf6357f07 /graphics | |
| parent | 7c6f9ee064833efefab3d1e0fc273ed664b615b1 (diff) | |
| download | pkgsrc-f8b9e66916bde2c59d29ac9f6b133eb9bf6643d3.tar.gz | |
Don't depend on gtk2+ package just to be able to update an icon cache file.
Instead update the cache iff gtk2 package also installed.
OKed wiz and jmmv. Bump PKGREVISION.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/hicolor-icon-theme/Makefile | 7 | ||||
| -rw-r--r-- | graphics/hicolor-icon-theme/buildlink3.mk | 6 | ||||
| -rw-r--r-- | graphics/hicolor-icon-theme/files/icon-cache.tmpl | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/graphics/hicolor-icon-theme/Makefile b/graphics/hicolor-icon-theme/Makefile index 4d3f0c3ee94..7e07868db4f 100644 --- a/graphics/hicolor-icon-theme/Makefile +++ b/graphics/hicolor-icon-theme/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2006/11/28 22:02:34 drochner Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/26 01:02:58 markd Exp $ # DISTNAME= hicolor-icon-theme-0.10 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://icon-theme.freedesktop.org/releases/ @@ -18,11 +19,11 @@ USE_DIRS+= xdg-1.1 USE_LANGUAGES= # none, not even C USE_TOOLS+= gmake -FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${BUILDLINK_PREFIX.gtk2}/bin/gtk-update-icon-cache" +EVAL_PREFIX+= PREFIX.gtk2=gtk2+ +FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${PREFIX.gtk2}/bin/gtk-update-icon-cache" FILES_SUBST+= ICON_THEME_DIR="${PREFIX}/share/icons/hicolor" INSTALL_TEMPLATES+= ../../graphics/hicolor-icon-theme/files/icon-cache.tmpl DEINSTALL_TEMPLATES+= ../../graphics/hicolor-icon-theme/files/icon-cache.tmpl PRINT_PLIST_AWK+= /^share\/icons\/hicolor\/icon-theme.cache$$/ { next; } -.include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/hicolor-icon-theme/buildlink3.mk b/graphics/hicolor-icon-theme/buildlink3.mk index 8809c122720..e70f07a5e5c 100644 --- a/graphics/hicolor-icon-theme/buildlink3.mk +++ b/graphics/hicolor-icon-theme/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/12/12 21:52:36 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2007/01/26 01:02:59 markd Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ HICOLOR_ICON_THEME_BUILDLINK3_MK:= ${HICOLOR_ICON_THEME_BUILDLINK3_MK}+ @@ -27,8 +27,8 @@ PRINT_PLIST_AWK+= /^@dirrm ${d:S/\//\\\//g}$$/ \ . undef dirs .if !defined(HICOLOR_ICON_THEME_DEPEND_ONLY) -.include "../../x11/gtk2/buildlink3.mk" -FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${BUILDLINK_PREFIX.gtk2}/bin/gtk-update-icon-cache" +EVAL_PREFIX+= PREFIX.gtk2=gtk2+ +FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${PREFIX.gtk2}/bin/gtk-update-icon-cache" FILES_SUBST+= ICON_THEME_DIR="${BUILDLINK_PREFIX.hicolor-icon-theme}/share/icons/hicolor" INSTALL_TEMPLATES+= ../../graphics/hicolor-icon-theme/files/icon-cache.tmpl DEINSTALL_TEMPLATES+= ../../graphics/hicolor-icon-theme/files/icon-cache.tmpl diff --git a/graphics/hicolor-icon-theme/files/icon-cache.tmpl b/graphics/hicolor-icon-theme/files/icon-cache.tmpl index b41a50c2f54..d1c0b700e97 100644 --- a/graphics/hicolor-icon-theme/files/icon-cache.tmpl +++ b/graphics/hicolor-icon-theme/files/icon-cache.tmpl @@ -1,4 +1,4 @@ -# $NetBSD: icon-cache.tmpl,v 1.1 2006/03/30 20:47:44 jmmv Exp $ +# $NetBSD: icon-cache.tmpl,v 1.2 2007/01/26 01:02:59 markd Exp $ # # Rebuild the icon cache. # @@ -8,6 +8,7 @@ ICON_THEME_DIR="@ICON_THEME_DIR@" case ${STAGE} in POST-INSTALL) + ${TEST} -x ${GTK_UPDATE_ICON_CACHE} && \ ${GTK_UPDATE_ICON_CACHE} -f -t ${ICON_THEME_DIR} >/dev/null 2>&1 || \ ${TRUE} ;; @@ -17,6 +18,7 @@ DEINSTALL) ;; POST-DEINSTALL) ${TEST} "${PKGBASE}" != "hicolor-icon-theme" && \ + ${TEST} -x ${GTK_UPDATE_ICON_CACHE} && \ ${GTK_UPDATE_ICON_CACHE} -f -t ${ICON_THEME_DIR} >/dev/null \ 2>&1 || ${TRUE} ;; |