Don't install icons that oxygen-icons now installs. Bump PKGREVISION.

4 files changed, 10 insertions, 17 deletions

diff --git a/misc/kdepim4/Makefile b/misc/kdepim4/Makefile
index 4e4bb783332..d1172d14d21 100644
--- a/misc/kdepim4/Makefile
+++ b/misc/kdepim4/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.74 2016/01/10 19:33:43 markd Exp $
+# $NetBSD: Makefile,v 1.75 2016/02/14 04:18:40 markd Exp $
 
 DISTNAME=	kdepim-4.14.10
 PKGNAME=	${DISTNAME:S/-4/4-4/}
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 MASTER_SITES=	${MASTER_SITE_KDE:=applications/15.04.3/src/}
@@ -57,6 +58,9 @@ SUBST_MESSAGE.perlfix=	Fix perl path in cmake script
 SUBST_FILES.perlfix=	korganizer/data/ical2vcal.cmake
 SUBST_SED.perlfix=	-e 's:@PERL@:${PERL5}:g'
 
+post-install:
+	${RM} ${DESTDIR}${PREFIX}/share/icons/oxygen/*/mimetypes/x-mail-distribution-list.png
+
 BUILDLINK_DEPMETHOD.qt4-tools=full
 
 .include "../../meta-pkgs/kde4/kde4.mk"
diff --git a/misc/kdepim4/PLIST b/misc/kdepim4/PLIST
index 3e6af83fc6e..05b1aa4be9f 100644
--- a/misc/kdepim4/PLIST
+++ b/misc/kdepim4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2016/01/10 19:33:43 markd Exp $
+@comment $NetBSD: PLIST,v 1.15 2016/02/14 04:18:40 markd Exp $
 bin/akonadi_archivemail_agent
 bin/akonadi_followupreminder_agent
 bin/akonadi_mailfilter_agent
@@ -690,20 +690,13 @@ share/icons/locolor/16x16/actions/ktnef_extract_all_to.png
 share/icons/locolor/16x16/actions/ktnef_extract_to.png
 share/icons/locolor/16x16/apps/ktnef.png
 share/icons/locolor/32x32/apps/ktnef.png
-share/icons/oxygen/128x128/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/16x16/actions/edit-delete-page.png
 share/icons/oxygen/16x16/actions/smallclock.png
 share/icons/oxygen/16x16/actions/upindicator.png
-share/icons/oxygen/16x16/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/22x22/actions/checkmark.png
 share/icons/oxygen/22x22/actions/edit-delete-page.png
-share/icons/oxygen/22x22/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/256x256/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/32x32/actions/edit-delete-page.png
-share/icons/oxygen/32x32/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/48x48/actions/edit-delete-page.png
-share/icons/oxygen/48x48/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/512x512/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/scalable/actions/edit-delete-page.svgz
 share/icons/oxygen/scalable/mimetypes/x-mail-distribution-list.svgz
 share/kde/apps/akonadi_archivemail_agent/akonadi_archivemail_agent.notifyrc
diff --git a/x11/kde-workspace4/Makefile b/x11/kde-workspace4/Makefile
index e8fe6a7916f..b0ba1977500 100644
--- a/x11/kde-workspace4/Makefile
+++ b/x11/kde-workspace4/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2016/01/10 19:06:41 markd Exp $
+# $NetBSD: Makefile,v 1.51 2016/02/14 04:20:24 markd Exp $
 
 DISTNAME=	kde-workspace-4.11.22
 PKGNAME=	${DISTNAME:S/-4/4-4/}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Base workspace for the KDE 4 integrated X11 desktop
 MASTER_SITES=	${MASTER_SITE_KDE:=applications/15.08.0/src/}
@@ -123,6 +124,7 @@ post-install:
                 kdmrc > ${WRKDIR}/kdmrc.ad;				\
 	${CP} -f ${WRKDIR}/kdmrc.ad kdmrc
 .endif
+	${RM} ${DESTDIR}${PREFIX}/share/icons/oxygen/*/mimetypes/fonts-package.png
 
 CFLAGS.SunOS+=	-D__EXTENSIONS__ -D__uint16_t=uint16_t
 LDFLAGS.SunOS+=	-lsocket
diff --git a/x11/kde-workspace4/PLIST b/x11/kde-workspace4/PLIST
index 3f92844956d..e2fc7f1a455 100644
--- a/x11/kde-workspace4/PLIST
+++ b/x11/kde-workspace4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2016/01/10 19:06:41 markd Exp $
+@comment $NetBSD: PLIST,v 1.11 2016/02/14 04:20:24 markd Exp $
 bin/genkdmconf
 bin/kaccess
 bin/kapplymousetheme
@@ -1114,7 +1114,6 @@ share/icons/hicolor/48x48/apps/kmenuedit.png
 share/icons/hicolor/48x48/apps/ksplash.png
 share/icons/hicolor/64x64/apps/ksplash.png
 share/icons/oxygen/128x128/apps/kcmkwm.png
-share/icons/oxygen/128x128/mimetypes/fonts-package.png
 share/icons/oxygen/16x16/apps/computer.png
 share/icons/oxygen/16x16/apps/daemon.png
 share/icons/oxygen/16x16/apps/kcmkwm.png
@@ -1127,21 +1126,16 @@ share/icons/oxygen/16x16/apps/running.png
 share/icons/oxygen/16x16/apps/shell.png
 share/icons/oxygen/16x16/apps/unknownapp.png
 share/icons/oxygen/16x16/apps/waiting.png
-share/icons/oxygen/16x16/mimetypes/fonts-package.png
 share/icons/oxygen/22x22/apps/kcmkwm.png
 share/icons/oxygen/22x22/apps/kfontview.png
-share/icons/oxygen/22x22/mimetypes/fonts-package.png
 share/icons/oxygen/32x32/apps/kcmkwm.png
 share/icons/oxygen/32x32/apps/kfontview.png
 share/icons/oxygen/32x32/apps/kwin.png
-share/icons/oxygen/32x32/mimetypes/fonts-package.png
 share/icons/oxygen/48x48/apps/kcmkwm.png
 share/icons/oxygen/48x48/apps/kfontview.png
 share/icons/oxygen/48x48/apps/kwin.png
-share/icons/oxygen/48x48/mimetypes/fonts-package.png
 share/icons/oxygen/64x64/apps/kcmkwm.png
 share/icons/oxygen/64x64/apps/kfontview.png
-share/icons/oxygen/64x64/mimetypes/fonts-package.png
 share/icons/oxygen/scalable/apps/kcmkwm.svgz
 share/icons/oxygen/scalable/apps/kfontview.svgz
 share/icons/oxygen/scalable/apps/kwin.svgz