Sun Apr 11 13:56:14 2010 UTC ()
Indirect the installation of dbus files into ${PKG_SYSCONFDIR}.
Bump PKGREVISION.


(markd)
diff -r1.11 -r1.12 pkgsrc/x11/kdebase-workspace4/Makefile
diff -r1.4 -r1.5 pkgsrc/x11/kdebase-workspace4/PLIST
cvs diff -r1.11 -r1.12 pkgsrc/x11/kdebase-workspace4/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kdebase-workspace4/Attic/Makefile 2010/04/10 02:45:04 1.11
+++ pkgsrc/x11/kdebase-workspace4/Attic/Makefile 2010/04/11 13:56:14 1.12
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.11 2010/04/10 02:45:04 markd Exp $ 1# $NetBSD: Makefile,v 1.12 2010/04/11 13:56:14 markd Exp $
2 2
3DISTNAME= kdebase-workspace-${_KDE_VERSION} 3DISTNAME= kdebase-workspace-${_KDE_VERSION}
 4PKGREVISION= 1
4CATEGORIES= x11 5CATEGORIES= x11
5COMMENT= base workspace for the KDE 4 integrated X11 desktop 6COMMENT= base workspace for the KDE 4 integrated X11 desktop
6 7
7MAKE_JOBS_SAFE= no 8MAKE_JOBS_SAFE= no
8 9
9.include "../../meta-pkgs/kde4/Makefile.kde4" 10.include "../../meta-pkgs/kde4/Makefile.kde4"
10 11
11DISTFILES= ${DEFAULT_DISTFILES} Daemon.png Daemon.README 12DISTFILES= ${DEFAULT_DISTFILES} Daemon.png Daemon.README
12DISTFILES+= NetBSD-flag-1.0.png 13DISTFILES+= NetBSD-flag-1.0.png
13SITES.Daemon.png= ${MASTER_SITE_LOCAL} 14SITES.Daemon.png= ${MASTER_SITE_LOCAL}
14SITES.Daemon.README= ${MASTER_SITE_LOCAL} 15SITES.Daemon.README= ${MASTER_SITE_LOCAL}
15SITES.NetBSD-flag-1.0.png= ${MASTER_SITE_LOCAL} 16SITES.NetBSD-flag-1.0.png= ${MASTER_SITE_LOCAL}
16 17
@@ -22,26 +23,32 @@ USE_TOOLS+= mkfontdir bdftopcf gmake @@ -22,26 +23,32 @@ USE_TOOLS+= mkfontdir bdftopcf gmake
22 23
23FONTS_DIRS.x11+= ${PREFIX}/share/kde/fonts/override 24FONTS_DIRS.x11+= ${PREFIX}/share/kde/fonts/override
24REQD_DIRS+= ${PREFIX}/share/kde/fonts 25REQD_DIRS+= ${PREFIX}/share/kde/fonts
25REQD_DIRS+= ${PREFIX}/share/kde/fonts/override 26REQD_DIRS+= ${PREFIX}/share/kde/fonts/override
26 27
27RCD_SCRIPTS= kdm 28RCD_SCRIPTS= kdm
28 29
29CONF_FILES= ${PREFIX}/share/kde/config/kdm/kdmrc \ 30CONF_FILES= ${PREFIX}/share/kde/config/kdm/kdmrc \
30 ${PKG_SYSCONFDIR}/kdm/kdmrc 31 ${PKG_SYSCONFDIR}/kdm/kdmrc
31OWN_DIRS= ${PKG_SYSCONFDIR}/kdm 32OWN_DIRS= ${PKG_SYSCONFDIR}/kdm
32 33
33CONF_FILES+= ${PREFIX}/share/examples/kdebase-workspace4/ksysguarddrc \ 34CONF_FILES+= ${PREFIX}/share/examples/kdebase-workspace4/ksysguarddrc \
34 ${PKG_SYSCONFDIR}/ksysguarddrc 35 ${PKG_SYSCONFDIR}/ksysguarddrc
 36CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.ksysguard.processlisthelper.conf \
 37 ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
 38CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.fontinst.conf \
 39 ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.fontinst.conf
 40CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.kcmclock.conf \
 41 ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
