[pkgsrc/trunk]: pkgsrc/x11/xpad Redo the previous in the correct way, by depe...

[kristerw <kristerw%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/24f33938f835
branches:  trunk
changeset: 476564:24f33938f835
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Mon Jun 14 20:23:30 2004 +0000

description:
Redo the previous in the correct way, by depending on
graphics/hicolor-icon-theme.  Noted by jmmv@.

Bump PKGREVISION.

diffstat:

 x11/xpad/Makefile         |   5 +++--
 x11/xpad/PLIST            |  12 +++++++++++-
 x11/xpad/distinfo         |   3 +--
 x11/xpad/patches/patch-aa |  12 ------------
 4 files changed, 15 insertions(+), 17 deletions(-)

diffs (71 lines):

diff -r 1decfd311518 -r 24f33938f835 x11/xpad/Makefile
--- a/x11/xpad/Makefile Mon Jun 14 15:22:41 2004 +0000
+++ b/x11/xpad/Makefile Mon Jun 14 20:23:30 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/05/07 01:14:51 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2004/06/14 20:23:30 kristerw Exp $
 #
 
 DISTNAME=      xpad-1.12
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=xpad/}
 EXTRACT_SUFX=  .tar.bz2
@@ -25,6 +25,7 @@
 BUILDLINK_TRANSFORM+=  S:-DGTK_DISABLE_DEPRECATED:
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1decfd311518 -r 24f33938f835 x11/xpad/PLIST
--- a/x11/xpad/PLIST    Mon Jun 14 15:22:41 2004 +0000
+++ b/x11/xpad/PLIST    Mon Jun 14 20:23:30 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/10/03 09:31:12 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/06/14 20:23:30 kristerw Exp $
 bin/xpad
 man/man1/xpad.1
 share/applications/xpad.desktop
@@ -20,3 +20,13 @@
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xpad.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xpad.mo
 share/pixmaps/xpad.png
+@comment in xdg-dirs: @dirrm share/pixmaps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/96x96/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/64x64/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/128x128/apps
+@comment in xdg-dirs: @dirrm share/applications
diff -r 1decfd311518 -r 24f33938f835 x11/xpad/distinfo
--- a/x11/xpad/distinfo Mon Jun 14 15:22:41 2004 +0000
+++ b/x11/xpad/distinfo Mon Jun 14 20:23:30 2004 +0000
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.4 2004/06/14 15:22:41 kristerw Exp $
+$NetBSD: distinfo,v 1.5 2004/06/14 20:23:30 kristerw Exp $
 
 SHA1 (xpad-1.12.tar.bz2) = 39785fb183d61039383204352ba03c4ca4cb392d
 Size (xpad-1.12.tar.bz2) = 238411 bytes
-SHA1 (patch-aa) = fc1afe577f64fbfeedb501f4dd87e59228473aff
diff -r 1decfd311518 -r 24f33938f835 x11/xpad/patches/patch-aa
--- a/x11/xpad/patches/patch-aa Mon Jun 14 15:22:41 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/06/14 15:22:41 kristerw Exp $
-
---- images/Makefile.in.orig    Wed Oct  1 21:09:15 2003
-+++ images/Makefile.in Mon Jun 14 17:17:36 2004
-@@ -196,6 +196,7 @@
- install-nobase_iconDATA: $(nobase_icon_DATA)
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(icondir)
-+      $(mkinstalldirs) $(DESTDIR)$(icondir)/hicolor/16x16/apps $(DESTDIR)$(icondir)/hicolor/22x22/apps $(DESTDIR)$(icondir)/hicolor/32x32/apps $(DESTDIR)$(icondir)/hicolor/48x48/apps 
$(DESTDIR)$(icondir)/hicolor/64x64/apps $(DESTDIR)$(icondir)/hicolor/96x96/apps $(DESTDIR)$(icondir)/hicolor/128x128/apps $(DESTDIR)$(icondir)/hicolor/scalable/apps
-       @list='$(nobase_icon_DATA)'; for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f="$$p"; \