diff options
| author | wiz <wiz@pkgsrc.org> | 2010-10-21 12:37:59 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2010-10-21 12:37:59 +0000 |
| commit | 906957240cb0f66333e5a56ba50912a3268e219d (patch) | |
| tree | dc49dca07b0dd7193001a0054762570f2f3edd3a /graphics | |
| parent | 8059774c156828bf21caefbec5efad4232aa8ce2 (diff) | |
| download | pkgsrc-906957240cb0f66333e5a56ba50912a3268e219d.tar.gz | |
Use TOOLS_NOOP to get rid of gtk-update-icon-cache.
Wrap it in an if, so that the script isn't added twice (by both
gnome-icon-theme and hicolor-icon-them) which currently causes
a warning message.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/gnome-icon-theme/buildlink3.mk | 19 | ||||
| -rw-r--r-- | graphics/hicolor-icon-theme/buildlink3.mk | 19 |
2 files changed, 12 insertions, 26 deletions
diff --git a/graphics/gnome-icon-theme/buildlink3.mk b/graphics/gnome-icon-theme/buildlink3.mk index c3b2cbcf2f4..8b7da64611a 100644 --- a/graphics/gnome-icon-theme/buildlink3.mk +++ b/graphics/gnome-icon-theme/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2010/10/20 20:34:29 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2010/10/21 12:37:59 wiz Exp $ BUILDLINK_TREE+= gnome-icon-theme @@ -26,18 +26,11 @@ DEINSTALL_TEMPLATES+= ../../graphics/gnome-icon-theme/files/icon-cache.tmpl PRINT_PLIST_AWK+= /^share\/icons\/gnome\/icon-theme.cache$$/ { next; } CHECK_FILES_SKIP+= ${PREFIX}/share/icons/gnome/icon-theme.cache -BUILDLINK_TARGETS+= guic-buildlink-fake2 -_GUIC_FAKE= ${BUILDLINK_DIR}/bin/gtk-update-icon-cache - -.PHONY: guic-buildlink-fake2 -guic-buildlink-fake2: - ${RUN} \ - if [ ! -f ${_GUIC_FAKE} ]; then \ - ${ECHO_BUILDLINK_MSG} "Creating ${_GUIC_FAKE}"; \ - ${MKDIR} ${_GUIC_FAKE:H}; \ - ${ECHO} "#!${SH}" > ${_GUIC_FAKE}; \ - ${CHMOD} +x ${_GUIC_FAKE}; \ - fi +.if !defined(NOOP_GTK_UPDATE_ICON_CACHE) +NOOP_GTK_UPDATE_ICON_CACHE= +TOOLS_NOOP+= gtk-update-icon-cache +.endif + .endif # GNOME_ICON_THEME_DEPEND_ONLY .endif # GNOME_ICON_THEME_BUILDLINK3_MK diff --git a/graphics/hicolor-icon-theme/buildlink3.mk b/graphics/hicolor-icon-theme/buildlink3.mk index 1b75b95a550..fd18500b7ff 100644 --- a/graphics/hicolor-icon-theme/buildlink3.mk +++ b/graphics/hicolor-icon-theme/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2009/06/14 22:58:01 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2010/10/21 12:37:59 wiz Exp $ BUILDLINK_TREE+= hicolor-icon-theme @@ -24,18 +24,11 @@ DEINSTALL_TEMPLATES+= ../../graphics/hicolor-icon-theme/files/icon-cache.tmpl PRINT_PLIST_AWK+= /^share\/icons\/hicolor\/icon-theme.cache$$/ { next; } CHECK_FILES_SKIP+= ${PREFIX}/share/icons/hicolor/icon-theme.cache -BUILDLINK_TARGETS+= guic-buildlink-fake -_GUIC_FAKE= ${BUILDLINK_DIR}/bin/gtk-update-icon-cache - -.PHONY: guic-buildlink-fake -guic-buildlink-fake: - ${RUN} \ - if [ ! -f ${_GUIC_FAKE} ]; then \ - ${ECHO_BUILDLINK_MSG} "Creating ${_GUIC_FAKE}"; \ - ${MKDIR} ${_GUIC_FAKE:H}; \ - ${ECHO} "#!${SH}" > ${_GUIC_FAKE}; \ - ${CHMOD} +x ${_GUIC_FAKE}; \ - fi +.if !defined(NOOP_GTK_UPDATE_ICON_CACHE) +NOOP_GTK_UPDATE_ICON_CACHE= +TOOLS_NOOP+= gtk-update-icon-cache +.endif + .endif # HICOLOR_ICON_THEME_DEPEND_ONLY .endif # HICOLOR_ICON_THEME_BUILDLINK3_MK |