35 42
36REPLACE_PERL+= \ 43REPLACE_PERL+= \
37 kcontrol/keys/convertShortcuts.pl \ 44 kcontrol/keys/convertShortcuts.pl \
38 kwin/data/kwin3_plugin.pl \ 45 kwin/data/kwin3_plugin.pl \
39 kwin/data/pluginlibFix.pl 46 kwin/data/pluginlibFix.pl
40 47
41PY_PATCHPLIST= yes 48PY_PATCHPLIST= yes
42 49
43.include "../../mk/bsd.prefs.mk" 50.include "../../mk/bsd.prefs.mk"
44.include "options.mk" 51.include "options.mk"
45 52
46SUBST_CLASSES+= paths qtpath 53SUBST_CLASSES+= paths qtpath
47SUBST_FILES.paths= kcontrol/kdm/main.cpp 54SUBST_FILES.paths= kcontrol/kdm/main.cpp
cvs diff -r1.4 -r1.5 pkgsrc/x11/kdebase-workspace4/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/kdebase-workspace4/Attic/PLIST 2010/04/10 02:45:04 1.4
+++ pkgsrc/x11/kdebase-workspace4/Attic/PLIST 2010/04/11 13:56:14 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.4 2010/04/10 02:45:04 markd Exp $ 1@comment $NetBSD: PLIST,v 1.5 2010/04/11 13:56:14 markd Exp $
2bin/genkdmconf 2bin/genkdmconf
3bin/kaccess 3bin/kaccess
4bin/kapplymousetheme 4bin/kapplymousetheme
5bin/kblankscrn.kss 5bin/kblankscrn.kss
6bin/kcheckrunning 6bin/kcheckrunning
7bin/kcminit 7bin/kcminit
8bin/kcminit_startup 8bin/kcminit_startup
9bin/kdm 9bin/kdm
10bin/kdmctl 10bin/kdmctl
11bin/kdostartupconfig4 11bin/kdostartupconfig4
12bin/kfontinst 12bin/kfontinst
13bin/kfontview 13bin/kfontview
14bin/klipper 14bin/klipper
@@ -584,26 +584,29 @@ share/doc/kde/HTML/en/ksysguard/common @@ -584,26 +584,29 @@ share/doc/kde/HTML/en/ksysguard/common
584share/doc/kde/HTML/en/ksysguard/index.cache.bz2 584share/doc/kde/HTML/en/ksysguard/index.cache.bz2
585share/doc/kde/HTML/en/ksysguard/index.docbook 585share/doc/kde/HTML/en/ksysguard/index.docbook
586share/doc/kde/HTML/en/kxkb/common 586share/doc/kde/HTML/en/kxkb/common
587share/doc/kde/HTML/en/kxkb/index.cache.bz2 587share/doc/kde/HTML/en/kxkb/index.cache.bz2
588share/doc/kde/HTML/en/kxkb/index.docbook 588share/doc/kde/HTML/en/kxkb/index.docbook
589share/doc/kde/HTML/en/plasma-desktop/common 589share/doc/kde/HTML/en/plasma-desktop/common
590share/doc/kde/HTML/en/plasma-desktop/favorite-widgets.png 590share/doc/kde/HTML/en/plasma-desktop/favorite-widgets.png
591share/doc/kde/HTML/en/plasma-desktop/index.cache.bz2 591share/doc/kde/HTML/en/plasma-desktop/index.cache.bz2
592share/doc/kde/HTML/en/plasma-desktop/index.docbook 592share/doc/kde/HTML/en/plasma-desktop/index.docbook
593share/doc/kde/HTML/en/plasma-desktop/taskbar-settings.png 593share/doc/kde/HTML/en/plasma-desktop/taskbar-settings.png
594share/doc/kde/HTML/en/systemsettings/common 594share/doc/kde/HTML/en/systemsettings/common
595share/doc/kde/HTML/en/systemsettings/index.cache.bz2 595share/doc/kde/HTML/en/systemsettings/index.cache.bz2
596share/doc/kde/HTML/en/systemsettings/index.docbook 596share/doc/kde/HTML/en/systemsettings/index.docbook
 597share/examples/kde4-dbus/org.kde.fontinst.conf
 598share/examples/kde4-dbus/org.kde.kcontrol.kcmclock.conf
 599share/examples/kde4-dbus/org.kde.ksysguard.processlisthelper.conf
597share/examples/kdebase-workspace4/ksysguarddrc 600share/examples/kdebase-workspace4/ksysguarddrc
598share/examples/rc.d/kdm 601share/examples/rc.d/kdm
599share/icons/Daemon.png 602share/icons/Daemon.png
600share/icons/NetBSD-flag.png 603share/icons/NetBSD-flag.png
601share/icons/Oxygen_Black/cursors/00000000000000020006000e7e9ffc3f 604share/icons/Oxygen_Black/cursors/00000000000000020006000e7e9ffc3f
602share/icons/Oxygen_Black/cursors/00008160000006810000408080010102 605share/icons/Oxygen_Black/cursors/00008160000006810000408080010102
603share/icons/Oxygen_Black/cursors/03b6e0fcb3499374a867c041f52298f0 606share/icons/Oxygen_Black/cursors/03b6e0fcb3499374a867c041f52298f0
604share/icons/Oxygen_Black/cursors/08e8e1c95fe2fc01f976f1e063a24ccd 607share/icons/Oxygen_Black/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
605share/icons/Oxygen_Black/cursors/1081e37283d90000800003c07f3ef6bf 608share/icons/Oxygen_Black/cursors/1081e37283d90000800003c07f3ef6bf
606share/icons/Oxygen_Black/cursors/3085a0e285430894940527032f8b26df 609share/icons/Oxygen_Black/cursors/3085a0e285430894940527032f8b26df
607share/icons/Oxygen_Black/cursors/3ecb610c1bf2410f44200f48c40d3599 610share/icons/Oxygen_Black/cursors/3ecb610c1bf2410f44200f48c40d3599
608share/icons/Oxygen_Black/cursors/4498f0e0c1937ffe01fd06f973665830 611share/icons/Oxygen_Black/cursors/4498f0e0c1937ffe01fd06f973665830
609share/icons/Oxygen_Black/cursors/5c6cd98b3f3ebcb1f9c7f1c204630408 612share/icons/Oxygen_Black/cursors/5c6cd98b3f3ebcb1f9c7f1c204630408