This patch moves the largest remaining conflicting part for KDE[34]. Mostly mechanical, tested on a few KDE apps. Tested a few times on my i386. Bulk test likely not needed but maybe someone wants to take a look?
Some background info: I didn't want to move share/config/ initially, but later realized that this is not real. So share/config/ gets renamed to share/config.kde3/, which in turn makes splitting -colors subpackages of kdelibs unneeded. :-\ So those subpackages will come back into -main in the next diff. After this patch, there will be exactly two conflicting items in kdelibs-3.x and kdelibs-4.x packages, which are likely easily solvable - but I have to run a full careful KDE4 build first. okay? -- zhuk@ Index: audio/amarok/Makefile =================================================================== RCS file: /cvs/ports/audio/amarok/Makefile,v retrieving revision 1.60 diff -u -p -r1.60 Makefile --- audio/amarok/Makefile 22 Oct 2013 11:34:12 -0000 1.60 +++ audio/amarok/Makefile 21 Dec 2013 17:07:06 -0000 @@ -7,7 +7,7 @@ HOMEPAGE = http://amarok.kde.org/ V = 1.4.10 MASTER_SITES = ${MASTER_SITE_KDE:=stable/amarok/$V/src/} DISTNAME = amarok-$V -REVISION = 21 +REVISION = 22 EXTRACT_SUFX = .tar.bz2 # GPLv2/LGPLv2/GFDL Index: audio/amarok/pkg/PLIST =================================================================== RCS file: /cvs/ports/audio/amarok/pkg/PLIST,v retrieving revision 1.15 diff -u -p -r1.15 PLIST --- audio/amarok/pkg/PLIST 22 Oct 2013 11:34:12 -0000 1.15 +++ audio/amarok/pkg/PLIST 21 Dec 2013 17:07:06 -0000 @@ -590,9 +590,9 @@ share/apps.kde3/konqueror/servicemenus/a share/apps.kde3/konqueror/servicemenus/amarok_play_audiocd.desktop share/apps.kde3/profiles/ share/apps.kde3/profiles/amarok.profile.xml -share/config.kcfg/amarok.kcfg -share/config.kcfg/xinecfg.kcfg -share/config/amarokrc +share/config.kcfg.kde3/amarok.kcfg +share/config.kcfg.kde3/xinecfg.kcfg +share/config.kde3/amarokrc share/doc/HTML.kde3/da/ share/doc/HTML.kde3/da/amarok/ share/doc/HTML.kde3/da/amarok/advanced.docbook Index: editors/kile/Makefile =================================================================== RCS file: /cvs/ports/editors/kile/Makefile,v retrieving revision 1.26 diff -u -p -r1.26 Makefile --- editors/kile/Makefile 22 Oct 2013 11:34:14 -0000 1.26 +++ editors/kile/Makefile 21 Dec 2013 17:07:06 -0000 @@ -2,7 +2,7 @@ COMMENT= integrated LaTeX environment for KDE DISTNAME= kile-2.0 -REVISION= 6 +REVISION= 7 CATEGORIES= editors x11/kde HOMEPAGE= http://kile.sourceforge.net/ Index: editors/kile/pkg/PLIST =================================================================== RCS file: /cvs/ports/editors/kile/pkg/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- editors/kile/pkg/PLIST 22 Oct 2013 11:34:14 -0000 1.8 +++ editors/kile/pkg/PLIST 21 Dec 2013 17:07:06 -0000 @@ -1358,7 +1358,7 @@ share/apps.kde3/kile/test/test_bib.tex share/apps.kde3/kile/test/test_index.tex share/apps.kde3/kile/test/test_plain.tex share/apps.kde3/kile/tips -share/config.kcfg/kile.kcfg +share/config.kcfg.kde3/kile.kcfg share/doc/HTML.kde3/da/ share/doc/HTML.kde3/da/kile/ share/doc/HTML.kde3/da/kile/common Index: graphics/gwenview/Makefile =================================================================== RCS file: /cvs/ports/graphics/gwenview/Makefile,v retrieving revision 1.61 diff -u -p -r1.61 Makefile --- graphics/gwenview/Makefile 13 Dec 2013 09:40:03 -0000 1.61 +++ graphics/gwenview/Makefile 21 Dec 2013 17:07:06 -0000 @@ -4,7 +4,7 @@ COMMENT= image viewer for KDE DISTNAME= gwenview-1.4.2 PKGSPEC= gwenview-<4 -REVISION = 15 +REVISION = 16 SHARED_LIBS += gwenviewcore 5.0 # .1.0 CATEGORIES= graphics x11 x11/kde Index: graphics/gwenview/pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/gwenview/pkg/PLIST,v retrieving revision 1.25 diff -u -p -r1.25 PLIST --- graphics/gwenview/pkg/PLIST 13 Dec 2013 09:43:09 -0000 1.25 +++ graphics/gwenview/pkg/PLIST 21 Dec 2013 17:07:06 -0000 @@ -82,14 +82,14 @@ share/apps.kde3/kconf_update/gwenview_th share/apps.kde3/konqueror/ share/apps.kde3/konqueror/servicemenus/ share/apps.kde3/konqueror/servicemenus/konqgwenview.desktop -share/config.kcfg/ -share/config.kcfg/fileoperationconfig.kcfg -share/config.kcfg/fileviewconfig.kcfg -share/config.kcfg/fullscreenconfig.kcfg -share/config.kcfg/gvdirpartconfig.kcfg -share/config.kcfg/imageviewconfig.kcfg -share/config.kcfg/miscconfig.kcfg -share/config.kcfg/slideshowconfig.kcfg +share/config.kcfg.kde3/ +share/config.kcfg.kde3/fileoperationconfig.kcfg +share/config.kcfg.kde3/fileviewconfig.kcfg +share/config.kcfg.kde3/fullscreenconfig.kcfg +share/config.kcfg.kde3/gvdirpartconfig.kcfg +share/config.kcfg.kde3/imageviewconfig.kcfg +share/config.kcfg.kde3/miscconfig.kcfg +share/config.kcfg.kde3/slideshowconfig.kcfg share/doc/HTML.kde3/en/gwenview/ share/doc/HTML.kde3/en/gwenview/browse_mode.png share/doc/HTML.kde3/en/gwenview/common Index: graphics/kimdaba/Makefile =================================================================== RCS file: /cvs/ports/graphics/kimdaba/Makefile,v retrieving revision 1.31 diff -u -p -r1.31 Makefile --- graphics/kimdaba/Makefile 22 Oct 2013 11:34:17 -0000 1.31 +++ graphics/kimdaba/Makefile 21 Dec 2013 17:07:06 -0000 @@ -3,7 +3,7 @@ COMMENT= kde image database CATEGORIES= graphics x11 x11/kde DISTNAME= kphotoalbum-3.0 -REVISION = 13 +REVISION = 14 EXTRACT_SUFX= .tar.bz2 HOMEPAGE= http://www.kphotoalbum.org/ MASTER_SITES= ${HOMEPAGE}data/download/ Index: graphics/kimdaba/pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/kimdaba/pkg/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- graphics/kimdaba/pkg/PLIST 22 Oct 2013 11:34:17 -0000 1.8 +++ graphics/kimdaba/pkg/PLIST 21 Dec 2013 17:07:06 -0000 @@ -97,7 +97,7 @@ share/apps.kde3/kphotoalbum/themes/round share/apps.kde3/kphotoalbum/themes/rounded/upleft.png share/apps.kde3/kphotoalbum/themes/rounded/upright.png share/apps.kde3/kphotoalbum/tips -share/config/kphotoalbumrc +share/config.kde3/kphotoalbumrc share/doc/HTML.kde3/da/ share/doc/HTML.kde3/da/kphotoalbum/ share/doc/HTML.kde3/da/kphotoalbum/browsing.docbook Index: graphics/kipi-plugins/Makefile =================================================================== RCS file: /cvs/ports/graphics/kipi-plugins/Makefile,v retrieving revision 1.41 diff -u -p -r1.41 Makefile --- graphics/kipi-plugins/Makefile 13 Dec 2013 09:40:03 -0000 1.41 +++ graphics/kipi-plugins/Makefile 21 Dec 2013 17:07:06 -0000 @@ -7,7 +7,7 @@ DISTNAME = kipi-plugins-0.1.6 PKGNAME-main = ${DISTNAME} PKGNAME-cal = kipi-kcal-plugin-0.1.6 PKGSPEC-main = kipi-plugins-<1 -REVISION-main = 9 +REVISION-main = 10 REVISION-cal = 8 HOMEPAGE = http://extragear.kde.org/apps/kipi/ Index: graphics/kipi-plugins/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/graphics/kipi-plugins/pkg/PLIST-main,v retrieving revision 1.6 diff -u -p -r1.6 PLIST-main --- graphics/kipi-plugins/pkg/PLIST-main 13 Dec 2013 09:43:09 -0000 1.6 +++ graphics/kipi-plugins/pkg/PLIST-main 21 Dec 2013 17:07:06 -0000 @@ -177,8 +177,8 @@ share/apps.kde3/kipiplugin_viewer/icons/ share/apps.kde3/kipiplugin_viewer/icons/hicolor/32x32/ share/apps.kde3/kipiplugin_viewer/icons/hicolor/32x32/actions/ share/apps.kde3/kipiplugin_viewer/icons/hicolor/32x32/actions/ogl.png -share/config.kcfg/ -share/config.kcfg/htmlexportconfig.kcfg +share/config.kcfg.kde3/ +share/config.kcfg.kde3/htmlexportconfig.kcfg share/doc/HTML.kde3/de/ share/doc/HTML.kde3/de/kipi-plugins/ share/doc/HTML.kde3/de/kipi-plugins/acquire-savetargetpreview.png Index: math/kst/Makefile =================================================================== RCS file: /cvs/ports/math/kst/Makefile,v retrieving revision 1.25 diff -u -p -r1.25 Makefile --- math/kst/Makefile 22 Oct 2013 11:34:20 -0000 1.25 +++ math/kst/Makefile 21 Dec 2013 17:07:06 -0000 @@ -4,7 +4,7 @@ CATEGORIES= math x11/kde COMMENT= data viewing/plotting tool DISTNAME= kst-1.2.1 -REVISION= 9 +REVISION= 10 SHARED_ONLY= Yes SHARED_LIBS= kst 4.0 \ kstapp 4.0 \ Index: math/kst/pkg/PLIST =================================================================== RCS file: /cvs/ports/math/kst/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- math/kst/pkg/PLIST 22 Oct 2013 11:34:20 -0000 1.5 +++ math/kst/pkg/PLIST 21 Dec 2013 17:07:07 -0000 @@ -208,50 +208,50 @@ share/apps.kde3/kst/tutorial/demo.kst share/apps.kde3/kst/tutorial/gyrodata.dat share/apps.kde3/kst/tutorial/maxima.dat share/apps.kde3/kst/tutorial/vsa.dat -share/config/colors/IDL 00 BW-Linear -share/config/colors/IDL 01 Blue-White -share/config/colors/IDL 02 GRN-RED-BLU-WHT -share/config/colors/IDL 03 RED-Temperature -share/config/colors/IDL 04 BLU-GRN-RED-YEL -share/config/colors/IDL 05 STD-Gamma-II -share/config/colors/IDL 06 PRISM -share/config/colors/IDL 07 RED-PURPLE -share/config/colors/IDL 08 GRN-WHT-Linear -share/config/colors/IDL 09 GRN-WHT-Exp -share/config/colors/IDL 10 GRN-PINK -share/config/colors/IDL 11 BLUE-RED -share/config/colors/IDL 12 16-Level -share/config/colors/IDL 13 RAINBOW -share/config/colors/IDL 14 STEPS -share/config/colors/IDL 15 STERN-Special -share/config/colors/IDL 16 Haze -share/config/colors/IDL 17 BLU-Pastel-RED -share/config/colors/IDL 18 Pastels -share/config/colors/IDL 19 Hue-Sat-Light1 -share/config/colors/IDL 20 Hue-Sat-Light2 -share/config/colors/IDL 21 Hue-Sat-Value1 -share/config/colors/IDL 22 Hue-Sat-Value2 -share/config/colors/IDL 23 Purple-Red-Stripe -share/config/colors/IDL 24 Beach -share/config/colors/IDL 25 Mac-Style -share/config/colors/IDL 26 Eos-A -share/config/colors/IDL 27 Eos-B -share/config/colors/IDL 28 Hardcandy -share/config/colors/IDL 29 Nature -share/config/colors/IDL 30 Ocean -share/config/colors/IDL 31 Peppermint -share/config/colors/IDL 32 Plasma -share/config/colors/IDL 33 Blue-Red -share/config/colors/IDL 34 Rainbow -share/config/colors/IDL 35 Blue-Waves -share/config/colors/IDL 36 Volcano -share/config/colors/IDL 37 Waves -share/config/colors/IDL 38 Rainbow18 -share/config/colors/IDL 39 Rainbow-White -share/config/colors/IDL 40 Rainbow-Black -share/config/colors/Kst Colors -share/config/colors/Kst Grayscale 256 -share/config/colors/Kst Spectrum 1021 +share/config.kde3/colors/IDL 00 BW-Linear +share/config.kde3/colors/IDL 01 Blue-White +share/config.kde3/colors/IDL 02 GRN-RED-BLU-WHT +share/config.kde3/colors/IDL 03 RED-Temperature +share/config.kde3/colors/IDL 04 BLU-GRN-RED-YEL +share/config.kde3/colors/IDL 05 STD-Gamma-II +share/config.kde3/colors/IDL 06 PRISM +share/config.kde3/colors/IDL 07 RED-PURPLE +share/config.kde3/colors/IDL 08 GRN-WHT-Linear +share/config.kde3/colors/IDL 09 GRN-WHT-Exp +share/config.kde3/colors/IDL 10 GRN-PINK +share/config.kde3/colors/IDL 11 BLUE-RED +share/config.kde3/colors/IDL 12 16-Level +share/config.kde3/colors/IDL 13 RAINBOW +share/config.kde3/colors/IDL 14 STEPS +share/config.kde3/colors/IDL 15 STERN-Special +share/config.kde3/colors/IDL 16 Haze +share/config.kde3/colors/IDL 17 BLU-Pastel-RED +share/config.kde3/colors/IDL 18 Pastels +share/config.kde3/colors/IDL 19 Hue-Sat-Light1 +share/config.kde3/colors/IDL 20 Hue-Sat-Light2 +share/config.kde3/colors/IDL 21 Hue-Sat-Value1 +share/config.kde3/colors/IDL 22 Hue-Sat-Value2 +share/config.kde3/colors/IDL 23 Purple-Red-Stripe +share/config.kde3/colors/IDL 24 Beach +share/config.kde3/colors/IDL 25 Mac-Style +share/config.kde3/colors/IDL 26 Eos-A +share/config.kde3/colors/IDL 27 Eos-B +share/config.kde3/colors/IDL 28 Hardcandy +share/config.kde3/colors/IDL 29 Nature +share/config.kde3/colors/IDL 30 Ocean +share/config.kde3/colors/IDL 31 Peppermint +share/config.kde3/colors/IDL 32 Plasma +share/config.kde3/colors/IDL 33 Blue-Red +share/config.kde3/colors/IDL 34 Rainbow +share/config.kde3/colors/IDL 35 Blue-Waves +share/config.kde3/colors/IDL 36 Volcano +share/config.kde3/colors/IDL 37 Waves +share/config.kde3/colors/IDL 38 Rainbow18 +share/config.kde3/colors/IDL 39 Rainbow-White +share/config.kde3/colors/IDL 40 Rainbow-Black +share/config.kde3/colors/Kst Colors +share/config.kde3/colors/Kst Grayscale 256 +share/config.kde3/colors/Kst Spectrum 1021 share/doc/HTML.kde3/da/ share/doc/HTML.kde3/da/kst/ share/doc/HTML.kde3/da/kst/additionalformats-chapter.docbook Index: net/ktorrent/Makefile =================================================================== RCS file: /cvs/ports/net/ktorrent/Makefile,v retrieving revision 1.33 diff -u -p -r1.33 Makefile --- net/ktorrent/Makefile 22 Oct 2013 11:34:22 -0000 1.33 +++ net/ktorrent/Makefile 21 Dec 2013 17:07:07 -0000 @@ -6,7 +6,7 @@ COMMENT= BitTorrent client for KDE VERSION= 2.2.8 DISTNAME= ktorrent-${VERSION} -REVISION= 10 +REVISION= 11 CATEGORIES= net x11 x11/kde EXTRACT_SUFX= .tar.bz2 Index: net/ktorrent/pkg/PLIST =================================================================== RCS file: /cvs/ports/net/ktorrent/pkg/PLIST,v retrieving revision 1.10 diff -u -p -r1.10 PLIST --- net/ktorrent/pkg/PLIST 22 Oct 2013 11:34:22 -0000 1.10 +++ net/ktorrent/pkg/PLIST 21 Dec 2013 17:07:07 -0000 @@ -381,18 +381,18 @@ share/apps.kde3/ktorrent/www/mobile/sett share/apps.kde3/ktorrent/www/mobile/start.png share/apps.kde3/ktorrent/www/mobile/stop.png share/apps.kde3/ktorrent/www/mobile/torrent.php -share/config.kcfg/ -share/config.kcfg/ktinfowidgetplugin.kcfg -share/config.kcfg/ktipfilterplugin.kcfg -share/config.kcfg/ktlogviewerplugin.kcfg -share/config.kcfg/ktorrent.kcfg -share/config.kcfg/ktrssfeedplugin.kcfg -share/config.kcfg/ktscanfolderplugin.kcfg -share/config.kcfg/ktschedulerplugin.kcfg -share/config.kcfg/ktsearchplugin.kcfg -share/config.kcfg/ktstatsplugin.kcfg -share/config.kcfg/ktupnpplugin.kcfg -share/config.kcfg/ktwebinterfaceplugin.kcfg +share/config.kcfg.kde3/ +share/config.kcfg.kde3/ktinfowidgetplugin.kcfg +share/config.kcfg.kde3/ktipfilterplugin.kcfg +share/config.kcfg.kde3/ktlogviewerplugin.kcfg +share/config.kcfg.kde3/ktorrent.kcfg +share/config.kcfg.kde3/ktrssfeedplugin.kcfg +share/config.kcfg.kde3/ktscanfolderplugin.kcfg +share/config.kcfg.kde3/ktschedulerplugin.kcfg +share/config.kcfg.kde3/ktsearchplugin.kcfg +share/config.kcfg.kde3/ktstatsplugin.kcfg +share/config.kcfg.kde3/ktupnpplugin.kcfg +share/config.kcfg.kde3/ktwebinterfaceplugin.kcfg share/icons/hicolor/128x128/apps/ktorrent.png share/icons/hicolor/128x128/mimetypes/torrent.png share/icons/hicolor/16x16/apps/ktorrent.png @@ -409,8 +409,6 @@ share/icons/hicolor/scalable/apps/ktorre share/icons/hicolor/scalable/mimetypes/torrent.svgz share/locale/ar/LC_MESSAGES/ktorrent.mo share/locale/bg/LC_MESSAGES/ktorrent.mo -share/locale/br/ -share/locale/br/LC_MESSAGES/ share/locale/br/LC_MESSAGES/ktorrent.mo share/locale/ca/LC_MESSAGES/ktorrent.mo share/locale/cs/LC_MESSAGES/ktorrent.mo @@ -431,8 +429,6 @@ share/locale/ka/LC_MESSAGES/ktorrent.mo share/locale/lt/LC_MESSAGES/ktorrent.mo share/locale/ms/LC_MESSAGES/ktorrent.mo share/locale/nb/LC_MESSAGES/ktorrent.mo -share/locale/nds/ -share/locale/nds/LC_MESSAGES/ share/locale/nds/LC_MESSAGES/ktorrent.mo share/locale/nl/LC_MESSAGES/ktorrent.mo share/locale/pa/LC_MESSAGES/ktorrent.mo Index: sysutils/filelight/Makefile =================================================================== RCS file: /cvs/ports/sysutils/filelight/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- sysutils/filelight/Makefile 22 Oct 2013 11:34:23 -0000 1.19 +++ sysutils/filelight/Makefile 21 Dec 2013 17:07:07 -0000 @@ -5,7 +5,7 @@ SHARED_ONLY= Yes COMMENT= concentric segmented-rings disk usage visualisation DISTNAME= filelight-1.0 -REVISION = 11 +REVISION = 12 CATEGORIES= sysutils x11/kde PKGSPEC = filelight-<2 Index: sysutils/filelight/pkg/PLIST =================================================================== RCS file: /cvs/ports/sysutils/filelight/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- sysutils/filelight/pkg/PLIST 22 Oct 2013 11:34:23 -0000 1.6 +++ sysutils/filelight/pkg/PLIST 21 Dec 2013 17:07:07 -0000 @@ -6,7 +6,7 @@ share/applications/kde/filelight.desktop share/apps.kde3/filelight/ share/apps.kde3/filelight/filelight_partui.rc share/apps.kde3/filelight/filelightui.rc -share/config/filelightrc +share/config.kde3/filelightrc share/icons/crystalsvg/32x32/actions/view_filelight.png share/icons/hicolor/16x16/apps/filelight.png share/icons/hicolor/22x22/apps/filelight.png Index: x11/kde/accessibility3/Makefile =================================================================== RCS file: /cvs/ports/x11/kde/accessibility3/Makefile,v retrieving revision 1.53 diff -u -p -r1.53 Makefile --- x11/kde/accessibility3/Makefile 26 Oct 2013 23:18:15 -0000 1.53 +++ x11/kde/accessibility3/Makefile 21 Dec 2013 17:07:07 -0000 @@ -26,7 +26,7 @@ LIB_DEPENDS-mono = SEPARATE_BUILD = flavored -REVISION-main = 16 +REVISION-main = 17 WANTLIB = GL FLAC ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi WANTLIB += Xinerama Xmu Xrandr Xrender Xt Xtst Xxf86vm art_lgpl_2 Index: x11/kde/accessibility3/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/x11/kde/accessibility3/pkg/PLIST-main,v retrieving revision 1.1 diff -u -p -r1.1 PLIST-main --- x11/kde/accessibility3/pkg/PLIST-main 26 Oct 2013 23:18:15 -0000 1.1 +++ x11/kde/accessibility3/pkg/PLIST-main 21 Dec 2013 17:07:07 -0000 @@ -328,7 +328,7 @@ share/apps.kde3/kttsd/xmltransformer/xht share/apps.kde3/kttsd/xmltransformer/xhtml2ssml_simple.xsl share/apps.kde3/kttsd/xslt/ share/apps.kde3/kttsd/xslt/SSMLtoPlainText.xsl -share/config/kmouthrc +share/config.kde3/kmouthrc share/doc/HTML.kde3/en/kmag/ share/doc/HTML.kde3/en/kmag/common share/doc/HTML.kde3/en/kmag/index.cache.bz2 Index: x11/kde/addons3/Makefile =================================================================== RCS file: /cvs/ports/x11/kde/addons3/Makefile,v retrieving revision 1.71 diff -u -p -r1.71 Makefile --- x11/kde/addons3/Makefile 22 Oct 2013 11:33:56 -0000 1.71 +++ x11/kde/addons3/Makefile 21 Dec 2013 17:07:07 -0000 @@ -3,7 +3,7 @@ COMMENT = K Desktop Environment, addons CATEGORIES = x11 x11/kde VERSION = 3.5.10 -REVISION = 14 +REVISION = 15 DISTNAME = kdeaddons-${VERSION} MODKDE_VERSION = 3.5.8 Index: x11/kde/addons3/pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/kde/addons3/pkg/PLIST,v retrieving revision 1.33 diff -u -p -r1.33 PLIST --- x11/kde/addons3/pkg/PLIST 22 Oct 2013 11:33:56 -0000 1.33 +++ x11/kde/addons3/pkg/PLIST 21 Dec 2013 17:07:07 -0000 @@ -352,9 +352,9 @@ share/apps.kde3/noatun/tyler.plugin share/apps.kde3/noatun/tylerstates share/apps.kde3/noatun/wakeup.plugin share/apps.kde3/noatun/wavecapture.plugin -share/config.kcfg/kbinaryclock.kcfg -share/config.kcfg/konq_sidebarnews.kcfg -share/config/translaterc +share/config.kcfg.kde3/kbinaryclock.kcfg +share/config.kcfg.kde3/konq_sidebarnews.kcfg +share/config.kde3/translaterc share/doc/HTML.kde3/en/kate-plugins/ share/doc/HTML.kde3/en/kate-plugins/common share/doc/HTML.kde3/en/kate-plugins/configure_insertcommand.png Index: x11/kde/admin3/Makefile =================================================================== RCS file: /cvs/ports/x11/kde/admin3/Makefile,v retrieving revision 1.44 diff -u -p -r1.44 Makefile --- x11/kde/admin3/Makefile 22 Oct 2013 11:33:56 -0000 1.44 +++ x11/kde/admin3/Makefile 21 Dec 2013 17:07:07 -0000 @@ -15,7 +15,7 @@ LIB_DEPENDS = x11/kde/libs3 SEPARATE_BUILD = flavored -REVISION = 10 +REVISION = 11 WANTLIB = ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2 c expat fam WANTLIB += fontconfig freetype idn kabc kresources kwalletclient WANTLIB += lib/kde3/DCOP lib/kde3/kdecore>=6 lib/kde3/kdefx Index: x11/kde/admin3/pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/kde/admin3/pkg/PLIST,v retrieving revision 1.18 diff -u -p -r1.18 PLIST --- x11/kde/admin3/pkg/PLIST 22 Oct 2013 11:33:57 -0000 1.18 +++ x11/kde/admin3/pkg/PLIST 21 Dec 2013 17:07:07 -0000 @@ -92,8 +92,8 @@ share/apps.kde3/kuser/kuserui.rc share/apps.kde3/kuser/pics/ share/apps.kde3/kuser/pics/group.png share/apps.kde3/kuser/pics/user.png -share/config.kcfg/ -share/config.kcfg/kuser.kcfg +share/config.kcfg.kde3/ +share/config.kcfg.kde3/kuser.kcfg share/doc/HTML.kde3/en/kcron/ share/doc/HTML.kde3/en/kcron/common share/doc/HTML.kde3/en/kcron/index.cache.bz2 Index: x11/kde/base3/Makefile =================================================================== RCS file: /cvs/ports/x11/kde/base3/Makefile,v retrieving revision 1.123 diff -u -p -r1.123 Makefile --- x11/kde/base3/Makefile 27 Nov 2013 21:42:00 -0000 1.123 +++ x11/kde/base3/Makefile 21 Dec 2013 17:07:07 -0000 @@ -13,8 +13,8 @@ PKGNAME-en_US = kde3-locale-en_US-${VER PKGNAME-locale = kde3-locale-${VERSION} PKG_ARCH-en_US = * PKG_ARCH-locale = * -REVISION-main = 30 -REVISION-samba = 10 +REVISION-main = 31 +REVISION-samba = 11 REVISION-en_US = 0 REVISION-locale = 0 @@ -89,7 +89,7 @@ WANTLIB-locale = SEPARATE_BUILD = flavored post-install: - ${INSTALL_DATA} ${FILESDIR}/kdesurc ${PREFIX}/share/config + ${INSTALL_DATA} ${FILESDIR}/kdesurc ${PREFIX}/${MODKDE_CONFIG_SUBDIR} ${INSTALL_DATA_DIR} ${PREFIX}/${MODKDE_HTML_SUBDIR}/en/common .include <bsd.port.mk> Index: x11/kde/base3/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/x11/kde/base3/pkg/PLIST-main,v retrieving revision 1.19 diff -u -p -r1.19 PLIST-main --- x11/kde/base3/pkg/PLIST-main 24 Nov 2013 19:56:30 -0000 1.19 +++ x11/kde/base3/pkg/PLIST-main 21 Dec 2013 17:07:08 -0000 @@ -2058,29 +2058,29 @@ share/autostart/klipper.desktop share/autostart/konqy_preload.desktop share/autostart/ktip.desktop share/autostart/panel.desktop -share/config.kcfg/ -share/config.kcfg/kcm_useraccount.kcfg -share/config.kcfg/kcm_useraccount_pass.kcfg -share/config.kcfg/kdesktop.kcfg -share/config.kcfg/keditbookmarks.kcfg -share/config.kcfg/khelpcenter.kcfg -share/config.kcfg/kickerSettings.kcfg -share/config.kcfg/klaunch.kcfg -share/config.kcfg/konq_listview.kcfg -share/config.kcfg/konqueror.kcfg -share/config.kcfg/kwebdesktop.kcfg -share/config.kcfg/kwin.kcfg -share/config.kcfg/launcherapplet.kcfg -share/config.kcfg/mediamanagersettings.kcfg -share/config.kcfg/taskbar.kcfg -share/config/katerc -share/config/kdesktop_custom_menu1 -share/config/kdesktop_custom_menu2 -share/config/kdesurc -share/config/klipperrc -share/config/konqsidebartng.rc -share/config/kshorturifilterrc -share/config/kxkb_groups +share/config.kcfg.kde3/ +share/config.kcfg.kde3/kcm_useraccount.kcfg +share/config.kcfg.kde3/kcm_useraccount_pass.kcfg +share/config.kcfg.kde3/kdesktop.kcfg +share/config.kcfg.kde3/keditbookmarks.kcfg +share/config.kcfg.kde3/khelpcenter.kcfg +share/config.kcfg.kde3/kickerSettings.kcfg +share/config.kcfg.kde3/klaunch.kcfg +share/config.kcfg.kde3/konq_listview.kcfg +share/config.kcfg.kde3/konqueror.kcfg +share/config.kcfg.kde3/kwebdesktop.kcfg +share/config.kcfg.kde3/kwin.kcfg +share/config.kcfg.kde3/launcherapplet.kcfg +share/config.kcfg.kde3/mediamanagersettings.kcfg +share/config.kcfg.kde3/taskbar.kcfg +share/config.kde3/katerc +share/config.kde3/kdesktop_custom_menu1 +share/config.kde3/kdesktop_custom_menu2 +share/config.kde3/kdesurc +share/config.kde3/klipperrc +share/config.kde3/konqsidebartng.rc +share/config.kde3/kshorturifilterrc +share/config.kde3/kxkb_groups share/desktop-directories/ share/desktop-directories/kde-development-translation.directory share/desktop-directories/kde-development-webdevelopment.directory Index: x11/kde/edu3/Makefile =================================================================== RCS file: /cvs/ports/x11/kde/edu3/Makefile,v retrieving revision 1.69 diff -u -p -r1.69 Makefile --- x11/kde/edu3/Makefile 22 Oct 2013 11:33:59 -0000 1.69 +++ x11/kde/edu3/Makefile 21 Dec 2013 17:07:08 -0000 @@ -23,7 +23,7 @@ SEPARATE_BUILD = flavored CONFIGURE_ARGS += --disable-kig-python-scripting \ --disable-ocamlsolver -REVISION = 11 +REVISION = 12 WANTLIB = GL ICE SM X11 Xau Xcursor Xdamage Xdmcp Xext Xfixes Xft Xi Xinerama \ Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 artsflow artsflow_idl artskde \ audiofile c drm expat fam fontconfig freetype glib-2.0>=800 \ Index: x11/kde/edu3/pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/kde/edu3/pkg/PLIST,v retrieving revision 1.38 diff -u -p -r1.38 PLIST --- x11/kde/edu3/pkg/PLIST 22 Oct 2013 11:33:59 -0000 1.38 +++ x11/kde/edu3/pkg/PLIST 21 Dec 2013 17:07:09 -0000 @@ -2134,34 +2134,34 @@ share/apps.kde3/kwordquiz/icons/hicolor/ share/apps.kde3/kwordquiz/icons/hicolor/scalable/apps/ share/apps.kde3/kwordquiz/icons/hicolor/scalable/apps/kwordquiz.svg share/apps.kde3/kwordquiz/kwordquizui.rc -share/config.kcfg/ -share/config.kcfg/blinken.kcfg -share/config.kcfg/kalzium.kcfg -share/config.kcfg/kanagram.kcfg -share/config.kcfg/kbruch.kcfg -share/config.kcfg/keduca.kcfg -share/config.kcfg/kgeography.kcfg -share/config.kcfg/khangman.kcfg -share/config.kcfg/kiten.kcfg -share/config.kcfg/klatin.kcfg -share/config.kcfg/klettres.kcfg -share/config.kcfg/kmplot.kcfg -share/config.kcfg/kstars.kcfg -share/config.kcfg/ktouch.kcfg -share/config.kcfg/kturtle.kcfg -share/config.kcfg/kverbos.kcfg -share/config.kcfg/kvoctrain.kcfg -share/config.kcfg/kwordquiz.kcfg -share/config.kcfg/languagesettings.kcfg -share/config.kcfg/presettings.kcfg -share/config/khangmanrc -share/config/klettresrc -share/config/kstarsrc -share/config/kvoctrainrc -share/config/kwordquizrc -share/config/magic/ -share/config/magic/cabri.magic -share/config/magic/drgeo.magic +share/config.kcfg.kde3/ +share/config.kcfg.kde3/blinken.kcfg +share/config.kcfg.kde3/kalzium.kcfg +share/config.kcfg.kde3/kanagram.kcfg +share/config.kcfg.kde3/kbruch.kcfg +share/config.kcfg.kde3/keduca.kcfg +share/config.kcfg.kde3/kgeography.kcfg +share/config.kcfg.kde3/khangman.kcfg +share/config.kcfg.kde3/kiten.kcfg +share/config.kcfg.kde3/klatin.kcfg +share/config.kcfg.kde3/klettres.kcfg +share/config.kcfg.kde3/kmplot.kcfg +share/config.kcfg.kde3/kstars.kcfg +share/config.kcfg.kde3/ktouch.kcfg +share/config.kcfg.kde3/kturtle.kcfg +share/config.kcfg.kde3/kverbos.kcfg +share/config.kcfg.kde3/kvoctrain.kcfg +share/config.kcfg.kde3/kwordquiz.kcfg +share/config.kcfg.kde3/languagesettings.kcfg +share/config.kcfg.kde3/presettings.kcfg +share/config.kde3/khangmanrc +share/config.kde3/klettresrc +share/config.kde3/kstarsrc +share/config.kde3/kvoctrainrc +share/config.kde3/kwordquizrc +share/config.kde3/magic/ +share/config.kde3/magic/cabri.magic +share/config.kde3/magic/drgeo.magic share/doc/HTML.kde3/en/blinken/ share/doc/HTML.kde3/en/blinken/blinken1.png share/doc/HTML.kde3/en/blinken/blinken2.png Index: x11/kde/games3/Makefile =================================================================== RCS file: /cvs/ports/x11/kde/games3/Makefile,v retrieving revision 1.69 diff -u -p -r1.69 Makefile --- x11/kde/games3/Makefile 22 Oct 2013 11:33:59 -0000 1.69 +++ x11/kde/games3/Makefile 21 Dec 2013 17:07:09 -0000 @@ -19,7 +19,7 @@ RUN_DEPENDS += devel/desktop-file-utils LIB_DEPENDS = x11/kde/libs3 SEPARATE_BUILD = flavored -REVISION = 12 +REVISION = 13 WANTLIB = GL ICE SM X11 Xau Xcursor Xdamage Xdmcp Xext Xfixes Xft Xi Xinerama \ Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 artsflow artsflow_idl \ audiofile c drm expat fam fontconfig freetype glib-2.0 gmodule-2.0 \ Index: x11/kde/games3/pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/kde/games3/pkg/PLIST,v retrieving revision 1.30 diff -u -p -r1.30 PLIST --- x11/kde/games3/pkg/PLIST 22 Oct 2013 11:33:59 -0000 1.30 +++ x11/kde/games3/pkg/PLIST 21 Dec 2013 17:07:09 -0000 @@ -2242,21 +2242,21 @@ share/apps.kde3/lskat/grafix/type3.png share/apps.kde3/lskat/lskatui.rc share/apps.kde3/zeroconf/ share/apps.kde3/zeroconf/_kbattleship._tcp -share/config.kcfg/ -share/config.kcfg/kasteroids.kcfg -share/config.kcfg/kfouleggs.kcfg -share/config.kcfg/kjumpingcube.kcfg -share/config.kcfg/klines.kcfg -share/config.kcfg/kmahjongg.kcfg -share/config.kcfg/kreversi.kcfg -share/config.kcfg/kshisen.kcfg -share/config.kcfg/ksirtet.kcfg -share/config.kcfg/ksnake.kcfg -share/config.kcfg/kspaceduel.kcfg -share/config.kcfg/ktron.kcfg -share/config.kcfg/kwin4.kcfg -share/config/magic/ -share/config/magic/kolf.magic +share/config.kcfg.kde3/ +share/config.kcfg.kde3/kasteroids.kcfg +share/config.kcfg.kde3/kfouleggs.kcfg +share/config.kcfg.kde3/kjumpingcube.kcfg +share/config.kcfg.kde3/klines.kcfg +share/config.kcfg.kde3/kmahjongg.kcfg +share/config.kcfg.kde3/kreversi.kcfg +share/config.kcfg.kde3/kshisen.kcfg +share/config.kcfg.kde3/ksirtet.kcfg +share/config.kcfg.kde3/ksnake.kcfg +share/config.kcfg.kde3/kspaceduel.kcfg +share/config.kcfg.kde3/ktron.kcfg +share/config.kcfg.kde3/kwin4.kcfg +share/config.kde3/magic/ +share/config.kde3/magic/kolf.magic share/doc/HTML.kde3/en/atlantik/ share/doc/HTML.kde3/en/atlantik/common share/doc/HTML.kde3/en/atlantik/index.cache.bz2 Index: x11/kde/graphics3/Makefile =================================================================== RCS file: /cvs/ports/x11/kde/graphics3/Makefile,v retrieving revision 1.113 diff -u -p -r1.113 Makefile --- x11/kde/graphics3/Makefile 22 Oct 2013 11:33:59 -0000 1.113 +++ x11/kde/graphics3/Makefile 21 Dec 2013 17:07:09 -0000 @@ -9,10 +9,10 @@ VERSION = 3.5.10 DISTNAME = kdegraphics-${VERSION} MODKDE_VERSION = 3.5.8 -REVISION-main = 21 -REVISION-kamera = 11 -REVISION-kpov = 10 -REVISION-sane = 14 +REVISION-main = 22 +REVISION-kamera = 12 +REVISION-kpov = 11 +REVISION-sane = 15 SEPARATE_BUILD = flavored MULTI_PACKAGES = -main -kpov -kamera -sane Index: x11/kde/graphics3/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/x11/kde/graphics3/pkg/PLIST-main,v retrieving revision 1.13 diff -u -p -r1.13 PLIST-main --- x11/kde/graphics3/pkg/PLIST-main 22 Oct 2013 11:34:00 -0000 1.13 +++ x11/kde/graphics3/pkg/PLIST-main 21 Dec 2013 17:07:10 -0000 @@ -600,12 +600,12 @@ share/apps.kde3/kviewviewer/kviewviewer. share/apps.kde3/kviewviewer/kviewviewer_ro.rc share/apps.kde3/photobook/ share/apps.kde3/photobook/photobookui.rc -share/config.kcfg/ -share/config.kcfg/djvumultipage.kcfg -share/config.kcfg/kdvi.kcfg -share/config.kcfg/kghostview.kcfg -share/config.kcfg/kpdf.kcfg -share/config.kcfg/kviewshell.kcfg +share/config.kcfg.kde3/ +share/config.kcfg.kde3/djvumultipage.kcfg +share/config.kcfg.kde3/kdvi.kcfg +share/config.kcfg.kde3/kghostview.kcfg +share/config.kcfg.kde3/kpdf.kcfg +share/config.kcfg.kde3/kviewshell.kcfg share/doc/HTML.kde3/en/kcoloredit/ share/doc/HTML.kde3/en/kcoloredit/common share/doc/HTML.kde3/en/kcoloredit/index.cache.bz2 Index: x11/kde/graphics3/pkg/PLIST-sane =================================================================== RCS file: /cvs/ports/x11/kde/graphics3/pkg/PLIST-sane,v retrieving revision 1.11 diff -u -p -r1.11 PLIST-sane --- x11/kde/graphics3/pkg/PLIST-sane 22 Oct 2013 11:34:00 -0000 1.11 +++ x11/kde/graphics3/pkg/PLIST-sane 21 Dec 2013 17:07:10 -0000 @@ -25,7 +25,7 @@ share/apps.kde3/kooka/pics/scaletowidth. share/apps.kde3/kooka/pics/thumbviewtile.png share/apps.kde3/kview/kpartplugins/kviewscanner.desktop share/apps.kde3/kview/kpartplugins/kviewscanner.rc -share/config/kookarc +share/config.kde3/kookarc share/icons/crystalsvg/16x16/actions/palette_color.png share/icons/crystalsvg/16x16/actions/palette_gray.png share/icons/crystalsvg/16x16/actions/palette_halftone.png Index: x11/kde/multimedia3/Makefile =================================================================== RCS file: /cvs/ports/x11/kde/multimedia3/Makefile,v retrieving revision 1.80 diff -u -p -r1.80 Makefile --- x11/kde/multimedia3/Makefile 22 Oct 2013 11:34:05 -0000 1.80 +++ x11/kde/multimedia3/Makefile 21 Dec 2013 17:07:10 -0000 @@ -3,7 +3,7 @@ COMMENT = K Desktop Environment, multimedia applications CATEGORIES = x11 x11/kde VERSION = 3.5.10 -REVISION = 15 +REVISION = 16 DISTNAME = kdemultimedia-${VERSION} MODKDE_VERSION = 3.5.8 SHARED_LIBS += artsbuilder 1.0 # .0.0 Index: x11/kde/multimedia3/pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/kde/multimedia3/pkg/PLIST,v retrieving revision 1.39 diff -u -p -r1.39 PLIST --- x11/kde/multimedia3/pkg/PLIST 22 Oct 2013 11:34:06 -0000 1.39 +++ x11/kde/multimedia3/pkg/PLIST 21 Dec 2013 17:07:10 -0000 @@ -1041,13 +1041,13 @@ share/apps.kde3/videothumbnail/sprocket- share/apps.kde3/videothumbnail/sprocket-medium.png share/apps.kde3/videothumbnail/sprocket-small.png share/autostart/restore_kmix_volumes.desktop -share/config.kcfg/ -share/config.kcfg/audiocd_lame_encoder.kcfg -share/config.kcfg/audiocd_vorbis_encoder.kcfg -share/config.kcfg/kaudiocreator.kcfg -share/config.kcfg/kaudiocreator_encoders.kcfg -share/config.kcfg/kscd.kcfg -share/config.kcfg/libkcddb.kcfg +share/config.kcfg.kde3/ +share/config.kcfg.kde3/audiocd_lame_encoder.kcfg +share/config.kcfg.kde3/audiocd_vorbis_encoder.kcfg +share/config.kcfg.kde3/kaudiocreator.kcfg +share/config.kcfg.kde3/kaudiocreator_encoders.kcfg +share/config.kcfg.kde3/kscd.kcfg +share/config.kcfg.kde3/libkcddb.kcfg share/desktop-directories/ share/desktop-directories/kde-multimedia-music.directory share/doc/HTML.kde3/en/artsbuilder/ Index: x11/kde/network3/Makefile =================================================================== RCS file: /cvs/ports/x11/kde/network3/Makefile,v retrieving revision 1.77 diff -u -p -r1.77 Makefile --- x11/kde/network3/Makefile 16 Dec 2013 10:39:51 -0000 1.77 +++ x11/kde/network3/Makefile 21 Dec 2013 17:07:10 -0000 @@ -10,7 +10,7 @@ PKGNAME-main = ${DISTNAME} PKGNAME-kopsounds = kde3-kopete-sounds-${VERSION} PKGSPEC-main = kdenetwork->=3,<4 PKG_ARCH-kopsounds = * -REVISION-main = 12 +REVISION-main = 13 SHARED_LIBS += kopete 2.0 # .1.0 SHARED_LIBS += kopete_videodevice 1.0 # .0.0 Index: x11/kde/network3/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/x11/kde/network3/pkg/PLIST-main,v retrieving revision 1.1 diff -u -p -r1.1 PLIST-main --- x11/kde/network3/pkg/PLIST-main 16 Dec 2013 10:39:52 -0000 1.1 +++ x11/kde/network3/pkg/PLIST-main 21 Dec 2013 17:07:10 -0000 @@ -1481,14 +1481,14 @@ share/apps.kde3/zeroconf/_nfs._tcp share/apps.kde3/zeroconf/_rfb._tcp share/apps.kde3/zeroconf/_ssh._tcp share/apps.kde3/zeroconf/_webdav._tcp -share/config.kcfg/ -share/config.kcfg/historyconfig.kcfg -share/config.kcfg/kopete.kcfg -share/config.kcfg/kopeteidentityconfigpreferences.kcfg -share/config.kcfg/latexconfig.kcfg -share/config.kcfg/nowlisteningconfig.kcfg -share/config/ksircrc -share/config/ktalkdrc +share/config.kcfg.kde3/ +share/config.kcfg.kde3/historyconfig.kcfg +share/config.kcfg.kde3/kopete.kcfg +share/config.kcfg.kde3/kopeteidentityconfigpreferences.kcfg +share/config.kcfg.kde3/latexconfig.kcfg +share/config.kcfg.kde3/nowlisteningconfig.kcfg +share/config.kde3/ksircrc +share/config.kde3/ktalkdrc share/doc/HTML.kde3/en/kcontrol/ share/doc/HTML.kde3/en/kcontrol/kcmtalkd/ share/doc/HTML.kde3/en/kcontrol/kcmtalkd/common Index: x11/kde/office3/Makefile =================================================================== RCS file: /cvs/ports/x11/kde/office3/Makefile,v retrieving revision 1.88 diff -u -p -r1.88 Makefile --- x11/kde/office3/Makefile 25 Nov 2013 14:16:24 -0000 1.88 +++ x11/kde/office3/Makefile 21 Dec 2013 17:07:10 -0000 @@ -3,7 +3,7 @@ COMMENT= office suite for KDE VERSION= 1.6.3 -REVISION = 33 +REVISION = 34 CATEGORIES= x11 x11/kde productivity MASTER_SITES?= ${MASTER_SITE_KDE:S@$@stable/koffice-${VERSION}/src/@} Index: x11/kde/office3/pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/kde/office3/pkg/PLIST,v retrieving revision 1.35 diff -u -p -r1.35 PLIST --- x11/kde/office3/pkg/PLIST 22 Oct 2013 11:34:09 -0000 1.35 +++ x11/kde/office3/pkg/PLIST 21 Dec 2013 17:07:11 -0000 @@ -4312,12 +4312,12 @@ share/apps.kde3/xsltfilter/export/kword/ share/apps.kde3/xsltfilter/export/kword/xslfo/ share/apps.kde3/xsltfilter/export/kword/xslfo/kword2xslfo-table.xsl share/apps.kde3/xsltfilter/export/kword/xslfo/main.xsl -share/config.kcfg/ -share/config.kcfg/kivio.kcfg -share/config.kcfg/koshell.kcfg -share/config/kexirc -share/config/magic/ -share/config/magic/kexi.magic +share/config.kcfg.kde3/ +share/config.kcfg.kde3/kivio.kcfg +share/config.kcfg.kde3/koshell.kcfg +share/config.kde3/kexirc +share/config.kde3/magic/ +share/config.kde3/magic/kexi.magic share/doc/HTML.kde3/en/karbon/ share/doc/HTML.kde3/en/karbon/common share/doc/HTML.kde3/en/karbon/index.cache.bz2 Index: x11/kde/pim3/Makefile =================================================================== RCS file: /cvs/ports/x11/kde/pim3/Makefile,v retrieving revision 1.82 diff -u -p -r1.82 Makefile --- x11/kde/pim3/Makefile 22 Oct 2013 11:34:10 -0000 1.82 +++ x11/kde/pim3/Makefile 21 Dec 2013 17:07:11 -0000 @@ -5,7 +5,7 @@ CATEGORIES = x11 x11/kde productivity VERSION = 3.5.10 DISTNAME = kdepim-${VERSION} PKGSPEC = kdepim->=3,<4 -REVISION = 17 +REVISION = 18 MODKDE_VERSION = 3.5.8 Index: x11/kde/pim3/pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/kde/pim3/pkg/PLIST,v retrieving revision 1.40 diff -u -p -r1.40 PLIST --- x11/kde/pim3/pkg/PLIST 22 Oct 2013 11:34:10 -0000 1.40 +++ x11/kde/pim3/pkg/PLIST 21 Dec 2013 17:07:11 -0000 @@ -1736,38 +1736,38 @@ share/apps.kde3/libkleopatra/pics/key_un share/autostart/kalarm.tray.desktop share/autostart/kalarmd.autostart.desktop share/autostart/korgac.desktop -share/config.kcfg/abbrowserconduit.kcfg -share/config.kcfg/akregator.kcfg -share/config.kcfg/custommimeheader.kcfg -share/config.kcfg/customtemplates_kfg.kcfg -share/config.kcfg/docconduit.kcfg -share/config.kcfg/egroupware.kcfg -share/config.kcfg/groupwise.kcfg -share/config.kcfg/kandy.kcfg -share/config.kcfg/kmail.kcfg -share/config.kcfg/knoteconfig.kcfg -share/config.kcfg/knotesconduit.kcfg -share/config.kcfg/knotesglobalconfig.kcfg -share/config.kcfg/kolab.kcfg -share/config.kcfg/kontact.kcfg -share/config.kcfg/korganizer.kcfg -share/config.kcfg/kpalmdoc.kcfg -share/config.kcfg/kpilot.kcfg -share/config.kcfg/kpilotlib.kcfg -share/config.kcfg/memofileconduit.kcfg -share/config.kcfg/mk4config.kcfg -share/config.kcfg/pimemoticons.kcfg -share/config.kcfg/popmail.kcfg -share/config.kcfg/replyphrases.kcfg -share/config.kcfg/scalix.kcfg -share/config.kcfg/slox.kcfg -share/config.kcfg/sysinfoconduit.kcfg -share/config.kcfg/templatesconfiguration_kfg.kcfg -share/config.kcfg/timeconduit.kcfg -share/config.kcfg/vcalconduitbase.kcfg -share/config/kmail.antispamrc -share/config/kmail.antivirusrc -share/config/libkleopatrarc +share/config.kcfg.kde3/abbrowserconduit.kcfg +share/config.kcfg.kde3/akregator.kcfg +share/config.kcfg.kde3/custommimeheader.kcfg +share/config.kcfg.kde3/customtemplates_kfg.kcfg +share/config.kcfg.kde3/docconduit.kcfg +share/config.kcfg.kde3/egroupware.kcfg +share/config.kcfg.kde3/groupwise.kcfg +share/config.kcfg.kde3/kandy.kcfg +share/config.kcfg.kde3/kmail.kcfg +share/config.kcfg.kde3/knoteconfig.kcfg +share/config.kcfg.kde3/knotesconduit.kcfg +share/config.kcfg.kde3/knotesglobalconfig.kcfg +share/config.kcfg.kde3/kolab.kcfg +share/config.kcfg.kde3/kontact.kcfg +share/config.kcfg.kde3/korganizer.kcfg +share/config.kcfg.kde3/kpalmdoc.kcfg +share/config.kcfg.kde3/kpilot.kcfg +share/config.kcfg.kde3/kpilotlib.kcfg +share/config.kcfg.kde3/memofileconduit.kcfg +share/config.kcfg.kde3/mk4config.kcfg +share/config.kcfg.kde3/pimemoticons.kcfg +share/config.kcfg.kde3/popmail.kcfg +share/config.kcfg.kde3/replyphrases.kcfg +share/config.kcfg.kde3/scalix.kcfg +share/config.kcfg.kde3/slox.kcfg +share/config.kcfg.kde3/sysinfoconduit.kcfg +share/config.kcfg.kde3/templatesconfiguration_kfg.kcfg +share/config.kcfg.kde3/timeconduit.kcfg +share/config.kcfg.kde3/vcalconduitbase.kcfg +share/config.kde3/kmail.antispamrc +share/config.kde3/kmail.antivirusrc +share/config.kde3/libkleopatrarc share/doc/HTML.kde3/en/akregator/ share/doc/HTML.kde3/en/akregator/add-feed.png share/doc/HTML.kde3/en/akregator/add-feed2.png Index: x11/kde/sdk3/Makefile =================================================================== RCS file: /cvs/ports/x11/kde/sdk3/Makefile,v retrieving revision 1.67 diff -u -p -r1.67 Makefile --- x11/kde/sdk3/Makefile 22 Oct 2013 11:34:10 -0000 1.67 +++ x11/kde/sdk3/Makefile 21 Dec 2013 17:07:11 -0000 @@ -8,7 +8,7 @@ DISTNAME = kdesdk-${VERSION} PKGNAME-main = ${DISTNAME} PKGSPEC-main = kdesdk->=3,<4 -REVISION-main = 16 +REVISION-main = 17 PKGNAME-svn = kdesvn-${VERSION} REVISION-svn = 16 Index: x11/kde/sdk3/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/x11/kde/sdk3/pkg/PLIST-main,v retrieving revision 1.11 diff -u -p -r1.11 PLIST-main --- x11/kde/sdk3/pkg/PLIST-main 22 Oct 2013 11:34:11 -0000 1.11 +++ x11/kde/sdk3/pkg/PLIST-main 21 Dec 2013 17:07:11 -0000 @@ -691,10 +691,10 @@ share/apps.kde3/umbrello/tips share/apps.kde3/umbrello/umbrelloui.rc share/apps.kde3/umbrello/xmi.css share/apps.kde3/umbrello/xmi2docbook.xsl -share/config.kcfg/ -share/config.kcfg/cervisiapart.kcfg -share/config.kcfg/kbabel.kcfg -share/config.kcfg/kbprojectsettings.kcfg +share/config.kcfg.kde3/ +share/config.kcfg.kde3/cervisiapart.kcfg +share/config.kcfg.kde3/kbabel.kcfg +share/config.kcfg.kde3/kbprojectsettings.kcfg share/doc/HTML.kde3/en/cervisia/ share/doc/HTML.kde3/en/cervisia/annotate.png share/doc/HTML.kde3/en/cervisia/checkout.png Index: x11/kde/utils3/Makefile =================================================================== RCS file: /cvs/ports/x11/kde/utils3/Makefile,v retrieving revision 1.76 diff -u -p -r1.76 Makefile --- x11/kde/utils3/Makefile 22 Oct 2013 11:34:11 -0000 1.76 +++ x11/kde/utils3/Makefile 21 Dec 2013 17:07:11 -0000 @@ -5,7 +5,7 @@ CATEGORIES = x11 x11/kde VERSION = 3.5.10 DISTNAME = kdeutils-${VERSION} MODKDE_VERSION = 3.5.8 -REVISION = 15 +REVISION = 16 SHARED_LIBS += khexeditcommon 1.0 # .0.0 SHARED_LIBS += kcmlaptop 1.0 # .0.0 Index: x11/kde/utils3/pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/kde/utils3/pkg/PLIST,v retrieving revision 1.31 diff -u -p -r1.31 PLIST --- x11/kde/utils3/pkg/PLIST 22 Oct 2013 11:34:11 -0000 1.31 +++ x11/kde/utils3/pkg/PLIST 21 Dec 2013 17:07:11 -0000 @@ -352,13 +352,13 @@ share/apps.kde3/superkaramba/ share/apps.kde3/superkaramba/superkarambaui.rc share/autostart/irkick.desktop share/autostart/kgpg.desktop -share/config.kcfg/ -share/config.kcfg/ark.kcfg -share/config.kcfg/kcalc.kcfg -share/config.kcfg/kedit.kcfg -share/config.kcfg/kgpg.kcfg -share/config.kcfg/kjots.kcfg -share/config/ksim_panelextensionrc +share/config.kcfg.kde3/ +share/config.kcfg.kde3/ark.kcfg +share/config.kcfg.kde3/kcalc.kcfg +share/config.kcfg.kde3/kedit.kcfg +share/config.kcfg.kde3/kgpg.kcfg +share/config.kcfg.kde3/kjots.kcfg +share/config.kde3/ksim_panelextensionrc share/doc/HTML.kde3/en/KRegExpEditor/ share/doc/HTML.kde3/en/KRegExpEditor/altn.png share/doc/HTML.kde3/en/KRegExpEditor/altntool.png Index: x11/kde/webdev/Makefile =================================================================== RCS file: /cvs/ports/x11/kde/webdev/Makefile,v retrieving revision 1.45 diff -u -p -r1.45 Makefile --- x11/kde/webdev/Makefile 22 Oct 2013 11:34:12 -0000 1.45 +++ x11/kde/webdev/Makefile 21 Dec 2013 17:07:11 -0000 @@ -4,7 +4,7 @@ COMMENT = web development tool CATEGORIES = x11 x11/kde VERSION = 3.5.10 DISTNAME = kdewebdev-${VERSION} -REVISION = 11 +REVISION = 12 MODKDE_VERSION = 3.5.8 PKGSPEC = kdewebdev->=3,<4 Index: x11/kde/webdev/pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/kde/webdev/pkg/PLIST,v retrieving revision 1.23 diff -u -p -r1.23 PLIST --- x11/kde/webdev/pkg/PLIST 22 Oct 2013 11:34:12 -0000 1.23 +++ x11/kde/webdev/pkg/PLIST 21 Dec 2013 17:07:11 -0000 @@ -1560,7 +1560,7 @@ share/apps.kde3/quanta/toolbars/wml-1-2/ share/apps.kde3/quanta/toolbars/wml-1-2/text.toolbar.tgz share/apps.kde3/quanta/toolbars/xml/ share/apps.kde3/quanta/toolbars/xml/fonts.toolbar.tgz -share/config.kcfg/klinkstatus.kcfg +share/config.kcfg.kde3/klinkstatus.kcfg share/doc/HTML.kde3/en/kfilereplace/ share/doc/HTML.kde3/en/kfilereplace/addstringsdialog_window.png share/doc/HTML.kde3/en/kfilereplace/backup_option.png Index: x11/kmplayer/Makefile =================================================================== RCS file: /cvs/ports/x11/kmplayer/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- x11/kmplayer/Makefile 17 Dec 2013 11:55:59 -0000 1.19 +++ x11/kmplayer/Makefile 21 Dec 2013 17:07:11 -0000 @@ -5,7 +5,7 @@ CATEGORIES= x11 x11/kde DISTNAME= kmplayer-0.6.4 EXTRACT_SUFX= .tar.bz2 -REVISION= 7 +REVISION= 8 SHARED_LIBS= kparts_kmplayer 0.0 \ kdeinit_kmplayer 0.0 Index: x11/kmplayer/patches/patch-kmplayer_Makefile_in =================================================================== RCS file: x11/kmplayer/patches/patch-kmplayer_Makefile_in diff -N x11/kmplayer/patches/patch-kmplayer_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/kmplayer/patches/patch-kmplayer_Makefile_in 21 Dec 2013 17:07:11 -0000 @@ -0,0 +1,47 @@ +$OpenBSD$ +--- kmplayer/Makefile.in.orig Sun Feb 9 03:29:45 2003 ++++ kmplayer/Makefile.in Thu Dec 19 18:34:19 2013 +@@ -69,7 +69,7 @@ target_triplet = @target@ + EXEEXT = @EXEEXT@ + OBJEXT = @OBJEXT@ + PATH_SEPARATOR = @PATH_SEPARATOR@ +-datadir = $(kde_datadir)/kmplayer ++datadir = @datadir@ + AMTAR = @AMTAR@ + ARTSCCONFIG = @ARTSCCONFIG@ + AS = @AS@ +@@ -570,20 +570,20 @@ uninstall-confDATA: + dataDATA_INSTALL = $(INSTALL_DATA) + install-dataDATA: $(data_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(datadir) ++ $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/$(PACKAGE) + @list='$(data_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/$$f"; \ +- $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/$$f; \ ++ echo " $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_datadir)/$(PACKAGE)/$$f"; \ ++ $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_datadir)/$(PACKAGE)/$$f; \ + done + + uninstall-dataDATA: + @$(NORMAL_UNINSTALL) + @list='$(data_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(datadir)/$$f"; \ +- rm -f $(DESTDIR)$(datadir)/$$f; \ ++ echo " rm -f $(DESTDIR)$(kde_datadir)/$(PACKAGE)/$$f"; \ ++ rm -f $(DESTDIR)$(kde_datadir)/$(PACKAGE)/$$f; \ + done + kde_servicesDATA_INSTALL = $(INSTALL_DATA) + install-kde_servicesDATA: $(kde_services_DATA) +@@ -750,7 +750,7 @@ install-binPROGRAMS: install-libLTLIBRARIES + + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(applnkdir) $(DESTDIR)$(confdir) $(DESTDIR)$(datadir) $(DESTDIR)$(kde_servicesdir) ++ $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(applnkdir) $(DESTDIR)$(confdir) $(DESTDIR)$(kde_datadir) $(DESTDIR)$(kde_servicesdir) + + install: install-recursive + install-exec: install-exec-recursive Index: x11/kmplayer/pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/kmplayer/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- x11/kmplayer/pkg/PLIST 17 Dec 2013 11:55:59 -0000 1.7 +++ x11/kmplayer/pkg/PLIST 21 Dec 2013 17:07:11 -0000 @@ -12,7 +12,7 @@ share/applnk/Multimedia/kmplayer.desktop share/apps.kde3/kmplayer/ share/apps.kde3/kmplayer/kmplayerpartui.rc share/apps.kde3/kmplayer/kmplayerui.rc -share/config/kmplayerrc +share/config.kde3/kmplayerrc share/doc/HTML.kde3/en/kmplayer/ share/doc/HTML.kde3/en/kmplayer/common share/doc/HTML.kde3/en/kmplayer/index.cache.bz2 Index: x11/krusader/Makefile =================================================================== RCS file: /cvs/ports/x11/krusader/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- x11/krusader/Makefile 22 Oct 2013 11:34:25 -0000 1.21 +++ x11/krusader/Makefile 21 Dec 2013 17:07:11 -0000 @@ -5,7 +5,7 @@ SHARED_ONLY= Yes COMMENT= twin panel file manager for KDE DISTNAME= krusader-1.80.0 -REVISION= 12 +REVISION= 13 CATEGORIES= x11 x11/kde Index: x11/krusader/pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/krusader/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- x11/krusader/pkg/PLIST 22 Oct 2013 11:34:25 -0000 1.7 +++ x11/krusader/pkg/PLIST 21 Dec 2013 17:07:11 -0000 @@ -122,7 +122,7 @@ share/apps.kde3/krusader/total_commander share/apps.kde3/krusader/total_commander.keymap share/apps.kde3/krusader/total_commander.keymap.info share/apps.kde3/krusader/useraction_examples.xml -share/config/kio_isorc +share/config.kde3/kio_isorc share/doc/HTML.kde3/en/krusader/ share/doc/HTML.kde3/en/krusader/actionman.png share/doc/HTML.kde3/en/krusader/archives.docbook Index: x11/tellico/Makefile =================================================================== RCS file: /cvs/ports/x11/tellico/Makefile,v retrieving revision 1.30 diff -u -p -r1.30 Makefile --- x11/tellico/Makefile 22 Oct 2013 11:34:26 -0000 1.30 +++ x11/tellico/Makefile 21 Dec 2013 17:07:11 -0000 @@ -3,7 +3,7 @@ COMMENT= organizer for book/dvd/music collections DISTNAME= tellico-1.3.6 -REVISION= 10 +REVISION= 11 CATEGORIES= x11 databases Index: x11/tellico/pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/tellico/pkg/PLIST,v retrieving revision 1.9 diff -u -p -r1.9 PLIST --- x11/tellico/pkg/PLIST 22 Oct 2013 11:34:26 -0000 1.9 +++ x11/tellico/pkg/PLIST 21 Dec 2013 17:07:11 -0000 @@ -110,8 +110,8 @@ share/apps.kde3/tellico/welcome.html share/apps.kde3/tellico/xmp2tellico.xsl share/apps.kde3/tellico/yahoo2tellico.xsl share/apps.kde3/tellico/z3950-servers.cfg -share/config.kcfg/tellico_config.kcfg -share/config/tellicorc +share/config.kcfg.kde3/tellico_config.kcfg +share/config.kde3/tellicorc share/doc/HTML.kde3/en/tellico/ share/doc/HTML.kde3/en/tellico/CMakeLists.txt share/doc/HTML.kde3/en/tellico/advanced.docbook Index: x11/yakuake/Makefile =================================================================== RCS file: /cvs/ports/x11/yakuake/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- x11/yakuake/Makefile 22 Oct 2013 11:34:27 -0000 1.17 +++ x11/yakuake/Makefile 21 Dec 2013 17:07:11 -0000 @@ -3,7 +3,7 @@ COMMENT= yet another kuake KDE terminal emulator DISTNAME= yakuake-2.8.1 -REVISION= 10 +REVISION= 11 CATEGORIES= x11 x11/kde EXTRACT_SUFX= .tar.bz2 Index: x11/yakuake/pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/yakuake/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- x11/yakuake/pkg/PLIST 22 Oct 2013 11:34:27 -0000 1.7 +++ x11/yakuake/pkg/PLIST 21 Dec 2013 17:07:11 -0000 @@ -99,7 +99,7 @@ share/apps.kde3/yakuake/plastik_light/ti share/apps.kde3/yakuake/plastik_light/title/quit_over.png share/apps.kde3/yakuake/plastik_light/title/quit_up.png share/apps.kde3/yakuake/plastik_light/title/right.png -share/config.kcfg/yakuake.kcfg +share/config.kcfg.kde3/yakuake.kcfg share/icons/hicolor/16x16/apps/yakuake.png share/icons/hicolor/32x32/apps/yakuake.png share/locale/de/LC_MESSAGES/yakuake.mo
