aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.kde.mk2
-rw-r--r--Mk/bsd.kde4.mk2
-rw-r--r--arabic/kde3-i18n/Makefile6
-rw-r--r--arabic/kde3-i18n/distinfo2
-rw-r--r--arabic/kde4-l10n/Makefile6
-rw-r--r--arabic/kde4-l10n/distinfo2
-rw-r--r--archivers/ark/distinfo2
-rw-r--r--audio/arts/Makefile2
-rw-r--r--audio/arts/distinfo2
-rw-r--r--chinese/kde3-i18n-zh_CN/Makefile6
-rw-r--r--chinese/kde3-i18n-zh_CN/distinfo2
-rw-r--r--chinese/kde3-i18n-zh_TW/Makefile6
-rw-r--r--chinese/kde3-i18n-zh_TW/distinfo2
-rw-r--r--chinese/kde4-l10n-zh_CN/Makefile6
-rw-r--r--chinese/kde4-l10n-zh_CN/distinfo2
-rw-r--r--chinese/kde4-l10n-zh_TW/Makefile6
-rw-r--r--chinese/kde4-l10n-zh_TW/distinfo2
-rw-r--r--comms/kremotecontrol/distinfo2
-rw-r--r--deskutils/kcharselect/distinfo2
-rw-r--r--deskutils/kdepim3/distinfo2
-rw-r--r--deskutils/kdepim3/pkg-plist106
-rw-r--r--deskutils/kdepim4/distinfo2
-rw-r--r--deskutils/kdepim4/pkg-plist106
-rw-r--r--deskutils/kdepim44/distinfo2
-rw-r--r--deskutils/kdepim44/pkg-plist106
-rw-r--r--devel/kdesdk3/files/plist.base.rm81
-rw-r--r--devel/kdesdk3/files/plist.cervisia9
-rw-r--r--devel/kdesdk3/files/plist.cervisia.rm2
-rw-r--r--devel/kdesdk3/pkg-plist (renamed from devel/kdesdk3/files/plist.base)95
-rw-r--r--devel/kdesdk4/files/plist.base.rm81
-rw-r--r--devel/kdesdk4/files/plist.cervisia9
-rw-r--r--devel/kdesdk4/files/plist.cervisia.rm2
-rw-r--r--devel/kdesdk4/pkg-plist (renamed from devel/kdesdk4/files/plist.base)95
-rw-r--r--french/kde3-i18n/Makefile7
-rw-r--r--french/kde3-i18n/distinfo2
-rw-r--r--french/kde3-i18n/pkg-plist35
-rw-r--r--french/kde4-l10n/Makefile7
-rw-r--r--french/kde4-l10n/distinfo2
-rw-r--r--french/kde4-l10n/pkg-plist35
-rw-r--r--games/kdegames3/distinfo2
-rw-r--r--games/kdegames3/pkg-plist19
-rw-r--r--games/kdegames4/distinfo2
-rw-r--r--games/kdegames4/pkg-plist19
-rw-r--r--german/kde3-i18n/Makefile7
-rw-r--r--german/kde3-i18n/distinfo2
-rw-r--r--german/kde3-i18n/pkg-plist5
-rw-r--r--german/kde4-l10n/Makefile7
-rw-r--r--german/kde4-l10n/distinfo2
-rw-r--r--german/kde4-l10n/pkg-plist5
-rw-r--r--graphics/kdegraphics3/distinfo2
-rw-r--r--graphics/kdegraphics3/files/patch-kghostview-kgv_miniwidget.cpp85
-rw-r--r--graphics/kdegraphics3/files/patch-kghostview-kgv_miniwidget.h28
-rw-r--r--graphics/kdegraphics3/files/patch-kghostview-kpswidget.cpp48
-rw-r--r--graphics/kdegraphics3/files/patch-kghostview-kpswidget.h25
-rw-r--r--graphics/kdegraphics4/distinfo2
-rw-r--r--graphics/kdegraphics4/files/patch-kghostview-kgv_miniwidget.cpp85
-rw-r--r--graphics/kdegraphics4/files/patch-kghostview-kgv_miniwidget.h28
-rw-r--r--graphics/kdegraphics4/files/patch-kghostview-kpswidget.cpp48
-rw-r--r--graphics/kdegraphics4/files/patch-kghostview-kpswidget.h25
-rw-r--r--hebrew/kde3-i18n/Makefile6
-rw-r--r--hebrew/kde3-i18n/distinfo2
-rw-r--r--hebrew/kde3-i18n/pkg-plist2
-rw-r--r--hebrew/kde4-l10n/Makefile6
-rw-r--r--hebrew/kde4-l10n/distinfo2
-rw-r--r--hebrew/kde4-l10n/pkg-plist2
-rw-r--r--hungarian/kde3-i18n/Makefile6
-rw-r--r--hungarian/kde3-i18n/distinfo2
-rw-r--r--hungarian/kde4-l10n/Makefile6
-rw-r--r--hungarian/kde4-l10n/distinfo2
-rw-r--r--japanese/kde3-i18n/Makefile7
-rw-r--r--japanese/kde3-i18n/distinfo2
-rw-r--r--japanese/kde3-i18n/pkg-plist7
-rw-r--r--japanese/kde4-l10n/Makefile7
-rw-r--r--japanese/kde4-l10n/distinfo2
-rw-r--r--japanese/kde4-l10n/pkg-plist7
-rw-r--r--korean/kde3-i18n/Makefile6
-rw-r--r--korean/kde4-l10n/Makefile6
-rw-r--r--math/kcalc/distinfo2
-rw-r--r--misc/kde3-i18n-af/Makefile6
-rw-r--r--misc/kde3-i18n-af/distinfo2
-rw-r--r--misc/kde3-i18n-ar/Makefile6
-rw-r--r--misc/kde3-i18n-ar/distinfo2
-rw-r--r--misc/kde3-i18n-az/Makefile6
-rw-r--r--misc/kde3-i18n-bg/Makefile6
-rw-r--r--misc/kde3-i18n-bg/distinfo2
-rw-r--r--misc/kde3-i18n-bs/Makefile6
-rw-r--r--misc/kde3-i18n-bs/distinfo2
-rw-r--r--misc/kde3-i18n-ca/Makefile6
-rw-r--r--misc/kde3-i18n-ca/distinfo2
-rw-r--r--misc/kde3-i18n-cs/Makefile6
-rw-r--r--misc/kde3-i18n-cs/distinfo2
-rw-r--r--misc/kde3-i18n-da/Makefile6
-rw-r--r--misc/kde3-i18n-da/distinfo2
-rw-r--r--misc/kde3-i18n-el/Makefile6
-rw-r--r--misc/kde3-i18n-el/distinfo2
-rw-r--r--misc/kde3-i18n-en_GB/Makefile6
-rw-r--r--misc/kde3-i18n-en_GB/distinfo2
-rw-r--r--misc/kde3-i18n-eo/Makefile6
-rw-r--r--misc/kde3-i18n-eo/distinfo2
-rw-r--r--misc/kde3-i18n-es/Makefile6
-rw-r--r--misc/kde3-i18n-es/distinfo2
-rw-r--r--misc/kde3-i18n-et/Makefile6
-rw-r--r--misc/kde3-i18n-et/distinfo2
-rw-r--r--misc/kde3-i18n-fi/Makefile6
-rw-r--r--misc/kde3-i18n-fi/distinfo2
-rw-r--r--misc/kde3-i18n-hr/Makefile6
-rw-r--r--misc/kde3-i18n-hr/distinfo2
-rw-r--r--misc/kde3-i18n-id/Makefile6
-rw-r--r--misc/kde3-i18n-is/Makefile6
-rw-r--r--misc/kde3-i18n-is/distinfo2
-rw-r--r--misc/kde3-i18n-it/Makefile6
-rw-r--r--misc/kde3-i18n-it/distinfo2
-rw-r--r--misc/kde3-i18n-lt/Makefile6
-rw-r--r--misc/kde3-i18n-lt/distinfo2
-rw-r--r--misc/kde3-i18n-lv/Makefile6
-rw-r--r--misc/kde3-i18n-mt/Makefile6
-rw-r--r--misc/kde3-i18n-mt/distinfo2
-rw-r--r--misc/kde3-i18n-nb/Makefile6
-rw-r--r--misc/kde3-i18n-nb/distinfo2
-rw-r--r--misc/kde3-i18n-nl/Makefile6
-rw-r--r--misc/kde3-i18n-nl/distinfo2
-rw-r--r--misc/kde3-i18n-nn/Makefile6
-rw-r--r--misc/kde3-i18n-nn/distinfo2
-rw-r--r--misc/kde3-i18n-pl/Makefile6
-rw-r--r--misc/kde3-i18n-pl/distinfo2
-rw-r--r--misc/kde3-i18n-ro/Makefile6
-rw-r--r--misc/kde3-i18n-ro/distinfo2
-rw-r--r--misc/kde3-i18n-sk/Makefile6
-rw-r--r--misc/kde3-i18n-sk/distinfo2
-rw-r--r--misc/kde3-i18n-sl/Makefile6
-rw-r--r--misc/kde3-i18n-sl/distinfo2
-rw-r--r--misc/kde3-i18n-sr/Makefile6
-rw-r--r--misc/kde3-i18n-sr/distinfo2
-rw-r--r--misc/kde3-i18n-sv/Makefile6
-rw-r--r--misc/kde3-i18n-sv/distinfo2
-rw-r--r--misc/kde3-i18n-ta/Makefile6
-rw-r--r--misc/kde3-i18n-ta/distinfo2
-rw-r--r--misc/kde3-i18n-th/Makefile6
-rw-r--r--misc/kde3-i18n-th/distinfo2
-rw-r--r--misc/kde3-i18n-tr/Makefile6
-rw-r--r--misc/kde3-i18n-tr/distinfo2
-rw-r--r--misc/kde3-i18n-ven/Makefile6
-rw-r--r--misc/kde3-i18n-ven/distinfo2
-rw-r--r--misc/kde3-i18n-xh/Makefile6
-rw-r--r--misc/kde3-i18n-xh/distinfo2
-rw-r--r--misc/kde3-i18n-zu/Makefile6
-rw-r--r--misc/kde3-i18n-zu/distinfo2
-rw-r--r--misc/kde3-i18n/Makefile26
-rw-r--r--misc/kde4-i18n-is/Makefile6
-rw-r--r--misc/kde4-i18n-is/distinfo2
-rw-r--r--misc/kde4-l10n-bg/Makefile6
-rw-r--r--misc/kde4-l10n-bg/distinfo2
-rw-r--r--misc/kde4-l10n-ca/Makefile6
-rw-r--r--misc/kde4-l10n-ca/distinfo2
-rw-r--r--misc/kde4-l10n-cs/Makefile6
-rw-r--r--misc/kde4-l10n-cs/distinfo2
-rw-r--r--misc/kde4-l10n-da/Makefile6
-rw-r--r--misc/kde4-l10n-da/distinfo2
-rw-r--r--misc/kde4-l10n-el/Makefile6
-rw-r--r--misc/kde4-l10n-el/distinfo2
-rw-r--r--misc/kde4-l10n-en_GB/Makefile6
-rw-r--r--misc/kde4-l10n-en_GB/distinfo2
-rw-r--r--misc/kde4-l10n-eo/Makefile6
-rw-r--r--misc/kde4-l10n-eo/distinfo2
-rw-r--r--misc/kde4-l10n-es/Makefile6
-rw-r--r--misc/kde4-l10n-es/distinfo2
-rw-r--r--misc/kde4-l10n-et/Makefile6
-rw-r--r--misc/kde4-l10n-et/distinfo2
-rw-r--r--misc/kde4-l10n-fi/Makefile6
-rw-r--r--misc/kde4-l10n-fi/distinfo2
-rw-r--r--misc/kde4-l10n-is/Makefile6
-rw-r--r--misc/kde4-l10n-is/distinfo2
-rw-r--r--misc/kde4-l10n-it/Makefile6
-rw-r--r--misc/kde4-l10n-it/distinfo2
-rw-r--r--misc/kde4-l10n-lt/Makefile6
-rw-r--r--misc/kde4-l10n-lt/distinfo2
-rw-r--r--misc/kde4-l10n-lv/Makefile6
-rw-r--r--misc/kde4-l10n-nb/Makefile6
-rw-r--r--misc/kde4-l10n-nb/distinfo2
-rw-r--r--misc/kde4-l10n-nl/Makefile6
-rw-r--r--misc/kde4-l10n-nl/distinfo2
-rw-r--r--misc/kde4-l10n-nn/Makefile6
-rw-r--r--misc/kde4-l10n-nn/distinfo2
-rw-r--r--misc/kde4-l10n-ro/Makefile6
-rw-r--r--misc/kde4-l10n-ro/distinfo2
-rw-r--r--misc/kde4-l10n-sk/Makefile6
-rw-r--r--misc/kde4-l10n-sk/distinfo2
-rw-r--r--misc/kde4-l10n-sl/Makefile6
-rw-r--r--misc/kde4-l10n-sl/distinfo2
-rw-r--r--misc/kde4-l10n-sr/Makefile6
-rw-r--r--misc/kde4-l10n-sr/distinfo2
-rw-r--r--misc/kde4-l10n-sv/Makefile6
-rw-r--r--misc/kde4-l10n-sv/distinfo2
-rw-r--r--misc/kde4-l10n-ta/Makefile6
-rw-r--r--misc/kde4-l10n-ta/distinfo2
-rw-r--r--misc/kde4-l10n-th/Makefile6
-rw-r--r--misc/kde4-l10n-th/distinfo2
-rw-r--r--misc/kde4-l10n-tr/Makefile6
-rw-r--r--misc/kde4-l10n-tr/distinfo2
-rw-r--r--misc/kde4-l10n/Makefile26
-rw-r--r--misc/kdeaddons3/distinfo2
-rw-r--r--misc/kdeedu3/distinfo2
-rw-r--r--misc/kdeedu4/distinfo2
-rw-r--r--misc/kdeutils3/distinfo2
-rw-r--r--misc/kdeutils4/distinfo2
-rw-r--r--multimedia/kdemultimedia3/Makefile7
-rw-r--r--multimedia/kdemultimedia3/distinfo2
-rw-r--r--multimedia/kdemultimedia3/files/plist.base6
-rw-r--r--multimedia/kdemultimedia3/files/plist.base.rm2
-rw-r--r--multimedia/kdemultimedia3/pkg-message9
-rw-r--r--multimedia/kdemultimedia4/Makefile7
-rw-r--r--multimedia/kdemultimedia4/distinfo2
-rw-r--r--multimedia/kdemultimedia4/files/plist.base6
-rw-r--r--multimedia/kdemultimedia4/files/plist.base.rm2
-rw-r--r--multimedia/kdemultimedia4/pkg-message9
-rw-r--r--net/kdenetwork3/distinfo2
-rw-r--r--net/kdenetwork4/distinfo2
-rw-r--r--polish/kde3-i18n/Makefile6
-rw-r--r--polish/kde3-i18n/distinfo2
-rw-r--r--polish/kde4-l10n/Makefile6
-rw-r--r--polish/kde4-l10n/distinfo2
-rw-r--r--portuguese/kde3-i18n-pt_BR/Makefile6
-rw-r--r--portuguese/kde3-i18n-pt_BR/distinfo2
-rw-r--r--portuguese/kde3-i18n/Makefile6
-rw-r--r--portuguese/kde3-i18n/distinfo2
-rw-r--r--portuguese/kde4-l10n-pt_BR/Makefile6
-rw-r--r--portuguese/kde4-l10n-pt_BR/distinfo2
-rw-r--r--portuguese/kde4-l10n/Makefile6
-rw-r--r--portuguese/kde4-l10n/distinfo2
-rw-r--r--russian/kde3-i18n/Makefile7
-rw-r--r--russian/kde3-i18n/distinfo2
-rw-r--r--russian/kde4-l10n/Makefile7
-rw-r--r--russian/kde4-l10n/distinfo2
-rw-r--r--security/kgpg-kde4/distinfo2
-rw-r--r--security/kwallet/distinfo2
-rw-r--r--sysutils/kdeadmin3/distinfo2
-rw-r--r--sysutils/kdeadmin4/distinfo2
-rw-r--r--sysutils/kdf/distinfo2
-rw-r--r--sysutils/kfloppy/distinfo2
-rw-r--r--sysutils/sweeper/distinfo2
-rw-r--r--ukrainian/kde3-i18n/Makefile7
-rw-r--r--ukrainian/kde3-i18n/distinfo2
-rw-r--r--ukrainian/kde4-l10n/Makefile7
-rw-r--r--ukrainian/kde4-l10n/distinfo2
-rw-r--r--vietnamese/kde3-i18n/distinfo2
-rw-r--r--www/kdewebdev/distinfo2
-rw-r--r--www/kdewebdev4/distinfo2
-rw-r--r--www/quanta/distinfo2
-rw-r--r--x11-clocks/kdetoys3/distinfo2
-rw-r--r--x11-clocks/kdetoys3/pkg-plist11
-rw-r--r--x11-clocks/kdetoys4/distinfo2
-rw-r--r--x11-clocks/kdetoys4/pkg-plist11
-rw-r--r--x11-themes/kdeartwork3/Makefile23
-rw-r--r--x11-themes/kdeartwork3/distinfo2
-rw-r--r--x11-themes/kdeartwork3/files/patch-configure57
-rw-r--r--x11-themes/kdeartwork3/files/plist.base (renamed from x11-wm/kdeartwork3/pkg-plist)117
-rw-r--r--x11-themes/kdeartwork3/files/plist.base.rm117
-rw-r--r--x11-themes/kdeartwork3/files/plist.xs176
-rw-r--r--x11-themes/kdeartwork3/files/plist.xs.rm1
-rw-r--r--x11-themes/kdeartwork4/Makefile23
-rw-r--r--x11-themes/kdeartwork4/distinfo2
-rw-r--r--x11-themes/kdeartwork4/files/patch-configure57
-rw-r--r--x11-themes/kdeartwork4/files/plist.base (renamed from x11-themes/kdeartwork3/pkg-plist)117
-rw-r--r--x11-themes/kdeartwork4/files/plist.base.rm117
-rw-r--r--x11-themes/kdeartwork4/files/plist.xs176
-rw-r--r--x11-themes/kdeartwork4/files/plist.xs.rm1
-rw-r--r--x11-toolkits/qt31/Makefile3
-rw-r--r--x11-toolkits/qt31/distinfo2
-rw-r--r--x11-toolkits/qt31/files/patch-qfiledialog.cpp11
-rw-r--r--x11-toolkits/qt31/files/patch-qlistview.cpp11
-rw-r--r--x11-toolkits/qt31/files/patch-qlock.cpp10
-rw-r--r--x11-toolkits/qt31/files/patch-qpopupmenu.cpp11
-rw-r--r--x11-toolkits/qt31/files/patch-qtextedit.cpp20
-rw-r--r--x11-toolkits/qt31/pkg-plist285
-rw-r--r--x11-toolkits/qt32/Makefile3
-rw-r--r--x11-toolkits/qt32/distinfo2
-rw-r--r--x11-toolkits/qt32/files/patch-qfiledialog.cpp11
-rw-r--r--x11-toolkits/qt32/files/patch-qlistview.cpp11
-rw-r--r--x11-toolkits/qt32/files/patch-qlock.cpp10
-rw-r--r--x11-toolkits/qt32/files/patch-qpopupmenu.cpp11
-rw-r--r--x11-toolkits/qt32/files/patch-qtextedit.cpp20
-rw-r--r--x11-toolkits/qt32/pkg-plist285
-rw-r--r--x11-toolkits/qt33/Makefile3
-rw-r--r--x11-toolkits/qt33/distinfo2
-rw-r--r--x11-toolkits/qt33/files/patch-qfiledialog.cpp11
-rw-r--r--x11-toolkits/qt33/files/patch-qlistview.cpp11
-rw-r--r--x11-toolkits/qt33/files/patch-qlock.cpp10
-rw-r--r--x11-toolkits/qt33/files/patch-qpopupmenu.cpp11
-rw-r--r--x11-toolkits/qt33/files/patch-qtextedit.cpp20
-rw-r--r--x11-toolkits/qt33/pkg-plist285
-rw-r--r--x11-wm/kdeartwork3/Makefile23
-rw-r--r--x11-wm/kdeartwork3/distinfo2
-rw-r--r--x11-wm/kdeartwork3/files/patch-configure57
-rw-r--r--x11-wm/kdeartwork3/files/plist.base (renamed from x11-themes/kdeartwork4/pkg-plist)117
-rw-r--r--x11-wm/kdeartwork3/files/plist.base.rm117
-rw-r--r--x11-wm/kdeartwork3/files/plist.xs176
-rw-r--r--x11-wm/kdeartwork3/files/plist.xs.rm1
-rw-r--r--x11/kde4-baseapps/Makefile4
-rw-r--r--x11/kde4-baseapps/distinfo3
-rw-r--r--x11/kde4-baseapps/files/plist.base1
-rw-r--r--x11/kde4-runtime/Makefile4
-rw-r--r--x11/kde4-runtime/distinfo3
-rw-r--r--x11/kde4-runtime/files/plist.base1
-rw-r--r--x11/kde4-workspace/Makefile4
-rw-r--r--x11/kde4-workspace/distinfo3
-rw-r--r--x11/kde4-workspace/files/plist.base1
-rw-r--r--x11/kdebase3/Makefile4
-rw-r--r--x11/kdebase3/distinfo3
-rw-r--r--x11/kdebase3/files/plist.base1
-rw-r--r--x11/kdebase4-runtime/Makefile4
-rw-r--r--x11/kdebase4-runtime/distinfo3
-rw-r--r--x11/kdebase4-runtime/files/plist.base1
-rw-r--r--x11/kdebase4-workspace/Makefile4
-rw-r--r--x11/kdebase4-workspace/distinfo3
-rw-r--r--x11/kdebase4-workspace/files/plist.base1
-rw-r--r--x11/kdebase4/Makefile4
-rw-r--r--x11/kdebase4/distinfo3
-rw-r--r--x11/kdebase4/files/plist.base1
-rw-r--r--x11/kdelibs3/Makefile8
-rw-r--r--x11/kdelibs3/distinfo2
-rw-r--r--x11/kdelibs3/files/patch-kdoctools::xmlizer8
-rw-r--r--x11/kdelibs3/files/plist.base14
-rw-r--r--x11/kdelibs3/files/plist.base.rm23
-rw-r--r--x11/kdelibs4/Makefile8
-rw-r--r--x11/kdelibs4/distinfo2
-rw-r--r--x11/kdelibs4/files/patch-kdoctools::xmlizer8
-rw-r--r--x11/kdelibs4/files/plist.base14
-rw-r--r--x11/kdelibs4/files/plist.base.rm23
328 files changed, 2661 insertions, 2157 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk
index ac170f812c43..e76a4d3dec41 100644
--- a/Mk/bsd.kde.mk
+++ b/Mk/bsd.kde.mk
@@ -93,7 +93,7 @@ CONFIGURE_ENV+= MOC="${MOC}" QTDIR="${QTDIR}"
# Yeah, it's namespace pollution, but this is really the best place for this
# stuff. Arts does NOT use it anymore.
-KDE_VERSION= 3.1.1
+KDE_VERSION= 3.1.2
KDE_ORIGVER= ${KDE_VERSION}
KDE_PREFIX?= ${LOCALBASE}
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index ac170f812c43..e76a4d3dec41 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -93,7 +93,7 @@ CONFIGURE_ENV+= MOC="${MOC}" QTDIR="${QTDIR}"
# Yeah, it's namespace pollution, but this is really the best place for this
# stuff. Arts does NOT use it anymore.
-KDE_VERSION= 3.1.1
+KDE_VERSION= 3.1.2
KDE_ORIGVER= ${KDE_VERSION}
KDE_PREFIX?= ${LOCALBASE}
diff --git a/arabic/kde3-i18n/Makefile b/arabic/kde3-i18n/Makefile
index ae0b4323ca49..2976fff8aff7 100644
--- a/arabic/kde3-i18n/Makefile
+++ b/arabic/kde3-i18n/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= ar-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/arabic/kde3-i18n/distinfo b/arabic/kde3-i18n/distinfo
index beb3ed7b076e..2514c3b3bfc8 100644
--- a/arabic/kde3-i18n/distinfo
+++ b/arabic/kde3-i18n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-ar-3.1.1.tar.bz2) = 3355c77de993a7928cdb637ce2f8b763
+MD5 (KDE/kde-i18n/kde-i18n-ar-3.1.2.tar.bz2) = 72248ac70109ac64f76aaadf3cffe7a6
diff --git a/arabic/kde4-l10n/Makefile b/arabic/kde4-l10n/Makefile
index ae0b4323ca49..2976fff8aff7 100644
--- a/arabic/kde4-l10n/Makefile
+++ b/arabic/kde4-l10n/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= ar-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/arabic/kde4-l10n/distinfo b/arabic/kde4-l10n/distinfo
index beb3ed7b076e..2514c3b3bfc8 100644
--- a/arabic/kde4-l10n/distinfo
+++ b/arabic/kde4-l10n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-ar-3.1.1.tar.bz2) = 3355c77de993a7928cdb637ce2f8b763
+MD5 (KDE/kde-i18n/kde-i18n-ar-3.1.2.tar.bz2) = 72248ac70109ac64f76aaadf3cffe7a6
diff --git a/archivers/ark/distinfo b/archivers/ark/distinfo
index d93b5e24f10b..b21b9d66641b 100644
--- a/archivers/ark/distinfo
+++ b/archivers/ark/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.1.tar.bz2) = fd2fef424ffb3de13e4fc8d55b995b73
+MD5 (KDE/kdeutils-3.1.2.tar.bz2) = 49611a79b2d77cf6e9913ffb445fa209
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index a88f28a96be7..30b328dd19e7 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= arts
-PORTVERSION= 1.1.1
+PORTVERSION= 1.1.2
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= audio kde
diff --git a/audio/arts/distinfo b/audio/arts/distinfo
index a726a8bac2a3..a929e44deb6a 100644
--- a/audio/arts/distinfo
+++ b/audio/arts/distinfo
@@ -1 +1 @@
-MD5 (KDE/arts-1.1.1.tar.bz2) = 67be8c2a84d6b928f407947138a77982
+MD5 (KDE/arts-1.1.2.tar.bz2) = 5d5a1858f8dcf0d88600291899dff75b \ No newline at end of file
diff --git a/chinese/kde3-i18n-zh_CN/Makefile b/chinese/kde3-i18n-zh_CN/Makefile
index 758b999cc72e..038a7b066f05 100644
--- a/chinese/kde3-i18n-zh_CN/Makefile
+++ b/chinese/kde3-i18n-zh_CN/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= chinese kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= zh_CN-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Simplified Chinese messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/chinese/kde3-i18n-zh_CN/distinfo b/chinese/kde3-i18n-zh_CN/distinfo
index 3e20febb38d4..496672566397 100644
--- a/chinese/kde3-i18n-zh_CN/distinfo
+++ b/chinese/kde3-i18n-zh_CN/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.1.1.tar.bz2) = cdbdb93c79b60c78c653467cc1bfb661
+MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.1.2.tar.bz2) = e607c9f63bf6ebe7bfe887680c9ab2a2
diff --git a/chinese/kde3-i18n-zh_TW/Makefile b/chinese/kde3-i18n-zh_TW/Makefile
index 0246e3843976..312bbadcc790 100644
--- a/chinese/kde3-i18n-zh_TW/Makefile
+++ b/chinese/kde3-i18n-zh_TW/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= chinese kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= zh_TW-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Traditional Chinese messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/chinese/kde3-i18n-zh_TW/distinfo b/chinese/kde3-i18n-zh_TW/distinfo
index 3f53e0bd61fa..b45922fa6d09 100644
--- a/chinese/kde3-i18n-zh_TW/distinfo
+++ b/chinese/kde3-i18n-zh_TW/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-zh_TW-3.1.1.tar.bz2) = 462b6c1306bfad7e06cdabeb06933e88
+MD5 (KDE/kde-i18n/kde-i18n-zh_TW-3.1.2.tar.bz2) = 26cf26fd3064b3d9af46e541c8dbb340
diff --git a/chinese/kde4-l10n-zh_CN/Makefile b/chinese/kde4-l10n-zh_CN/Makefile
index 758b999cc72e..038a7b066f05 100644
--- a/chinese/kde4-l10n-zh_CN/Makefile
+++ b/chinese/kde4-l10n-zh_CN/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= chinese kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= zh_CN-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Simplified Chinese messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/chinese/kde4-l10n-zh_CN/distinfo b/chinese/kde4-l10n-zh_CN/distinfo
index 3e20febb38d4..496672566397 100644
--- a/chinese/kde4-l10n-zh_CN/distinfo
+++ b/chinese/kde4-l10n-zh_CN/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.1.1.tar.bz2) = cdbdb93c79b60c78c653467cc1bfb661
+MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.1.2.tar.bz2) = e607c9f63bf6ebe7bfe887680c9ab2a2
diff --git a/chinese/kde4-l10n-zh_TW/Makefile b/chinese/kde4-l10n-zh_TW/Makefile
index 0246e3843976..312bbadcc790 100644
--- a/chinese/kde4-l10n-zh_TW/Makefile
+++ b/chinese/kde4-l10n-zh_TW/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= chinese kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= zh_TW-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Traditional Chinese messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/chinese/kde4-l10n-zh_TW/distinfo b/chinese/kde4-l10n-zh_TW/distinfo
index 3f53e0bd61fa..b45922fa6d09 100644
--- a/chinese/kde4-l10n-zh_TW/distinfo
+++ b/chinese/kde4-l10n-zh_TW/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-zh_TW-3.1.1.tar.bz2) = 462b6c1306bfad7e06cdabeb06933e88
+MD5 (KDE/kde-i18n/kde-i18n-zh_TW-3.1.2.tar.bz2) = 26cf26fd3064b3d9af46e541c8dbb340
diff --git a/comms/kremotecontrol/distinfo b/comms/kremotecontrol/distinfo
index d93b5e24f10b..b21b9d66641b 100644
--- a/comms/kremotecontrol/distinfo
+++ b/comms/kremotecontrol/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.1.tar.bz2) = fd2fef424ffb3de13e4fc8d55b995b73
+MD5 (KDE/kdeutils-3.1.2.tar.bz2) = 49611a79b2d77cf6e9913ffb445fa209
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index d93b5e24f10b..b21b9d66641b 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.1.tar.bz2) = fd2fef424ffb3de13e4fc8d55b995b73
+MD5 (KDE/kdeutils-3.1.2.tar.bz2) = 49611a79b2d77cf6e9913ffb445fa209
diff --git a/deskutils/kdepim3/distinfo b/deskutils/kdepim3/distinfo
index 04c19492e565..d9dc0e0289b1 100644
--- a/deskutils/kdepim3/distinfo
+++ b/deskutils/kdepim3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdepim-3.1.1.tar.bz2) = 482a24da0eae33a053ec656f9e50083e
+MD5 (KDE/kdepim-3.1.2.tar.bz2) = 37253cbba0fcf1201f6b24d3e8efa943 \ No newline at end of file
diff --git a/deskutils/kdepim3/pkg-plist b/deskutils/kdepim3/pkg-plist
index 5a524a8d4a19..745bcef77837 100644
--- a/deskutils/kdepim3/pkg-plist
+++ b/deskutils/kdepim3/pkg-plist
@@ -44,15 +44,12 @@ lib/kde3/kfile_vcf.la
lib/kde3/kfile_vcf.so
lib/kde3/libaddressconduit.la
lib/kde3/libaddressconduit.so
-lib/kde3/libaddressconduit.so.0
lib/kde3/libexpenseconduit.la
lib/kde3/libexpenseconduit.so
-lib/kde3/libexpenseconduit.so.0
lib/kde3/libkaddressbookpart.la
lib/kde3/libkaddressbookpart.so
lib/kde3/libknotesconduit.la
lib/kde3/libknotesconduit.so
-lib/kde3/libknotesconduit.so.0
lib/kde3/libkorg_birthdays.la
lib/kde3/libkorg_birthdays.so
lib/kde3/libkorg_datenums.la
@@ -67,19 +64,14 @@ lib/kde3/libkorg_webexport.la
lib/kde3/libkorg_webexport.so
lib/kde3/libnullconduit.la
lib/kde3/libnullconduit.so
-lib/kde3/libnullconduit.so.0
lib/kde3/libpopmailconduit.la
lib/kde3/libpopmailconduit.so
-lib/kde3/libpopmailconduit.so.0
lib/kde3/libtimeconduit.la
lib/kde3/libtimeconduit.so
-lib/kde3/libtimeconduit.so.0
lib/kde3/libtodoconduit.la
lib/kde3/libtodoconduit.so
-lib/kde3/libtodoconduit.so.0
lib/kde3/libvcalconduit.la
lib/kde3/libvcalconduit.so
-lib/kde3/libvcalconduit.so.0
lib/libkalarmd.la
lib/libkalarmd.so
lib/libkalarmd.so.0
@@ -432,77 +424,100 @@ share/servicetypes/calendardecoration.desktop
share/servicetypes/calendarplugin.desktop
share/servicetypes/korganizerpart.desktop
share/servicetypes/kpilotconduit.desktop
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/ksync/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/ksync/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kpilot/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kpilot/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/knotes/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/knotes/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kgantt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kgantt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kandy/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kandy/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarmd/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarmd/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarm/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarm/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/calendarsystem/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/calendarsystem/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/calendarsystem/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarm/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarmd/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kandy/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kgantt/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/knotes/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kandy/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kpilot/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/ksync/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarmd/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/ksync/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kpilot/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/knotes/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kgantt/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kandy/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kalarmd/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kalarm/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/calendarsystem/html || true
-@dirrm share/servicetypes
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarm/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html
@dirrm share/services/korganizer
-@dirrm share/services
@dirrm share/icons/locolor/32x32/apps
@dirrm share/icons/locolor/32x32
@dirrm share/icons/locolor/16x16/apps
@dirrm share/icons/locolor/16x16
@dirrm share/icons/locolor
@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48
@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/32x32
@dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/icons/crystalsvg/22x22/actions
-@dirrm share/icons/crystalsvg/22x22
@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/16x16/actions
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
@dirrm share/doc/HTML/en/kpilot
@dirrm share/doc/HTML/en/korganizer
@dirrm share/doc/HTML/en/knotes
+@dirrm share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html
@dirrm share/doc/HTML/en/kdepim-apidocs/libkpimexchange
+@dirrm share/doc/HTML/en/kdepim-apidocs/libkdepim/html
@dirrm share/doc/HTML/en/kdepim-apidocs/libkdepim
+@dirrm share/doc/HTML/en/kdepim-apidocs/libkcal/html
@dirrm share/doc/HTML/en/kdepim-apidocs/libkcal
+@dirrm share/doc/HTML/en/kdepim-apidocs/ksync/html
@dirrm share/doc/HTML/en/kdepim-apidocs/ksync
+@dirrm share/doc/HTML/en/kdepim-apidocs/kpilot/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kpilot
+@dirrm share/doc/HTML/en/kdepim-apidocs/korganizer/html
@dirrm share/doc/HTML/en/kdepim-apidocs/korganizer
+@dirrm share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html
@dirrm share/doc/HTML/en/kdepim-apidocs/konsolekalendar
+@dirrm share/doc/HTML/en/kdepim-apidocs/knotes/html
@dirrm share/doc/HTML/en/kdepim-apidocs/knotes
+@dirrm share/doc/HTML/en/kdepim-apidocs/kgantt/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kgantt
+@dirrm share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kfile-plugins
+@dirrm share/doc/HTML/en/kdepim-apidocs/kandy/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kandy
+@dirrm share/doc/HTML/en/kdepim-apidocs/kalarmd/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kalarmd
+@dirrm share/doc/HTML/en/kdepim-apidocs/kalarm/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kalarm
+@dirrm share/doc/HTML/en/kdepim-apidocs/kaddressbook/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kaddressbook
+@dirrm share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt
@dirrm share/doc/HTML/en/kdepim-apidocs/kabc
+@dirrm share/doc/HTML/en/kdepim-apidocs/calendarsystem/html
@dirrm share/doc/HTML/en/kdepim-apidocs/calendarsystem
@dirrm share/doc/HTML/en/kdepim-apidocs
@dirrm share/doc/HTML/en/kcontrol/kalarmd
@@ -511,10 +526,6 @@ share/servicetypes/kpilotconduit.desktop
@dirrm share/doc/HTML/en/kandy
@dirrm share/doc/HTML/en/kalarm
@dirrm share/doc/HTML/en/kaddressbook
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/config
-@dirrm share/autostart
@dirrm share/apps/ksync
@dirrm share/apps/kpilot/icons/crystalsvg/16x16/actions
@dirrm share/apps/kpilot/icons/crystalsvg/16x16
@@ -573,13 +584,10 @@ share/servicetypes/kpilotconduit.desktop
@dirrm share/apps/kaddressbook/icons
@dirrm share/apps/kaddressbook/csv-templates
@dirrm share/apps/kaddressbook
-@dirrm share/apps
@dirrm share/applnk/Utilities/More
@dirrm share/applnk/Utilities
@dirrm share/applnk/Applications
@dirrm share/applnk/.hidden
-@dirrm share/applnk
-@dirrm lib/kde3
@dirrm include/kpilot
@dirrm include/korganizer
@dirrm include/kgantt
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index 04c19492e565..d9dc0e0289b1 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdepim-3.1.1.tar.bz2) = 482a24da0eae33a053ec656f9e50083e
+MD5 (KDE/kdepim-3.1.2.tar.bz2) = 37253cbba0fcf1201f6b24d3e8efa943 \ No newline at end of file
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index 5a524a8d4a19..745bcef77837 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -44,15 +44,12 @@ lib/kde3/kfile_vcf.la
lib/kde3/kfile_vcf.so
lib/kde3/libaddressconduit.la
lib/kde3/libaddressconduit.so
-lib/kde3/libaddressconduit.so.0
lib/kde3/libexpenseconduit.la
lib/kde3/libexpenseconduit.so
-lib/kde3/libexpenseconduit.so.0
lib/kde3/libkaddressbookpart.la
lib/kde3/libkaddressbookpart.so
lib/kde3/libknotesconduit.la
lib/kde3/libknotesconduit.so
-lib/kde3/libknotesconduit.so.0
lib/kde3/libkorg_birthdays.la
lib/kde3/libkorg_birthdays.so
lib/kde3/libkorg_datenums.la
@@ -67,19 +64,14 @@ lib/kde3/libkorg_webexport.la
lib/kde3/libkorg_webexport.so
lib/kde3/libnullconduit.la
lib/kde3/libnullconduit.so
-lib/kde3/libnullconduit.so.0
lib/kde3/libpopmailconduit.la
lib/kde3/libpopmailconduit.so
-lib/kde3/libpopmailconduit.so.0
lib/kde3/libtimeconduit.la
lib/kde3/libtimeconduit.so
-lib/kde3/libtimeconduit.so.0
lib/kde3/libtodoconduit.la
lib/kde3/libtodoconduit.so
-lib/kde3/libtodoconduit.so.0
lib/kde3/libvcalconduit.la
lib/kde3/libvcalconduit.so
-lib/kde3/libvcalconduit.so.0
lib/libkalarmd.la
lib/libkalarmd.so
lib/libkalarmd.so.0
@@ -432,77 +424,100 @@ share/servicetypes/calendardecoration.desktop
share/servicetypes/calendarplugin.desktop
share/servicetypes/korganizerpart.desktop
share/servicetypes/kpilotconduit.desktop
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/ksync/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/ksync/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kpilot/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kpilot/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/knotes/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/knotes/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kgantt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kgantt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kandy/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kandy/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarmd/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarmd/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarm/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarm/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/calendarsystem/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/calendarsystem/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/calendarsystem/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarm/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarmd/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kandy/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kgantt/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/knotes/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kandy/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kpilot/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/ksync/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarmd/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/ksync/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kpilot/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/knotes/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kgantt/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kandy/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kalarmd/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kalarm/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/calendarsystem/html || true
-@dirrm share/servicetypes
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarm/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html
@dirrm share/services/korganizer
-@dirrm share/services
@dirrm share/icons/locolor/32x32/apps
@dirrm share/icons/locolor/32x32
@dirrm share/icons/locolor/16x16/apps
@dirrm share/icons/locolor/16x16
@dirrm share/icons/locolor
@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48
@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/32x32
@dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/icons/crystalsvg/22x22/actions
-@dirrm share/icons/crystalsvg/22x22
@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/16x16/actions
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
@dirrm share/doc/HTML/en/kpilot
@dirrm share/doc/HTML/en/korganizer
@dirrm share/doc/HTML/en/knotes
+@dirrm share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html
@dirrm share/doc/HTML/en/kdepim-apidocs/libkpimexchange
+@dirrm share/doc/HTML/en/kdepim-apidocs/libkdepim/html
@dirrm share/doc/HTML/en/kdepim-apidocs/libkdepim
+@dirrm share/doc/HTML/en/kdepim-apidocs/libkcal/html
@dirrm share/doc/HTML/en/kdepim-apidocs/libkcal
+@dirrm share/doc/HTML/en/kdepim-apidocs/ksync/html
@dirrm share/doc/HTML/en/kdepim-apidocs/ksync
+@dirrm share/doc/HTML/en/kdepim-apidocs/kpilot/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kpilot
+@dirrm share/doc/HTML/en/kdepim-apidocs/korganizer/html
@dirrm share/doc/HTML/en/kdepim-apidocs/korganizer
+@dirrm share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html
@dirrm share/doc/HTML/en/kdepim-apidocs/konsolekalendar
+@dirrm share/doc/HTML/en/kdepim-apidocs/knotes/html
@dirrm share/doc/HTML/en/kdepim-apidocs/knotes
+@dirrm share/doc/HTML/en/kdepim-apidocs/kgantt/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kgantt
+@dirrm share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kfile-plugins
+@dirrm share/doc/HTML/en/kdepim-apidocs/kandy/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kandy
+@dirrm share/doc/HTML/en/kdepim-apidocs/kalarmd/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kalarmd
+@dirrm share/doc/HTML/en/kdepim-apidocs/kalarm/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kalarm
+@dirrm share/doc/HTML/en/kdepim-apidocs/kaddressbook/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kaddressbook
+@dirrm share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt
@dirrm share/doc/HTML/en/kdepim-apidocs/kabc
+@dirrm share/doc/HTML/en/kdepim-apidocs/calendarsystem/html
@dirrm share/doc/HTML/en/kdepim-apidocs/calendarsystem
@dirrm share/doc/HTML/en/kdepim-apidocs
@dirrm share/doc/HTML/en/kcontrol/kalarmd
@@ -511,10 +526,6 @@ share/servicetypes/kpilotconduit.desktop
@dirrm share/doc/HTML/en/kandy
@dirrm share/doc/HTML/en/kalarm
@dirrm share/doc/HTML/en/kaddressbook
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/config
-@dirrm share/autostart
@dirrm share/apps/ksync
@dirrm share/apps/kpilot/icons/crystalsvg/16x16/actions
@dirrm share/apps/kpilot/icons/crystalsvg/16x16
@@ -573,13 +584,10 @@ share/servicetypes/kpilotconduit.desktop
@dirrm share/apps/kaddressbook/icons
@dirrm share/apps/kaddressbook/csv-templates
@dirrm share/apps/kaddressbook
-@dirrm share/apps
@dirrm share/applnk/Utilities/More
@dirrm share/applnk/Utilities
@dirrm share/applnk/Applications
@dirrm share/applnk/.hidden
-@dirrm share/applnk
-@dirrm lib/kde3
@dirrm include/kpilot
@dirrm include/korganizer
@dirrm include/kgantt
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index 04c19492e565..d9dc0e0289b1 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdepim-3.1.1.tar.bz2) = 482a24da0eae33a053ec656f9e50083e
+MD5 (KDE/kdepim-3.1.2.tar.bz2) = 37253cbba0fcf1201f6b24d3e8efa943 \ No newline at end of file
diff --git a/deskutils/kdepim44/pkg-plist b/deskutils/kdepim44/pkg-plist
index 5a524a8d4a19..745bcef77837 100644
--- a/deskutils/kdepim44/pkg-plist
+++ b/deskutils/kdepim44/pkg-plist
@@ -44,15 +44,12 @@ lib/kde3/kfile_vcf.la
lib/kde3/kfile_vcf.so
lib/kde3/libaddressconduit.la
lib/kde3/libaddressconduit.so
-lib/kde3/libaddressconduit.so.0
lib/kde3/libexpenseconduit.la
lib/kde3/libexpenseconduit.so
-lib/kde3/libexpenseconduit.so.0
lib/kde3/libkaddressbookpart.la
lib/kde3/libkaddressbookpart.so
lib/kde3/libknotesconduit.la
lib/kde3/libknotesconduit.so
-lib/kde3/libknotesconduit.so.0
lib/kde3/libkorg_birthdays.la
lib/kde3/libkorg_birthdays.so
lib/kde3/libkorg_datenums.la
@@ -67,19 +64,14 @@ lib/kde3/libkorg_webexport.la
lib/kde3/libkorg_webexport.so
lib/kde3/libnullconduit.la
lib/kde3/libnullconduit.so
-lib/kde3/libnullconduit.so.0
lib/kde3/libpopmailconduit.la
lib/kde3/libpopmailconduit.so
-lib/kde3/libpopmailconduit.so.0
lib/kde3/libtimeconduit.la
lib/kde3/libtimeconduit.so
-lib/kde3/libtimeconduit.so.0
lib/kde3/libtodoconduit.la
lib/kde3/libtodoconduit.so
-lib/kde3/libtodoconduit.so.0
lib/kde3/libvcalconduit.la
lib/kde3/libvcalconduit.so
-lib/kde3/libvcalconduit.so.0
lib/libkalarmd.la
lib/libkalarmd.so
lib/libkalarmd.so.0
@@ -432,77 +424,100 @@ share/servicetypes/calendardecoration.desktop
share/servicetypes/calendarplugin.desktop
share/servicetypes/korganizerpart.desktop
share/servicetypes/kpilotconduit.desktop
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/ksync/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/ksync/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kpilot/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kpilot/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/knotes/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/knotes/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kgantt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kgantt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kandy/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kandy/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarmd/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarmd/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarm/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarm/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/calendarsystem/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/calendarsystem/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/calendarsystem/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarm/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarmd/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kandy/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kgantt/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/knotes/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kandy/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kpilot/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/ksync/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarmd/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/ksync/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kpilot/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/knotes/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kgantt/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kandy/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kalarmd/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kalarm/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/calendarsystem/html || true
-@dirrm share/servicetypes
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarm/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html
@dirrm share/services/korganizer
-@dirrm share/services
@dirrm share/icons/locolor/32x32/apps
@dirrm share/icons/locolor/32x32
@dirrm share/icons/locolor/16x16/apps
@dirrm share/icons/locolor/16x16
@dirrm share/icons/locolor
@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48
@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/32x32
@dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/icons/crystalsvg/22x22/actions
-@dirrm share/icons/crystalsvg/22x22
@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/16x16/actions
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
@dirrm share/doc/HTML/en/kpilot
@dirrm share/doc/HTML/en/korganizer
@dirrm share/doc/HTML/en/knotes
+@dirrm share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html
@dirrm share/doc/HTML/en/kdepim-apidocs/libkpimexchange
+@dirrm share/doc/HTML/en/kdepim-apidocs/libkdepim/html
@dirrm share/doc/HTML/en/kdepim-apidocs/libkdepim
+@dirrm share/doc/HTML/en/kdepim-apidocs/libkcal/html
@dirrm share/doc/HTML/en/kdepim-apidocs/libkcal
+@dirrm share/doc/HTML/en/kdepim-apidocs/ksync/html
@dirrm share/doc/HTML/en/kdepim-apidocs/ksync
+@dirrm share/doc/HTML/en/kdepim-apidocs/kpilot/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kpilot
+@dirrm share/doc/HTML/en/kdepim-apidocs/korganizer/html
@dirrm share/doc/HTML/en/kdepim-apidocs/korganizer
+@dirrm share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html
@dirrm share/doc/HTML/en/kdepim-apidocs/konsolekalendar
+@dirrm share/doc/HTML/en/kdepim-apidocs/knotes/html
@dirrm share/doc/HTML/en/kdepim-apidocs/knotes
+@dirrm share/doc/HTML/en/kdepim-apidocs/kgantt/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kgantt
+@dirrm share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kfile-plugins
+@dirrm share/doc/HTML/en/kdepim-apidocs/kandy/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kandy
+@dirrm share/doc/HTML/en/kdepim-apidocs/kalarmd/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kalarmd
+@dirrm share/doc/HTML/en/kdepim-apidocs/kalarm/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kalarm
+@dirrm share/doc/HTML/en/kdepim-apidocs/kaddressbook/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kaddressbook
+@dirrm share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
@dirrm share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt
@dirrm share/doc/HTML/en/kdepim-apidocs/kabc
+@dirrm share/doc/HTML/en/kdepim-apidocs/calendarsystem/html
@dirrm share/doc/HTML/en/kdepim-apidocs/calendarsystem
@dirrm share/doc/HTML/en/kdepim-apidocs
@dirrm share/doc/HTML/en/kcontrol/kalarmd
@@ -511,10 +526,6 @@ share/servicetypes/kpilotconduit.desktop
@dirrm share/doc/HTML/en/kandy
@dirrm share/doc/HTML/en/kalarm
@dirrm share/doc/HTML/en/kaddressbook
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/config
-@dirrm share/autostart
@dirrm share/apps/ksync
@dirrm share/apps/kpilot/icons/crystalsvg/16x16/actions
@dirrm share/apps/kpilot/icons/crystalsvg/16x16
@@ -573,13 +584,10 @@ share/servicetypes/kpilotconduit.desktop
@dirrm share/apps/kaddressbook/icons
@dirrm share/apps/kaddressbook/csv-templates
@dirrm share/apps/kaddressbook
-@dirrm share/apps
@dirrm share/applnk/Utilities/More
@dirrm share/applnk/Utilities
@dirrm share/applnk/Applications
@dirrm share/applnk/.hidden
-@dirrm share/applnk
-@dirrm lib/kde3
@dirrm include/kpilot
@dirrm include/korganizer
@dirrm include/kgantt
diff --git a/devel/kdesdk3/files/plist.base.rm b/devel/kdesdk3/files/plist.base.rm
deleted file mode 100644
index 4ec1713c8e36..000000000000
--- a/devel/kdesdk3/files/plist.base.rm
+++ /dev/null
@@ -1,81 +0,0 @@
-@dirrm share/servicetypes
-@dirrm share/services
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk
-@dirrm share/icons/locolor/32x32/mimetypes
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/mimetypes
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/crystalsvg/48x48/mimetypes
-@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48
-@dirrm share/icons/crystalsvg/32x32/mimetypes
-@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/32x32
-@dirrm share/icons/crystalsvg/16x16/mimetypes
-@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
-@dirrm share/doc/HTML/en/kompare
-@dirrm share/doc/HTML/en/kbugbuster
-@dirrm share/doc/HTML/en/kbabel
-@dirrm share/doc/HTML/en/cervisia
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/apps/komparepart
-@dirrm share/apps/kompare/icons/locolor/32x32/apps
-@dirrm share/apps/kompare/icons/locolor/32x32
-@dirrm share/apps/kompare/icons/locolor/16x16/apps
-@dirrm share/apps/kompare/icons/locolor/16x16
-@dirrm share/apps/kompare/icons/locolor
-@dirrm share/apps/kompare/icons/crystalsvg/16x16/apps
-@dirrm share/apps/kompare/icons/crystalsvg/16x16
-@dirrm share/apps/kompare/icons/crystalsvg
-@dirrm share/apps/kompare/icons
-@dirrm share/apps/kompare
-@dirrm share/apps/kbugbuster/pics
-@dirrm share/apps/kbugbuster
-@dirrm share/apps/kbabeldict/modules
-@dirrm share/apps/kbabeldict
-@dirrm share/apps/kbabel/pics
-@dirrm share/apps/kbabel/icons/locolor/32x32/actions
-@dirrm share/apps/kbabel/icons/locolor/32x32
-@dirrm share/apps/kbabel/icons/locolor/22x22/actions
-@dirrm share/apps/kbabel/icons/locolor/22x22
-@dirrm share/apps/kbabel/icons/locolor/16x16/actions
-@dirrm share/apps/kbabel/icons/locolor/16x16
-@dirrm share/apps/kbabel/icons/locolor
-@dirrm share/apps/kbabel/icons/hicolor/32x32/actions
-@dirrm share/apps/kbabel/icons/hicolor/32x32
-@dirrm share/apps/kbabel/icons/hicolor/22x22/actions
-@dirrm share/apps/kbabel/icons/hicolor/22x22
-@dirrm share/apps/kbabel/icons/hicolor/16x16/actions
-@dirrm share/apps/kbabel/icons/hicolor/16x16
-@dirrm share/apps/kbabel/icons/hicolor
-@dirrm share/apps/kbabel/icons
-@dirrm share/apps/kbabel
-@dirrm share/apps/kapptemplate/kpartplugin/no-exe
-@dirrm share/apps/kapptemplate/kpartplugin
-@dirrm share/apps/kapptemplate/kpartapp/no-exe
-@dirrm share/apps/kapptemplate/kpartapp
-@dirrm share/apps/kapptemplate/kapp/no-exe
-@dirrm share/apps/kapptemplate/kapp
-@dirrm share/apps/kapptemplate/include
-@dirrm share/apps/kapptemplate/existing
-@dirrm share/apps/kapptemplate/bin
-@dirrm share/apps/kapptemplate/appframework/no-exe
-@dirrm share/apps/kapptemplate/appframework
-@dirrm share/apps/kapptemplate/admin
-@dirrm share/apps/kapptemplate
-@dirrm share/apps/kabc/formats
-@dirrm share/apps/kabc
-@dirrm share/apps/catalogmanager
-@dirrm share/apps
-@dirrm share/applnk/Development
-@dirrm share/applnk
-@dirrm lib/kde3
-@dirrm include/kbabel
diff --git a/devel/kdesdk3/files/plist.cervisia b/devel/kdesdk3/files/plist.cervisia
deleted file mode 100644
index 880ced8785a9..000000000000
--- a/devel/kdesdk3/files/plist.cervisia
+++ /dev/null
@@ -1,9 +0,0 @@
-bin/cervisia
-lib/libcervisia.la
-lib/libcervisia.so
-lib/libcervisia.so.1
-share/applnk/Development/cervisia.desktop
-share/apps/cervisia/cervisiashellui.rc
-share/apps/cervisiapart/cervisiaui.rc
-share/icons/crystalsvg/16x16/apps/cervisia.png
-share/icons/crystalsvg/32x32/apps/cervisia.png
diff --git a/devel/kdesdk3/files/plist.cervisia.rm b/devel/kdesdk3/files/plist.cervisia.rm
deleted file mode 100644
index 1759058f42c0..000000000000
--- a/devel/kdesdk3/files/plist.cervisia.rm
+++ /dev/null
@@ -1,2 +0,0 @@
-@dirrm share/apps/cervisiapart
-@dirrm share/apps/cervisia
diff --git a/devel/kdesdk3/files/plist.base b/devel/kdesdk3/pkg-plist
index 46e3622ded77..7123dd4a6ae7 100644
--- a/devel/kdesdk3/files/plist.base
+++ b/devel/kdesdk3/pkg-plist
@@ -1,5 +1,6 @@
bin/adddebug
bin/catalogmanager
+bin/cervisia
bin/cheatmake
bin/create_cvsignore
bin/create_makefile
@@ -75,6 +76,9 @@ lib/kde3/pothumbnail.so
lib/libcatalogmanager.la
lib/libcatalogmanager.so
lib/libcatalogmanager.so.1
+lib/libcervisia.la
+lib/libcervisia.so
+lib/libcervisia.so.1
lib/libkbabel.la
lib/libkbabel.so
lib/libkbabel.so.1
@@ -91,11 +95,14 @@ lib/libkspy.la
lib/libkspy.so
lib/libkspy.so.1
share/applnk/Development/catalogmanager.desktop
+share/applnk/Development/cervisia.desktop
share/applnk/Development/kbabel.desktop
share/applnk/Development/kbabeldict.desktop
share/applnk/Development/kbugbuster.desktop
share/applnk/Development/kompare.desktop
share/apps/catalogmanager/catalogmanagerui.rc
+share/apps/cervisia/cervisiashellui.rc
+share/apps/cervisiapart/cervisiaui.rc
share/apps/kabc/formats/kdeaccountsplugin.desktop
share/apps/kapptemplate/admin/ChangeLog
share/apps/kapptemplate/admin/Doxyfile.am
@@ -432,12 +439,14 @@ share/doc/HTML/en/kompare/common
share/doc/HTML/en/kompare/index.cache.bz2
share/doc/HTML/en/kompare/index.docbook
share/icons/crystalsvg/16x16/apps/catalogmanager.png
+share/icons/crystalsvg/16x16/apps/cervisia.png
share/icons/crystalsvg/16x16/apps/kbabel.png
share/icons/crystalsvg/16x16/apps/kbabeldict.png
share/icons/crystalsvg/16x16/apps/kbugbuster.png
share/icons/crystalsvg/16x16/apps/kompare.png
share/icons/crystalsvg/16x16/mimetypes/gettext.png
share/icons/crystalsvg/32x32/apps/catalogmanager.png
+share/icons/crystalsvg/32x32/apps/cervisia.png
share/icons/crystalsvg/32x32/apps/kbabel.png
share/icons/crystalsvg/32x32/apps/kbabeldict.png
share/icons/crystalsvg/32x32/mimetypes/gettext.png
@@ -466,3 +475,89 @@ share/services/komparepart.desktop
share/services/pothumbnail.desktop
share/servicetypes/komparenavigationpart.desktop
share/servicetypes/kompareviewpart.desktop
+@dirrm include/kbabel
+@dirrm include
+@dirrm lib/kde3
+@dirrm lib
+@dirrm share/doc/HTML/en/cervisia
+@dirrm share/doc/HTML/en/kompare
+@dirrm share/doc/HTML/en/kbugbuster
+@dirrm share/doc/HTML/en/kbabel
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
+@dirrm share/doc
+@dirrm share/applnk/Development
+@dirrm share/applnk
+@dirrm share/icons/crystalsvg/32x32/apps
+@dirrm share/icons/crystalsvg/32x32/mimetypes
+@dirrm share/icons/crystalsvg/32x32
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/icons/crystalsvg/16x16/mimetypes
+@dirrm share/icons/crystalsvg/16x16
+@dirrm share/icons/crystalsvg/48x48/apps
+@dirrm share/icons/crystalsvg/48x48/mimetypes
+@dirrm share/icons/crystalsvg/48x48
+@dirrm share/icons/crystalsvg
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16/mimetypes
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/32x32/mimetypes
+@dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor
+@dirrm share/icons
+@dirrm share/apps/cervisiapart
+@dirrm share/apps/cervisia
+@dirrm share/apps/kapptemplate/admin
+@dirrm share/apps/kapptemplate/appframework/no-exe
+@dirrm share/apps/kapptemplate/appframework
+@dirrm share/apps/kapptemplate/existing
+@dirrm share/apps/kapptemplate/kapp/no-exe
+@dirrm share/apps/kapptemplate/kapp
+@dirrm share/apps/kapptemplate/kpartapp/no-exe
+@dirrm share/apps/kapptemplate/kpartapp
+@dirrm share/apps/kapptemplate/kpartplugin/no-exe
+@dirrm share/apps/kapptemplate/kpartplugin
+@dirrm share/apps/kapptemplate/bin
+@dirrm share/apps/kapptemplate/include
+@dirrm share/apps/kapptemplate
+@dirrm share/apps/kbabeldict/modules
+@dirrm share/apps/kbabeldict
+@dirrm share/apps/kbabel/pics
+@dirrm share/apps/kbabel/icons/locolor/32x32/actions
+@dirrm share/apps/kbabel/icons/locolor/32x32
+@dirrm share/apps/kbabel/icons/locolor/16x16/actions
+@dirrm share/apps/kbabel/icons/locolor/16x16
+@dirrm share/apps/kbabel/icons/locolor/22x22/actions
+@dirrm share/apps/kbabel/icons/locolor/22x22
+@dirrm share/apps/kbabel/icons/locolor
+@dirrm share/apps/kbabel/icons/hicolor/32x32/actions
+@dirrm share/apps/kbabel/icons/hicolor/32x32
+@dirrm share/apps/kbabel/icons/hicolor/16x16/actions
+@dirrm share/apps/kbabel/icons/hicolor/16x16
+@dirrm share/apps/kbabel/icons/hicolor/22x22/actions
+@dirrm share/apps/kbabel/icons/hicolor/22x22
+@dirrm share/apps/kbabel/icons/hicolor
+@dirrm share/apps/kbabel/icons
+@dirrm share/apps/kbabel
+@dirrm share/apps/catalogmanager
+@dirrm share/apps/kbugbuster/pics
+@dirrm share/apps/kbugbuster
+@dirrm share/apps/kabc/formats
+@dirrm share/apps/kabc
+@dirrm share/apps/komparepart
+@dirrm share/apps/kompare/icons/crystalsvg/16x16/apps
+@dirrm share/apps/kompare/icons/crystalsvg/16x16
+@dirrm share/apps/kompare/icons/crystalsvg
+@dirrm share/apps/kompare/icons/locolor/16x16/apps
+@dirrm share/apps/kompare/icons/locolor/16x16
+@dirrm share/apps/kompare/icons/locolor/32x32/apps
+@dirrm share/apps/kompare/icons/locolor/32x32
+@dirrm share/apps/kompare/icons/locolor
+@dirrm share/apps/kompare/icons
+@dirrm share/apps/kompare
+@dirrm share/apps
+@dirrm share/mimelnk/application
+@dirrm share/mimelnk
+@dirrm share/services
+@dirrm share/servicetypes
diff --git a/devel/kdesdk4/files/plist.base.rm b/devel/kdesdk4/files/plist.base.rm
deleted file mode 100644
index 4ec1713c8e36..000000000000
--- a/devel/kdesdk4/files/plist.base.rm
+++ /dev/null
@@ -1,81 +0,0 @@
-@dirrm share/servicetypes
-@dirrm share/services
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk
-@dirrm share/icons/locolor/32x32/mimetypes
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/mimetypes
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/crystalsvg/48x48/mimetypes
-@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48
-@dirrm share/icons/crystalsvg/32x32/mimetypes
-@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/32x32
-@dirrm share/icons/crystalsvg/16x16/mimetypes
-@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
-@dirrm share/doc/HTML/en/kompare
-@dirrm share/doc/HTML/en/kbugbuster
-@dirrm share/doc/HTML/en/kbabel
-@dirrm share/doc/HTML/en/cervisia
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/apps/komparepart
-@dirrm share/apps/kompare/icons/locolor/32x32/apps
-@dirrm share/apps/kompare/icons/locolor/32x32
-@dirrm share/apps/kompare/icons/locolor/16x16/apps
-@dirrm share/apps/kompare/icons/locolor/16x16
-@dirrm share/apps/kompare/icons/locolor
-@dirrm share/apps/kompare/icons/crystalsvg/16x16/apps
-@dirrm share/apps/kompare/icons/crystalsvg/16x16
-@dirrm share/apps/kompare/icons/crystalsvg
-@dirrm share/apps/kompare/icons
-@dirrm share/apps/kompare
-@dirrm share/apps/kbugbuster/pics
-@dirrm share/apps/kbugbuster
-@dirrm share/apps/kbabeldict/modules
-@dirrm share/apps/kbabeldict
-@dirrm share/apps/kbabel/pics
-@dirrm share/apps/kbabel/icons/locolor/32x32/actions
-@dirrm share/apps/kbabel/icons/locolor/32x32
-@dirrm share/apps/kbabel/icons/locolor/22x22/actions
-@dirrm share/apps/kbabel/icons/locolor/22x22
-@dirrm share/apps/kbabel/icons/locolor/16x16/actions
-@dirrm share/apps/kbabel/icons/locolor/16x16
-@dirrm share/apps/kbabel/icons/locolor
-@dirrm share/apps/kbabel/icons/hicolor/32x32/actions
-@dirrm share/apps/kbabel/icons/hicolor/32x32
-@dirrm share/apps/kbabel/icons/hicolor/22x22/actions
-@dirrm share/apps/kbabel/icons/hicolor/22x22
-@dirrm share/apps/kbabel/icons/hicolor/16x16/actions
-@dirrm share/apps/kbabel/icons/hicolor/16x16
-@dirrm share/apps/kbabel/icons/hicolor
-@dirrm share/apps/kbabel/icons
-@dirrm share/apps/kbabel
-@dirrm share/apps/kapptemplate/kpartplugin/no-exe
-@dirrm share/apps/kapptemplate/kpartplugin
-@dirrm share/apps/kapptemplate/kpartapp/no-exe
-@dirrm share/apps/kapptemplate/kpartapp
-@dirrm share/apps/kapptemplate/kapp/no-exe
-@dirrm share/apps/kapptemplate/kapp
-@dirrm share/apps/kapptemplate/include
-@dirrm share/apps/kapptemplate/existing
-@dirrm share/apps/kapptemplate/bin
-@dirrm share/apps/kapptemplate/appframework/no-exe
-@dirrm share/apps/kapptemplate/appframework
-@dirrm share/apps/kapptemplate/admin
-@dirrm share/apps/kapptemplate
-@dirrm share/apps/kabc/formats
-@dirrm share/apps/kabc
-@dirrm share/apps/catalogmanager
-@dirrm share/apps
-@dirrm share/applnk/Development
-@dirrm share/applnk
-@dirrm lib/kde3
-@dirrm include/kbabel
diff --git a/devel/kdesdk4/files/plist.cervisia b/devel/kdesdk4/files/plist.cervisia
deleted file mode 100644
index 880ced8785a9..000000000000
--- a/devel/kdesdk4/files/plist.cervisia
+++ /dev/null
@@ -1,9 +0,0 @@
-bin/cervisia
-lib/libcervisia.la
-lib/libcervisia.so
-lib/libcervisia.so.1
-share/applnk/Development/cervisia.desktop
-share/apps/cervisia/cervisiashellui.rc
-share/apps/cervisiapart/cervisiaui.rc
-share/icons/crystalsvg/16x16/apps/cervisia.png
-share/icons/crystalsvg/32x32/apps/cervisia.png
diff --git a/devel/kdesdk4/files/plist.cervisia.rm b/devel/kdesdk4/files/plist.cervisia.rm
deleted file mode 100644
index 1759058f42c0..000000000000
--- a/devel/kdesdk4/files/plist.cervisia.rm
+++ /dev/null
@@ -1,2 +0,0 @@
-@dirrm share/apps/cervisiapart
-@dirrm share/apps/cervisia
diff --git a/devel/kdesdk4/files/plist.base b/devel/kdesdk4/pkg-plist
index 46e3622ded77..7123dd4a6ae7 100644
--- a/devel/kdesdk4/files/plist.base
+++ b/devel/kdesdk4/pkg-plist
@@ -1,5 +1,6 @@
bin/adddebug
bin/catalogmanager
+bin/cervisia
bin/cheatmake
bin/create_cvsignore
bin/create_makefile
@@ -75,6 +76,9 @@ lib/kde3/pothumbnail.so
lib/libcatalogmanager.la
lib/libcatalogmanager.so
lib/libcatalogmanager.so.1
+lib/libcervisia.la
+lib/libcervisia.so
+lib/libcervisia.so.1
lib/libkbabel.la
lib/libkbabel.so
lib/libkbabel.so.1
@@ -91,11 +95,14 @@ lib/libkspy.la
lib/libkspy.so
lib/libkspy.so.1
share/applnk/Development/catalogmanager.desktop
+share/applnk/Development/cervisia.desktop
share/applnk/Development/kbabel.desktop
share/applnk/Development/kbabeldict.desktop
share/applnk/Development/kbugbuster.desktop
share/applnk/Development/kompare.desktop
share/apps/catalogmanager/catalogmanagerui.rc
+share/apps/cervisia/cervisiashellui.rc
+share/apps/cervisiapart/cervisiaui.rc
share/apps/kabc/formats/kdeaccountsplugin.desktop
share/apps/kapptemplate/admin/ChangeLog
share/apps/kapptemplate/admin/Doxyfile.am
@@ -432,12 +439,14 @@ share/doc/HTML/en/kompare/common
share/doc/HTML/en/kompare/index.cache.bz2
share/doc/HTML/en/kompare/index.docbook
share/icons/crystalsvg/16x16/apps/catalogmanager.png
+share/icons/crystalsvg/16x16/apps/cervisia.png
share/icons/crystalsvg/16x16/apps/kbabel.png
share/icons/crystalsvg/16x16/apps/kbabeldict.png
share/icons/crystalsvg/16x16/apps/kbugbuster.png
share/icons/crystalsvg/16x16/apps/kompare.png
share/icons/crystalsvg/16x16/mimetypes/gettext.png
share/icons/crystalsvg/32x32/apps/catalogmanager.png
+share/icons/crystalsvg/32x32/apps/cervisia.png
share/icons/crystalsvg/32x32/apps/kbabel.png
share/icons/crystalsvg/32x32/apps/kbabeldict.png
share/icons/crystalsvg/32x32/mimetypes/gettext.png
@@ -466,3 +475,89 @@ share/services/komparepart.desktop
share/services/pothumbnail.desktop
share/servicetypes/komparenavigationpart.desktop
share/servicetypes/kompareviewpart.desktop
+@dirrm include/kbabel
+@dirrm include
+@dirrm lib/kde3
+@dirrm lib
+@dirrm share/doc/HTML/en/cervisia
+@dirrm share/doc/HTML/en/kompare
+@dirrm share/doc/HTML/en/kbugbuster
+@dirrm share/doc/HTML/en/kbabel
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
+@dirrm share/doc
+@dirrm share/applnk/Development
+@dirrm share/applnk
+@dirrm share/icons/crystalsvg/32x32/apps
+@dirrm share/icons/crystalsvg/32x32/mimetypes
+@dirrm share/icons/crystalsvg/32x32
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/icons/crystalsvg/16x16/mimetypes
+@dirrm share/icons/crystalsvg/16x16
+@dirrm share/icons/crystalsvg/48x48/apps
+@dirrm share/icons/crystalsvg/48x48/mimetypes
+@dirrm share/icons/crystalsvg/48x48
+@dirrm share/icons/crystalsvg
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16/mimetypes
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/32x32/mimetypes
+@dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor
+@dirrm share/icons
+@dirrm share/apps/cervisiapart
+@dirrm share/apps/cervisia
+@dirrm share/apps/kapptemplate/admin
+@dirrm share/apps/kapptemplate/appframework/no-exe
+@dirrm share/apps/kapptemplate/appframework
+@dirrm share/apps/kapptemplate/existing
+@dirrm share/apps/kapptemplate/kapp/no-exe
+@dirrm share/apps/kapptemplate/kapp
+@dirrm share/apps/kapptemplate/kpartapp/no-exe
+@dirrm share/apps/kapptemplate/kpartapp
+@dirrm share/apps/kapptemplate/kpartplugin/no-exe
+@dirrm share/apps/kapptemplate/kpartplugin
+@dirrm share/apps/kapptemplate/bin
+@dirrm share/apps/kapptemplate/include
+@dirrm share/apps/kapptemplate
+@dirrm share/apps/kbabeldict/modules
+@dirrm share/apps/kbabeldict
+@dirrm share/apps/kbabel/pics
+@dirrm share/apps/kbabel/icons/locolor/32x32/actions
+@dirrm share/apps/kbabel/icons/locolor/32x32
+@dirrm share/apps/kbabel/icons/locolor/16x16/actions
+@dirrm share/apps/kbabel/icons/locolor/16x16
+@dirrm share/apps/kbabel/icons/locolor/22x22/actions
+@dirrm share/apps/kbabel/icons/locolor/22x22
+@dirrm share/apps/kbabel/icons/locolor
+@dirrm share/apps/kbabel/icons/hicolor/32x32/actions
+@dirrm share/apps/kbabel/icons/hicolor/32x32
+@dirrm share/apps/kbabel/icons/hicolor/16x16/actions
+@dirrm share/apps/kbabel/icons/hicolor/16x16
+@dirrm share/apps/kbabel/icons/hicolor/22x22/actions
+@dirrm share/apps/kbabel/icons/hicolor/22x22
+@dirrm share/apps/kbabel/icons/hicolor
+@dirrm share/apps/kbabel/icons
+@dirrm share/apps/kbabel
+@dirrm share/apps/catalogmanager
+@dirrm share/apps/kbugbuster/pics
+@dirrm share/apps/kbugbuster
+@dirrm share/apps/kabc/formats
+@dirrm share/apps/kabc
+@dirrm share/apps/komparepart
+@dirrm share/apps/kompare/icons/crystalsvg/16x16/apps
+@dirrm share/apps/kompare/icons/crystalsvg/16x16
+@dirrm share/apps/kompare/icons/crystalsvg
+@dirrm share/apps/kompare/icons/locolor/16x16/apps
+@dirrm share/apps/kompare/icons/locolor/16x16
+@dirrm share/apps/kompare/icons/locolor/32x32/apps
+@dirrm share/apps/kompare/icons/locolor/32x32
+@dirrm share/apps/kompare/icons/locolor
+@dirrm share/apps/kompare/icons
+@dirrm share/apps/kompare
+@dirrm share/apps
+@dirrm share/mimelnk/application
+@dirrm share/mimelnk
+@dirrm share/services
+@dirrm share/servicetypes
diff --git a/french/kde3-i18n/Makefile b/french/kde3-i18n/Makefile
index f4e22e824739..ca5844ebeefd 100644
--- a/french/kde3-i18n/Makefile
+++ b/french/kde3-i18n/Makefile
@@ -7,14 +7,13 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES?= french kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= fr-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/french/kde3-i18n/distinfo b/french/kde3-i18n/distinfo
index 694ef2523139..661523b93081 100644
--- a/french/kde3-i18n/distinfo
+++ b/french/kde3-i18n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-fr-3.1.1.tar.bz2) = 294c74d78127220b4d0e85d34658b9fa
+MD5 (KDE/kde-i18n/kde-i18n-fr-3.1.2.tar.bz2) = 1348a925c2d4392b2fd3890c7e07c517
diff --git a/french/kde3-i18n/pkg-plist b/french/kde3-i18n/pkg-plist
index e769a02f9715..3cbc8e27a732 100644
--- a/french/kde3-i18n/pkg-plist
+++ b/french/kde3-i18n/pkg-plist
@@ -426,7 +426,17 @@ share/doc/HTML/fr/kdebugdialog/index.docbook
share/doc/HTML/fr/kdeprint/add-printer-wiz.docbook
share/doc/HTML/fr/kdeprint/common
share/doc/HTML/fr/kdeprint/cups-config.docbook
+share/doc/HTML/fr/kdeprint/cupsaddprinterwizard1.png
+share/doc/HTML/fr/kdeprint/cupsaddprinterwizard2_backendselection.png
+share/doc/HTML/fr/kdeprint/cupsaddprinterwizard4_networkscan_config.png
share/doc/HTML/fr/kdeprint/cupsoptions.docbook
+share/doc/HTML/fr/kdeprint/cupsserverconfiguration10_browsinggeneral.png
+share/doc/HTML/fr/kdeprint/cupsserverconfiguration1_welcome.png
+share/doc/HTML/fr/kdeprint/cupsserverconfiguration2_general.png
+share/doc/HTML/fr/kdeprint/cupsserverconfiguration3_logging.png
+share/doc/HTML/fr/kdeprint/cupsserverconfiguration4_directories.png
+share/doc/HTML/fr/kdeprint/cupsserverconfiguration6_encryption.png
+share/doc/HTML/fr/kdeprint/cupsserverconfiguration8_networkgeneral.png
share/doc/HTML/fr/kdeprint/extensions.docbook
share/doc/HTML/fr/kdeprint/external-command.docbook
share/doc/HTML/fr/kdeprint/final-word.docbook
@@ -434,6 +444,10 @@ share/doc/HTML/fr/kdeprint/getting-started.docbook
share/doc/HTML/fr/kdeprint/highlights.docbook
share/doc/HTML/fr/kdeprint/index.cache.bz2
share/doc/HTML/fr/kdeprint/index.docbook
+share/doc/HTML/fr/kdeprint/kcron_to_be_printed.png
+share/doc/HTML/fr/kdeprint/kprinter.png
+share/doc/HTML/fr/kdeprint/kprinter_called_from_run_command.png
+share/doc/HTML/fr/kdeprint/kprinter_with_kcron_developer_special.png
share/doc/HTML/fr/kdeprint/lpd.docbook
share/doc/HTML/fr/kdeprint/lpr-bsd.docbook
share/doc/HTML/fr/kdeprint/lprng.docbook
@@ -700,6 +714,9 @@ share/doc/HTML/fr/kjots/index.docbook
share/doc/HTML/fr/kjumpingcube/common
share/doc/HTML/fr/kjumpingcube/index.cache.bz2
share/doc/HTML/fr/kjumpingcube/index.docbook
+share/doc/HTML/fr/klettres/common
+share/doc/HTML/fr/klettres/index.cache.bz2
+share/doc/HTML/fr/klettres/index.docbook
share/doc/HTML/fr/klickety/common
share/doc/HTML/fr/klickety/index.cache.bz2
share/doc/HTML/fr/klickety/index.docbook
@@ -769,11 +786,18 @@ share/doc/HTML/fr/knewsticker/index.cache.bz2
share/doc/HTML/fr/knewsticker/index.docbook
share/doc/HTML/fr/knewsticker/kcmnewsticker-general.png
share/doc/HTML/fr/knewsticker/kcmnewsticker-newssources.png
+share/doc/HTML/fr/knode/commands.docbook
share/doc/HTML/fr/knode/common
share/doc/HTML/fr/knode/credits.docbook
+share/doc/HTML/fr/knode/faq.docbook
+share/doc/HTML/fr/knode/gloss.docbook
share/doc/HTML/fr/knode/index.cache.bz2
share/doc/HTML/fr/knode/index.docbook
+share/doc/HTML/fr/knode/install.docbook
+share/doc/HTML/fr/knode/introduction.docbook
+share/doc/HTML/fr/knode/journey.docbook
share/doc/HTML/fr/knode/knode-cleanup.png
+share/doc/HTML/fr/knode/knode-colors-fonts.png
share/doc/HTML/fr/knode/knode-colors.png
share/doc/HTML/fr/knode/knode-composer-attachments.png
share/doc/HTML/fr/knode/knode-composer-settings.png
@@ -796,6 +820,10 @@ share/doc/HTML/fr/knode/knode-search.png
share/doc/HTML/fr/knode/knode-start.png
share/doc/HTML/fr/knode/knode-subscribe.png
share/doc/HTML/fr/knode/knode-views.png
+share/doc/HTML/fr/knode/more.docbook
+share/doc/HTML/fr/knode/using-firststart.docbook
+share/doc/HTML/fr/knode/using-morefeatures.docbook
+share/doc/HTML/fr/knode/using-subscribing.docbook
share/doc/HTML/fr/knotes/common
share/doc/HTML/fr/knotes/index.cache.bz2
share/doc/HTML/fr/knotes/index.docbook
@@ -1211,6 +1239,9 @@ share/doc/HTML/fr/lisa/index.docbook
share/doc/HTML/fr/lskat/common
share/doc/HTML/fr/lskat/index.cache.bz2
share/doc/HTML/fr/lskat/index.docbook
+share/doc/HTML/fr/megami/common
+share/doc/HTML/fr/megami/index.cache.bz2
+share/doc/HTML/fr/megami/index.docbook
share/doc/HTML/fr/noatun/common
share/doc/HTML/fr/noatun/index.cache.bz2
share/doc/HTML/fr/noatun/index.docbook
@@ -1248,6 +1279,7 @@ share/locale/fr/LC_MESSAGES/desktop_kdesdk.mo
share/locale/fr/LC_MESSAGES/desktop_kdetoys.mo
share/locale/fr/LC_MESSAGES/desktop_kdeutils.mo
share/locale/fr/LC_MESSAGES/dirfilterplugin.mo
+share/locale/fr/LC_MESSAGES/dockbarextension.mo
share/locale/fr/LC_MESSAGES/domtreeviewer.mo
share/locale/fr/LC_MESSAGES/drkonqi.mo
share/locale/fr/LC_MESSAGES/dub.mo
@@ -1471,7 +1503,6 @@ share/locale/fr/LC_MESSAGES/kjots.mo
share/locale/fr/LC_MESSAGES/kjumpingcube.mo
share/locale/fr/LC_MESSAGES/klaptopdaemon.mo
share/locale/fr/LC_MESSAGES/klegacyimport.mo
-share/locale/fr/LC_MESSAGES/kless.mo
share/locale/fr/LC_MESSAGES/klettres.mo
share/locale/fr/LC_MESSAGES/klickety.mo
share/locale/fr/LC_MESSAGES/klines.mo
@@ -1651,6 +1682,7 @@ share/locale/fr/charset
share/locale/fr/entry.desktop
share/locale/fr/flag.png
@dirrm share/doc/HTML/fr/noatun
+@dirrm share/doc/HTML/fr/megami
@dirrm share/doc/HTML/fr/lskat
@dirrm share/doc/HTML/fr/lisa
@dirrm share/doc/HTML/fr/kxconfig
@@ -1733,6 +1765,7 @@ share/locale/fr/flag.png
@dirrm share/doc/HTML/fr/klipper
@dirrm share/doc/HTML/fr/klines
@dirrm share/doc/HTML/fr/klickety
+@dirrm share/doc/HTML/fr/klettres
@dirrm share/doc/HTML/fr/kjumpingcube
@dirrm share/doc/HTML/fr/kjots
@dirrm share/doc/HTML/fr/kit
diff --git a/french/kde4-l10n/Makefile b/french/kde4-l10n/Makefile
index f4e22e824739..ca5844ebeefd 100644
--- a/french/kde4-l10n/Makefile
+++ b/french/kde4-l10n/Makefile
@@ -7,14 +7,13 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES?= french kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= fr-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/french/kde4-l10n/distinfo b/french/kde4-l10n/distinfo
index 694ef2523139..661523b93081 100644
--- a/french/kde4-l10n/distinfo
+++ b/french/kde4-l10n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-fr-3.1.1.tar.bz2) = 294c74d78127220b4d0e85d34658b9fa
+MD5 (KDE/kde-i18n/kde-i18n-fr-3.1.2.tar.bz2) = 1348a925c2d4392b2fd3890c7e07c517
diff --git a/french/kde4-l10n/pkg-plist b/french/kde4-l10n/pkg-plist
index e769a02f9715..3cbc8e27a732 100644
--- a/french/kde4-l10n/pkg-plist
+++ b/french/kde4-l10n/pkg-plist
@@ -426,7 +426,17 @@ share/doc/HTML/fr/kdebugdialog/index.docbook
share/doc/HTML/fr/kdeprint/add-printer-wiz.docbook
share/doc/HTML/fr/kdeprint/common
share/doc/HTML/fr/kdeprint/cups-config.docbook
+share/doc/HTML/fr/kdeprint/cupsaddprinterwizard1.png
+share/doc/HTML/fr/kdeprint/cupsaddprinterwizard2_backendselection.png
+share/doc/HTML/fr/kdeprint/cupsaddprinterwizard4_networkscan_config.png
share/doc/HTML/fr/kdeprint/cupsoptions.docbook
+share/doc/HTML/fr/kdeprint/cupsserverconfiguration10_browsinggeneral.png
+share/doc/HTML/fr/kdeprint/cupsserverconfiguration1_welcome.png
+share/doc/HTML/fr/kdeprint/cupsserverconfiguration2_general.png
+share/doc/HTML/fr/kdeprint/cupsserverconfiguration3_logging.png
+share/doc/HTML/fr/kdeprint/cupsserverconfiguration4_directories.png
+share/doc/HTML/fr/kdeprint/cupsserverconfiguration6_encryption.png
+share/doc/HTML/fr/kdeprint/cupsserverconfiguration8_networkgeneral.png
share/doc/HTML/fr/kdeprint/extensions.docbook
share/doc/HTML/fr/kdeprint/external-command.docbook
share/doc/HTML/fr/kdeprint/final-word.docbook
@@ -434,6 +444,10 @@ share/doc/HTML/fr/kdeprint/getting-started.docbook
share/doc/HTML/fr/kdeprint/highlights.docbook
share/doc/HTML/fr/kdeprint/index.cache.bz2
share/doc/HTML/fr/kdeprint/index.docbook
+share/doc/HTML/fr/kdeprint/kcron_to_be_printed.png
+share/doc/HTML/fr/kdeprint/kprinter.png
+share/doc/HTML/fr/kdeprint/kprinter_called_from_run_command.png
+share/doc/HTML/fr/kdeprint/kprinter_with_kcron_developer_special.png
share/doc/HTML/fr/kdeprint/lpd.docbook
share/doc/HTML/fr/kdeprint/lpr-bsd.docbook
share/doc/HTML/fr/kdeprint/lprng.docbook
@@ -700,6 +714,9 @@ share/doc/HTML/fr/kjots/index.docbook
share/doc/HTML/fr/kjumpingcube/common
share/doc/HTML/fr/kjumpingcube/index.cache.bz2
share/doc/HTML/fr/kjumpingcube/index.docbook
+share/doc/HTML/fr/klettres/common
+share/doc/HTML/fr/klettres/index.cache.bz2
+share/doc/HTML/fr/klettres/index.docbook
share/doc/HTML/fr/klickety/common
share/doc/HTML/fr/klickety/index.cache.bz2
share/doc/HTML/fr/klickety/index.docbook
@@ -769,11 +786,18 @@ share/doc/HTML/fr/knewsticker/index.cache.bz2
share/doc/HTML/fr/knewsticker/index.docbook
share/doc/HTML/fr/knewsticker/kcmnewsticker-general.png
share/doc/HTML/fr/knewsticker/kcmnewsticker-newssources.png
+share/doc/HTML/fr/knode/commands.docbook
share/doc/HTML/fr/knode/common
share/doc/HTML/fr/knode/credits.docbook
+share/doc/HTML/fr/knode/faq.docbook
+share/doc/HTML/fr/knode/gloss.docbook
share/doc/HTML/fr/knode/index.cache.bz2
share/doc/HTML/fr/knode/index.docbook
+share/doc/HTML/fr/knode/install.docbook
+share/doc/HTML/fr/knode/introduction.docbook
+share/doc/HTML/fr/knode/journey.docbook
share/doc/HTML/fr/knode/knode-cleanup.png
+share/doc/HTML/fr/knode/knode-colors-fonts.png
share/doc/HTML/fr/knode/knode-colors.png
share/doc/HTML/fr/knode/knode-composer-attachments.png
share/doc/HTML/fr/knode/knode-composer-settings.png
@@ -796,6 +820,10 @@ share/doc/HTML/fr/knode/knode-search.png
share/doc/HTML/fr/knode/knode-start.png
share/doc/HTML/fr/knode/knode-subscribe.png
share/doc/HTML/fr/knode/knode-views.png
+share/doc/HTML/fr/knode/more.docbook
+share/doc/HTML/fr/knode/using-firststart.docbook
+share/doc/HTML/fr/knode/using-morefeatures.docbook
+share/doc/HTML/fr/knode/using-subscribing.docbook
share/doc/HTML/fr/knotes/common
share/doc/HTML/fr/knotes/index.cache.bz2
share/doc/HTML/fr/knotes/index.docbook
@@ -1211,6 +1239,9 @@ share/doc/HTML/fr/lisa/index.docbook
share/doc/HTML/fr/lskat/common
share/doc/HTML/fr/lskat/index.cache.bz2
share/doc/HTML/fr/lskat/index.docbook
+share/doc/HTML/fr/megami/common
+share/doc/HTML/fr/megami/index.cache.bz2
+share/doc/HTML/fr/megami/index.docbook
share/doc/HTML/fr/noatun/common
share/doc/HTML/fr/noatun/index.cache.bz2
share/doc/HTML/fr/noatun/index.docbook
@@ -1248,6 +1279,7 @@ share/locale/fr/LC_MESSAGES/desktop_kdesdk.mo
share/locale/fr/LC_MESSAGES/desktop_kdetoys.mo
share/locale/fr/LC_MESSAGES/desktop_kdeutils.mo
share/locale/fr/LC_MESSAGES/dirfilterplugin.mo
+share/locale/fr/LC_MESSAGES/dockbarextension.mo
share/locale/fr/LC_MESSAGES/domtreeviewer.mo
share/locale/fr/LC_MESSAGES/drkonqi.mo
share/locale/fr/LC_MESSAGES/dub.mo
@@ -1471,7 +1503,6 @@ share/locale/fr/LC_MESSAGES/kjots.mo
share/locale/fr/LC_MESSAGES/kjumpingcube.mo
share/locale/fr/LC_MESSAGES/klaptopdaemon.mo
share/locale/fr/LC_MESSAGES/klegacyimport.mo
-share/locale/fr/LC_MESSAGES/kless.mo
share/locale/fr/LC_MESSAGES/klettres.mo
share/locale/fr/LC_MESSAGES/klickety.mo
share/locale/fr/LC_MESSAGES/klines.mo
@@ -1651,6 +1682,7 @@ share/locale/fr/charset
share/locale/fr/entry.desktop
share/locale/fr/flag.png
@dirrm share/doc/HTML/fr/noatun
+@dirrm share/doc/HTML/fr/megami
@dirrm share/doc/HTML/fr/lskat
@dirrm share/doc/HTML/fr/lisa
@dirrm share/doc/HTML/fr/kxconfig
@@ -1733,6 +1765,7 @@ share/locale/fr/flag.png
@dirrm share/doc/HTML/fr/klipper
@dirrm share/doc/HTML/fr/klines
@dirrm share/doc/HTML/fr/klickety
+@dirrm share/doc/HTML/fr/klettres
@dirrm share/doc/HTML/fr/kjumpingcube
@dirrm share/doc/HTML/fr/kjots
@dirrm share/doc/HTML/fr/kit
diff --git a/games/kdegames3/distinfo b/games/kdegames3/distinfo
index d7a74fc59e6c..d7b0e911f14a 100644
--- a/games/kdegames3/distinfo
+++ b/games/kdegames3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdegames-3.1.1.tar.bz2) = c7af6a8961bf94257d2d8a319e464693
+MD5 (KDE/kdegames-3.1.2.tar.bz2) = c8174c17dcf66def32653bae63886f22
diff --git a/games/kdegames3/pkg-plist b/games/kdegames3/pkg-plist
index c1d8925757f7..b5294d244996 100644
--- a/games/kdegames3/pkg-plist
+++ b/games/kdegames3/pkg-plist
@@ -2070,9 +2070,6 @@ share/icons/locolor/32x32/apps/lskat.png
share/mimelnk/application/x-kolf.desktop
share/mimelnk/application/x-kourse.desktop
share/services/atlantik.protocol
-@dirrm share/services
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk
@dirrm share/icons/locolor/32x32/apps
@dirrm share/icons/locolor/32x32
@dirrm share/icons/locolor/16x16/apps
@@ -2080,19 +2077,9 @@ share/services/atlantik.protocol
@dirrm share/icons/locolor
@dirrm share/icons/hicolor/32x32/apps
@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor
@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48
@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/32x32/actions
-@dirrm share/icons/crystalsvg/32x32
-@dirrm share/icons/crystalsvg/22x22/actions
-@dirrm share/icons/crystalsvg/22x22
@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/16x16/actions
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
@dirrm share/doc/HTML/en/megami
@dirrm share/doc/HTML/en/lskat
@dirrm share/doc/HTML/en/kwin4
@@ -2122,10 +2109,7 @@ share/services/atlantik.protocol
@dirrm share/doc/HTML/en/katomic
@dirrm share/doc/HTML/en/kasteroids
@dirrm share/doc/HTML/en/atlantik
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
@dirrm share/config/magic
-@dirrm share/config
@dirrm share/apps/megami
@dirrm share/apps/lskat/grafix
@dirrm share/apps/lskat
@@ -2243,7 +2227,6 @@ share/services/atlantik.protocol
@dirrm share/apps/atlantik/icons/crystalsvg
@dirrm share/apps/atlantik/icons
@dirrm share/apps/atlantik
-@dirrm share/apps
@dirrm share/applnk/Toys
@dirrm share/applnk/Games/TacticStrategy
@dirrm share/applnk/Games/Kidsgames
@@ -2251,8 +2234,6 @@ share/services/atlantik.protocol
@dirrm share/applnk/Games/Board
@dirrm share/applnk/Games/Arcade
@dirrm share/applnk/Games
-@dirrm share/applnk
-@dirrm lib/kde3
@dirrm include/kolf
@dirrm include/kgame
@dirrm include/atlantik/ui
diff --git a/games/kdegames4/distinfo b/games/kdegames4/distinfo
index d7a74fc59e6c..d7b0e911f14a 100644
--- a/games/kdegames4/distinfo
+++ b/games/kdegames4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdegames-3.1.1.tar.bz2) = c7af6a8961bf94257d2d8a319e464693
+MD5 (KDE/kdegames-3.1.2.tar.bz2) = c8174c17dcf66def32653bae63886f22
diff --git a/games/kdegames4/pkg-plist b/games/kdegames4/pkg-plist
index c1d8925757f7..b5294d244996 100644
--- a/games/kdegames4/pkg-plist
+++ b/games/kdegames4/pkg-plist
@@ -2070,9 +2070,6 @@ share/icons/locolor/32x32/apps/lskat.png
share/mimelnk/application/x-kolf.desktop
share/mimelnk/application/x-kourse.desktop
share/services/atlantik.protocol
-@dirrm share/services
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk
@dirrm share/icons/locolor/32x32/apps
@dirrm share/icons/locolor/32x32
@dirrm share/icons/locolor/16x16/apps
@@ -2080,19 +2077,9 @@ share/services/atlantik.protocol
@dirrm share/icons/locolor
@dirrm share/icons/hicolor/32x32/apps
@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor
@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48
@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/32x32/actions
-@dirrm share/icons/crystalsvg/32x32
-@dirrm share/icons/crystalsvg/22x22/actions
-@dirrm share/icons/crystalsvg/22x22
@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/16x16/actions
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
@dirrm share/doc/HTML/en/megami
@dirrm share/doc/HTML/en/lskat
@dirrm share/doc/HTML/en/kwin4
@@ -2122,10 +2109,7 @@ share/services/atlantik.protocol
@dirrm share/doc/HTML/en/katomic
@dirrm share/doc/HTML/en/kasteroids
@dirrm share/doc/HTML/en/atlantik
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
@dirrm share/config/magic
-@dirrm share/config
@dirrm share/apps/megami
@dirrm share/apps/lskat/grafix
@dirrm share/apps/lskat
@@ -2243,7 +2227,6 @@ share/services/atlantik.protocol
@dirrm share/apps/atlantik/icons/crystalsvg
@dirrm share/apps/atlantik/icons
@dirrm share/apps/atlantik
-@dirrm share/apps
@dirrm share/applnk/Toys
@dirrm share/applnk/Games/TacticStrategy
@dirrm share/applnk/Games/Kidsgames
@@ -2251,8 +2234,6 @@ share/services/atlantik.protocol
@dirrm share/applnk/Games/Board
@dirrm share/applnk/Games/Arcade
@dirrm share/applnk/Games
-@dirrm share/applnk
-@dirrm lib/kde3
@dirrm include/kolf
@dirrm include/kgame
@dirrm include/atlantik/ui
diff --git a/german/kde3-i18n/Makefile b/german/kde3-i18n/Makefile
index 06ae1b6afe79..8b1db480f9c8 100644
--- a/german/kde3-i18n/Makefile
+++ b/german/kde3-i18n/Makefile
@@ -7,14 +7,13 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES?= german kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= de-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/german/kde3-i18n/distinfo b/german/kde3-i18n/distinfo
index 697dd3ccdd43..8e2d022ee28d 100644
--- a/german/kde3-i18n/distinfo
+++ b/german/kde3-i18n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-de-3.1.1.tar.bz2) = e28015cc3ea7ab7deb74b4ca1e9f5cbb
+MD5 (KDE/kde-i18n/kde-i18n-de-3.1.2.tar.bz2) = 66501e1abb219a457f9d325b3b4ed016
diff --git a/german/kde3-i18n/pkg-plist b/german/kde3-i18n/pkg-plist
index 49c6286187c3..ad67202965b6 100644
--- a/german/kde3-i18n/pkg-plist
+++ b/german/kde3-i18n/pkg-plist
@@ -614,6 +614,9 @@ share/doc/HTML/de/kioslave/telnet.docbook
share/doc/HTML/de/kioslave/thumbnail.docbook
share/doc/HTML/de/kioslave/webdav.docbook
share/doc/HTML/de/kioslave/webdavs.docbook
+share/doc/HTML/de/kit/common
+share/doc/HTML/de/kit/index.cache.bz2
+share/doc/HTML/de/kit/index.docbook
share/doc/HTML/de/kiten/common
share/doc/HTML/de/kiten/index.cache.bz2
share/doc/HTML/de/kiten/index.docbook
@@ -1143,6 +1146,7 @@ share/locale/de/LC_MESSAGES/desktop_kdesdk.mo
share/locale/de/LC_MESSAGES/desktop_kdetoys.mo
share/locale/de/LC_MESSAGES/desktop_kdeutils.mo
share/locale/de/LC_MESSAGES/dirfilterplugin.mo
+share/locale/de/LC_MESSAGES/dockbarextension.mo
share/locale/de/LC_MESSAGES/domtreeviewer.mo
share/locale/de/LC_MESSAGES/drkonqi.mo
share/locale/de/LC_MESSAGES/dub.mo
@@ -1612,6 +1616,7 @@ share/locale/de/flag.png
@dirrm share/doc/HTML/de/kjumpingcube
@dirrm share/doc/HTML/de/kjots
@dirrm share/doc/HTML/de/kiten
+@dirrm share/doc/HTML/de/kit
@dirrm share/doc/HTML/de/kioslave
@dirrm share/doc/HTML/de/kinfocenter/xserver
@dirrm share/doc/HTML/de/kinfocenter/usb
diff --git a/german/kde4-l10n/Makefile b/german/kde4-l10n/Makefile
index 06ae1b6afe79..8b1db480f9c8 100644
--- a/german/kde4-l10n/Makefile
+++ b/german/kde4-l10n/Makefile
@@ -7,14 +7,13 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES?= german kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= de-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/german/kde4-l10n/distinfo b/german/kde4-l10n/distinfo
index 697dd3ccdd43..8e2d022ee28d 100644
--- a/german/kde4-l10n/distinfo
+++ b/german/kde4-l10n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-de-3.1.1.tar.bz2) = e28015cc3ea7ab7deb74b4ca1e9f5cbb
+MD5 (KDE/kde-i18n/kde-i18n-de-3.1.2.tar.bz2) = 66501e1abb219a457f9d325b3b4ed016
diff --git a/german/kde4-l10n/pkg-plist b/german/kde4-l10n/pkg-plist
index 49c6286187c3..ad67202965b6 100644
--- a/german/kde4-l10n/pkg-plist
+++ b/german/kde4-l10n/pkg-plist
@@ -614,6 +614,9 @@ share/doc/HTML/de/kioslave/telnet.docbook
share/doc/HTML/de/kioslave/thumbnail.docbook
share/doc/HTML/de/kioslave/webdav.docbook
share/doc/HTML/de/kioslave/webdavs.docbook
+share/doc/HTML/de/kit/common
+share/doc/HTML/de/kit/index.cache.bz2
+share/doc/HTML/de/kit/index.docbook
share/doc/HTML/de/kiten/common
share/doc/HTML/de/kiten/index.cache.bz2
share/doc/HTML/de/kiten/index.docbook
@@ -1143,6 +1146,7 @@ share/locale/de/LC_MESSAGES/desktop_kdesdk.mo
share/locale/de/LC_MESSAGES/desktop_kdetoys.mo
share/locale/de/LC_MESSAGES/desktop_kdeutils.mo
share/locale/de/LC_MESSAGES/dirfilterplugin.mo
+share/locale/de/LC_MESSAGES/dockbarextension.mo
share/locale/de/LC_MESSAGES/domtreeviewer.mo
share/locale/de/LC_MESSAGES/drkonqi.mo
share/locale/de/LC_MESSAGES/dub.mo
@@ -1612,6 +1616,7 @@ share/locale/de/flag.png
@dirrm share/doc/HTML/de/kjumpingcube
@dirrm share/doc/HTML/de/kjots
@dirrm share/doc/HTML/de/kiten
+@dirrm share/doc/HTML/de/kit
@dirrm share/doc/HTML/de/kioslave
@dirrm share/doc/HTML/de/kinfocenter/xserver
@dirrm share/doc/HTML/de/kinfocenter/usb
diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo
index da101f3721a0..c9dfa5ea5e0a 100644
--- a/graphics/kdegraphics3/distinfo
+++ b/graphics/kdegraphics3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdegraphics-3.1.1.tar.bz2) = c417474e1aa6b7efd9a0233fee81cf71
+MD5 (KDE/kdegraphics-3.1.2.tar.bz2) = 05a791e5b685e35d3e05d23d2d467678
diff --git a/graphics/kdegraphics3/files/patch-kghostview-kgv_miniwidget.cpp b/graphics/kdegraphics3/files/patch-kghostview-kgv_miniwidget.cpp
deleted file mode 100644
index 625e7d5f6f83..000000000000
--- a/graphics/kdegraphics3/files/patch-kghostview-kgv_miniwidget.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
---- kghostview/kgv_miniwidget.cpp.orig Fri Jan 3 05:55:05 2003
-+++ kghostview/kgv_miniwidget.cpp Mon Apr 7 17:01:29 2003
-@@ -293,23 +293,22 @@ void KGVMiniWidget::openPDFFileContinue(
- }
-
- _tmpDSC->close();
-- _pdfFileName = _fileName;
-- _fileName = _tmpDSC->name();
- _format = PDF;
-
-- openPSFile();
-+ openPSFile(_tmpDSC->name());
- }
-
--void KGVMiniWidget::openPSFile()
-+void KGVMiniWidget::openPSFile(const QString &file)
- {
-+ QString fileName = file.isEmpty() ? _fileName : file;
- kdDebug(4500) << "KGVMiniWidget::openPSFile" << endl;
-
-- FILE* fp = fopen( QFile::encodeName( _fileName ), "r");
-+ FILE* fp = fopen( QFile::encodeName( fileName ), "r");
- if( fp == 0 )
- {
- KMessageBox::error( _part->widget(),
- i18n( "<qt>Error opening file <nobr><strong>%1</strong></nobr>: %2</qt>" )
-- .arg( _fileName )
-+ .arg( fileName )
- .arg( strerror( errno ) ) );
- emit canceled( "" );
- return;
-@@ -320,9 +319,7 @@ void KGVMiniWidget::openPSFile()
- _isFileOpen = true;
- scanDSC();
- buildTOC();
-- _psWidget->setFileName( dsc()->isStructured()
-- ? QString::null
-- : _fileName );
-+ _psWidget->setFileName( _fileName, dsc()->isStructured() );
- emit completed();
- }
- }
-@@ -859,6 +856,7 @@ bool KGVMiniWidget::convertFromPDF( cons
- << "-dNOPAUSE"
- << "-dBATCH"
- << "-dSAFER"
-+ << "-dPARANOIDSAFER"
- << "-sDEVICE=pswrite"
- << ( QCString("-sOutputFile=")+QFile::encodeName(saveFileName) )
- << ( QString("-dFirstPage=")+QString::number( firstPage ) )
-@@ -867,7 +865,7 @@ bool KGVMiniWidget::convertFromPDF( cons
- << "save"
- << "pop"
- << "-f"
-- << QFile::encodeName(_pdfFileName);
-+ << QFile::encodeName(_fileName);
-
- /*QValueList<QCString> args = process.args();
- QValueList<QCString>::Iterator it = args.begin();
-@@ -1074,7 +1072,7 @@ void KGVMiniWidget::saveAs()
- QString::null,
- _part->widget(),
- QString::null );
-- if( !KIO::NetAccess::upload( _format == PDF ? _pdfFileName : _fileName,
-+ if( !KIO::NetAccess::upload( _fileName,
- saveURL ) )
- ; // TODO: Proper error dialog
- }
-@@ -1311,10 +1309,16 @@ void Pdf2dsc::run( const QString& pdfNam
-
- _process = new KProcess;
- *_process << _ghostscriptPath
-+ << "-dSAFER"
-+ << "-dPARANOIDSAFER"
-+ << "-dDELAYSAFER"
- << "-dNODISPLAY"
- << "-dQUIET"
- << QString( "-sPDFname=%1" ).arg( pdfName )
- << QString( "-sDSCname=%1" ).arg( dscName )
-+ << "-c"
-+ << "<< /PermitFileReading [ PDFname ] /PermitFileWriting [ DSCname ] /PermitFileControl [] >> setuserparams .locksafe"
-+ << "-f"
- << "pdf2dsc.ps"
- << "-c"
- << "quit";
diff --git a/graphics/kdegraphics3/files/patch-kghostview-kgv_miniwidget.h b/graphics/kdegraphics3/files/patch-kghostview-kgv_miniwidget.h
deleted file mode 100644
index d7b262c7c984..000000000000
--- a/graphics/kdegraphics3/files/patch-kghostview-kgv_miniwidget.h
+++ /dev/null
@@ -1,28 +0,0 @@
---- kghostview/kgv_miniwidget.h.orig Sun Sep 15 23:12:40 2002
-+++ kghostview/kgv_miniwidget.h Mon Apr 7 17:02:48 2003
-@@ -85,7 +85,7 @@ protected:
- void clearTemporaryFiles();
-
- void uncompressFile();
-- void openPSFile();
-+ void openPSFile(const QString &file=QString::null);
-
- protected slots:
- void doOpenFile();
-@@ -116,7 +116,7 @@ protected:
- /*- PRINTING and SAVING ---------------------------------------------------*/
-
- // private data used:
--// Document specific: _dsc, _fileName, _pdfFileName, _format, _origurl
-+// Document specific: _dsc, _fileName, _format, _origurl
- // View specific: _currentPage, _marklist
- // This section only: _printer, _tmpFromPDF
-
-@@ -267,7 +267,6 @@ private:
- int _visiblePage;
-
- QString _fileName;
-- QString _pdfFileName;
- QString _mimetype;
-
- MarkList* _marklist;
diff --git a/graphics/kdegraphics3/files/patch-kghostview-kpswidget.cpp b/graphics/kdegraphics3/files/patch-kghostview-kpswidget.cpp
deleted file mode 100644
index d4b9cd3c6bb4..000000000000
--- a/graphics/kdegraphics3/files/patch-kghostview-kpswidget.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
---- kghostview/kpswidget.cpp.orig Sun Sep 15 23:12:40 2002
-+++ kghostview/kpswidget.cpp Mon Apr 7 17:04:00 2003
-@@ -309,10 +309,11 @@ void KPSWidget::setGhostscriptArguments(
- }
- }
-
--void KPSWidget::setFileName( const QString& fileName )
-+void KPSWidget::setFileName( const QString& fileName, bool usePipe )
- {
-- if( _fileName != fileName )
-+ if(( _fileName != fileName ) || (_usePipe != usePipe))
- {
-+ _usePipe = usePipe;
- _fileName = fileName;
- stopInterpreter();
- _ghostscriptDirty = true;
-@@ -508,8 +509,11 @@ void KPSWidget::startInterpreter()
- for( ; it != _ghostscriptArguments.end(); ++it )
- *_process << (*it);
-
-- if( _fileName.isEmpty() )
-- *_process << "-";
-+ if( _usePipe )
-+ *_process <<
-+ // The following two lines are their to ensure that we are allowed to read _fileName
-+ "-dDELAYSAFER" << "-sInputFile="+_fileName << "-c" <<
-+ "<< /PermitFileReading [ InputFile ] /PermitFileWriting [] /PermitFileControl [] >> setuserparams .locksafe";
- else
- *_process << _fileName << "-c" << "quit";
-
-@@ -527,7 +531,7 @@ void KPSWidget::startInterpreter()
- // Finally fire up the interpreter.
- kdDebug(4500) << "KPSWidget: starting interpreter" << endl;
- if( _process->start( KProcess::NotifyOnExit,
-- _fileName.isEmpty() ? KProcess::All : KProcess::AllOutput ) )
-+ _usePipe ? KProcess::All : KProcess::AllOutput ) )
- {
- _interpreterBusy = true;
- setCursor( waitCursor );
-@@ -648,7 +652,7 @@ void KPSWidget::readSettings()
- if( !intConfig->platformFonts() )
- arguments << "-dNOPLATFONTS";
-
-- arguments << "-dNOPAUSE" << "-dQUIET" << "-dSAFER";
-+ arguments << "-dNOPAUSE" << "-dQUIET" << "-dSAFER" << "-dPARANOIDSAFER";
-
- setGhostscriptArguments( arguments );
-
diff --git a/graphics/kdegraphics3/files/patch-kghostview-kpswidget.h b/graphics/kdegraphics3/files/patch-kghostview-kpswidget.h
deleted file mode 100644
index e8dbbeeb1915..000000000000
--- a/graphics/kdegraphics3/files/patch-kghostview-kpswidget.h
+++ /dev/null
@@ -1,25 +0,0 @@
---- kghostview/kpswidget.h.orig Sun Sep 15 23:12:40 2002
-+++ kghostview/kpswidget.h Mon Apr 7 17:05:04 2003
-@@ -134,10 +134,11 @@ public:
- bool sendPS( FILE*, unsigned int begin, unsigned int end );
-
- /**
-- * Sets the filename of the ghostscript input. Usually we use a pipe for
-- * communication and no filename will be needed.
-+ * Sets the filename of the ghostscript input.
-+ * @p usePipe indicates whether we use a pipe for
-+ * communication or let ghoscript read the file itself.
- */
-- void setFileName( const QString& );
-+ void setFileName( const QString&, bool usePipe );
-
- /**
- * Set the bounding box of the drawable. See my comment in the source
-@@ -243,6 +244,7 @@ private:
- QString _ghostscriptPath;
- QStringList _ghostscriptArguments;
- QString _fileName;
-+ bool _usePipe;
-
- /**
- * Flag set when one of the properties _ghostscriptPath,
diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo
index da101f3721a0..c9dfa5ea5e0a 100644
--- a/graphics/kdegraphics4/distinfo
+++ b/graphics/kdegraphics4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdegraphics-3.1.1.tar.bz2) = c417474e1aa6b7efd9a0233fee81cf71
+MD5 (KDE/kdegraphics-3.1.2.tar.bz2) = 05a791e5b685e35d3e05d23d2d467678
diff --git a/graphics/kdegraphics4/files/patch-kghostview-kgv_miniwidget.cpp b/graphics/kdegraphics4/files/patch-kghostview-kgv_miniwidget.cpp
deleted file mode 100644
index 625e7d5f6f83..000000000000
--- a/graphics/kdegraphics4/files/patch-kghostview-kgv_miniwidget.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
---- kghostview/kgv_miniwidget.cpp.orig Fri Jan 3 05:55:05 2003
-+++ kghostview/kgv_miniwidget.cpp Mon Apr 7 17:01:29 2003
-@@ -293,23 +293,22 @@ void KGVMiniWidget::openPDFFileContinue(
- }
-
- _tmpDSC->close();
-- _pdfFileName = _fileName;
-- _fileName = _tmpDSC->name();
- _format = PDF;
-
-- openPSFile();
-+ openPSFile(_tmpDSC->name());
- }
-
--void KGVMiniWidget::openPSFile()
-+void KGVMiniWidget::openPSFile(const QString &file)
- {
-+ QString fileName = file.isEmpty() ? _fileName : file;
- kdDebug(4500) << "KGVMiniWidget::openPSFile" << endl;
-
-- FILE* fp = fopen( QFile::encodeName( _fileName ), "r");
-+ FILE* fp = fopen( QFile::encodeName( fileName ), "r");
- if( fp == 0 )
- {
- KMessageBox::error( _part->widget(),
- i18n( "<qt>Error opening file <nobr><strong>%1</strong></nobr>: %2</qt>" )
-- .arg( _fileName )
-+ .arg( fileName )
- .arg( strerror( errno ) ) );
- emit canceled( "" );
- return;
-@@ -320,9 +319,7 @@ void KGVMiniWidget::openPSFile()
- _isFileOpen = true;
- scanDSC();
- buildTOC();
-- _psWidget->setFileName( dsc()->isStructured()
-- ? QString::null
-- : _fileName );
-+ _psWidget->setFileName( _fileName, dsc()->isStructured() );
- emit completed();
- }
- }
-@@ -859,6 +856,7 @@ bool KGVMiniWidget::convertFromPDF( cons
- << "-dNOPAUSE"
- << "-dBATCH"
- << "-dSAFER"
-+ << "-dPARANOIDSAFER"
- << "-sDEVICE=pswrite"
- << ( QCString("-sOutputFile=")+QFile::encodeName(saveFileName) )
- << ( QString("-dFirstPage=")+QString::number( firstPage ) )
-@@ -867,7 +865,7 @@ bool KGVMiniWidget::convertFromPDF( cons
- << "save"
- << "pop"
- << "-f"
-- << QFile::encodeName(_pdfFileName);
-+ << QFile::encodeName(_fileName);
-
- /*QValueList<QCString> args = process.args();
- QValueList<QCString>::Iterator it = args.begin();
-@@ -1074,7 +1072,7 @@ void KGVMiniWidget::saveAs()
- QString::null,
- _part->widget(),
- QString::null );
-- if( !KIO::NetAccess::upload( _format == PDF ? _pdfFileName : _fileName,
-+ if( !KIO::NetAccess::upload( _fileName,
- saveURL ) )
- ; // TODO: Proper error dialog
- }
-@@ -1311,10 +1309,16 @@ void Pdf2dsc::run( const QString& pdfNam
-
- _process = new KProcess;
- *_process << _ghostscriptPath
-+ << "-dSAFER"
-+ << "-dPARANOIDSAFER"
-+ << "-dDELAYSAFER"
- << "-dNODISPLAY"
- << "-dQUIET"
- << QString( "-sPDFname=%1" ).arg( pdfName )
- << QString( "-sDSCname=%1" ).arg( dscName )
-+ << "-c"
-+ << "<< /PermitFileReading [ PDFname ] /PermitFileWriting [ DSCname ] /PermitFileControl [] >> setuserparams .locksafe"
-+ << "-f"
- << "pdf2dsc.ps"
- << "-c"
- << "quit";
diff --git a/graphics/kdegraphics4/files/patch-kghostview-kgv_miniwidget.h b/graphics/kdegraphics4/files/patch-kghostview-kgv_miniwidget.h
deleted file mode 100644
index d7b262c7c984..000000000000
--- a/graphics/kdegraphics4/files/patch-kghostview-kgv_miniwidget.h
+++ /dev/null
@@ -1,28 +0,0 @@
---- kghostview/kgv_miniwidget.h.orig Sun Sep 15 23:12:40 2002
-+++ kghostview/kgv_miniwidget.h Mon Apr 7 17:02:48 2003
-@@ -85,7 +85,7 @@ protected:
- void clearTemporaryFiles();
-
- void uncompressFile();
-- void openPSFile();
-+ void openPSFile(const QString &file=QString::null);
-
- protected slots:
- void doOpenFile();
-@@ -116,7 +116,7 @@ protected:
- /*- PRINTING and SAVING ---------------------------------------------------*/
-
- // private data used:
--// Document specific: _dsc, _fileName, _pdfFileName, _format, _origurl
-+// Document specific: _dsc, _fileName, _format, _origurl
- // View specific: _currentPage, _marklist
- // This section only: _printer, _tmpFromPDF
-
-@@ -267,7 +267,6 @@ private:
- int _visiblePage;
-
- QString _fileName;
-- QString _pdfFileName;
- QString _mimetype;
-
- MarkList* _marklist;
diff --git a/graphics/kdegraphics4/files/patch-kghostview-kpswidget.cpp b/graphics/kdegraphics4/files/patch-kghostview-kpswidget.cpp
deleted file mode 100644
index d4b9cd3c6bb4..000000000000
--- a/graphics/kdegraphics4/files/patch-kghostview-kpswidget.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
---- kghostview/kpswidget.cpp.orig Sun Sep 15 23:12:40 2002
-+++ kghostview/kpswidget.cpp Mon Apr 7 17:04:00 2003
-@@ -309,10 +309,11 @@ void KPSWidget::setGhostscriptArguments(
- }
- }
-
--void KPSWidget::setFileName( const QString& fileName )
-+void KPSWidget::setFileName( const QString& fileName, bool usePipe )
- {
-- if( _fileName != fileName )
-+ if(( _fileName != fileName ) || (_usePipe != usePipe))
- {
-+ _usePipe = usePipe;
- _fileName = fileName;
- stopInterpreter();
- _ghostscriptDirty = true;
-@@ -508,8 +509,11 @@ void KPSWidget::startInterpreter()
- for( ; it != _ghostscriptArguments.end(); ++it )
- *_process << (*it);
-
-- if( _fileName.isEmpty() )
-- *_process << "-";
-+ if( _usePipe )
-+ *_process <<
-+ // The following two lines are their to ensure that we are allowed to read _fileName
-+ "-dDELAYSAFER" << "-sInputFile="+_fileName << "-c" <<
-+ "<< /PermitFileReading [ InputFile ] /PermitFileWriting [] /PermitFileControl [] >> setuserparams .locksafe";
- else
- *_process << _fileName << "-c" << "quit";
-
-@@ -527,7 +531,7 @@ void KPSWidget::startInterpreter()
- // Finally fire up the interpreter.
- kdDebug(4500) << "KPSWidget: starting interpreter" << endl;
- if( _process->start( KProcess::NotifyOnExit,
-- _fileName.isEmpty() ? KProcess::All : KProcess::AllOutput ) )
-+ _usePipe ? KProcess::All : KProcess::AllOutput ) )
- {
- _interpreterBusy = true;
- setCursor( waitCursor );
-@@ -648,7 +652,7 @@ void KPSWidget::readSettings()
- if( !intConfig->platformFonts() )
- arguments << "-dNOPLATFONTS";
-
-- arguments << "-dNOPAUSE" << "-dQUIET" << "-dSAFER";
-+ arguments << "-dNOPAUSE" << "-dQUIET" << "-dSAFER" << "-dPARANOIDSAFER";
-
- setGhostscriptArguments( arguments );
-
diff --git a/graphics/kdegraphics4/files/patch-kghostview-kpswidget.h b/graphics/kdegraphics4/files/patch-kghostview-kpswidget.h
deleted file mode 100644
index e8dbbeeb1915..000000000000
--- a/graphics/kdegraphics4/files/patch-kghostview-kpswidget.h
+++ /dev/null
@@ -1,25 +0,0 @@
---- kghostview/kpswidget.h.orig Sun Sep 15 23:12:40 2002
-+++ kghostview/kpswidget.h Mon Apr 7 17:05:04 2003
-@@ -134,10 +134,11 @@ public:
- bool sendPS( FILE*, unsigned int begin, unsigned int end );
-
- /**
-- * Sets the filename of the ghostscript input. Usually we use a pipe for
-- * communication and no filename will be needed.
-+ * Sets the filename of the ghostscript input.
-+ * @p usePipe indicates whether we use a pipe for
-+ * communication or let ghoscript read the file itself.
- */
-- void setFileName( const QString& );
-+ void setFileName( const QString&, bool usePipe );
-
- /**
- * Set the bounding box of the drawable. See my comment in the source
-@@ -243,6 +244,7 @@ private:
- QString _ghostscriptPath;
- QStringList _ghostscriptArguments;
- QString _fileName;
-+ bool _usePipe;
-
- /**
- * Flag set when one of the properties _ghostscriptPath,
diff --git a/hebrew/kde3-i18n/Makefile b/hebrew/kde3-i18n/Makefile
index 22d3672c8c74..e9eaec57bb69 100644
--- a/hebrew/kde3-i18n/Makefile
+++ b/hebrew/kde3-i18n/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= hebrew kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= he-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/hebrew/kde3-i18n/distinfo b/hebrew/kde3-i18n/distinfo
index 07498ca0f832..5b320ceecd28 100644
--- a/hebrew/kde3-i18n/distinfo
+++ b/hebrew/kde3-i18n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-he-3.1.1.tar.bz2) = 03e7d57291092d5f751d1c529c8a8acc
+MD5 (KDE/kde-i18n/kde-i18n-he-3.1.2.tar.bz2) = 801cd1120efae7271a28b28ef7702452
diff --git a/hebrew/kde3-i18n/pkg-plist b/hebrew/kde3-i18n/pkg-plist
index b33d7b3088db..a6b81504ffcd 100644
--- a/hebrew/kde3-i18n/pkg-plist
+++ b/hebrew/kde3-i18n/pkg-plist
@@ -88,12 +88,14 @@ share/locale/he/LC_MESSAGES/desktop_kdesdk.mo
share/locale/he/LC_MESSAGES/desktop_kdetoys.mo
share/locale/he/LC_MESSAGES/desktop_kdeutils.mo
share/locale/he/LC_MESSAGES/dirfilterplugin.mo
+share/locale/he/LC_MESSAGES/dockbarextension.mo
share/locale/he/LC_MESSAGES/domtreeviewer.mo
share/locale/he/LC_MESSAGES/drkonqi.mo
share/locale/he/LC_MESSAGES/dub.mo
share/locale/he/LC_MESSAGES/extensionproxy.mo
share/locale/he/LC_MESSAGES/ffrs.mo
share/locale/he/LC_MESSAGES/filetypes.mo
+share/locale/he/LC_MESSAGES/flashkard.mo
share/locale/he/LC_MESSAGES/fontinst.mo
share/locale/he/LC_MESSAGES/htmlsearch.mo
share/locale/he/LC_MESSAGES/imagerename_plugin.mo
diff --git a/hebrew/kde4-l10n/Makefile b/hebrew/kde4-l10n/Makefile
index 22d3672c8c74..e9eaec57bb69 100644
--- a/hebrew/kde4-l10n/Makefile
+++ b/hebrew/kde4-l10n/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= hebrew kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= he-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/hebrew/kde4-l10n/distinfo b/hebrew/kde4-l10n/distinfo
index 07498ca0f832..5b320ceecd28 100644
--- a/hebrew/kde4-l10n/distinfo
+++ b/hebrew/kde4-l10n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-he-3.1.1.tar.bz2) = 03e7d57291092d5f751d1c529c8a8acc
+MD5 (KDE/kde-i18n/kde-i18n-he-3.1.2.tar.bz2) = 801cd1120efae7271a28b28ef7702452
diff --git a/hebrew/kde4-l10n/pkg-plist b/hebrew/kde4-l10n/pkg-plist
index b33d7b3088db..a6b81504ffcd 100644
--- a/hebrew/kde4-l10n/pkg-plist
+++ b/hebrew/kde4-l10n/pkg-plist
@@ -88,12 +88,14 @@ share/locale/he/LC_MESSAGES/desktop_kdesdk.mo
share/locale/he/LC_MESSAGES/desktop_kdetoys.mo
share/locale/he/LC_MESSAGES/desktop_kdeutils.mo
share/locale/he/LC_MESSAGES/dirfilterplugin.mo
+share/locale/he/LC_MESSAGES/dockbarextension.mo
share/locale/he/LC_MESSAGES/domtreeviewer.mo
share/locale/he/LC_MESSAGES/drkonqi.mo
share/locale/he/LC_MESSAGES/dub.mo
share/locale/he/LC_MESSAGES/extensionproxy.mo
share/locale/he/LC_MESSAGES/ffrs.mo
share/locale/he/LC_MESSAGES/filetypes.mo
+share/locale/he/LC_MESSAGES/flashkard.mo
share/locale/he/LC_MESSAGES/fontinst.mo
share/locale/he/LC_MESSAGES/htmlsearch.mo
share/locale/he/LC_MESSAGES/imagerename_plugin.mo
diff --git a/hungarian/kde3-i18n/Makefile b/hungarian/kde3-i18n/Makefile
index e79434e2915d..3ae317546743 100644
--- a/hungarian/kde3-i18n/Makefile
+++ b/hungarian/kde3-i18n/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= hungarian kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= hu-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/hungarian/kde3-i18n/distinfo b/hungarian/kde3-i18n/distinfo
index 23d76b361d6f..c4adabf97592 100644
--- a/hungarian/kde3-i18n/distinfo
+++ b/hungarian/kde3-i18n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-hu-3.1.1.tar.bz2) = fdcc5e9b4a29938de5cdf0282650d33f
+MD5 (KDE/kde-i18n/kde-i18n-hu-3.1.2.tar.bz2) = 27625442dbc4de75f69b4039811f1a27
diff --git a/hungarian/kde4-l10n/Makefile b/hungarian/kde4-l10n/Makefile
index e79434e2915d..3ae317546743 100644
--- a/hungarian/kde4-l10n/Makefile
+++ b/hungarian/kde4-l10n/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= hungarian kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= hu-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/hungarian/kde4-l10n/distinfo b/hungarian/kde4-l10n/distinfo
index 23d76b361d6f..c4adabf97592 100644
--- a/hungarian/kde4-l10n/distinfo
+++ b/hungarian/kde4-l10n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-hu-3.1.1.tar.bz2) = fdcc5e9b4a29938de5cdf0282650d33f
+MD5 (KDE/kde-i18n/kde-i18n-hu-3.1.2.tar.bz2) = 27625442dbc4de75f69b4039811f1a27
diff --git a/japanese/kde3-i18n/Makefile b/japanese/kde3-i18n/Makefile
index db0199067764..de86fb67b9e2 100644
--- a/japanese/kde3-i18n/Makefile
+++ b/japanese/kde3-i18n/Makefile
@@ -7,14 +7,13 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES?= japanese kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= ja-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/japanese/kde3-i18n/distinfo b/japanese/kde3-i18n/distinfo
index b0822b2de560..f0c2b069c4d6 100644
--- a/japanese/kde3-i18n/distinfo
+++ b/japanese/kde3-i18n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-ja-3.1.1.tar.bz2) = be9449d4b413b66fde96cdeac987e285
+MD5 (KDE/kde-i18n/kde-i18n-ja-3.1.2.tar.bz2) = ef47f677e5d10ab907a9e0844544ba40
diff --git a/japanese/kde3-i18n/pkg-plist b/japanese/kde3-i18n/pkg-plist
index b312a61579fd..a2ab3aec4206 100644
--- a/japanese/kde3-i18n/pkg-plist
+++ b/japanese/kde3-i18n/pkg-plist
@@ -256,12 +256,14 @@ share/locale/ja/LC_MESSAGES/desktop_kdesdk.mo
share/locale/ja/LC_MESSAGES/desktop_kdetoys.mo
share/locale/ja/LC_MESSAGES/desktop_kdeutils.mo
share/locale/ja/LC_MESSAGES/dirfilterplugin.mo
+share/locale/ja/LC_MESSAGES/dockbarextension.mo
share/locale/ja/LC_MESSAGES/domtreeviewer.mo
share/locale/ja/LC_MESSAGES/drkonqi.mo
share/locale/ja/LC_MESSAGES/dub.mo
share/locale/ja/LC_MESSAGES/extensionproxy.mo
share/locale/ja/LC_MESSAGES/ffrs.mo
share/locale/ja/LC_MESSAGES/filetypes.mo
+share/locale/ja/LC_MESSAGES/flashkard.mo
share/locale/ja/LC_MESSAGES/fontinst.mo
share/locale/ja/LC_MESSAGES/gideon.mo
share/locale/ja/LC_MESSAGES/htmlsearch.mo
@@ -481,6 +483,7 @@ share/locale/ja/LC_MESSAGES/klock.mo
share/locale/ja/LC_MESSAGES/kmahjongg.mo
share/locale/ja/LC_MESSAGES/kmail.mo
share/locale/ja/LC_MESSAGES/kmailcvt.mo
+share/locale/ja/LC_MESSAGES/kmathtool.mo
share/locale/ja/LC_MESSAGES/kmcop.mo
share/locale/ja/LC_MESSAGES/kmenuedit.mo
share/locale/ja/LC_MESSAGES/kmessedwords.mo
@@ -490,6 +493,7 @@ share/locale/ja/LC_MESSAGES/kmines.mo
share/locale/ja/LC_MESSAGES/kminipagerapplet.mo
share/locale/ja/LC_MESSAGES/kmix.mo
share/locale/ja/LC_MESSAGES/kmoon.mo
+share/locale/ja/LC_MESSAGES/kmplot.mo
share/locale/ja/LC_MESSAGES/kmrml.mo
share/locale/ja/LC_MESSAGES/knewsticker.mo
share/locale/ja/LC_MESSAGES/knode.mo
@@ -514,10 +518,12 @@ share/locale/ja/LC_MESSAGES/kpaint.mo
share/locale/ja/LC_MESSAGES/kpartapp.mo
share/locale/ja/LC_MESSAGES/kpartsaver.mo
share/locale/ja/LC_MESSAGES/kpat.mo
+share/locale/ja/LC_MESSAGES/kpercentage.mo
share/locale/ja/LC_MESSAGES/kpersonalizer.mo
share/locale/ja/LC_MESSAGES/kpf.mo
share/locale/ja/LC_MESSAGES/kpilot.mo
share/locale/ja/LC_MESSAGES/kpoker.mo
+share/locale/ja/LC_MESSAGES/kpovmodeler.mo
share/locale/ja/LC_MESSAGES/kppp.mo
share/locale/ja/LC_MESSAGES/kppplogview.mo
share/locale/ja/LC_MESSAGES/kprinter.mo
@@ -569,6 +575,7 @@ share/locale/ja/LC_MESSAGES/ktux.mo
share/locale/ja/LC_MESSAGES/kuick_plugin.mo
share/locale/ja/LC_MESSAGES/kuickshow.mo
share/locale/ja/LC_MESSAGES/kuser.mo
+share/locale/ja/LC_MESSAGES/kverbos.mo
share/locale/ja/LC_MESSAGES/kview.mo
share/locale/ja/LC_MESSAGES/kview_scale.mo
share/locale/ja/LC_MESSAGES/kviewbrowserplugin.mo
diff --git a/japanese/kde4-l10n/Makefile b/japanese/kde4-l10n/Makefile
index db0199067764..de86fb67b9e2 100644
--- a/japanese/kde4-l10n/Makefile
+++ b/japanese/kde4-l10n/Makefile
@@ -7,14 +7,13 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES?= japanese kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= ja-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/japanese/kde4-l10n/distinfo b/japanese/kde4-l10n/distinfo
index b0822b2de560..f0c2b069c4d6 100644
--- a/japanese/kde4-l10n/distinfo
+++ b/japanese/kde4-l10n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-ja-3.1.1.tar.bz2) = be9449d4b413b66fde96cdeac987e285
+MD5 (KDE/kde-i18n/kde-i18n-ja-3.1.2.tar.bz2) = ef47f677e5d10ab907a9e0844544ba40
diff --git a/japanese/kde4-l10n/pkg-plist b/japanese/kde4-l10n/pkg-plist
index b312a61579fd..a2ab3aec4206 100644
--- a/japanese/kde4-l10n/pkg-plist
+++ b/japanese/kde4-l10n/pkg-plist
@@ -256,12 +256,14 @@ share/locale/ja/LC_MESSAGES/desktop_kdesdk.mo
share/locale/ja/LC_MESSAGES/desktop_kdetoys.mo
share/locale/ja/LC_MESSAGES/desktop_kdeutils.mo
share/locale/ja/LC_MESSAGES/dirfilterplugin.mo
+share/locale/ja/LC_MESSAGES/dockbarextension.mo
share/locale/ja/LC_MESSAGES/domtreeviewer.mo
share/locale/ja/LC_MESSAGES/drkonqi.mo
share/locale/ja/LC_MESSAGES/dub.mo
share/locale/ja/LC_MESSAGES/extensionproxy.mo
share/locale/ja/LC_MESSAGES/ffrs.mo
share/locale/ja/LC_MESSAGES/filetypes.mo
+share/locale/ja/LC_MESSAGES/flashkard.mo
share/locale/ja/LC_MESSAGES/fontinst.mo
share/locale/ja/LC_MESSAGES/gideon.mo
share/locale/ja/LC_MESSAGES/htmlsearch.mo
@@ -481,6 +483,7 @@ share/locale/ja/LC_MESSAGES/klock.mo
share/locale/ja/LC_MESSAGES/kmahjongg.mo
share/locale/ja/LC_MESSAGES/kmail.mo
share/locale/ja/LC_MESSAGES/kmailcvt.mo
+share/locale/ja/LC_MESSAGES/kmathtool.mo
share/locale/ja/LC_MESSAGES/kmcop.mo
share/locale/ja/LC_MESSAGES/kmenuedit.mo
share/locale/ja/LC_MESSAGES/kmessedwords.mo
@@ -490,6 +493,7 @@ share/locale/ja/LC_MESSAGES/kmines.mo
share/locale/ja/LC_MESSAGES/kminipagerapplet.mo
share/locale/ja/LC_MESSAGES/kmix.mo
share/locale/ja/LC_MESSAGES/kmoon.mo
+share/locale/ja/LC_MESSAGES/kmplot.mo
share/locale/ja/LC_MESSAGES/kmrml.mo
share/locale/ja/LC_MESSAGES/knewsticker.mo
share/locale/ja/LC_MESSAGES/knode.mo
@@ -514,10 +518,12 @@ share/locale/ja/LC_MESSAGES/kpaint.mo
share/locale/ja/LC_MESSAGES/kpartapp.mo
share/locale/ja/LC_MESSAGES/kpartsaver.mo
share/locale/ja/LC_MESSAGES/kpat.mo
+share/locale/ja/LC_MESSAGES/kpercentage.mo
share/locale/ja/LC_MESSAGES/kpersonalizer.mo
share/locale/ja/LC_MESSAGES/kpf.mo
share/locale/ja/LC_MESSAGES/kpilot.mo
share/locale/ja/LC_MESSAGES/kpoker.mo
+share/locale/ja/LC_MESSAGES/kpovmodeler.mo
share/locale/ja/LC_MESSAGES/kppp.mo
share/locale/ja/LC_MESSAGES/kppplogview.mo
share/locale/ja/LC_MESSAGES/kprinter.mo
@@ -569,6 +575,7 @@ share/locale/ja/LC_MESSAGES/ktux.mo
share/locale/ja/LC_MESSAGES/kuick_plugin.mo
share/locale/ja/LC_MESSAGES/kuickshow.mo
share/locale/ja/LC_MESSAGES/kuser.mo
+share/locale/ja/LC_MESSAGES/kverbos.mo
share/locale/ja/LC_MESSAGES/kview.mo
share/locale/ja/LC_MESSAGES/kview_scale.mo
share/locale/ja/LC_MESSAGES/kviewbrowserplugin.mo
diff --git a/korean/kde3-i18n/Makefile b/korean/kde3-i18n/Makefile
index b1dd1b92c91e..66825ce19538 100644
--- a/korean/kde3-i18n/Makefile
+++ b/korean/kde3-i18n/Makefile
@@ -10,11 +10,11 @@ PORTVERSION= 3.0.5
PORTREVISION= 1
CATEGORIES?= korean kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}a/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}a/src/kde-i18n
PKGNAMEPREFIX= ko-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/korean/kde4-l10n/Makefile b/korean/kde4-l10n/Makefile
index b1dd1b92c91e..66825ce19538 100644
--- a/korean/kde4-l10n/Makefile
+++ b/korean/kde4-l10n/Makefile
@@ -10,11 +10,11 @@ PORTVERSION= 3.0.5
PORTREVISION= 1
CATEGORIES?= korean kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}a/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}a/src/kde-i18n
PKGNAMEPREFIX= ko-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo
index d93b5e24f10b..b21b9d66641b 100644
--- a/math/kcalc/distinfo
+++ b/math/kcalc/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.1.tar.bz2) = fd2fef424ffb3de13e4fc8d55b995b73
+MD5 (KDE/kdeutils-3.1.2.tar.bz2) = 49611a79b2d77cf6e9913ffb445fa209
diff --git a/misc/kde3-i18n-af/Makefile b/misc/kde3-i18n-af/Makefile
index 8e6c1ce36123..c89923f3d193 100644
--- a/misc/kde3-i18n-af/Makefile
+++ b/misc/kde3-i18n-af/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= af-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-af/distinfo b/misc/kde3-i18n-af/distinfo
index 1f27b9afe137..78a76c2bc446 100644
--- a/misc/kde3-i18n-af/distinfo
+++ b/misc/kde3-i18n-af/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-af-3.1.1.tar.bz2) = 1d6d1d62a9d6735a4de32e3abc28321e
+MD5 (KDE/kde-i18n/kde-i18n-af-3.1.2.tar.bz2) = 4eeec749935541959c40db75931db419
diff --git a/misc/kde3-i18n-ar/Makefile b/misc/kde3-i18n-ar/Makefile
index ae0b4323ca49..2976fff8aff7 100644
--- a/misc/kde3-i18n-ar/Makefile
+++ b/misc/kde3-i18n-ar/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= ar-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-ar/distinfo b/misc/kde3-i18n-ar/distinfo
index beb3ed7b076e..2514c3b3bfc8 100644
--- a/misc/kde3-i18n-ar/distinfo
+++ b/misc/kde3-i18n-ar/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-ar-3.1.1.tar.bz2) = 3355c77de993a7928cdb637ce2f8b763
+MD5 (KDE/kde-i18n/kde-i18n-ar-3.1.2.tar.bz2) = 72248ac70109ac64f76aaadf3cffe7a6
diff --git a/misc/kde3-i18n-az/Makefile b/misc/kde3-i18n-az/Makefile
index 1f1ada828daa..70aceb6ace24 100644
--- a/misc/kde3-i18n-az/Makefile
+++ b/misc/kde3-i18n-az/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= 3.0.5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}a/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}a/src/kde-i18n
PKGNAMEPREFIX= az-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-bg/Makefile b/misc/kde3-i18n-bg/Makefile
index 6b27c08c3fac..ac6bb938a537 100644
--- a/misc/kde3-i18n-bg/Makefile
+++ b/misc/kde3-i18n-bg/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= bg-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-bg/distinfo b/misc/kde3-i18n-bg/distinfo
index 4419ccc40c2a..c092bf609562 100644
--- a/misc/kde3-i18n-bg/distinfo
+++ b/misc/kde3-i18n-bg/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-bg-3.1.1.tar.bz2) = b2966d43c13cca9bced746349612ce5f
+MD5 (KDE/kde-i18n/kde-i18n-bg-3.1.2.tar.bz2) = 9cbe2501e3e5ed7e7e4be2a4a0451a00
diff --git a/misc/kde3-i18n-bs/Makefile b/misc/kde3-i18n-bs/Makefile
index f1ac57e4445e..66a4309969f3 100644
--- a/misc/kde3-i18n-bs/Makefile
+++ b/misc/kde3-i18n-bs/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= bs-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-bs/distinfo b/misc/kde3-i18n-bs/distinfo
index 78a044ff2875..4853e0bdfd97 100644
--- a/misc/kde3-i18n-bs/distinfo
+++ b/misc/kde3-i18n-bs/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-bs-3.1.1.tar.bz2) = 930a9f10189c858a9e4a9c9ab5d1dc61
+MD5 (KDE/kde-i18n/kde-i18n-bs-3.1.2.tar.bz2) = 8931c75c281aae92f9ba29b7accfb462
diff --git a/misc/kde3-i18n-ca/Makefile b/misc/kde3-i18n-ca/Makefile
index 1d5b3639c6a9..1b6b17c9eeff 100644
--- a/misc/kde3-i18n-ca/Makefile
+++ b/misc/kde3-i18n-ca/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= ca-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-ca/distinfo b/misc/kde3-i18n-ca/distinfo
index 979b6d954b67..7f49c75f5195 100644
--- a/misc/kde3-i18n-ca/distinfo
+++ b/misc/kde3-i18n-ca/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-ca-3.1.1.tar.bz2) = 402d70a0e3d8c5a5edcf94086f9574aa
+MD5 (KDE/kde-i18n/kde-i18n-ca-3.1.2.tar.bz2) = 1295564b05984c83f8f97ba8a249c922
diff --git a/misc/kde3-i18n-cs/Makefile b/misc/kde3-i18n-cs/Makefile
index 44d432595d5a..1c5c24ed0338 100644
--- a/misc/kde3-i18n-cs/Makefile
+++ b/misc/kde3-i18n-cs/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= cs-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-cs/distinfo b/misc/kde3-i18n-cs/distinfo
index 14f657d20de3..ad29fa1ec734 100644
--- a/misc/kde3-i18n-cs/distinfo
+++ b/misc/kde3-i18n-cs/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-cs-3.1.1.tar.bz2) = 98a8b6a945e7e29c453caf0898a7602a
+MD5 (KDE/kde-i18n/kde-i18n-cs-3.1.2.tar.bz2) = 65e8cde8a24bb433b5441f2555a499a7
diff --git a/misc/kde3-i18n-da/Makefile b/misc/kde3-i18n-da/Makefile
index 23604627c5fe..a69e5304a828 100644
--- a/misc/kde3-i18n-da/Makefile
+++ b/misc/kde3-i18n-da/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= da-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-da/distinfo b/misc/kde3-i18n-da/distinfo
index 27f6b3cd78e6..a3b0d61421a5 100644
--- a/misc/kde3-i18n-da/distinfo
+++ b/misc/kde3-i18n-da/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-da-3.1.1.tar.bz2) = 73ea9bf7fa90b8abe6837cf7fdf82ae4
+MD5 (KDE/kde-i18n/kde-i18n-da-3.1.2.tar.bz2) = ad6af39d5a73aeb0e2731bc8a2ed36b5
diff --git a/misc/kde3-i18n-el/Makefile b/misc/kde3-i18n-el/Makefile
index ae5fdb0e1eca..8e5c0ece414f 100644
--- a/misc/kde3-i18n-el/Makefile
+++ b/misc/kde3-i18n-el/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= el-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-el/distinfo b/misc/kde3-i18n-el/distinfo
index 395f3330f566..11310e953611 100644
--- a/misc/kde3-i18n-el/distinfo
+++ b/misc/kde3-i18n-el/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-el-3.1.1.tar.bz2) = f96f5c5ed7f47bc5505bce6d10231d9b
+MD5 (KDE/kde-i18n/kde-i18n-el-3.1.2.tar.bz2) = b11e589e19fb1b47caccbedc8a7b2045
diff --git a/misc/kde3-i18n-en_GB/Makefile b/misc/kde3-i18n-en_GB/Makefile
index d161ad7058c8..28d80930542e 100644
--- a/misc/kde3-i18n-en_GB/Makefile
+++ b/misc/kde3-i18n-en_GB/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= en_GB-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-en_GB/distinfo b/misc/kde3-i18n-en_GB/distinfo
index 3bbd7b7f9047..a9302cde64d8 100644
--- a/misc/kde3-i18n-en_GB/distinfo
+++ b/misc/kde3-i18n-en_GB/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-en_GB-3.1.1.tar.bz2) = ec475be42a1d98c28edb6f79646d20b0
+MD5 (KDE/kde-i18n/kde-i18n-en_GB-3.1.2.tar.bz2) = 6aacdc352eda2427dfa0106d0b0cc073
diff --git a/misc/kde3-i18n-eo/Makefile b/misc/kde3-i18n-eo/Makefile
index ab61f55c729c..353ca070fd54 100644
--- a/misc/kde3-i18n-eo/Makefile
+++ b/misc/kde3-i18n-eo/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= eo-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-eo/distinfo b/misc/kde3-i18n-eo/distinfo
index 6dd214984a31..267c5bf6c2f7 100644
--- a/misc/kde3-i18n-eo/distinfo
+++ b/misc/kde3-i18n-eo/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-eo-3.1.1.tar.bz2) = bfac6b727a2894cb9dff4b2876b62352
+MD5 (KDE/kde-i18n/kde-i18n-eo-3.1.2.tar.bz2) = 4c81058ebf15ef46e15c2012b983502d
diff --git a/misc/kde3-i18n-es/Makefile b/misc/kde3-i18n-es/Makefile
index 0046d02abc6b..b1a6ccaa1397 100644
--- a/misc/kde3-i18n-es/Makefile
+++ b/misc/kde3-i18n-es/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= es-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-es/distinfo b/misc/kde3-i18n-es/distinfo
index cde029ecf675..42933553f7d9 100644
--- a/misc/kde3-i18n-es/distinfo
+++ b/misc/kde3-i18n-es/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-es-3.1.1.tar.bz2) = c74a3535048bbb35cd5fed6a1ea491ca
+MD5 (KDE/kde-i18n/kde-i18n-es-3.1.2.tar.bz2) = 6146b543a59c90e6d2b87041b731fee6
diff --git a/misc/kde3-i18n-et/Makefile b/misc/kde3-i18n-et/Makefile
index d6768c47dfbd..cc070da505e0 100644
--- a/misc/kde3-i18n-et/Makefile
+++ b/misc/kde3-i18n-et/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= et-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-et/distinfo b/misc/kde3-i18n-et/distinfo
index ebe3acab0201..f2d0219d9b05 100644
--- a/misc/kde3-i18n-et/distinfo
+++ b/misc/kde3-i18n-et/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-et-3.1.1.tar.bz2) = c1de988ba9b16f0f8629cfa33dd38997
+MD5 (KDE/kde-i18n/kde-i18n-et-3.1.2.tar.bz2) = c816ab5f3ce18294b4806f583b8f459b
diff --git a/misc/kde3-i18n-fi/Makefile b/misc/kde3-i18n-fi/Makefile
index 60512fdad268..8a02e0e6178c 100644
--- a/misc/kde3-i18n-fi/Makefile
+++ b/misc/kde3-i18n-fi/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= fi-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-fi/distinfo b/misc/kde3-i18n-fi/distinfo
index 35784b658a24..cf326af05497 100644
--- a/misc/kde3-i18n-fi/distinfo
+++ b/misc/kde3-i18n-fi/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-fi-3.1.1.tar.bz2) = 59696fd038bd2dcc6569a1769d8a409e
+MD5 (KDE/kde-i18n/kde-i18n-fi-3.1.2.tar.bz2) = 747dd8f0a6a0c656a73cd7f29dfaa77e
diff --git a/misc/kde3-i18n-hr/Makefile b/misc/kde3-i18n-hr/Makefile
index 9220108d6145..2c2ef94d6b02 100644
--- a/misc/kde3-i18n-hr/Makefile
+++ b/misc/kde3-i18n-hr/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= hr-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-hr/distinfo b/misc/kde3-i18n-hr/distinfo
index b7214dbb96f8..17106b0cee9b 100644
--- a/misc/kde3-i18n-hr/distinfo
+++ b/misc/kde3-i18n-hr/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-hr-3.1.1.tar.bz2) = 5e993259495d05fde1a64b05fc86ff85
+MD5 (KDE/kde-i18n/kde-i18n-hr-3.1.2.tar.bz2) = e2041f8c00df147a7368e46e9066bcc6
diff --git a/misc/kde3-i18n-id/Makefile b/misc/kde3-i18n-id/Makefile
index 2a7b0b88c847..a022cb5699d2 100644
--- a/misc/kde3-i18n-id/Makefile
+++ b/misc/kde3-i18n-id/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= 3.0.5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}a/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}a/src/kde-i18n
PKGNAMEPREFIX= id-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-is/Makefile b/misc/kde3-i18n-is/Makefile
index 5fbba0aa7237..17702fc2e249 100644
--- a/misc/kde3-i18n-is/Makefile
+++ b/misc/kde3-i18n-is/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= is-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-is/distinfo b/misc/kde3-i18n-is/distinfo
index a57351aedf48..19e1ce115bad 100644
--- a/misc/kde3-i18n-is/distinfo
+++ b/misc/kde3-i18n-is/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-is-3.1.1.tar.bz2) = ccd310be5c72f5fef3116f73f3313a85
+MD5 (KDE/kde-i18n/kde-i18n-is-3.1.2.tar.bz2) = 103b4a5176bfe673aef18d5da2099043
diff --git a/misc/kde3-i18n-it/Makefile b/misc/kde3-i18n-it/Makefile
index a269a71a0755..34c25a906deb 100644
--- a/misc/kde3-i18n-it/Makefile
+++ b/misc/kde3-i18n-it/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= it-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-it/distinfo b/misc/kde3-i18n-it/distinfo
index 8f6da93587d9..ff09d84d38d8 100644
--- a/misc/kde3-i18n-it/distinfo
+++ b/misc/kde3-i18n-it/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-it-3.1.1.tar.bz2) = 126ab7bf9f3eebc9b688aff976ed5765
+MD5 (KDE/kde-i18n/kde-i18n-it-3.1.2.tar.bz2) = 084a6e00afa65430cf9fdbad62e58877
diff --git a/misc/kde3-i18n-lt/Makefile b/misc/kde3-i18n-lt/Makefile
index 6f9fb0f08f65..00eaca27b12d 100644
--- a/misc/kde3-i18n-lt/Makefile
+++ b/misc/kde3-i18n-lt/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= lt-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-lt/distinfo b/misc/kde3-i18n-lt/distinfo
index b975e83ae92f..06fd410c3e6a 100644
--- a/misc/kde3-i18n-lt/distinfo
+++ b/misc/kde3-i18n-lt/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-lt-3.1.1.tar.bz2) = 5964a73455ce8b3e2e0cf0bb46557967
+MD5 (KDE/kde-i18n/kde-i18n-lt-3.1.2.tar.bz2) = 4d8cddef4f80e4542e5992cab8088d1c
diff --git a/misc/kde3-i18n-lv/Makefile b/misc/kde3-i18n-lv/Makefile
index 551ee9736860..19346864686e 100644
--- a/misc/kde3-i18n-lv/Makefile
+++ b/misc/kde3-i18n-lv/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= 3.0.5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}a/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}a/src/kde-i18n
PKGNAMEPREFIX= lv-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-mt/Makefile b/misc/kde3-i18n-mt/Makefile
index efc6d9b8c72d..9b0f03920d23 100644
--- a/misc/kde3-i18n-mt/Makefile
+++ b/misc/kde3-i18n-mt/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= mt-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-mt/distinfo b/misc/kde3-i18n-mt/distinfo
index b6359a4cb472..7ecedd876d66 100644
--- a/misc/kde3-i18n-mt/distinfo
+++ b/misc/kde3-i18n-mt/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-mt-3.1.1.tar.bz2) = 971b11c978926adb58b10690ff2037d6
+MD5 (KDE/kde-i18n/kde-i18n-mt-3.1.2.tar.bz2) = c0d0b20c7f9ff1b39cba5867e4594d9a
diff --git a/misc/kde3-i18n-nb/Makefile b/misc/kde3-i18n-nb/Makefile
index 16deb853d15c..5408b4a68ae5 100644
--- a/misc/kde3-i18n-nb/Makefile
+++ b/misc/kde3-i18n-nb/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= nb-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-nb/distinfo b/misc/kde3-i18n-nb/distinfo
index c7ea932d7926..473ebf333943 100644
--- a/misc/kde3-i18n-nb/distinfo
+++ b/misc/kde3-i18n-nb/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-nb-3.1.1.tar.bz2) = 95b3c02498b767b3727fb645f5550246
+MD5 (KDE/kde-i18n/kde-i18n-nb-3.1.2.tar.bz2) = 3aa6b4d829e0558f0fb483db96aa25c6
diff --git a/misc/kde3-i18n-nl/Makefile b/misc/kde3-i18n-nl/Makefile
index 1fe003ff4a68..984cb9761591 100644
--- a/misc/kde3-i18n-nl/Makefile
+++ b/misc/kde3-i18n-nl/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= nl-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-nl/distinfo b/misc/kde3-i18n-nl/distinfo
index 99da2477729f..ce5f0b8fa2e6 100644
--- a/misc/kde3-i18n-nl/distinfo
+++ b/misc/kde3-i18n-nl/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-nl-3.1.1.tar.bz2) = 80f1b5cc43f35de999f25fb151cae08f
+MD5 (KDE/kde-i18n/kde-i18n-nl-3.1.2.tar.bz2) = 5448d0c8300a2e0c999db297987ae1bb
diff --git a/misc/kde3-i18n-nn/Makefile b/misc/kde3-i18n-nn/Makefile
index f673edb15c41..df452df47eb2 100644
--- a/misc/kde3-i18n-nn/Makefile
+++ b/misc/kde3-i18n-nn/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= nn-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-nn/distinfo b/misc/kde3-i18n-nn/distinfo
index bbc926f87116..972aea4d68e4 100644
--- a/misc/kde3-i18n-nn/distinfo
+++ b/misc/kde3-i18n-nn/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-nn-3.1.1.tar.bz2) = fd6b45b63fcd2080dd1b489c5ccb0c82
+MD5 (KDE/kde-i18n/kde-i18n-nn-3.1.2.tar.bz2) = 2a7bd23fca7638acb4a7a7f0316f2fcb
diff --git a/misc/kde3-i18n-pl/Makefile b/misc/kde3-i18n-pl/Makefile
index 7cf5bd533b4e..cc785c2ff049 100644
--- a/misc/kde3-i18n-pl/Makefile
+++ b/misc/kde3-i18n-pl/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= pl-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-pl/distinfo b/misc/kde3-i18n-pl/distinfo
index 4e6df3e847f2..d0ca0dced9cf 100644
--- a/misc/kde3-i18n-pl/distinfo
+++ b/misc/kde3-i18n-pl/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-pl-3.1.1.tar.bz2) = ee352e35ab26285aa4b026ceae4b936b
+MD5 (KDE/kde-i18n/kde-i18n-pl-3.1.2.tar.bz2) = 940e3e57ab4d5c52e1ff3d1667f6ea2b
diff --git a/misc/kde3-i18n-ro/Makefile b/misc/kde3-i18n-ro/Makefile
index 9a5cbee8ae93..0a69146f1795 100644
--- a/misc/kde3-i18n-ro/Makefile
+++ b/misc/kde3-i18n-ro/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= ro-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-ro/distinfo b/misc/kde3-i18n-ro/distinfo
index 64c59d7e8416..0015f905cd39 100644
--- a/misc/kde3-i18n-ro/distinfo
+++ b/misc/kde3-i18n-ro/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-ro-3.1.1.tar.bz2) = 6bddedd8dba1b28a066e3e51a511c868
+MD5 (KDE/kde-i18n/kde-i18n-ro-3.1.2.tar.bz2) = d8cafbc44c8473a9601aa88b5122d820
diff --git a/misc/kde3-i18n-sk/Makefile b/misc/kde3-i18n-sk/Makefile
index 8c99a58498f3..026c64020765 100644
--- a/misc/kde3-i18n-sk/Makefile
+++ b/misc/kde3-i18n-sk/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= sk-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-sk/distinfo b/misc/kde3-i18n-sk/distinfo
index 252eaf3d175b..43b40be19835 100644
--- a/misc/kde3-i18n-sk/distinfo
+++ b/misc/kde3-i18n-sk/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-sk-3.1.1.tar.bz2) = 8351ba1e6695001aa8588542514fe601
+MD5 (KDE/kde-i18n/kde-i18n-sk-3.1.2.tar.bz2) = 9ec78c95637913119b9e2200ad2b46cd
diff --git a/misc/kde3-i18n-sl/Makefile b/misc/kde3-i18n-sl/Makefile
index ba74d8090bfb..b787e66ca080 100644
--- a/misc/kde3-i18n-sl/Makefile
+++ b/misc/kde3-i18n-sl/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= sl-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-sl/distinfo b/misc/kde3-i18n-sl/distinfo
index b47963e930fb..49a30ea257ea 100644
--- a/misc/kde3-i18n-sl/distinfo
+++ b/misc/kde3-i18n-sl/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-sl-3.1.1.tar.bz2) = 8e04c0dcb67f9236cff5f5f4fdb98377
+MD5 (KDE/kde-i18n/kde-i18n-sl-3.1.2.tar.bz2) = db97068d185b8a5a7af2f0223d42df49
diff --git a/misc/kde3-i18n-sr/Makefile b/misc/kde3-i18n-sr/Makefile
index 80b7d358ba78..4db8233aa16d 100644
--- a/misc/kde3-i18n-sr/Makefile
+++ b/misc/kde3-i18n-sr/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= sr-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-sr/distinfo b/misc/kde3-i18n-sr/distinfo
index 747ca552d5ed..ffe7fe973940 100644
--- a/misc/kde3-i18n-sr/distinfo
+++ b/misc/kde3-i18n-sr/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-sr-3.1.1.tar.bz2) = 6fdf6c0e728d8b9905415e7e07eb0ca2
+MD5 (KDE/kde-i18n/kde-i18n-sr-3.1.2.tar.bz2) = 92172da0498e4b487dfd2b3598e92863
diff --git a/misc/kde3-i18n-sv/Makefile b/misc/kde3-i18n-sv/Makefile
index a4662eca34a7..76aa993f6011 100644
--- a/misc/kde3-i18n-sv/Makefile
+++ b/misc/kde3-i18n-sv/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= sv-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-sv/distinfo b/misc/kde3-i18n-sv/distinfo
index 2644e3c62aab..2266a3e29825 100644
--- a/misc/kde3-i18n-sv/distinfo
+++ b/misc/kde3-i18n-sv/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-sv-3.1.1.tar.bz2) = 1f38f2b304030cdb35b9581a2544a528
+MD5 (KDE/kde-i18n/kde-i18n-sv-3.1.2.tar.bz2) = 54d6ce473969ac165863adc302d92100
diff --git a/misc/kde3-i18n-ta/Makefile b/misc/kde3-i18n-ta/Makefile
index ea58cb9e24dd..c8f039fc2f05 100644
--- a/misc/kde3-i18n-ta/Makefile
+++ b/misc/kde3-i18n-ta/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= ta-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-ta/distinfo b/misc/kde3-i18n-ta/distinfo
index 02fabdc5d7f0..a7189e535a8d 100644
--- a/misc/kde3-i18n-ta/distinfo
+++ b/misc/kde3-i18n-ta/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-ta-3.1.1.tar.bz2) = 46b7f09e2041343a5e8ca7b3ac544693
+MD5 (KDE/kde-i18n/kde-i18n-ta-3.1.2.tar.bz2) = 96ce17c9bf6ee9eb3893b5cd96d058a9
diff --git a/misc/kde3-i18n-th/Makefile b/misc/kde3-i18n-th/Makefile
index 2de621a146a9..936542944511 100644
--- a/misc/kde3-i18n-th/Makefile
+++ b/misc/kde3-i18n-th/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= th-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-th/distinfo b/misc/kde3-i18n-th/distinfo
index c250e351b7a9..208a5aac640e 100644
--- a/misc/kde3-i18n-th/distinfo
+++ b/misc/kde3-i18n-th/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-th-3.1.1.tar.bz2) = fd1f0164621c6ac7f6eb41dfc285a5a5
+MD5 (KDE/kde-i18n/kde-i18n-th-3.1.2.tar.bz2) = 741ad6b9f7cd6fee9f33d545cc5e9b98
diff --git a/misc/kde3-i18n-tr/Makefile b/misc/kde3-i18n-tr/Makefile
index 3b627c5e3725..52927a0e8ee5 100644
--- a/misc/kde3-i18n-tr/Makefile
+++ b/misc/kde3-i18n-tr/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= tr-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-tr/distinfo b/misc/kde3-i18n-tr/distinfo
index e35ab41f8bf8..fdb0ee9dc019 100644
--- a/misc/kde3-i18n-tr/distinfo
+++ b/misc/kde3-i18n-tr/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-tr-3.1.1.tar.bz2) = 8c84d2232cf5298cfa461559f5633d2c
+MD5 (KDE/kde-i18n/kde-i18n-tr-3.1.2.tar.bz2) = 9e62f9b13bc1d5d96944d6d86d35ea9e
diff --git a/misc/kde3-i18n-ven/Makefile b/misc/kde3-i18n-ven/Makefile
index 49c2c64b8f6b..21a1c5625dda 100644
--- a/misc/kde3-i18n-ven/Makefile
+++ b/misc/kde3-i18n-ven/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= ven-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-ven/distinfo b/misc/kde3-i18n-ven/distinfo
index f40470d70717..83f171b4c397 100644
--- a/misc/kde3-i18n-ven/distinfo
+++ b/misc/kde3-i18n-ven/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-ven-3.1.1.tar.bz2) = 3d3cde91f3ef9bc46b4920c085211ad3
+MD5 (KDE/kde-i18n/kde-i18n-ven-3.1.2.tar.bz2) = 071724c9c515e3cecd18a751a2eaad51
diff --git a/misc/kde3-i18n-xh/Makefile b/misc/kde3-i18n-xh/Makefile
index 7d2c0fd491d1..89360b755538 100644
--- a/misc/kde3-i18n-xh/Makefile
+++ b/misc/kde3-i18n-xh/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= xh-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-xh/distinfo b/misc/kde3-i18n-xh/distinfo
index ac39864d428c..a7fee82a561f 100644
--- a/misc/kde3-i18n-xh/distinfo
+++ b/misc/kde3-i18n-xh/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-xh-3.1.1.tar.bz2) = da51a1f83d22cdbfb39e727e7e0e8adc
+MD5 (KDE/kde-i18n/kde-i18n-xh-3.1.2.tar.bz2) = 5a2c127993434e48d7fa031dcf04c65f
diff --git a/misc/kde3-i18n-zu/Makefile b/misc/kde3-i18n-zu/Makefile
index 2bbeded6ad31..1eae5e12e625 100644
--- a/misc/kde3-i18n-zu/Makefile
+++ b/misc/kde3-i18n-zu/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= zu-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-zu/distinfo b/misc/kde3-i18n-zu/distinfo
index 4cabe0f2705c..9c98e9af13c2 100644
--- a/misc/kde3-i18n-zu/distinfo
+++ b/misc/kde3-i18n-zu/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-zu-3.1.1.tar.bz2) = ab1db9cf84bd6eca5cb3fb1250da66d6
+MD5 (KDE/kde-i18n/kde-i18n-zu-3.1.2.tar.bz2) = a5ed8610c371f9ee660999c93ab32d55
diff --git a/misc/kde3-i18n/Makefile b/misc/kde3-i18n/Makefile
index 60b7ee22324e..ec9947539f0c 100644
--- a/misc/kde3-i18n/Makefile
+++ b/misc/kde3-i18n/Makefile
@@ -16,27 +16,27 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE
RUN_DEPENDS+=\
- ${PREFIX}/share/locale/de/entry.desktop:${PORTSDIR}/german/kde3-i18n \
- ${PREFIX}/share/locale/fr/entry.desktop:${PORTSDIR}/french/kde3-i18n \
- ${PREFIX}/share/locale/he/entry.desktop:${PORTSDIR}/hebrew/kde3-i18n \
- ${PREFIX}/share/locale/hu/entry.desktop:${PORTSDIR}/hungarian/kde3-i18n \
- ${PREFIX}/share/locale/ja/entry.desktop:${PORTSDIR}/japanese/kde3-i18n \
- ${PREFIX}/share/locale/ko/entry.desktop:${PORTSDIR}/korean/kde3-i18n \
- ${PREFIX}/share/locale/ru/entry.desktop:${PORTSDIR}/russian/kde3-i18n \
- ${PREFIX}/share/locale/uk/entry.desktop:${PORTSDIR}/ukrainian/kde3-i18n \
- ${PREFIX}/share/locale/vi/entry.desktop:${PORTSDIR}/vietnamese/kde3-i18n
+ ${LOCALBASE}/share/locale/ja/entry.desktop:${PORTSDIR}/japanese/kde3-i18n \
+ ${LOCALBASE}/share/locale/fr/entry.desktop:${PORTSDIR}/french/kde3-i18n \
+ ${LOCALBASE}/share/locale/de/entry.desktop:${PORTSDIR}/german/kde3-i18n \
+ ${LOCALBASE}/share/locale/he/entry.desktop:${PORTSDIR}/hebrew/kde3-i18n \
+ ${LOCALBASE}/share/locale/hu/entry.desktop:${PORTSDIR}/hungarian/kde3-i18n \
+ ${LOCALBASE}/share/locale/ko/entry.desktop:${PORTSDIR}/korean/kde3-i18n \
+ ${LOCALBASE}/share/locale/ru/entry.desktop:${PORTSDIR}/russian/kde3-i18n \
+ ${LOCALBASE}/share/locale/uk/entry.desktop:${PORTSDIR}/ukrainian/kde3-i18n \
+ ${LOCALBASE}/share/locale/vi/entry.desktop:${PORTSDIR}/vietnamese/kde3-i18n
.for LANG in af ar az bg bs ca cs da el en_GB eo es et fi hr id is it \
lt lv mt nb nl nn pl ro sk sl sr sv ta th tr ven xh zu
RUN_DEPENDS+=\
-${PREFIX}/share/locale/${LANG}/entry.desktop:${PORTSDIR}/misc/kde3-i18n-${LANG}
+${LOCALBASE}/share/locale/${LANG}/entry.desktop:${PORTSDIR}/misc/kde3-i18n-${LANG}
.endfor
RUN_DEPENDS+=\
-${PREFIX}/share/locale/pt/entry.desktop:${PORTSDIR}/portuguese/kde3-i18n \
-${PREFIX}/share/locale/pt_BR/entry.desktop:${PORTSDIR}/portuguese/kde3-i18n-pt_BR
+${LOCALBASE}/share/locale/pt/entry.desktop:${PORTSDIR}/portuguese/kde3-i18n \
+${LOCALBASE}/share/locale/pt_BR/entry.desktop:${PORTSDIR}/portuguese/kde3-i18n-pt_BR
.for ZH in zh_CN zh_TW
RUN_DEPENDS+=\
-${PREFIX}/share/locale/${ZH}/entry.desktop:${PORTSDIR}/chinese/kde3-i18n-${ZH}
+${LOCALBASE}/share/locale/${ZH}/entry.desktop:${PORTSDIR}/chinese/kde3-i18n-${ZH}
.endfor
USE_KDELIBS_VER=3
diff --git a/misc/kde4-i18n-is/Makefile b/misc/kde4-i18n-is/Makefile
index 5fbba0aa7237..17702fc2e249 100644
--- a/misc/kde4-i18n-is/Makefile
+++ b/misc/kde4-i18n-is/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= is-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-i18n-is/distinfo b/misc/kde4-i18n-is/distinfo
index a57351aedf48..19e1ce115bad 100644
--- a/misc/kde4-i18n-is/distinfo
+++ b/misc/kde4-i18n-is/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-is-3.1.1.tar.bz2) = ccd310be5c72f5fef3116f73f3313a85
+MD5 (KDE/kde-i18n/kde-i18n-is-3.1.2.tar.bz2) = 103b4a5176bfe673aef18d5da2099043
diff --git a/misc/kde4-l10n-bg/Makefile b/misc/kde4-l10n-bg/Makefile
index 6b27c08c3fac..ac6bb938a537 100644
--- a/misc/kde4-l10n-bg/Makefile
+++ b/misc/kde4-l10n-bg/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= bg-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-bg/distinfo b/misc/kde4-l10n-bg/distinfo
index 4419ccc40c2a..c092bf609562 100644
--- a/misc/kde4-l10n-bg/distinfo
+++ b/misc/kde4-l10n-bg/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-bg-3.1.1.tar.bz2) = b2966d43c13cca9bced746349612ce5f
+MD5 (KDE/kde-i18n/kde-i18n-bg-3.1.2.tar.bz2) = 9cbe2501e3e5ed7e7e4be2a4a0451a00
diff --git a/misc/kde4-l10n-ca/Makefile b/misc/kde4-l10n-ca/Makefile
index 1d5b3639c6a9..1b6b17c9eeff 100644
--- a/misc/kde4-l10n-ca/Makefile
+++ b/misc/kde4-l10n-ca/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= ca-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-ca/distinfo b/misc/kde4-l10n-ca/distinfo
index 979b6d954b67..7f49c75f5195 100644
--- a/misc/kde4-l10n-ca/distinfo
+++ b/misc/kde4-l10n-ca/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-ca-3.1.1.tar.bz2) = 402d70a0e3d8c5a5edcf94086f9574aa
+MD5 (KDE/kde-i18n/kde-i18n-ca-3.1.2.tar.bz2) = 1295564b05984c83f8f97ba8a249c922
diff --git a/misc/kde4-l10n-cs/Makefile b/misc/kde4-l10n-cs/Makefile
index 44d432595d5a..1c5c24ed0338 100644
--- a/misc/kde4-l10n-cs/Makefile
+++ b/misc/kde4-l10n-cs/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= cs-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-cs/distinfo b/misc/kde4-l10n-cs/distinfo
index 14f657d20de3..ad29fa1ec734 100644
--- a/misc/kde4-l10n-cs/distinfo
+++ b/misc/kde4-l10n-cs/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-cs-3.1.1.tar.bz2) = 98a8b6a945e7e29c453caf0898a7602a
+MD5 (KDE/kde-i18n/kde-i18n-cs-3.1.2.tar.bz2) = 65e8cde8a24bb433b5441f2555a499a7
diff --git a/misc/kde4-l10n-da/Makefile b/misc/kde4-l10n-da/Makefile
index 23604627c5fe..a69e5304a828 100644
--- a/misc/kde4-l10n-da/Makefile
+++ b/misc/kde4-l10n-da/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= da-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-da/distinfo b/misc/kde4-l10n-da/distinfo
index 27f6b3cd78e6..a3b0d61421a5 100644
--- a/misc/kde4-l10n-da/distinfo
+++ b/misc/kde4-l10n-da/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-da-3.1.1.tar.bz2) = 73ea9bf7fa90b8abe6837cf7fdf82ae4
+MD5 (KDE/kde-i18n/kde-i18n-da-3.1.2.tar.bz2) = ad6af39d5a73aeb0e2731bc8a2ed36b5
diff --git a/misc/kde4-l10n-el/Makefile b/misc/kde4-l10n-el/Makefile
index ae5fdb0e1eca..8e5c0ece414f 100644
--- a/misc/kde4-l10n-el/Makefile
+++ b/misc/kde4-l10n-el/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= el-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-el/distinfo b/misc/kde4-l10n-el/distinfo
index 395f3330f566..11310e953611 100644
--- a/misc/kde4-l10n-el/distinfo
+++ b/misc/kde4-l10n-el/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-el-3.1.1.tar.bz2) = f96f5c5ed7f47bc5505bce6d10231d9b
+MD5 (KDE/kde-i18n/kde-i18n-el-3.1.2.tar.bz2) = b11e589e19fb1b47caccbedc8a7b2045
diff --git a/misc/kde4-l10n-en_GB/Makefile b/misc/kde4-l10n-en_GB/Makefile
index d161ad7058c8..28d80930542e 100644
--- a/misc/kde4-l10n-en_GB/Makefile
+++ b/misc/kde4-l10n-en_GB/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= en_GB-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-en_GB/distinfo b/misc/kde4-l10n-en_GB/distinfo
index 3bbd7b7f9047..a9302cde64d8 100644
--- a/misc/kde4-l10n-en_GB/distinfo
+++ b/misc/kde4-l10n-en_GB/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-en_GB-3.1.1.tar.bz2) = ec475be42a1d98c28edb6f79646d20b0
+MD5 (KDE/kde-i18n/kde-i18n-en_GB-3.1.2.tar.bz2) = 6aacdc352eda2427dfa0106d0b0cc073
diff --git a/misc/kde4-l10n-eo/Makefile b/misc/kde4-l10n-eo/Makefile
index ab61f55c729c..353ca070fd54 100644
--- a/misc/kde4-l10n-eo/Makefile
+++ b/misc/kde4-l10n-eo/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= eo-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-eo/distinfo b/misc/kde4-l10n-eo/distinfo
index 6dd214984a31..267c5bf6c2f7 100644
--- a/misc/kde4-l10n-eo/distinfo
+++ b/misc/kde4-l10n-eo/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-eo-3.1.1.tar.bz2) = bfac6b727a2894cb9dff4b2876b62352
+MD5 (KDE/kde-i18n/kde-i18n-eo-3.1.2.tar.bz2) = 4c81058ebf15ef46e15c2012b983502d
diff --git a/misc/kde4-l10n-es/Makefile b/misc/kde4-l10n-es/Makefile
index 0046d02abc6b..b1a6ccaa1397 100644
--- a/misc/kde4-l10n-es/Makefile
+++ b/misc/kde4-l10n-es/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= es-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-es/distinfo b/misc/kde4-l10n-es/distinfo
index cde029ecf675..42933553f7d9 100644
--- a/misc/kde4-l10n-es/distinfo
+++ b/misc/kde4-l10n-es/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-es-3.1.1.tar.bz2) = c74a3535048bbb35cd5fed6a1ea491ca
+MD5 (KDE/kde-i18n/kde-i18n-es-3.1.2.tar.bz2) = 6146b543a59c90e6d2b87041b731fee6
diff --git a/misc/kde4-l10n-et/Makefile b/misc/kde4-l10n-et/Makefile
index d6768c47dfbd..cc070da505e0 100644
--- a/misc/kde4-l10n-et/Makefile
+++ b/misc/kde4-l10n-et/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= et-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-et/distinfo b/misc/kde4-l10n-et/distinfo
index ebe3acab0201..f2d0219d9b05 100644
--- a/misc/kde4-l10n-et/distinfo
+++ b/misc/kde4-l10n-et/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-et-3.1.1.tar.bz2) = c1de988ba9b16f0f8629cfa33dd38997
+MD5 (KDE/kde-i18n/kde-i18n-et-3.1.2.tar.bz2) = c816ab5f3ce18294b4806f583b8f459b
diff --git a/misc/kde4-l10n-fi/Makefile b/misc/kde4-l10n-fi/Makefile
index 60512fdad268..8a02e0e6178c 100644
--- a/misc/kde4-l10n-fi/Makefile
+++ b/misc/kde4-l10n-fi/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= fi-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-fi/distinfo b/misc/kde4-l10n-fi/distinfo
index 35784b658a24..cf326af05497 100644
--- a/misc/kde4-l10n-fi/distinfo
+++ b/misc/kde4-l10n-fi/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-fi-3.1.1.tar.bz2) = 59696fd038bd2dcc6569a1769d8a409e
+MD5 (KDE/kde-i18n/kde-i18n-fi-3.1.2.tar.bz2) = 747dd8f0a6a0c656a73cd7f29dfaa77e
diff --git a/misc/kde4-l10n-is/Makefile b/misc/kde4-l10n-is/Makefile
index 5fbba0aa7237..17702fc2e249 100644
--- a/misc/kde4-l10n-is/Makefile
+++ b/misc/kde4-l10n-is/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= is-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-is/distinfo b/misc/kde4-l10n-is/distinfo
index a57351aedf48..19e1ce115bad 100644
--- a/misc/kde4-l10n-is/distinfo
+++ b/misc/kde4-l10n-is/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-is-3.1.1.tar.bz2) = ccd310be5c72f5fef3116f73f3313a85
+MD5 (KDE/kde-i18n/kde-i18n-is-3.1.2.tar.bz2) = 103b4a5176bfe673aef18d5da2099043
diff --git a/misc/kde4-l10n-it/Makefile b/misc/kde4-l10n-it/Makefile
index a269a71a0755..34c25a906deb 100644
--- a/misc/kde4-l10n-it/Makefile
+++ b/misc/kde4-l10n-it/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= it-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-it/distinfo b/misc/kde4-l10n-it/distinfo
index 8f6da93587d9..ff09d84d38d8 100644
--- a/misc/kde4-l10n-it/distinfo
+++ b/misc/kde4-l10n-it/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-it-3.1.1.tar.bz2) = 126ab7bf9f3eebc9b688aff976ed5765
+MD5 (KDE/kde-i18n/kde-i18n-it-3.1.2.tar.bz2) = 084a6e00afa65430cf9fdbad62e58877
diff --git a/misc/kde4-l10n-lt/Makefile b/misc/kde4-l10n-lt/Makefile
index 6f9fb0f08f65..00eaca27b12d 100644
--- a/misc/kde4-l10n-lt/Makefile
+++ b/misc/kde4-l10n-lt/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= lt-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-lt/distinfo b/misc/kde4-l10n-lt/distinfo
index b975e83ae92f..06fd410c3e6a 100644
--- a/misc/kde4-l10n-lt/distinfo
+++ b/misc/kde4-l10n-lt/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-lt-3.1.1.tar.bz2) = 5964a73455ce8b3e2e0cf0bb46557967
+MD5 (KDE/kde-i18n/kde-i18n-lt-3.1.2.tar.bz2) = 4d8cddef4f80e4542e5992cab8088d1c
diff --git a/misc/kde4-l10n-lv/Makefile b/misc/kde4-l10n-lv/Makefile
index 551ee9736860..19346864686e 100644
--- a/misc/kde4-l10n-lv/Makefile
+++ b/misc/kde4-l10n-lv/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= 3.0.5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}a/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}a/src/kde-i18n
PKGNAMEPREFIX= lv-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-nb/Makefile b/misc/kde4-l10n-nb/Makefile
index 16deb853d15c..5408b4a68ae5 100644
--- a/misc/kde4-l10n-nb/Makefile
+++ b/misc/kde4-l10n-nb/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= nb-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-nb/distinfo b/misc/kde4-l10n-nb/distinfo
index c7ea932d7926..473ebf333943 100644
--- a/misc/kde4-l10n-nb/distinfo
+++ b/misc/kde4-l10n-nb/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-nb-3.1.1.tar.bz2) = 95b3c02498b767b3727fb645f5550246
+MD5 (KDE/kde-i18n/kde-i18n-nb-3.1.2.tar.bz2) = 3aa6b4d829e0558f0fb483db96aa25c6
diff --git a/misc/kde4-l10n-nl/Makefile b/misc/kde4-l10n-nl/Makefile
index 1fe003ff4a68..984cb9761591 100644
--- a/misc/kde4-l10n-nl/Makefile
+++ b/misc/kde4-l10n-nl/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= nl-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-nl/distinfo b/misc/kde4-l10n-nl/distinfo
index 99da2477729f..ce5f0b8fa2e6 100644
--- a/misc/kde4-l10n-nl/distinfo
+++ b/misc/kde4-l10n-nl/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-nl-3.1.1.tar.bz2) = 80f1b5cc43f35de999f25fb151cae08f
+MD5 (KDE/kde-i18n/kde-i18n-nl-3.1.2.tar.bz2) = 5448d0c8300a2e0c999db297987ae1bb
diff --git a/misc/kde4-l10n-nn/Makefile b/misc/kde4-l10n-nn/Makefile
index f673edb15c41..df452df47eb2 100644
--- a/misc/kde4-l10n-nn/Makefile
+++ b/misc/kde4-l10n-nn/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= nn-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-nn/distinfo b/misc/kde4-l10n-nn/distinfo
index bbc926f87116..972aea4d68e4 100644
--- a/misc/kde4-l10n-nn/distinfo
+++ b/misc/kde4-l10n-nn/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-nn-3.1.1.tar.bz2) = fd6b45b63fcd2080dd1b489c5ccb0c82
+MD5 (KDE/kde-i18n/kde-i18n-nn-3.1.2.tar.bz2) = 2a7bd23fca7638acb4a7a7f0316f2fcb
diff --git a/misc/kde4-l10n-ro/Makefile b/misc/kde4-l10n-ro/Makefile
index 9a5cbee8ae93..0a69146f1795 100644
--- a/misc/kde4-l10n-ro/Makefile
+++ b/misc/kde4-l10n-ro/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= ro-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-ro/distinfo b/misc/kde4-l10n-ro/distinfo
index 64c59d7e8416..0015f905cd39 100644
--- a/misc/kde4-l10n-ro/distinfo
+++ b/misc/kde4-l10n-ro/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-ro-3.1.1.tar.bz2) = 6bddedd8dba1b28a066e3e51a511c868
+MD5 (KDE/kde-i18n/kde-i18n-ro-3.1.2.tar.bz2) = d8cafbc44c8473a9601aa88b5122d820
diff --git a/misc/kde4-l10n-sk/Makefile b/misc/kde4-l10n-sk/Makefile
index 8c99a58498f3..026c64020765 100644
--- a/misc/kde4-l10n-sk/Makefile
+++ b/misc/kde4-l10n-sk/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= sk-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-sk/distinfo b/misc/kde4-l10n-sk/distinfo
index 252eaf3d175b..43b40be19835 100644
--- a/misc/kde4-l10n-sk/distinfo
+++ b/misc/kde4-l10n-sk/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-sk-3.1.1.tar.bz2) = 8351ba1e6695001aa8588542514fe601
+MD5 (KDE/kde-i18n/kde-i18n-sk-3.1.2.tar.bz2) = 9ec78c95637913119b9e2200ad2b46cd
diff --git a/misc/kde4-l10n-sl/Makefile b/misc/kde4-l10n-sl/Makefile
index ba74d8090bfb..b787e66ca080 100644
--- a/misc/kde4-l10n-sl/Makefile
+++ b/misc/kde4-l10n-sl/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= sl-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-sl/distinfo b/misc/kde4-l10n-sl/distinfo
index b47963e930fb..49a30ea257ea 100644
--- a/misc/kde4-l10n-sl/distinfo
+++ b/misc/kde4-l10n-sl/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-sl-3.1.1.tar.bz2) = 8e04c0dcb67f9236cff5f5f4fdb98377
+MD5 (KDE/kde-i18n/kde-i18n-sl-3.1.2.tar.bz2) = db97068d185b8a5a7af2f0223d42df49
diff --git a/misc/kde4-l10n-sr/Makefile b/misc/kde4-l10n-sr/Makefile
index 80b7d358ba78..4db8233aa16d 100644
--- a/misc/kde4-l10n-sr/Makefile
+++ b/misc/kde4-l10n-sr/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= sr-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-sr/distinfo b/misc/kde4-l10n-sr/distinfo
index 747ca552d5ed..ffe7fe973940 100644
--- a/misc/kde4-l10n-sr/distinfo
+++ b/misc/kde4-l10n-sr/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-sr-3.1.1.tar.bz2) = 6fdf6c0e728d8b9905415e7e07eb0ca2
+MD5 (KDE/kde-i18n/kde-i18n-sr-3.1.2.tar.bz2) = 92172da0498e4b487dfd2b3598e92863
diff --git a/misc/kde4-l10n-sv/Makefile b/misc/kde4-l10n-sv/Makefile
index a4662eca34a7..76aa993f6011 100644
--- a/misc/kde4-l10n-sv/Makefile
+++ b/misc/kde4-l10n-sv/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= sv-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-sv/distinfo b/misc/kde4-l10n-sv/distinfo
index 2644e3c62aab..2266a3e29825 100644
--- a/misc/kde4-l10n-sv/distinfo
+++ b/misc/kde4-l10n-sv/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-sv-3.1.1.tar.bz2) = 1f38f2b304030cdb35b9581a2544a528
+MD5 (KDE/kde-i18n/kde-i18n-sv-3.1.2.tar.bz2) = 54d6ce473969ac165863adc302d92100
diff --git a/misc/kde4-l10n-ta/Makefile b/misc/kde4-l10n-ta/Makefile
index ea58cb9e24dd..c8f039fc2f05 100644
--- a/misc/kde4-l10n-ta/Makefile
+++ b/misc/kde4-l10n-ta/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= ta-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-ta/distinfo b/misc/kde4-l10n-ta/distinfo
index 02fabdc5d7f0..a7189e535a8d 100644
--- a/misc/kde4-l10n-ta/distinfo
+++ b/misc/kde4-l10n-ta/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-ta-3.1.1.tar.bz2) = 46b7f09e2041343a5e8ca7b3ac544693
+MD5 (KDE/kde-i18n/kde-i18n-ta-3.1.2.tar.bz2) = 96ce17c9bf6ee9eb3893b5cd96d058a9
diff --git a/misc/kde4-l10n-th/Makefile b/misc/kde4-l10n-th/Makefile
index 2de621a146a9..936542944511 100644
--- a/misc/kde4-l10n-th/Makefile
+++ b/misc/kde4-l10n-th/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= th-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-th/distinfo b/misc/kde4-l10n-th/distinfo
index c250e351b7a9..208a5aac640e 100644
--- a/misc/kde4-l10n-th/distinfo
+++ b/misc/kde4-l10n-th/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-th-3.1.1.tar.bz2) = fd1f0164621c6ac7f6eb41dfc285a5a5
+MD5 (KDE/kde-i18n/kde-i18n-th-3.1.2.tar.bz2) = 741ad6b9f7cd6fee9f33d545cc5e9b98
diff --git a/misc/kde4-l10n-tr/Makefile b/misc/kde4-l10n-tr/Makefile
index 3b627c5e3725..52927a0e8ee5 100644
--- a/misc/kde4-l10n-tr/Makefile
+++ b/misc/kde4-l10n-tr/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= tr-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-tr/distinfo b/misc/kde4-l10n-tr/distinfo
index e35ab41f8bf8..fdb0ee9dc019 100644
--- a/misc/kde4-l10n-tr/distinfo
+++ b/misc/kde4-l10n-tr/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-tr-3.1.1.tar.bz2) = 8c84d2232cf5298cfa461559f5633d2c
+MD5 (KDE/kde-i18n/kde-i18n-tr-3.1.2.tar.bz2) = 9e62f9b13bc1d5d96944d6d86d35ea9e
diff --git a/misc/kde4-l10n/Makefile b/misc/kde4-l10n/Makefile
index 60b7ee22324e..ec9947539f0c 100644
--- a/misc/kde4-l10n/Makefile
+++ b/misc/kde4-l10n/Makefile
@@ -16,27 +16,27 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE
RUN_DEPENDS+=\
- ${PREFIX}/share/locale/de/entry.desktop:${PORTSDIR}/german/kde3-i18n \
- ${PREFIX}/share/locale/fr/entry.desktop:${PORTSDIR}/french/kde3-i18n \
- ${PREFIX}/share/locale/he/entry.desktop:${PORTSDIR}/hebrew/kde3-i18n \
- ${PREFIX}/share/locale/hu/entry.desktop:${PORTSDIR}/hungarian/kde3-i18n \
- ${PREFIX}/share/locale/ja/entry.desktop:${PORTSDIR}/japanese/kde3-i18n \
- ${PREFIX}/share/locale/ko/entry.desktop:${PORTSDIR}/korean/kde3-i18n \
- ${PREFIX}/share/locale/ru/entry.desktop:${PORTSDIR}/russian/kde3-i18n \
- ${PREFIX}/share/locale/uk/entry.desktop:${PORTSDIR}/ukrainian/kde3-i18n \
- ${PREFIX}/share/locale/vi/entry.desktop:${PORTSDIR}/vietnamese/kde3-i18n
+ ${LOCALBASE}/share/locale/ja/entry.desktop:${PORTSDIR}/japanese/kde3-i18n \
+ ${LOCALBASE}/share/locale/fr/entry.desktop:${PORTSDIR}/french/kde3-i18n \
+ ${LOCALBASE}/share/locale/de/entry.desktop:${PORTSDIR}/german/kde3-i18n \
+ ${LOCALBASE}/share/locale/he/entry.desktop:${PORTSDIR}/hebrew/kde3-i18n \
+ ${LOCALBASE}/share/locale/hu/entry.desktop:${PORTSDIR}/hungarian/kde3-i18n \
+ ${LOCALBASE}/share/locale/ko/entry.desktop:${PORTSDIR}/korean/kde3-i18n \
+ ${LOCALBASE}/share/locale/ru/entry.desktop:${PORTSDIR}/russian/kde3-i18n \
+ ${LOCALBASE}/share/locale/uk/entry.desktop:${PORTSDIR}/ukrainian/kde3-i18n \
+ ${LOCALBASE}/share/locale/vi/entry.desktop:${PORTSDIR}/vietnamese/kde3-i18n
.for LANG in af ar az bg bs ca cs da el en_GB eo es et fi hr id is it \
lt lv mt nb nl nn pl ro sk sl sr sv ta th tr ven xh zu
RUN_DEPENDS+=\
-${PREFIX}/share/locale/${LANG}/entry.desktop:${PORTSDIR}/misc/kde3-i18n-${LANG}
+${LOCALBASE}/share/locale/${LANG}/entry.desktop:${PORTSDIR}/misc/kde3-i18n-${LANG}
.endfor
RUN_DEPENDS+=\
-${PREFIX}/share/locale/pt/entry.desktop:${PORTSDIR}/portuguese/kde3-i18n \
-${PREFIX}/share/locale/pt_BR/entry.desktop:${PORTSDIR}/portuguese/kde3-i18n-pt_BR
+${LOCALBASE}/share/locale/pt/entry.desktop:${PORTSDIR}/portuguese/kde3-i18n \
+${LOCALBASE}/share/locale/pt_BR/entry.desktop:${PORTSDIR}/portuguese/kde3-i18n-pt_BR
.for ZH in zh_CN zh_TW
RUN_DEPENDS+=\
-${PREFIX}/share/locale/${ZH}/entry.desktop:${PORTSDIR}/chinese/kde3-i18n-${ZH}
+${LOCALBASE}/share/locale/${ZH}/entry.desktop:${PORTSDIR}/chinese/kde3-i18n-${ZH}
.endfor
USE_KDELIBS_VER=3
diff --git a/misc/kdeaddons3/distinfo b/misc/kdeaddons3/distinfo
index ae41717dc231..de6036402d60 100644
--- a/misc/kdeaddons3/distinfo
+++ b/misc/kdeaddons3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeaddons-3.1.1.tar.bz2) = d52ec39b0ea4005c48b22481d50bcc29
+MD5 (KDE/kdeaddons-3.1.2.tar.bz2) = 9a16c3df67c7096cc25e5d2acb557912
diff --git a/misc/kdeedu3/distinfo b/misc/kdeedu3/distinfo
index 13d81a4c548b..90fae25454e7 100644
--- a/misc/kdeedu3/distinfo
+++ b/misc/kdeedu3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeedu-3.1.1.tar.bz2) = 6520da39109c5919437ac3c914342658
+MD5 (KDE/kdeedu-3.1.2.tar.bz2) = ba2a96454b7d2a7d92c991b08d932242
diff --git a/misc/kdeedu4/distinfo b/misc/kdeedu4/distinfo
index 13d81a4c548b..90fae25454e7 100644
--- a/misc/kdeedu4/distinfo
+++ b/misc/kdeedu4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeedu-3.1.1.tar.bz2) = 6520da39109c5919437ac3c914342658
+MD5 (KDE/kdeedu-3.1.2.tar.bz2) = ba2a96454b7d2a7d92c991b08d932242
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index d93b5e24f10b..b21b9d66641b 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.1.tar.bz2) = fd2fef424ffb3de13e4fc8d55b995b73
+MD5 (KDE/kdeutils-3.1.2.tar.bz2) = 49611a79b2d77cf6e9913ffb445fa209
diff --git a/misc/kdeutils4/distinfo b/misc/kdeutils4/distinfo
index d93b5e24f10b..b21b9d66641b 100644
--- a/misc/kdeutils4/distinfo
+++ b/misc/kdeutils4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.1.tar.bz2) = fd2fef424ffb3de13e4fc8d55b995b73
+MD5 (KDE/kdeutils-3.1.2.tar.bz2) = 49611a79b2d77cf6e9913ffb445fa209
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 2f178e3a28a3..64953c58296e 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -17,7 +17,8 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Multimedia utilities for the KDE integrated X11 desktop
RUN_DEPENDS+= xanim:${PORTSDIR}/multimedia/xanim
-LIB_DEPENDS+= ogg.4:${PORTSDIR}/audio/libogg \
+LIB_DEPENDS+= cdda_paranoia:${PORTSDIR}/audio/cdparanoia \
+ ogg.4:${PORTSDIR}/audio/libogg \
vorbis.2:${PORTSDIR}/audio/libvorbis
USE_KDELIBS_VER=3
@@ -33,11 +34,9 @@ MAKE_ENV= ${CONFIGURE_ENV}
CONFIGURE_ARGS+= --without-lame \
--with-vorbis="${LOCALBASE}" \
- --disable-cdparanoia \
--enable-audio=oss,esd
-#.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include "/usr/ports/x11/kde3/Makefile.kde"
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
.if defined(WITH_MIDI) || defined(WITH_KMIDI)
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 3cdc3cfb2f32..00febe86a632 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdemultimedia-3.1.1.tar.bz2) = bdd53d23d13adf2419554e995417178e
+MD5 (KDE/kdemultimedia-3.1.2.tar.bz2) = 63ffa8b3c6b3151acdaaa22afd7e55ea
diff --git a/multimedia/kdemultimedia3/files/plist.base b/multimedia/kdemultimedia3/files/plist.base
index 248cf8b6fe4b..f4c98b77d631 100644
--- a/multimedia/kdemultimedia3/files/plist.base
+++ b/multimedia/kdemultimedia3/files/plist.base
@@ -133,6 +133,8 @@ include/noatun/winskinvis.h
include/plugin_deps.h
lib/kaboodle.la
lib/kaboodle.so
+lib/kde3/kcm_audiocd.la
+lib/kde3/kcm_audiocd.so
lib/kde3/kcm_kmix.la
lib/kde3/kcm_kmix.so
lib/kde3/kfile_au.la
@@ -147,6 +149,8 @@ lib/kde3/kfile_ogg.la
lib/kde3/kfile_ogg.so
lib/kde3/kfile_wav.la
lib/kde3/kfile_wav.so
+lib/kde3/kio_audiocd.la
+lib/kde3/kio_audiocd.so
lib/kde3/kmix_panelapplet.la
lib/kde3/kmix_panelapplet.so
lib/kde3/libkaboodlepart.la
@@ -374,6 +378,7 @@ share/applnk/Multimedia/kmix.desktop
share/applnk/Multimedia/krec.desktop
share/applnk/Multimedia/kscd.desktop
share/applnk/Multimedia/noatun.desktop
+share/applnk/Settings/Sound/audiocd.desktop
share/apps/aktion/aktion_part.rc
share/apps/aktion/toolbar/ak_maximize.png
share/apps/aktion/toolbar/ak_setup.png
@@ -917,6 +922,7 @@ share/mimelnk/application/x-artsbuilder.desktop
share/mimelnk/audio/x-karaoke.desktop
share/mimelnk/interface/x-winamp-skin.desktop
share/mimelnk/text/xmcd.desktop
+share/services/audiocd.protocol
share/services/kaboodle_component.desktop
share/services/kfile_au.desktop
share/services/kfile_avi.desktop
diff --git a/multimedia/kdemultimedia3/files/plist.base.rm b/multimedia/kdemultimedia3/files/plist.base.rm
index d3dc3d66c794..efcb40656fbc 100644
--- a/multimedia/kdemultimedia3/files/plist.base.rm
+++ b/multimedia/kdemultimedia3/files/plist.base.rm
@@ -103,6 +103,8 @@
@dirrm share/apps/aktion/toolbar
@dirrm share/apps/aktion
@dirrm share/apps
+@dirrm share/applnk/Settings/Sound
+@dirrm share/applnk/Settings
@dirrm share/applnk/Multimedia/More
@dirrm share/applnk/Multimedia
@dirrm share/applnk/.hidden
diff --git a/multimedia/kdemultimedia3/pkg-message b/multimedia/kdemultimedia3/pkg-message
index 26efb2200342..9c314ca92c65 100644
--- a/multimedia/kdemultimedia3/pkg-message
+++ b/multimedia/kdemultimedia3/pkg-message
@@ -11,4 +11,13 @@ For example, if you have an IDE/ATAPI CD-ROM device:
ln -sf /dev/racd0c /dev/cdrom
chmod 666 /dev/racd0c
+
+Additional instructions for using the audiocd:/ kioslave:
+
+If you have an SCSI CD-ROM or if you have an IDE/ATAPI drive AND
+you have activated ATAPICAM in your kernel, change the permissions for
+the CAM transport layer and CAM passthrough layer devices to 666, i.e.:
+
+ chmod 666 /dev/xpt0 /dev/pass0
+
======================================================================
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 2f178e3a28a3..64953c58296e 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -17,7 +17,8 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Multimedia utilities for the KDE integrated X11 desktop
RUN_DEPENDS+= xanim:${PORTSDIR}/multimedia/xanim
-LIB_DEPENDS+= ogg.4:${PORTSDIR}/audio/libogg \
+LIB_DEPENDS+= cdda_paranoia:${PORTSDIR}/audio/cdparanoia \
+ ogg.4:${PORTSDIR}/audio/libogg \
vorbis.2:${PORTSDIR}/audio/libvorbis
USE_KDELIBS_VER=3
@@ -33,11 +34,9 @@ MAKE_ENV= ${CONFIGURE_ENV}
CONFIGURE_ARGS+= --without-lame \
--with-vorbis="${LOCALBASE}" \
- --disable-cdparanoia \
--enable-audio=oss,esd
-#.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include "/usr/ports/x11/kde3/Makefile.kde"
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
.if defined(WITH_MIDI) || defined(WITH_KMIDI)
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index 3cdc3cfb2f32..00febe86a632 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdemultimedia-3.1.1.tar.bz2) = bdd53d23d13adf2419554e995417178e
+MD5 (KDE/kdemultimedia-3.1.2.tar.bz2) = 63ffa8b3c6b3151acdaaa22afd7e55ea
diff --git a/multimedia/kdemultimedia4/files/plist.base b/multimedia/kdemultimedia4/files/plist.base
index 248cf8b6fe4b..f4c98b77d631 100644
--- a/multimedia/kdemultimedia4/files/plist.base
+++ b/multimedia/kdemultimedia4/files/plist.base
@@ -133,6 +133,8 @@ include/noatun/winskinvis.h
include/plugin_deps.h
lib/kaboodle.la
lib/kaboodle.so
+lib/kde3/kcm_audiocd.la
+lib/kde3/kcm_audiocd.so
lib/kde3/kcm_kmix.la
lib/kde3/kcm_kmix.so
lib/kde3/kfile_au.la
@@ -147,6 +149,8 @@ lib/kde3/kfile_ogg.la
lib/kde3/kfile_ogg.so
lib/kde3/kfile_wav.la
lib/kde3/kfile_wav.so
+lib/kde3/kio_audiocd.la
+lib/kde3/kio_audiocd.so
lib/kde3/kmix_panelapplet.la
lib/kde3/kmix_panelapplet.so
lib/kde3/libkaboodlepart.la
@@ -374,6 +378,7 @@ share/applnk/Multimedia/kmix.desktop
share/applnk/Multimedia/krec.desktop
share/applnk/Multimedia/kscd.desktop
share/applnk/Multimedia/noatun.desktop
+share/applnk/Settings/Sound/audiocd.desktop
share/apps/aktion/aktion_part.rc
share/apps/aktion/toolbar/ak_maximize.png
share/apps/aktion/toolbar/ak_setup.png
@@ -917,6 +922,7 @@ share/mimelnk/application/x-artsbuilder.desktop
share/mimelnk/audio/x-karaoke.desktop
share/mimelnk/interface/x-winamp-skin.desktop
share/mimelnk/text/xmcd.desktop
+share/services/audiocd.protocol
share/services/kaboodle_component.desktop
share/services/kfile_au.desktop
share/services/kfile_avi.desktop
diff --git a/multimedia/kdemultimedia4/files/plist.base.rm b/multimedia/kdemultimedia4/files/plist.base.rm
index d3dc3d66c794..efcb40656fbc 100644
--- a/multimedia/kdemultimedia4/files/plist.base.rm
+++ b/multimedia/kdemultimedia4/files/plist.base.rm
@@ -103,6 +103,8 @@
@dirrm share/apps/aktion/toolbar
@dirrm share/apps/aktion
@dirrm share/apps
+@dirrm share/applnk/Settings/Sound
+@dirrm share/applnk/Settings
@dirrm share/applnk/Multimedia/More
@dirrm share/applnk/Multimedia
@dirrm share/applnk/.hidden
diff --git a/multimedia/kdemultimedia4/pkg-message b/multimedia/kdemultimedia4/pkg-message
index 26efb2200342..9c314ca92c65 100644
--- a/multimedia/kdemultimedia4/pkg-message
+++ b/multimedia/kdemultimedia4/pkg-message
@@ -11,4 +11,13 @@ For example, if you have an IDE/ATAPI CD-ROM device:
ln -sf /dev/racd0c /dev/cdrom
chmod 666 /dev/racd0c
+
+Additional instructions for using the audiocd:/ kioslave:
+
+If you have an SCSI CD-ROM or if you have an IDE/ATAPI drive AND
+you have activated ATAPICAM in your kernel, change the permissions for
+the CAM transport layer and CAM passthrough layer devices to 666, i.e.:
+
+ chmod 666 /dev/xpt0 /dev/pass0
+
======================================================================
diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo
index 2be617ca46c5..6b6106686dba 100644
--- a/net/kdenetwork3/distinfo
+++ b/net/kdenetwork3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdenetwork-3.1.1.tar.bz2) = d981fa1114d06256230bed4a4b948766
+MD5 (KDE/kdenetwork-3.1.2.tar.bz2) = baf7663463d9e85a96d5c5143ef2b4be
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index 2be617ca46c5..6b6106686dba 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdenetwork-3.1.1.tar.bz2) = d981fa1114d06256230bed4a4b948766
+MD5 (KDE/kdenetwork-3.1.2.tar.bz2) = baf7663463d9e85a96d5c5143ef2b4be
diff --git a/polish/kde3-i18n/Makefile b/polish/kde3-i18n/Makefile
index 7cf5bd533b4e..cc785c2ff049 100644
--- a/polish/kde3-i18n/Makefile
+++ b/polish/kde3-i18n/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= pl-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/polish/kde3-i18n/distinfo b/polish/kde3-i18n/distinfo
index 4e6df3e847f2..d0ca0dced9cf 100644
--- a/polish/kde3-i18n/distinfo
+++ b/polish/kde3-i18n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-pl-3.1.1.tar.bz2) = ee352e35ab26285aa4b026ceae4b936b
+MD5 (KDE/kde-i18n/kde-i18n-pl-3.1.2.tar.bz2) = 940e3e57ab4d5c52e1ff3d1667f6ea2b
diff --git a/polish/kde4-l10n/Makefile b/polish/kde4-l10n/Makefile
index 7cf5bd533b4e..cc785c2ff049 100644
--- a/polish/kde4-l10n/Makefile
+++ b/polish/kde4-l10n/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= pl-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/polish/kde4-l10n/distinfo b/polish/kde4-l10n/distinfo
index 4e6df3e847f2..d0ca0dced9cf 100644
--- a/polish/kde4-l10n/distinfo
+++ b/polish/kde4-l10n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-pl-3.1.1.tar.bz2) = ee352e35ab26285aa4b026ceae4b936b
+MD5 (KDE/kde-i18n/kde-i18n-pl-3.1.2.tar.bz2) = 940e3e57ab4d5c52e1ff3d1667f6ea2b
diff --git a/portuguese/kde3-i18n-pt_BR/Makefile b/portuguese/kde3-i18n-pt_BR/Makefile
index 6a7e533902a3..948c80906fe2 100644
--- a/portuguese/kde3-i18n-pt_BR/Makefile
+++ b/portuguese/kde3-i18n-pt_BR/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= pt_BR-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/portuguese/kde3-i18n-pt_BR/distinfo b/portuguese/kde3-i18n-pt_BR/distinfo
index 878e0ae63241..eb75b7b910a3 100644
--- a/portuguese/kde3-i18n-pt_BR/distinfo
+++ b/portuguese/kde3-i18n-pt_BR/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-pt_BR-3.1.1.tar.bz2) = 2ee4a5563001bdf4ca91fab1f28f22f6
+MD5 (KDE/kde-i18n/kde-i18n-pt_BR-3.1.2.tar.bz2) = b8f8bd9007a7944877037eaa0cb3cdb3
diff --git a/portuguese/kde3-i18n/Makefile b/portuguese/kde3-i18n/Makefile
index e1bbaf4c962a..4229aef78fa3 100644
--- a/portuguese/kde3-i18n/Makefile
+++ b/portuguese/kde3-i18n/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= pt-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/portuguese/kde3-i18n/distinfo b/portuguese/kde3-i18n/distinfo
index 8afadfd7d9e4..9129e39cae18 100644
--- a/portuguese/kde3-i18n/distinfo
+++ b/portuguese/kde3-i18n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-pt-3.1.1.tar.bz2) = 910275fe2303657538b957c295c5abef
+MD5 (KDE/kde-i18n/kde-i18n-pt-3.1.2.tar.bz2) = c0ff6400840e9dc9e8ec378286d4cf20
diff --git a/portuguese/kde4-l10n-pt_BR/Makefile b/portuguese/kde4-l10n-pt_BR/Makefile
index 6a7e533902a3..948c80906fe2 100644
--- a/portuguese/kde4-l10n-pt_BR/Makefile
+++ b/portuguese/kde4-l10n-pt_BR/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= pt_BR-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/portuguese/kde4-l10n-pt_BR/distinfo b/portuguese/kde4-l10n-pt_BR/distinfo
index 878e0ae63241..eb75b7b910a3 100644
--- a/portuguese/kde4-l10n-pt_BR/distinfo
+++ b/portuguese/kde4-l10n-pt_BR/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-pt_BR-3.1.1.tar.bz2) = 2ee4a5563001bdf4ca91fab1f28f22f6
+MD5 (KDE/kde-i18n/kde-i18n-pt_BR-3.1.2.tar.bz2) = b8f8bd9007a7944877037eaa0cb3cdb3
diff --git a/portuguese/kde4-l10n/Makefile b/portuguese/kde4-l10n/Makefile
index e1bbaf4c962a..4229aef78fa3 100644
--- a/portuguese/kde4-l10n/Makefile
+++ b/portuguese/kde4-l10n/Makefile
@@ -9,11 +9,11 @@ PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= pt-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/portuguese/kde4-l10n/distinfo b/portuguese/kde4-l10n/distinfo
index 8afadfd7d9e4..9129e39cae18 100644
--- a/portuguese/kde4-l10n/distinfo
+++ b/portuguese/kde4-l10n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-pt-3.1.1.tar.bz2) = 910275fe2303657538b957c295c5abef
+MD5 (KDE/kde-i18n/kde-i18n-pt-3.1.2.tar.bz2) = c0ff6400840e9dc9e8ec378286d4cf20
diff --git a/russian/kde3-i18n/Makefile b/russian/kde3-i18n/Makefile
index d76560e3be98..4b890a4d1893 100644
--- a/russian/kde3-i18n/Makefile
+++ b/russian/kde3-i18n/Makefile
@@ -7,14 +7,13 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES?= russian kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= ru-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/russian/kde3-i18n/distinfo b/russian/kde3-i18n/distinfo
index 44f21fbeb48f..1c1b50df94dd 100644
--- a/russian/kde3-i18n/distinfo
+++ b/russian/kde3-i18n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-ru-3.1.1.tar.bz2) = 8f302d7538d4a7acaff02712e1b6170a
+MD5 (KDE/kde-i18n/kde-i18n-ru-3.1.2.tar.bz2) = 29826eaaf185fe685e8c75d33a9f304c
diff --git a/russian/kde4-l10n/Makefile b/russian/kde4-l10n/Makefile
index d76560e3be98..4b890a4d1893 100644
--- a/russian/kde4-l10n/Makefile
+++ b/russian/kde4-l10n/Makefile
@@ -7,14 +7,13 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES?= russian kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= ru-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/russian/kde4-l10n/distinfo b/russian/kde4-l10n/distinfo
index 44f21fbeb48f..1c1b50df94dd 100644
--- a/russian/kde4-l10n/distinfo
+++ b/russian/kde4-l10n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-ru-3.1.1.tar.bz2) = 8f302d7538d4a7acaff02712e1b6170a
+MD5 (KDE/kde-i18n/kde-i18n-ru-3.1.2.tar.bz2) = 29826eaaf185fe685e8c75d33a9f304c
diff --git a/security/kgpg-kde4/distinfo b/security/kgpg-kde4/distinfo
index d93b5e24f10b..b21b9d66641b 100644
--- a/security/kgpg-kde4/distinfo
+++ b/security/kgpg-kde4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.1.tar.bz2) = fd2fef424ffb3de13e4fc8d55b995b73
+MD5 (KDE/kdeutils-3.1.2.tar.bz2) = 49611a79b2d77cf6e9913ffb445fa209
diff --git a/security/kwallet/distinfo b/security/kwallet/distinfo
index d93b5e24f10b..b21b9d66641b 100644
--- a/security/kwallet/distinfo
+++ b/security/kwallet/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.1.tar.bz2) = fd2fef424ffb3de13e4fc8d55b995b73
+MD5 (KDE/kdeutils-3.1.2.tar.bz2) = 49611a79b2d77cf6e9913ffb445fa209
diff --git a/sysutils/kdeadmin3/distinfo b/sysutils/kdeadmin3/distinfo
index fc8daaa140db..2ac90c236b8d 100644
--- a/sysutils/kdeadmin3/distinfo
+++ b/sysutils/kdeadmin3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeadmin-3.1.1.tar.bz2) = 755deaf26d0841ed16eddd7596701004
+MD5 (KDE/kdeadmin-3.1.2.tar.bz2) = 94c2981cd54bd02549664852fb82dd05
diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo
index fc8daaa140db..2ac90c236b8d 100644
--- a/sysutils/kdeadmin4/distinfo
+++ b/sysutils/kdeadmin4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeadmin-3.1.1.tar.bz2) = 755deaf26d0841ed16eddd7596701004
+MD5 (KDE/kdeadmin-3.1.2.tar.bz2) = 94c2981cd54bd02549664852fb82dd05
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index d93b5e24f10b..b21b9d66641b 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.1.tar.bz2) = fd2fef424ffb3de13e4fc8d55b995b73
+MD5 (KDE/kdeutils-3.1.2.tar.bz2) = 49611a79b2d77cf6e9913ffb445fa209
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index d93b5e24f10b..b21b9d66641b 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.1.tar.bz2) = fd2fef424ffb3de13e4fc8d55b995b73
+MD5 (KDE/kdeutils-3.1.2.tar.bz2) = 49611a79b2d77cf6e9913ffb445fa209
diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo
index d93b5e24f10b..b21b9d66641b 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.1.tar.bz2) = fd2fef424ffb3de13e4fc8d55b995b73
+MD5 (KDE/kdeutils-3.1.2.tar.bz2) = 49611a79b2d77cf6e9913ffb445fa209
diff --git a/ukrainian/kde3-i18n/Makefile b/ukrainian/kde3-i18n/Makefile
index a3f7d31dfca3..79077cb2337c 100644
--- a/ukrainian/kde3-i18n/Makefile
+++ b/ukrainian/kde3-i18n/Makefile
@@ -7,14 +7,13 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES?= ukrainian kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= uk-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/ukrainian/kde3-i18n/distinfo b/ukrainian/kde3-i18n/distinfo
index cb84a71e7914..6ab01fd6c58e 100644
--- a/ukrainian/kde3-i18n/distinfo
+++ b/ukrainian/kde3-i18n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-uk-3.1.1.tar.bz2) = 52e51ee42674c94725a6183c1c48d2fe
+MD5 (KDE/kde-i18n/kde-i18n-uk-3.1.2.tar.bz2) = d1f5c6905a9c6eb7785ccf452bebb505
diff --git a/ukrainian/kde4-l10n/Makefile b/ukrainian/kde4-l10n/Makefile
index a3f7d31dfca3..79077cb2337c 100644
--- a/ukrainian/kde4-l10n/Makefile
+++ b/ukrainian/kde4-l10n/Makefile
@@ -7,14 +7,13 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES?= ukrainian kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src/kde-i18n
PKGNAMEPREFIX= uk-
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE
-MAINTAINER?= kde@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/ukrainian/kde4-l10n/distinfo b/ukrainian/kde4-l10n/distinfo
index cb84a71e7914..6ab01fd6c58e 100644
--- a/ukrainian/kde4-l10n/distinfo
+++ b/ukrainian/kde4-l10n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-uk-3.1.1.tar.bz2) = 52e51ee42674c94725a6183c1c48d2fe
+MD5 (KDE/kde-i18n/kde-i18n-uk-3.1.2.tar.bz2) = d1f5c6905a9c6eb7785ccf452bebb505
diff --git a/vietnamese/kde3-i18n/distinfo b/vietnamese/kde3-i18n/distinfo
index ffdb37c3fadb..a9432c17de8f 100644
--- a/vietnamese/kde3-i18n/distinfo
+++ b/vietnamese/kde3-i18n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-vi-3.1.1.tar.bz2) = f6415eebc2da66490a22c2e0a04ce000
+MD5 (KDE/kde-i18n/kde-i18n-vi-3.1.2.tar.bz2) = 337548f06fa72f12d95031be1951d05c
diff --git a/www/kdewebdev/distinfo b/www/kdewebdev/distinfo
index cc9f60dd703a..391b0fa9f61b 100644
--- a/www/kdewebdev/distinfo
+++ b/www/kdewebdev/distinfo
@@ -1 +1 @@
-MD5 (KDE/quanta-3.1.1.tar.bz2) = b910e5da826edac61a324452adbab9fb
+MD5 (KDE/quanta-3.1.2.tar.bz2) = f615ecd35f96db25b834ab8ffb4561c7
diff --git a/www/kdewebdev4/distinfo b/www/kdewebdev4/distinfo
index cc9f60dd703a..391b0fa9f61b 100644
--- a/www/kdewebdev4/distinfo
+++ b/www/kdewebdev4/distinfo
@@ -1 +1 @@
-MD5 (KDE/quanta-3.1.1.tar.bz2) = b910e5da826edac61a324452adbab9fb
+MD5 (KDE/quanta-3.1.2.tar.bz2) = f615ecd35f96db25b834ab8ffb4561c7
diff --git a/www/quanta/distinfo b/www/quanta/distinfo
index cc9f60dd703a..391b0fa9f61b 100644
--- a/www/quanta/distinfo
+++ b/www/quanta/distinfo
@@ -1 +1 @@
-MD5 (KDE/quanta-3.1.1.tar.bz2) = b910e5da826edac61a324452adbab9fb
+MD5 (KDE/quanta-3.1.2.tar.bz2) = f615ecd35f96db25b834ab8ffb4561c7
diff --git a/x11-clocks/kdetoys3/distinfo b/x11-clocks/kdetoys3/distinfo
index fbb96862e77c..bf89e256d0e0 100644
--- a/x11-clocks/kdetoys3/distinfo
+++ b/x11-clocks/kdetoys3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdetoys-3.1.1.tar.bz2) = cb234ac58f12d1fbf88bc38c94f9616e
+MD5 (KDE/kdetoys-3.1.2.tar.bz2) = fa311c7b142f7b4b6a61bce463e851eb
diff --git a/x11-clocks/kdetoys3/pkg-plist b/x11-clocks/kdetoys3/pkg-plist
index 2a4e27ec747a..b64b1612f95a 100644
--- a/x11-clocks/kdetoys3/pkg-plist
+++ b/x11-clocks/kdetoys3/pkg-plist
@@ -555,20 +555,14 @@ share/icons/crystalsvg/48x48/apps/kworldclock.png
share/icons/locolor/16x16/apps/ktux.png
share/icons/locolor/32x32/apps/ktux.png
share/services/kweatherservice.desktop
-@dirrm share/services
@dirrm share/icons/locolor/32x32/apps
@dirrm share/icons/locolor/32x32
@dirrm share/icons/locolor/16x16/apps
@dirrm share/icons/locolor/16x16
@dirrm share/icons/locolor
@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48
@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/32x32
@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
@dirrm share/doc/HTML/en/kworldclock
@dirrm share/doc/HTML/en/kweather
@dirrm share/doc/HTML/en/kteatime
@@ -576,8 +570,6 @@ share/services/kweatherservice.desktop
@dirrm share/doc/HTML/en/kmoon
@dirrm share/doc/HTML/en/kaphorism
@dirrm share/doc/HTML/en/amor
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
@dirrm share/apps/kworldclock/pics
@dirrm share/apps/kworldclock/maps/depths
@dirrm share/apps/kworldclock/maps
@@ -606,9 +598,6 @@ share/services/kweatherservice.desktop
@dirrm share/apps/amor/blob
@dirrm share/apps/amor/b
@dirrm share/apps/amor
-@dirrm share/apps
@dirrm share/applnk/Toys
@dirrm share/applnk/System/ScreenSavers
@dirrm share/applnk/System
-@dirrm share/applnk
-@dirrm lib/kde3
diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo
index fbb96862e77c..bf89e256d0e0 100644
--- a/x11-clocks/kdetoys4/distinfo
+++ b/x11-clocks/kdetoys4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdetoys-3.1.1.tar.bz2) = cb234ac58f12d1fbf88bc38c94f9616e
+MD5 (KDE/kdetoys-3.1.2.tar.bz2) = fa311c7b142f7b4b6a61bce463e851eb
diff --git a/x11-clocks/kdetoys4/pkg-plist b/x11-clocks/kdetoys4/pkg-plist
index 2a4e27ec747a..b64b1612f95a 100644
--- a/x11-clocks/kdetoys4/pkg-plist
+++ b/x11-clocks/kdetoys4/pkg-plist
@@ -555,20 +555,14 @@ share/icons/crystalsvg/48x48/apps/kworldclock.png
share/icons/locolor/16x16/apps/ktux.png
share/icons/locolor/32x32/apps/ktux.png
share/services/kweatherservice.desktop
-@dirrm share/services
@dirrm share/icons/locolor/32x32/apps
@dirrm share/icons/locolor/32x32
@dirrm share/icons/locolor/16x16/apps
@dirrm share/icons/locolor/16x16
@dirrm share/icons/locolor
@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48
@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/32x32
@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
@dirrm share/doc/HTML/en/kworldclock
@dirrm share/doc/HTML/en/kweather
@dirrm share/doc/HTML/en/kteatime
@@ -576,8 +570,6 @@ share/services/kweatherservice.desktop
@dirrm share/doc/HTML/en/kmoon
@dirrm share/doc/HTML/en/kaphorism
@dirrm share/doc/HTML/en/amor
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
@dirrm share/apps/kworldclock/pics
@dirrm share/apps/kworldclock/maps/depths
@dirrm share/apps/kworldclock/maps
@@ -606,9 +598,6 @@ share/services/kweatherservice.desktop
@dirrm share/apps/amor/blob
@dirrm share/apps/amor/b
@dirrm share/apps/amor
-@dirrm share/apps
@dirrm share/applnk/Toys
@dirrm share/applnk/System/ScreenSavers
@dirrm share/applnk/System
-@dirrm share/applnk
-@dirrm lib/kde3
diff --git a/x11-themes/kdeartwork3/Makefile b/x11-themes/kdeartwork3/Makefile
index 85bf2299441f..acbc259570da 100644
--- a/x11-themes/kdeartwork3/Makefile
+++ b/x11-themes/kdeartwork3/Makefile
@@ -26,6 +26,27 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3
+KDE_BUILD_PLIST=yes
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if exists(${X11BASE}/bin/xscreensaver)
+WITH_XS= yes
+.endif # exists(${X11BASE}/bin/xscreensaver)
+
+.if exists(${X11BASE}/bin/screensaver-properties-capplet)
+WITH_XSGNOME= yes
+.endif # exists(${X11BASE}/bin/screensaver-properties-capplet)
+
+.if defined(WITH_XS) && !defined(WITH_XSGNOME)
+BUILD_DEPENDS+= xscreensaver:${PORTSDIR}/x11/xscreensaver
+PLIST_APPEND+= plist.xs
+.endif # defined(WITH_XS)
+
+.if defined(WITH_XSGNOME)
+BUILD_DEPENDS+= screensaver-properties-capplet:${PORTSDIR}/x11/xscreensaver-gnome
+PLIST_APPEND+= plist.xs
+.endif # defined(WITH_XSGNOME)
+
+.include <bsd.port.post.mk>
diff --git a/x11-themes/kdeartwork3/distinfo b/x11-themes/kdeartwork3/distinfo
index 8fa7e0e71b39..4f91b9b06152 100644
--- a/x11-themes/kdeartwork3/distinfo
+++ b/x11-themes/kdeartwork3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeartwork-3.1.1.tar.bz2) = aaf6a2a8736f448766cd190685606d6a
+MD5 (KDE/kdeartwork-3.1.2.tar.bz2) = 0ac7fda2acfa32ce26913ff864722e44
diff --git a/x11-themes/kdeartwork3/files/patch-configure b/x11-themes/kdeartwork3/files/patch-configure
new file mode 100644
index 000000000000..88893ee6c34a
--- /dev/null
+++ b/x11-themes/kdeartwork3/files/patch-configure
@@ -0,0 +1,57 @@
+--- configure.orig Sun May 11 14:21:07 2003
++++ configure Sun May 11 14:22:34 2003
+@@ -24849,12 +24849,12 @@
+ IFS=$old_IFS
+
+
+- echo "$as_me:$LINENO: checking for lib/xscreensaver/flame" >&5
+-echo $ECHO_N "checking for lib/xscreensaver/flame... $ECHO_C" >&6
++ echo "$as_me:$LINENO: checking for bin/xscreensaver-hacks/flame" >&5
++echo $ECHO_N "checking for bin/xscreensaver-hacks/flame... $ECHO_C" >&6
+ if test -n "$XSCREENSAVER"; then
+ kde_cv_path="$XSCREENSAVER";
+ else
+- kde_cache=`echo lib/xscreensaver/flame | sed 'y%./+-%__p_%'`
++ kde_cache=`echo bin/xscreensaver-hacks/flame | sed 'y%./+-%__p_%'`
+
+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24870,16 +24870,16 @@
+ IFS=$kde_save_IFS
+
+ for dir in $dirs; do
+- if test -x "$dir/lib/xscreensaver/flame"; then
++ if test -x "$dir/bin/xscreensaver-hacks/flame"; then
+ if test -n ""
+ then
+- evalstr="$dir/lib/xscreensaver/flame 2>&1 "
++ evalstr="$dir/bin/xscreensaver-hacks/flame 2>&1 "
+ if eval $evalstr; then
+- kde_cv_path="$dir/lib/xscreensaver/flame"
++ kde_cv_path="$dir/bin/xscreensaver-hacks/flame"
+ break
+ fi
+ else
+- kde_cv_path="$dir/lib/xscreensaver/flame"
++ kde_cv_path="$dir/bin/xscreensaver-hacks/flame"
+ break
+ fi
+ fi
+@@ -24923,7 +24923,7 @@
+ XSCREENSAVER_CONFIG=NO
+ for i in $xscreensaver_prefixes ;
+ do
+- for j in lib/xscreensaver/config/flame.xml;
++ for j in share/xscreensaver/config/flame.xml;
+ do
+ echo "configure: 24928: $i/$j" >&5
+ if test -r "$i/$j"; then
+@@ -24954,7 +24954,7 @@
+ XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/lib/X11/xscreensaver/config"
+ fi
+ else
+- XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/lib/xscreensaver/config"
++ XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/share/xscreensaver/config"
+ fi
+ echo "$as_me:$LINENO: result: $XSCREENSAVER_CONFIG" >&5
+ echo "${ECHO_T}$XSCREENSAVER_CONFIG" >&6
diff --git a/x11-wm/kdeartwork3/pkg-plist b/x11-themes/kdeartwork3/files/plist.base
index 615ceacadfba..1e8ab383dfa6 100644
--- a/x11-wm/kdeartwork3/pkg-plist
+++ b/x11-themes/kdeartwork3/files/plist.base
@@ -5604,120 +5604,3 @@ share/wallpapers/simple_wallpaper.jpg
share/wallpapers/sunday_brunch.jpg
share/wallpapers/vegetative_fog.jpg
share/wallpapers/winter_theme_1.jpg
-@dirrm share/wallpapers
-@dirrm share/sounds
-@dirrm share/icons/slick/48x48/mimetypes
-@dirrm share/icons/slick/48x48/filesystems
-@dirrm share/icons/slick/48x48/devices
-@dirrm share/icons/slick/48x48/apps
-@dirrm share/icons/slick/48x48/actions
-@dirrm share/icons/slick/48x48
-@dirrm share/icons/slick/32x32/mimetypes
-@dirrm share/icons/slick/32x32/filesystems
-@dirrm share/icons/slick/32x32/devices
-@dirrm share/icons/slick/32x32/apps
-@dirrm share/icons/slick/32x32/actions
-@dirrm share/icons/slick/32x32
-@dirrm share/icons/slick/22x22/actions
-@dirrm share/icons/slick/22x22
-@dirrm share/icons/slick/16x16/mimetypes
-@dirrm share/icons/slick/16x16/filesystems
-@dirrm share/icons/slick/16x16/devices
-@dirrm share/icons/slick/16x16/apps
-@dirrm share/icons/slick/16x16/actions
-@dirrm share/icons/slick/16x16
-@dirrm share/icons/slick
-@dirrm share/icons/kdeclassic/64x64/mimetypes
-@dirrm share/icons/kdeclassic/64x64/filesystems
-@dirrm share/icons/kdeclassic/64x64
-@dirrm share/icons/kdeclassic/48x48/mimetypes
-@dirrm share/icons/kdeclassic/48x48/filesystems
-@dirrm share/icons/kdeclassic/48x48/devices
-@dirrm share/icons/kdeclassic/48x48/apps
-@dirrm share/icons/kdeclassic/48x48/actions
-@dirrm share/icons/kdeclassic/48x48
-@dirrm share/icons/kdeclassic/32x32/mimetypes
-@dirrm share/icons/kdeclassic/32x32/filesystems
-@dirrm share/icons/kdeclassic/32x32/devices
-@dirrm share/icons/kdeclassic/32x32/apps
-@dirrm share/icons/kdeclassic/32x32/actions
-@dirrm share/icons/kdeclassic/32x32
-@dirrm share/icons/kdeclassic/22x22/mimetypes
-@dirrm share/icons/kdeclassic/22x22/apps
-@dirrm share/icons/kdeclassic/22x22/actions
-@dirrm share/icons/kdeclassic/22x22
-@dirrm share/icons/kdeclassic/16x16/mimetypes
-@dirrm share/icons/kdeclassic/16x16/filesystems
-@dirrm share/icons/kdeclassic/16x16/devices
-@dirrm share/icons/kdeclassic/16x16/apps
-@dirrm share/icons/kdeclassic/16x16/actions
-@dirrm share/icons/kdeclassic/16x16
-@dirrm share/icons/kdeclassic
-@dirrm share/icons/ikons/64x64/filesystems
-@dirrm share/icons/ikons/64x64/apps
-@dirrm share/icons/ikons/64x64
-@dirrm share/icons/ikons/48x48/mimetypes
-@dirrm share/icons/ikons/48x48/filesystems
-@dirrm share/icons/ikons/48x48/devices
-@dirrm share/icons/ikons/48x48/apps
-@dirrm share/icons/ikons/48x48
-@dirrm share/icons/ikons/32x32/mimetypes
-@dirrm share/icons/ikons/32x32/filesystems
-@dirrm share/icons/ikons/32x32/devices
-@dirrm share/icons/ikons/32x32/apps
-@dirrm share/icons/ikons/32x32
-@dirrm share/icons/ikons/22x22/apps
-@dirrm share/icons/ikons/22x22/actions
-@dirrm share/icons/ikons/22x22
-@dirrm share/icons/ikons/16x16/mimetypes
-@dirrm share/icons/ikons/16x16/filesystems
-@dirrm share/icons/ikons/16x16/devices
-@dirrm share/icons/ikons/16x16/apps
-@dirrm share/icons/ikons/16x16/actions
-@dirrm share/icons/ikons/16x16
-@dirrm share/icons/ikons
-@dirrm share/icons/Technical/48x48/mimetypes
-@dirrm share/icons/Technical/48x48/filesystems
-@dirrm share/icons/Technical/48x48
-@dirrm share/icons/Technical/32x32/mimetypes
-@dirrm share/icons/Technical/32x32/filesystems
-@dirrm share/icons/Technical/32x32/actions
-@dirrm share/icons/Technical/32x32
-@dirrm share/icons/Technical
-@dirrm share/icons/Locolor/32x32/mimetypes
-@dirrm share/icons/Locolor/32x32/filesystems
-@dirrm share/icons/Locolor/32x32/devices
-@dirrm share/icons/Locolor/32x32/apps
-@dirrm share/icons/Locolor/32x32/actions
-@dirrm share/icons/Locolor/32x32
-@dirrm share/icons/Locolor/16x16/mimetypes
-@dirrm share/icons/Locolor/16x16/filesystems
-@dirrm share/icons/Locolor/16x16/devices
-@dirrm share/icons/Locolor/16x16/apps
-@dirrm share/icons/Locolor/16x16/actions
-@dirrm share/icons/Locolor/16x16
-@dirrm share/icons/Locolor
-@dirrm share/icons
-@dirrm share/apps/kworldclock/maps/rainfall
-@dirrm share/apps/kworldclock/maps/mggd
-@dirrm share/apps/kworldclock/maps/depths
-@dirrm share/apps/kworldclock/maps/caida_bw
-@dirrm share/apps/kworldclock/maps/caida
-@dirrm share/apps/kworldclock/maps/bio
-@dirrm share/apps/kworldclock/maps/alt
-@dirrm share/apps/kworldclock/maps
-@dirrm share/apps/kworldclock
-@dirrm share/apps/kwin/icewm-themes/Model
-@dirrm share/apps/kwin/icewm-themes/MenschMaschine
-@dirrm share/apps/kwin/icewm-themes
-@dirrm share/apps/kwin
-@dirrm share/apps/kstyle/themes
-@dirrm share/apps/kstyle
-@dirrm share/apps/kscreensaver
-@dirrm share/apps
-@dirrm share/applnk/System/ScreenSavers
-@dirrm share/applnk/System
-@dirrm share/applnk
-@dirrm lib/kde3/plugins/styles
-@dirrm lib/kde3/plugins
-@dirrm lib/kde3
diff --git a/x11-themes/kdeartwork3/files/plist.base.rm b/x11-themes/kdeartwork3/files/plist.base.rm
new file mode 100644
index 000000000000..a862242a0bf7
--- /dev/null
+++ b/x11-themes/kdeartwork3/files/plist.base.rm
@@ -0,0 +1,117 @@
+@dirrm share/wallpapers
+@dirrm share/sounds
+@dirrm share/icons/slick/48x48/mimetypes
+@dirrm share/icons/slick/48x48/filesystems
+@dirrm share/icons/slick/48x48/devices
+@dirrm share/icons/slick/48x48/apps
+@dirrm share/icons/slick/48x48/actions
+@dirrm share/icons/slick/48x48
+@dirrm share/icons/slick/32x32/mimetypes
+@dirrm share/icons/slick/32x32/filesystems
+@dirrm share/icons/slick/32x32/devices
+@dirrm share/icons/slick/32x32/apps
+@dirrm share/icons/slick/32x32/actions
+@dirrm share/icons/slick/32x32
+@dirrm share/icons/slick/22x22/actions
+@dirrm share/icons/slick/22x22
+@dirrm share/icons/slick/16x16/mimetypes
+@dirrm share/icons/slick/16x16/filesystems
+@dirrm share/icons/slick/16x16/devices
+@dirrm share/icons/slick/16x16/apps
+@dirrm share/icons/slick/16x16/actions
+@dirrm share/icons/slick/16x16
+@dirrm share/icons/slick
+@dirrm share/icons/kdeclassic/64x64/mimetypes
+@dirrm share/icons/kdeclassic/64x64/filesystems
+@dirrm share/icons/kdeclassic/64x64
+@dirrm share/icons/kdeclassic/48x48/mimetypes
+@dirrm share/icons/kdeclassic/48x48/filesystems
+@dirrm share/icons/kdeclassic/48x48/devices
+@dirrm share/icons/kdeclassic/48x48/apps
+@dirrm share/icons/kdeclassic/48x48/actions
+@dirrm share/icons/kdeclassic/48x48
+@dirrm share/icons/kdeclassic/32x32/mimetypes
+@dirrm share/icons/kdeclassic/32x32/filesystems
+@dirrm share/icons/kdeclassic/32x32/devices
+@dirrm share/icons/kdeclassic/32x32/apps
+@dirrm share/icons/kdeclassic/32x32/actions
+@dirrm share/icons/kdeclassic/32x32
+@dirrm share/icons/kdeclassic/22x22/mimetypes
+@dirrm share/icons/kdeclassic/22x22/apps
+@dirrm share/icons/kdeclassic/22x22/actions
+@dirrm share/icons/kdeclassic/22x22
+@dirrm share/icons/kdeclassic/16x16/mimetypes
+@dirrm share/icons/kdeclassic/16x16/filesystems
+@dirrm share/icons/kdeclassic/16x16/devices
+@dirrm share/icons/kdeclassic/16x16/apps
+@dirrm share/icons/kdeclassic/16x16/actions
+@dirrm share/icons/kdeclassic/16x16
+@dirrm share/icons/kdeclassic
+@dirrm share/icons/ikons/64x64/filesystems
+@dirrm share/icons/ikons/64x64/apps
+@dirrm share/icons/ikons/64x64
+@dirrm share/icons/ikons/48x48/mimetypes
+@dirrm share/icons/ikons/48x48/filesystems
+@dirrm share/icons/ikons/48x48/devices
+@dirrm share/icons/ikons/48x48/apps
+@dirrm share/icons/ikons/48x48
+@dirrm share/icons/ikons/32x32/mimetypes
+@dirrm share/icons/ikons/32x32/filesystems
+@dirrm share/icons/ikons/32x32/devices
+@dirrm share/icons/ikons/32x32/apps
+@dirrm share/icons/ikons/32x32
+@dirrm share/icons/ikons/22x22/apps
+@dirrm share/icons/ikons/22x22/actions
+@dirrm share/icons/ikons/22x22
+@dirrm share/icons/ikons/16x16/mimetypes
+@dirrm share/icons/ikons/16x16/filesystems
+@dirrm share/icons/ikons/16x16/devices
+@dirrm share/icons/ikons/16x16/apps
+@dirrm share/icons/ikons/16x16/actions
+@dirrm share/icons/ikons/16x16
+@dirrm share/icons/ikons
+@dirrm share/icons/Technical/48x48/mimetypes
+@dirrm share/icons/Technical/48x48/filesystems
+@dirrm share/icons/Technical/48x48
+@dirrm share/icons/Technical/32x32/mimetypes
+@dirrm share/icons/Technical/32x32/filesystems
+@dirrm share/icons/Technical/32x32/actions
+@dirrm share/icons/Technical/32x32
+@dirrm share/icons/Technical
+@dirrm share/icons/Locolor/32x32/mimetypes
+@dirrm share/icons/Locolor/32x32/filesystems
+@dirrm share/icons/Locolor/32x32/devices
+@dirrm share/icons/Locolor/32x32/apps
+@dirrm share/icons/Locolor/32x32/actions
+@dirrm share/icons/Locolor/32x32
+@dirrm share/icons/Locolor/16x16/mimetypes
+@dirrm share/icons/Locolor/16x16/filesystems
+@dirrm share/icons/Locolor/16x16/devices
+@dirrm share/icons/Locolor/16x16/apps
+@dirrm share/icons/Locolor/16x16/actions
+@dirrm share/icons/Locolor/16x16
+@dirrm share/icons/Locolor
+@dirrm share/icons
+@dirrm share/apps/kworldclock/maps/rainfall
+@dirrm share/apps/kworldclock/maps/mggd
+@dirrm share/apps/kworldclock/maps/depths
+@dirrm share/apps/kworldclock/maps/caida_bw
+@dirrm share/apps/kworldclock/maps/caida
+@dirrm share/apps/kworldclock/maps/bio
+@dirrm share/apps/kworldclock/maps/alt
+@dirrm share/apps/kworldclock/maps
+@dirrm share/apps/kworldclock
+@dirrm share/apps/kwin/icewm-themes/Model
+@dirrm share/apps/kwin/icewm-themes/MenschMaschine
+@dirrm share/apps/kwin/icewm-themes
+@dirrm share/apps/kwin
+@dirrm share/apps/kstyle/themes
+@dirrm share/apps/kstyle
+@dirrm share/apps/kscreensaver
+@dirrm share/apps
+@dirrm share/applnk/System/ScreenSavers
+@dirrm share/applnk/System
+@dirrm share/applnk
+@dirrm lib/kde3/plugins/styles
+@dirrm lib/kde3/plugins
+@dirrm lib/kde3
diff --git a/x11-themes/kdeartwork3/files/plist.xs b/x11-themes/kdeartwork3/files/plist.xs
new file mode 100644
index 000000000000..9d5aabc15f64
--- /dev/null
+++ b/x11-themes/kdeartwork3/files/plist.xs
@@ -0,0 +1,176 @@
+bin/kxsconfig
+bin/kxsrun
+share/applnk/System/ScreenSavers/anemone.desktop
+share/applnk/System/ScreenSavers/ant.desktop
+share/applnk/System/ScreenSavers/apollonian.desktop
+share/applnk/System/ScreenSavers/atlantis.desktop
+share/applnk/System/ScreenSavers/attraction.desktop
+share/applnk/System/ScreenSavers/blaster.desktop
+share/applnk/System/ScreenSavers/blitspin.desktop
+share/applnk/System/ScreenSavers/bouboule.desktop
+share/applnk/System/ScreenSavers/boxed.desktop
+share/applnk/System/ScreenSavers/braid.desktop
+share/applnk/System/ScreenSavers/bsod.desktop
+share/applnk/System/ScreenSavers/bubble3d.desktop
+share/applnk/System/ScreenSavers/bubbles.desktop
+share/applnk/System/ScreenSavers/bumps.desktop
+share/applnk/System/ScreenSavers/cage.desktop
+share/applnk/System/ScreenSavers/ccurve.desktop
+share/applnk/System/ScreenSavers/circuit.desktop
+share/applnk/System/ScreenSavers/compass.desktop
+share/applnk/System/ScreenSavers/coral.desktop
+share/applnk/System/ScreenSavers/critical.desktop
+share/applnk/System/ScreenSavers/crystal.desktop
+share/applnk/System/ScreenSavers/cubenetic.desktop
+share/applnk/System/ScreenSavers/cynosure.desktop
+share/applnk/System/ScreenSavers/dangerball.desktop
+share/applnk/System/ScreenSavers/decayscreen.desktop
+share/applnk/System/ScreenSavers/deco.desktop
+share/applnk/System/ScreenSavers/deluxe.desktop
+share/applnk/System/ScreenSavers/demon.desktop
+share/applnk/System/ScreenSavers/discrete.desktop
+share/applnk/System/ScreenSavers/distort.desktop
+share/applnk/System/ScreenSavers/drift.desktop
+share/applnk/System/ScreenSavers/endgame.desktop
+share/applnk/System/ScreenSavers/engine.desktop
+share/applnk/System/ScreenSavers/epicycle.desktop
+share/applnk/System/ScreenSavers/euler2d.desktop
+share/applnk/System/ScreenSavers/extrusion.desktop
+share/applnk/System/ScreenSavers/fadeplot.desktop
+share/applnk/System/ScreenSavers/flag.desktop
+share/applnk/System/ScreenSavers/flame.desktop
+share/applnk/System/ScreenSavers/flipscreen3d.desktop
+share/applnk/System/ScreenSavers/flow.desktop
+share/applnk/System/ScreenSavers/fluidballs.desktop
+share/applnk/System/ScreenSavers/forest.desktop
+share/applnk/System/ScreenSavers/galaxy.desktop
+share/applnk/System/ScreenSavers/gears.desktop
+share/applnk/System/ScreenSavers/gflux.desktop
+share/applnk/System/ScreenSavers/glforestfire.desktop
+share/applnk/System/ScreenSavers/glplanet.desktop
+share/applnk/System/ScreenSavers/glsnake.desktop
+share/applnk/System/ScreenSavers/gltext.desktop
+share/applnk/System/ScreenSavers/goop.desktop
+share/applnk/System/ScreenSavers/grav.desktop
+share/applnk/System/ScreenSavers/greynetic.desktop
+share/applnk/System/ScreenSavers/halo.desktop
+share/applnk/System/ScreenSavers/helix.desktop
+share/applnk/System/ScreenSavers/hopalong.desktop
+share/applnk/System/ScreenSavers/hyperball.desktop
+share/applnk/System/ScreenSavers/hypercube.desktop
+share/applnk/System/ScreenSavers/ifs.desktop
+share/applnk/System/ScreenSavers/imsmap.desktop
+share/applnk/System/ScreenSavers/interference.desktop
+share/applnk/System/ScreenSavers/jigsaw.desktop
+share/applnk/System/ScreenSavers/juggle.desktop
+share/applnk/System/ScreenSavers/julia.desktop
+share/applnk/System/ScreenSavers/kaleidescope.desktop
+share/applnk/System/ScreenSavers/kumppa.desktop
+share/applnk/System/ScreenSavers/lament.desktop
+share/applnk/System/ScreenSavers/laser.desktop
+share/applnk/System/ScreenSavers/lavalite.desktop
+share/applnk/System/ScreenSavers/lightning.desktop
+share/applnk/System/ScreenSavers/lisa.desktop
+share/applnk/System/ScreenSavers/lissie.desktop
+share/applnk/System/ScreenSavers/lmorph.desktop
+share/applnk/System/ScreenSavers/loop.desktop
+share/applnk/System/ScreenSavers/maze.desktop
+share/applnk/System/ScreenSavers/menger.desktop
+share/applnk/System/ScreenSavers/moebius.desktop
+share/applnk/System/ScreenSavers/moire.desktop
+share/applnk/System/ScreenSavers/moire2.desktop
+share/applnk/System/ScreenSavers/molecule.desktop
+share/applnk/System/ScreenSavers/morph3d.desktop
+share/applnk/System/ScreenSavers/mountain.desktop
+share/applnk/System/ScreenSavers/munch.desktop
+share/applnk/System/ScreenSavers/nerverot.desktop
+share/applnk/System/ScreenSavers/noseguy.desktop
+share/applnk/System/ScreenSavers/pedal.desktop
+share/applnk/System/ScreenSavers/penetrate.desktop
+share/applnk/System/ScreenSavers/penrose.desktop
+share/applnk/System/ScreenSavers/petri.desktop
+share/applnk/System/ScreenSavers/phosphor.desktop
+share/applnk/System/ScreenSavers/pipes.desktop
+share/applnk/System/ScreenSavers/pixmaps.desktop
+share/applnk/System/ScreenSavers/polyominoes.desktop
+share/applnk/System/ScreenSavers/pulsar.desktop
+share/applnk/System/ScreenSavers/pyro.desktop
+share/applnk/System/ScreenSavers/qix.desktop
+share/applnk/System/ScreenSavers/queens.desktop
+share/applnk/System/ScreenSavers/rd-bomb.desktop
+share/applnk/System/ScreenSavers/ripples.desktop
+share/applnk/System/ScreenSavers/rocks.desktop
+share/applnk/System/ScreenSavers/rorschach.desktop
+share/applnk/System/ScreenSavers/rotor.desktop
+share/applnk/System/ScreenSavers/rotzoomer.desktop
+share/applnk/System/ScreenSavers/rubik.desktop
+share/applnk/System/ScreenSavers/sballs.desktop
+share/applnk/System/ScreenSavers/shadebobs.desktop
+share/applnk/System/ScreenSavers/sierpinski.desktop
+share/applnk/System/ScreenSavers/sierpinski3d.desktop
+share/applnk/System/ScreenSavers/slidescreen.desktop
+share/applnk/System/ScreenSavers/slip.desktop
+share/applnk/System/ScreenSavers/sonar.desktop
+share/applnk/System/ScreenSavers/speedmine.desktop
+share/applnk/System/ScreenSavers/sphere.desktop
+share/applnk/System/ScreenSavers/spheremonics.desktop
+share/applnk/System/ScreenSavers/spiral.desktop
+share/applnk/System/ScreenSavers/spotlight.desktop
+share/applnk/System/ScreenSavers/sproingies.desktop
+share/applnk/System/ScreenSavers/squiral.desktop
+share/applnk/System/ScreenSavers/stairs.desktop
+share/applnk/System/ScreenSavers/starfish.desktop
+share/applnk/System/ScreenSavers/starwars.desktop
+share/applnk/System/ScreenSavers/stonerview.desktop
+share/applnk/System/ScreenSavers/strange.desktop
+share/applnk/System/ScreenSavers/superquadrics.desktop
+share/applnk/System/ScreenSavers/swirl.desktop
+share/applnk/System/ScreenSavers/t3d.desktop
+share/applnk/System/ScreenSavers/thornbird.desktop
+share/applnk/System/ScreenSavers/triangle.desktop
+share/applnk/System/ScreenSavers/truchet.desktop
+share/applnk/System/ScreenSavers/twang.desktop
+share/applnk/System/ScreenSavers/vermiculate.desktop
+share/applnk/System/ScreenSavers/vidwhacker.desktop
+share/applnk/System/ScreenSavers/vines.desktop
+share/applnk/System/ScreenSavers/wander.desktop
+share/applnk/System/ScreenSavers/webcollage.desktop
+share/applnk/System/ScreenSavers/whirlwindwarp.desktop
+share/applnk/System/ScreenSavers/whirlygig.desktop
+share/applnk/System/ScreenSavers/worm.desktop
+share/applnk/System/ScreenSavers/xflame.desktop
+share/applnk/System/ScreenSavers/xjack.desktop
+share/applnk/System/ScreenSavers/xlyap.desktop
+share/applnk/System/ScreenSavers/xmatrix.desktop
+share/applnk/System/ScreenSavers/xrayswarm.desktop
+share/applnk/System/ScreenSavers/xspirograph.desktop
+share/applnk/System/ScreenSavers/xsublim.desktop
+share/applnk/System/ScreenSavers/xteevee.desktop
+share/applnk/System/ScreenSavers/zoom.desktop
+share/config/antrc
+share/config/attractionrc
+share/config/bouboulerc
+share/config/bubblesrc
+share/config/coralrc
+share/config/crystalrc
+share/config/decayscreenrc
+share/config/deluxerc
+share/config/demonrc
+share/config/driftrc
+share/config/epicyclerc
+share/config/fadeplotrc
+share/config/flamerc
+share/config/flowrc
+share/config/forestrc
+share/config/gearsrc
+share/config/gooprc
+share/config/gravrc
+share/config/halorc
+share/config/imsmaprc
+share/config/interferencerc
+share/config/kumpparc
+share/config/laserrc
+share/config/lissierc
+share/config/penroserc
+share/config/rocksrc
+share/config/sliprc
diff --git a/x11-themes/kdeartwork3/files/plist.xs.rm b/x11-themes/kdeartwork3/files/plist.xs.rm
new file mode 100644
index 000000000000..b0ceca4d1202
--- /dev/null
+++ b/x11-themes/kdeartwork3/files/plist.xs.rm
@@ -0,0 +1 @@
+@dirrm share/config
diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile
index 85bf2299441f..acbc259570da 100644
--- a/x11-themes/kdeartwork4/Makefile
+++ b/x11-themes/kdeartwork4/Makefile
@@ -26,6 +26,27 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3
+KDE_BUILD_PLIST=yes
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if exists(${X11BASE}/bin/xscreensaver)
+WITH_XS= yes
+.endif # exists(${X11BASE}/bin/xscreensaver)
+
+.if exists(${X11BASE}/bin/screensaver-properties-capplet)
+WITH_XSGNOME= yes
+.endif # exists(${X11BASE}/bin/screensaver-properties-capplet)
+
+.if defined(WITH_XS) && !defined(WITH_XSGNOME)
+BUILD_DEPENDS+= xscreensaver:${PORTSDIR}/x11/xscreensaver
+PLIST_APPEND+= plist.xs
+.endif # defined(WITH_XS)
+
+.if defined(WITH_XSGNOME)
+BUILD_DEPENDS+= screensaver-properties-capplet:${PORTSDIR}/x11/xscreensaver-gnome
+PLIST_APPEND+= plist.xs
+.endif # defined(WITH_XSGNOME)
+
+.include <bsd.port.post.mk>
diff --git a/x11-themes/kdeartwork4/distinfo b/x11-themes/kdeartwork4/distinfo
index 8fa7e0e71b39..4f91b9b06152 100644
--- a/x11-themes/kdeartwork4/distinfo
+++ b/x11-themes/kdeartwork4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeartwork-3.1.1.tar.bz2) = aaf6a2a8736f448766cd190685606d6a
+MD5 (KDE/kdeartwork-3.1.2.tar.bz2) = 0ac7fda2acfa32ce26913ff864722e44
diff --git a/x11-themes/kdeartwork4/files/patch-configure b/x11-themes/kdeartwork4/files/patch-configure
new file mode 100644
index 000000000000..88893ee6c34a
--- /dev/null
+++ b/x11-themes/kdeartwork4/files/patch-configure
@@ -0,0 +1,57 @@
+--- configure.orig Sun May 11 14:21:07 2003
++++ configure Sun May 11 14:22:34 2003
+@@ -24849,12 +24849,12 @@
+ IFS=$old_IFS
+
+
+- echo "$as_me:$LINENO: checking for lib/xscreensaver/flame" >&5
+-echo $ECHO_N "checking for lib/xscreensaver/flame... $ECHO_C" >&6
++ echo "$as_me:$LINENO: checking for bin/xscreensaver-hacks/flame" >&5
++echo $ECHO_N "checking for bin/xscreensaver-hacks/flame... $ECHO_C" >&6
+ if test -n "$XSCREENSAVER"; then
+ kde_cv_path="$XSCREENSAVER";
+ else
+- kde_cache=`echo lib/xscreensaver/flame | sed 'y%./+-%__p_%'`
++ kde_cache=`echo bin/xscreensaver-hacks/flame | sed 'y%./+-%__p_%'`
+
+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24870,16 +24870,16 @@
+ IFS=$kde_save_IFS
+
+ for dir in $dirs; do
+- if test -x "$dir/lib/xscreensaver/flame"; then
++ if test -x "$dir/bin/xscreensaver-hacks/flame"; then
+ if test -n ""
+ then
+- evalstr="$dir/lib/xscreensaver/flame 2>&1 "
++ evalstr="$dir/bin/xscreensaver-hacks/flame 2>&1 "
+ if eval $evalstr; then
+- kde_cv_path="$dir/lib/xscreensaver/flame"
++ kde_cv_path="$dir/bin/xscreensaver-hacks/flame"
+ break
+ fi
+ else
+- kde_cv_path="$dir/lib/xscreensaver/flame"
++ kde_cv_path="$dir/bin/xscreensaver-hacks/flame"
+ break
+ fi
+ fi
+@@ -24923,7 +24923,7 @@
+ XSCREENSAVER_CONFIG=NO
+ for i in $xscreensaver_prefixes ;
+ do
+- for j in lib/xscreensaver/config/flame.xml;
++ for j in share/xscreensaver/config/flame.xml;
+ do
+ echo "configure: 24928: $i/$j" >&5
+ if test -r "$i/$j"; then
+@@ -24954,7 +24954,7 @@
+ XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/lib/X11/xscreensaver/config"
+ fi
+ else
+- XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/lib/xscreensaver/config"
++ XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/share/xscreensaver/config"
+ fi
+ echo "$as_me:$LINENO: result: $XSCREENSAVER_CONFIG" >&5
+ echo "${ECHO_T}$XSCREENSAVER_CONFIG" >&6
diff --git a/x11-themes/kdeartwork3/pkg-plist b/x11-themes/kdeartwork4/files/plist.base
index 615ceacadfba..1e8ab383dfa6 100644
--- a/x11-themes/kdeartwork3/pkg-plist
+++ b/x11-themes/kdeartwork4/files/plist.base
@@ -5604,120 +5604,3 @@ share/wallpapers/simple_wallpaper.jpg
share/wallpapers/sunday_brunch.jpg
share/wallpapers/vegetative_fog.jpg
share/wallpapers/winter_theme_1.jpg
-@dirrm share/wallpapers
-@dirrm share/sounds
-@dirrm share/icons/slick/48x48/mimetypes
-@dirrm share/icons/slick/48x48/filesystems
-@dirrm share/icons/slick/48x48/devices
-@dirrm share/icons/slick/48x48/apps
-@dirrm share/icons/slick/48x48/actions
-@dirrm share/icons/slick/48x48
-@dirrm share/icons/slick/32x32/mimetypes
-@dirrm share/icons/slick/32x32/filesystems
-@dirrm share/icons/slick/32x32/devices
-@dirrm share/icons/slick/32x32/apps
-@dirrm share/icons/slick/32x32/actions
-@dirrm share/icons/slick/32x32
-@dirrm share/icons/slick/22x22/actions
-@dirrm share/icons/slick/22x22
-@dirrm share/icons/slick/16x16/mimetypes
-@dirrm share/icons/slick/16x16/filesystems
-@dirrm share/icons/slick/16x16/devices
-@dirrm share/icons/slick/16x16/apps
-@dirrm share/icons/slick/16x16/actions
-@dirrm share/icons/slick/16x16
-@dirrm share/icons/slick
-@dirrm share/icons/kdeclassic/64x64/mimetypes
-@dirrm share/icons/kdeclassic/64x64/filesystems
-@dirrm share/icons/kdeclassic/64x64
-@dirrm share/icons/kdeclassic/48x48/mimetypes
-@dirrm share/icons/kdeclassic/48x48/filesystems
-@dirrm share/icons/kdeclassic/48x48/devices
-@dirrm share/icons/kdeclassic/48x48/apps
-@dirrm share/icons/kdeclassic/48x48/actions
-@dirrm share/icons/kdeclassic/48x48
-@dirrm share/icons/kdeclassic/32x32/mimetypes
-@dirrm share/icons/kdeclassic/32x32/filesystems
-@dirrm share/icons/kdeclassic/32x32/devices
-@dirrm share/icons/kdeclassic/32x32/apps
-@dirrm share/icons/kdeclassic/32x32/actions
-@dirrm share/icons/kdeclassic/32x32
-@dirrm share/icons/kdeclassic/22x22/mimetypes
-@dirrm share/icons/kdeclassic/22x22/apps
-@dirrm share/icons/kdeclassic/22x22/actions
-@dirrm share/icons/kdeclassic/22x22
-@dirrm share/icons/kdeclassic/16x16/mimetypes
-@dirrm share/icons/kdeclassic/16x16/filesystems
-@dirrm share/icons/kdeclassic/16x16/devices
-@dirrm share/icons/kdeclassic/16x16/apps
-@dirrm share/icons/kdeclassic/16x16/actions
-@dirrm share/icons/kdeclassic/16x16
-@dirrm share/icons/kdeclassic
-@dirrm share/icons/ikons/64x64/filesystems
-@dirrm share/icons/ikons/64x64/apps
-@dirrm share/icons/ikons/64x64
-@dirrm share/icons/ikons/48x48/mimetypes
-@dirrm share/icons/ikons/48x48/filesystems
-@dirrm share/icons/ikons/48x48/devices
-@dirrm share/icons/ikons/48x48/apps
-@dirrm share/icons/ikons/48x48
-@dirrm share/icons/ikons/32x32/mimetypes
-@dirrm share/icons/ikons/32x32/filesystems
-@dirrm share/icons/ikons/32x32/devices
-@dirrm share/icons/ikons/32x32/apps
-@dirrm share/icons/ikons/32x32
-@dirrm share/icons/ikons/22x22/apps
-@dirrm share/icons/ikons/22x22/actions
-@dirrm share/icons/ikons/22x22
-@dirrm share/icons/ikons/16x16/mimetypes
-@dirrm share/icons/ikons/16x16/filesystems
-@dirrm share/icons/ikons/16x16/devices
-@dirrm share/icons/ikons/16x16/apps
-@dirrm share/icons/ikons/16x16/actions
-@dirrm share/icons/ikons/16x16
-@dirrm share/icons/ikons
-@dirrm share/icons/Technical/48x48/mimetypes
-@dirrm share/icons/Technical/48x48/filesystems
-@dirrm share/icons/Technical/48x48
-@dirrm share/icons/Technical/32x32/mimetypes
-@dirrm share/icons/Technical/32x32/filesystems
-@dirrm share/icons/Technical/32x32/actions
-@dirrm share/icons/Technical/32x32
-@dirrm share/icons/Technical
-@dirrm share/icons/Locolor/32x32/mimetypes
-@dirrm share/icons/Locolor/32x32/filesystems
-@dirrm share/icons/Locolor/32x32/devices
-@dirrm share/icons/Locolor/32x32/apps
-@dirrm share/icons/Locolor/32x32/actions
-@dirrm share/icons/Locolor/32x32
-@dirrm share/icons/Locolor/16x16/mimetypes
-@dirrm share/icons/Locolor/16x16/filesystems
-@dirrm share/icons/Locolor/16x16/devices
-@dirrm share/icons/Locolor/16x16/apps
-@dirrm share/icons/Locolor/16x16/actions
-@dirrm share/icons/Locolor/16x16
-@dirrm share/icons/Locolor
-@dirrm share/icons
-@dirrm share/apps/kworldclock/maps/rainfall
-@dirrm share/apps/kworldclock/maps/mggd
-@dirrm share/apps/kworldclock/maps/depths
-@dirrm share/apps/kworldclock/maps/caida_bw
-@dirrm share/apps/kworldclock/maps/caida
-@dirrm share/apps/kworldclock/maps/bio
-@dirrm share/apps/kworldclock/maps/alt
-@dirrm share/apps/kworldclock/maps
-@dirrm share/apps/kworldclock
-@dirrm share/apps/kwin/icewm-themes/Model
-@dirrm share/apps/kwin/icewm-themes/MenschMaschine
-@dirrm share/apps/kwin/icewm-themes
-@dirrm share/apps/kwin
-@dirrm share/apps/kstyle/themes
-@dirrm share/apps/kstyle
-@dirrm share/apps/kscreensaver
-@dirrm share/apps
-@dirrm share/applnk/System/ScreenSavers
-@dirrm share/applnk/System
-@dirrm share/applnk
-@dirrm lib/kde3/plugins/styles
-@dirrm lib/kde3/plugins
-@dirrm lib/kde3
diff --git a/x11-themes/kdeartwork4/files/plist.base.rm b/x11-themes/kdeartwork4/files/plist.base.rm
new file mode 100644
index 000000000000..a862242a0bf7
--- /dev/null
+++ b/x11-themes/kdeartwork4/files/plist.base.rm
@@ -0,0 +1,117 @@
+@dirrm share/wallpapers
+@dirrm share/sounds
+@dirrm share/icons/slick/48x48/mimetypes
+@dirrm share/icons/slick/48x48/filesystems
+@dirrm share/icons/slick/48x48/devices
+@dirrm share/icons/slick/48x48/apps
+@dirrm share/icons/slick/48x48/actions
+@dirrm share/icons/slick/48x48
+@dirrm share/icons/slick/32x32/mimetypes
+@dirrm share/icons/slick/32x32/filesystems
+@dirrm share/icons/slick/32x32/devices
+@dirrm share/icons/slick/32x32/apps
+@dirrm share/icons/slick/32x32/actions
+@dirrm share/icons/slick/32x32
+@dirrm share/icons/slick/22x22/actions
+@dirrm share/icons/slick/22x22
+@dirrm share/icons/slick/16x16/mimetypes
+@dirrm share/icons/slick/16x16/filesystems
+@dirrm share/icons/slick/16x16/devices
+@dirrm share/icons/slick/16x16/apps
+@dirrm share/icons/slick/16x16/actions
+@dirrm share/icons/slick/16x16
+@dirrm share/icons/slick
+@dirrm share/icons/kdeclassic/64x64/mimetypes
+@dirrm share/icons/kdeclassic/64x64/filesystems
+@dirrm share/icons/kdeclassic/64x64
+@dirrm share/icons/kdeclassic/48x48/mimetypes
+@dirrm share/icons/kdeclassic/48x48/filesystems
+@dirrm share/icons/kdeclassic/48x48/devices
+@dirrm share/icons/kdeclassic/48x48/apps
+@dirrm share/icons/kdeclassic/48x48/actions
+@dirrm share/icons/kdeclassic/48x48
+@dirrm share/icons/kdeclassic/32x32/mimetypes
+@dirrm share/icons/kdeclassic/32x32/filesystems
+@dirrm share/icons/kdeclassic/32x32/devices
+@dirrm share/icons/kdeclassic/32x32/apps
+@dirrm share/icons/kdeclassic/32x32/actions
+@dirrm share/icons/kdeclassic/32x32
+@dirrm share/icons/kdeclassic/22x22/mimetypes
+@dirrm share/icons/kdeclassic/22x22/apps
+@dirrm share/icons/kdeclassic/22x22/actions
+@dirrm share/icons/kdeclassic/22x22
+@dirrm share/icons/kdeclassic/16x16/mimetypes
+@dirrm share/icons/kdeclassic/16x16/filesystems
+@dirrm share/icons/kdeclassic/16x16/devices
+@dirrm share/icons/kdeclassic/16x16/apps
+@dirrm share/icons/kdeclassic/16x16/actions
+@dirrm share/icons/kdeclassic/16x16
+@dirrm share/icons/kdeclassic
+@dirrm share/icons/ikons/64x64/filesystems
+@dirrm share/icons/ikons/64x64/apps
+@dirrm share/icons/ikons/64x64
+@dirrm share/icons/ikons/48x48/mimetypes
+@dirrm share/icons/ikons/48x48/filesystems
+@dirrm share/icons/ikons/48x48/devices
+@dirrm share/icons/ikons/48x48/apps
+@dirrm share/icons/ikons/48x48
+@dirrm share/icons/ikons/32x32/mimetypes
+@dirrm share/icons/ikons/32x32/filesystems
+@dirrm share/icons/ikons/32x32/devices
+@dirrm share/icons/ikons/32x32/apps
+@dirrm share/icons/ikons/32x32
+@dirrm share/icons/ikons/22x22/apps
+@dirrm share/icons/ikons/22x22/actions
+@dirrm share/icons/ikons/22x22
+@dirrm share/icons/ikons/16x16/mimetypes
+@dirrm share/icons/ikons/16x16/filesystems
+@dirrm share/icons/ikons/16x16/devices
+@dirrm share/icons/ikons/16x16/apps
+@dirrm share/icons/ikons/16x16/actions
+@dirrm share/icons/ikons/16x16
+@dirrm share/icons/ikons
+@dirrm share/icons/Technical/48x48/mimetypes
+@dirrm share/icons/Technical/48x48/filesystems
+@dirrm share/icons/Technical/48x48
+@dirrm share/icons/Technical/32x32/mimetypes
+@dirrm share/icons/Technical/32x32/filesystems
+@dirrm share/icons/Technical/32x32/actions
+@dirrm share/icons/Technical/32x32
+@dirrm share/icons/Technical
+@dirrm share/icons/Locolor/32x32/mimetypes
+@dirrm share/icons/Locolor/32x32/filesystems
+@dirrm share/icons/Locolor/32x32/devices
+@dirrm share/icons/Locolor/32x32/apps
+@dirrm share/icons/Locolor/32x32/actions
+@dirrm share/icons/Locolor/32x32
+@dirrm share/icons/Locolor/16x16/mimetypes
+@dirrm share/icons/Locolor/16x16/filesystems
+@dirrm share/icons/Locolor/16x16/devices
+@dirrm share/icons/Locolor/16x16/apps
+@dirrm share/icons/Locolor/16x16/actions
+@dirrm share/icons/Locolor/16x16
+@dirrm share/icons/Locolor
+@dirrm share/icons
+@dirrm share/apps/kworldclock/maps/rainfall
+@dirrm share/apps/kworldclock/maps/mggd
+@dirrm share/apps/kworldclock/maps/depths
+@dirrm share/apps/kworldclock/maps/caida_bw
+@dirrm share/apps/kworldclock/maps/caida
+@dirrm share/apps/kworldclock/maps/bio
+@dirrm share/apps/kworldclock/maps/alt
+@dirrm share/apps/kworldclock/maps
+@dirrm share/apps/kworldclock
+@dirrm share/apps/kwin/icewm-themes/Model
+@dirrm share/apps/kwin/icewm-themes/MenschMaschine
+@dirrm share/apps/kwin/icewm-themes
+@dirrm share/apps/kwin
+@dirrm share/apps/kstyle/themes
+@dirrm share/apps/kstyle
+@dirrm share/apps/kscreensaver
+@dirrm share/apps
+@dirrm share/applnk/System/ScreenSavers
+@dirrm share/applnk/System
+@dirrm share/applnk
+@dirrm lib/kde3/plugins/styles
+@dirrm lib/kde3/plugins
+@dirrm lib/kde3
diff --git a/x11-themes/kdeartwork4/files/plist.xs b/x11-themes/kdeartwork4/files/plist.xs
new file mode 100644
index 000000000000..9d5aabc15f64
--- /dev/null
+++ b/x11-themes/kdeartwork4/files/plist.xs
@@ -0,0 +1,176 @@
+bin/kxsconfig
+bin/kxsrun
+share/applnk/System/ScreenSavers/anemone.desktop
+share/applnk/System/ScreenSavers/ant.desktop
+share/applnk/System/ScreenSavers/apollonian.desktop
+share/applnk/System/ScreenSavers/atlantis.desktop
+share/applnk/System/ScreenSavers/attraction.desktop
+share/applnk/System/ScreenSavers/blaster.desktop
+share/applnk/System/ScreenSavers/blitspin.desktop
+share/applnk/System/ScreenSavers/bouboule.desktop
+share/applnk/System/ScreenSavers/boxed.desktop
+share/applnk/System/ScreenSavers/braid.desktop
+share/applnk/System/ScreenSavers/bsod.desktop
+share/applnk/System/ScreenSavers/bubble3d.desktop
+share/applnk/System/ScreenSavers/bubbles.desktop
+share/applnk/System/ScreenSavers/bumps.desktop
+share/applnk/System/ScreenSavers/cage.desktop
+share/applnk/System/ScreenSavers/ccurve.desktop
+share/applnk/System/ScreenSavers/circuit.desktop
+share/applnk/System/ScreenSavers/compass.desktop
+share/applnk/System/ScreenSavers/coral.desktop
+share/applnk/System/ScreenSavers/critical.desktop
+share/applnk/System/ScreenSavers/crystal.desktop
+share/applnk/System/ScreenSavers/cubenetic.desktop
+share/applnk/System/ScreenSavers/cynosure.desktop
+share/applnk/System/ScreenSavers/dangerball.desktop
+share/applnk/System/ScreenSavers/decayscreen.desktop
+share/applnk/System/ScreenSavers/deco.desktop
+share/applnk/System/ScreenSavers/deluxe.desktop
+share/applnk/System/ScreenSavers/demon.desktop
+share/applnk/System/ScreenSavers/discrete.desktop
+share/applnk/System/ScreenSavers/distort.desktop
+share/applnk/System/ScreenSavers/drift.desktop
+share/applnk/System/ScreenSavers/endgame.desktop
+share/applnk/System/ScreenSavers/engine.desktop
+share/applnk/System/ScreenSavers/epicycle.desktop
+share/applnk/System/ScreenSavers/euler2d.desktop
+share/applnk/System/ScreenSavers/extrusion.desktop
+share/applnk/System/ScreenSavers/fadeplot.desktop
+share/applnk/System/ScreenSavers/flag.desktop
+share/applnk/System/ScreenSavers/flame.desktop
+share/applnk/System/ScreenSavers/flipscreen3d.desktop
+share/applnk/System/ScreenSavers/flow.desktop
+share/applnk/System/ScreenSavers/fluidballs.desktop
+share/applnk/System/ScreenSavers/forest.desktop
+share/applnk/System/ScreenSavers/galaxy.desktop
+share/applnk/System/ScreenSavers/gears.desktop
+share/applnk/System/ScreenSavers/gflux.desktop
+share/applnk/System/ScreenSavers/glforestfire.desktop
+share/applnk/System/ScreenSavers/glplanet.desktop
+share/applnk/System/ScreenSavers/glsnake.desktop
+share/applnk/System/ScreenSavers/gltext.desktop
+share/applnk/System/ScreenSavers/goop.desktop
+share/applnk/System/ScreenSavers/grav.desktop
+share/applnk/System/ScreenSavers/greynetic.desktop
+share/applnk/System/ScreenSavers/halo.desktop
+share/applnk/System/ScreenSavers/helix.desktop
+share/applnk/System/ScreenSavers/hopalong.desktop
+share/applnk/System/ScreenSavers/hyperball.desktop
+share/applnk/System/ScreenSavers/hypercube.desktop
+share/applnk/System/ScreenSavers/ifs.desktop
+share/applnk/System/ScreenSavers/imsmap.desktop
+share/applnk/System/ScreenSavers/interference.desktop
+share/applnk/System/ScreenSavers/jigsaw.desktop
+share/applnk/System/ScreenSavers/juggle.desktop
+share/applnk/System/ScreenSavers/julia.desktop
+share/applnk/System/ScreenSavers/kaleidescope.desktop
+share/applnk/System/ScreenSavers/kumppa.desktop
+share/applnk/System/ScreenSavers/lament.desktop
+share/applnk/System/ScreenSavers/laser.desktop
+share/applnk/System/ScreenSavers/lavalite.desktop
+share/applnk/System/ScreenSavers/lightning.desktop
+share/applnk/System/ScreenSavers/lisa.desktop
+share/applnk/System/ScreenSavers/lissie.desktop
+share/applnk/System/ScreenSavers/lmorph.desktop
+share/applnk/System/ScreenSavers/loop.desktop
+share/applnk/System/ScreenSavers/maze.desktop
+share/applnk/System/ScreenSavers/menger.desktop
+share/applnk/System/ScreenSavers/moebius.desktop
+share/applnk/System/ScreenSavers/moire.desktop
+share/applnk/System/ScreenSavers/moire2.desktop
+share/applnk/System/ScreenSavers/molecule.desktop
+share/applnk/System/ScreenSavers/morph3d.desktop
+share/applnk/System/ScreenSavers/mountain.desktop
+share/applnk/System/ScreenSavers/munch.desktop
+share/applnk/System/ScreenSavers/nerverot.desktop
+share/applnk/System/ScreenSavers/noseguy.desktop
+share/applnk/System/ScreenSavers/pedal.desktop
+share/applnk/System/ScreenSavers/penetrate.desktop
+share/applnk/System/ScreenSavers/penrose.desktop
+share/applnk/System/ScreenSavers/petri.desktop
+share/applnk/System/ScreenSavers/phosphor.desktop
+share/applnk/System/ScreenSavers/pipes.desktop
+share/applnk/System/ScreenSavers/pixmaps.desktop
+share/applnk/System/ScreenSavers/polyominoes.desktop
+share/applnk/System/ScreenSavers/pulsar.desktop
+share/applnk/System/ScreenSavers/pyro.desktop
+share/applnk/System/ScreenSavers/qix.desktop
+share/applnk/System/ScreenSavers/queens.desktop
+share/applnk/System/ScreenSavers/rd-bomb.desktop
+share/applnk/System/ScreenSavers/ripples.desktop
+share/applnk/System/ScreenSavers/rocks.desktop
+share/applnk/System/ScreenSavers/rorschach.desktop
+share/applnk/System/ScreenSavers/rotor.desktop
+share/applnk/System/ScreenSavers/rotzoomer.desktop
+share/applnk/System/ScreenSavers/rubik.desktop
+share/applnk/System/ScreenSavers/sballs.desktop
+share/applnk/System/ScreenSavers/shadebobs.desktop
+share/applnk/System/ScreenSavers/sierpinski.desktop
+share/applnk/System/ScreenSavers/sierpinski3d.desktop
+share/applnk/System/ScreenSavers/slidescreen.desktop
+share/applnk/System/ScreenSavers/slip.desktop
+share/applnk/System/ScreenSavers/sonar.desktop
+share/applnk/System/ScreenSavers/speedmine.desktop
+share/applnk/System/ScreenSavers/sphere.desktop
+share/applnk/System/ScreenSavers/spheremonics.desktop
+share/applnk/System/ScreenSavers/spiral.desktop
+share/applnk/System/ScreenSavers/spotlight.desktop
+share/applnk/System/ScreenSavers/sproingies.desktop
+share/applnk/System/ScreenSavers/squiral.desktop
+share/applnk/System/ScreenSavers/stairs.desktop
+share/applnk/System/ScreenSavers/starfish.desktop
+share/applnk/System/ScreenSavers/starwars.desktop
+share/applnk/System/ScreenSavers/stonerview.desktop
+share/applnk/System/ScreenSavers/strange.desktop
+share/applnk/System/ScreenSavers/superquadrics.desktop
+share/applnk/System/ScreenSavers/swirl.desktop
+share/applnk/System/ScreenSavers/t3d.desktop
+share/applnk/System/ScreenSavers/thornbird.desktop
+share/applnk/System/ScreenSavers/triangle.desktop
+share/applnk/System/ScreenSavers/truchet.desktop
+share/applnk/System/ScreenSavers/twang.desktop
+share/applnk/System/ScreenSavers/vermiculate.desktop
+share/applnk/System/ScreenSavers/vidwhacker.desktop
+share/applnk/System/ScreenSavers/vines.desktop
+share/applnk/System/ScreenSavers/wander.desktop
+share/applnk/System/ScreenSavers/webcollage.desktop
+share/applnk/System/ScreenSavers/whirlwindwarp.desktop
+share/applnk/System/ScreenSavers/whirlygig.desktop
+share/applnk/System/ScreenSavers/worm.desktop
+share/applnk/System/ScreenSavers/xflame.desktop
+share/applnk/System/ScreenSavers/xjack.desktop
+share/applnk/System/ScreenSavers/xlyap.desktop
+share/applnk/System/ScreenSavers/xmatrix.desktop
+share/applnk/System/ScreenSavers/xrayswarm.desktop
+share/applnk/System/ScreenSavers/xspirograph.desktop
+share/applnk/System/ScreenSavers/xsublim.desktop
+share/applnk/System/ScreenSavers/xteevee.desktop
+share/applnk/System/ScreenSavers/zoom.desktop
+share/config/antrc
+share/config/attractionrc
+share/config/bouboulerc
+share/config/bubblesrc
+share/config/coralrc
+share/config/crystalrc
+share/config/decayscreenrc
+share/config/deluxerc
+share/config/demonrc
+share/config/driftrc
+share/config/epicyclerc
+share/config/fadeplotrc
+share/config/flamerc
+share/config/flowrc
+share/config/forestrc
+share/config/gearsrc
+share/config/gooprc
+share/config/gravrc
+share/config/halorc
+share/config/imsmaprc
+share/config/interferencerc
+share/config/kumpparc
+share/config/laserrc
+share/config/lissierc
+share/config/penroserc
+share/config/rocksrc
+share/config/sliprc
diff --git a/x11-themes/kdeartwork4/files/plist.xs.rm b/x11-themes/kdeartwork4/files/plist.xs.rm
new file mode 100644
index 000000000000..b0ceca4d1202
--- /dev/null
+++ b/x11-themes/kdeartwork4/files/plist.xs.rm
@@ -0,0 +1 @@
+@dirrm share/config
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 799f3115b043..3340b4bd78e5 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= qt
-PORTVERSION= 3.1.1
-PORTREVISION= 5
+PORTVERSION= 3.1.2
CATEGORIES?= x11-toolkits
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
ftp://ftp.silug.org/pub/qt/ \
diff --git a/x11-toolkits/qt31/distinfo b/x11-toolkits/qt31/distinfo
index f0b3fd135bad..b63babb92bf5 100644
--- a/x11-toolkits/qt31/distinfo
+++ b/x11-toolkits/qt31/distinfo
@@ -1 +1 @@
-MD5 (KDE/qt-x11-free-3.1.1.tar.bz2) = 977b9f59eed14f33343a797544b5418a
+MD5 (KDE/qt-x11-free-3.1.2.tar.bz2) = 156591717687799c69cf3f8b64a898f2
diff --git a/x11-toolkits/qt31/files/patch-qfiledialog.cpp b/x11-toolkits/qt31/files/patch-qfiledialog.cpp
deleted file mode 100644
index 79ae98e8f03b..000000000000
--- a/x11-toolkits/qt31/files/patch-qfiledialog.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dialogs/qfiledialog.cpp Thu Nov 7 14:07:21 2002
-+++ /cvs/qt-copy/src/dialogs/qfiledialog.cpp Thu Nov 21 13:06:09 2002
-@@ -3170,7 +3170,7 @@
- user = dr.mid( 1, i-1 ).local8Bit();
- dr = dr.mid( i, dr.length() );
- struct passwd *pw;
--#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-+#if 0
- struct passwd mt_pw;
- char buffer[2048];
- if ( ::getpwnam_r( user, &mt_pw, buffer, 2048, &pw ) == 0 && pw == &mt_pw )
diff --git a/x11-toolkits/qt31/files/patch-qlistview.cpp b/x11-toolkits/qt31/files/patch-qlistview.cpp
new file mode 100644
index 000000000000..73882d3e9746
--- /dev/null
+++ b/x11-toolkits/qt31/files/patch-qlistview.cpp
@@ -0,0 +1,11 @@
+--- src/widgets/qlistview.cpp.orig Mon Feb 24 09:30:39 2003
++++ src/widgets/qlistview.cpp Mon May 12 19:42:07 2003
+@@ -6215,7 +6215,7 @@
+
+ void QListView::ensureItemVisible( const QListViewItem * i )
+ {
+- if ( !i )
++ if ( !i || !i->isVisible() )
+ return;
+
+ QListViewItem *parent = i->parent();
diff --git a/x11-toolkits/qt31/files/patch-qlock.cpp b/x11-toolkits/qt31/files/patch-qlock.cpp
deleted file mode 100644
index ee610b2d46b2..000000000000
--- a/x11-toolkits/qt31/files/patch-qlock.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/kernel/qlock.cpp.orig Mon Dec 9 04:40:45 2002
-+++ src/kernel/qlock.cpp Sun Dec 29 05:31:54 2002
-@@ -41,6 +41,7 @@
- #include <sys/file.h>
- #else
- #include <sys/types.h>
-+#include <sys/ipc.h>
- #include <sys/sem.h>
- #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) \
- || defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_BSDI)
diff --git a/x11-toolkits/qt31/files/patch-qpopupmenu.cpp b/x11-toolkits/qt31/files/patch-qpopupmenu.cpp
new file mode 100644
index 000000000000..78affc105b4a
--- /dev/null
+++ b/x11-toolkits/qt31/files/patch-qpopupmenu.cpp
@@ -0,0 +1,11 @@
+--- src/widgets/qpopupmenu.cpp.orig Mon May 12 19:44:39 2003
++++ src/widgets/qpopupmenu.cpp Mon May 12 19:45:42 2003
+@@ -1739,7 +1739,7 @@
+ if ( style().styleHint(QStyle::SH_PopupMenu_SloppySubMenus, this) &&
+ d->mouseMoveBuffer.contains( e->pos() ) ) {
+ actItem = item;
+- popupSubMenuLater( style().styleHint(QStyle::SH_PopupMenu_SubMenuPopupDelay, this) * 2,
++ popupSubMenuLater( style().styleHint(QStyle::SH_PopupMenu_SubMenuPopupDelay, this) * 6,
+ this );
+ return;
+ }
diff --git a/x11-toolkits/qt31/files/patch-qtextedit.cpp b/x11-toolkits/qt31/files/patch-qtextedit.cpp
new file mode 100644
index 000000000000..7c22203692de
--- /dev/null
+++ b/x11-toolkits/qt31/files/patch-qtextedit.cpp
@@ -0,0 +1,20 @@
+--- src/widgets/qtextedit.cpp.orig Mon Feb 24 09:30:37 2003
++++ src/widgets/qtextedit.cpp Mon May 12 19:50:19 2003
+@@ -1863,7 +1863,7 @@
+ }
+ setModified();
+ emit textChanged();
+- emit selectionChanged();
++ emit copyAvailable( doc->hasSelection( QTextDocument::Standard ) );
+ }
+
+ /*!
+@@ -4801,7 +4801,7 @@
+ return;
+ if ( doc->hasSelection( QTextDocument::Standard ) )
+ removeSelectedText();
+- if ( !m->provides( st.data() ) )
++ if ( !QRichTextDrag::canDecode( m ) )
+ return;
+ QString t;
+ if ( !QRichTextDrag::decode( m, t, st.data(), subtype ) )
diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist
index b0ded5e60e8a..20be8e28e214 100644
--- a/x11-toolkits/qt31/pkg-plist
+++ b/x11-toolkits/qt31/pkg-plist
@@ -14,6 +14,11 @@ bin/qmake
bin/qtconfig
bin/qvfb
bin/uic
+include/jri.h
+include/jri_md.h
+include/jritypes.h
+include/npapi.h
+include/npupp.h
include/private/qapplication_p.h
include/private/qcolor_p.h
include/private/qcom_p.h
@@ -214,11 +219,8 @@ include/qmime.h
include/qmlined.h
include/qmngio.h
include/qmodules.h
-include/qmotif.h
-include/qmotifdialog.h
include/qmotifplusstyle.h
include/qmotifstyle.h
-include/qmotifwidget.h
include/qmovie.h
include/qmsgbox.h
include/qmultilinedit.h
@@ -227,6 +229,7 @@ include/qmutex.h
include/qnamespace.h
include/qnetwork.h
include/qnetworkprotocol.h
+include/qnp.h
include/qobjcoll.h
include/qobjdefs.h
include/qobject.h
@@ -387,36 +390,38 @@ include/qwindow.h
include/qwindowdefs.h
include/qwindowsstyle.h
include/qwindowsxpstyle.h
+include/qwinexport.h
include/qwizard.h
include/qwmatrix.h
include/qworkspace.h
include/qxml.h
-include/qxtwidget.h
lib/libdesigner.a
lib/libdesigner.prl
lib/libeditor.a
lib/libeditor.prl
lib/libqassistantclient.a
lib/libqassistantclient.prl
-lib/libqmotif.prl
+lib/libqnp.prl
lib/libqt-mt.prl
lib/libqt-mt.so
lib/libqt-mt.so.3
lib/libqt-mt.so.3.1
-lib/libqt-mt.so.3.1.1
+lib/libqt-mt.so.3.1.2
lib/libqui.prl
lib/libqui.so
lib/libqui.so.1
lib/libqui.so.1.0
lib/libqui.so.1.0.0
+lib/plugins/designer/libcppeditor.so
+lib/plugins/designer/libdlgplugin.so
+lib/plugins/designer/libkdevdlgplugin.so
+lib/plugins/designer/librcplugin.so
+lib/plugins/designer/libwizards.so
share/doc/qt/html/aboutqt.html
share/doc/qt/html/abstract-connections.png
share/doc/qt/html/abstractwidgets.html
share/doc/qt/html/accelerators.html
share/doc/qt/html/aclock-example.html
-share/doc/qt/html/actiongroup.png
-share/doc/qt/html/addmainwidg.png
-share/doc/qt/html/addmenuitem.png
share/doc/qt/html/addressbook-example.html
share/doc/qt/html/advanced.html
share/doc/qt/html/annotated.html
@@ -441,7 +446,6 @@ share/doc/qt/html/brush-styles.png
share/doc/qt/html/bughowto.html
share/doc/qt/html/buttongroup-w.png
share/doc/qt/html/buttongroups-example.html
-share/doc/qt/html/buttons.png
share/doc/qt/html/buyhowto.html
share/doc/qt/html/canvas-chart-example.html
share/doc/qt/html/canvas-example.html
@@ -471,11 +475,8 @@ share/doc/qt/html/classchart.html
share/doc/qt/html/classes.html
share/doc/qt/html/clientserver-example.html
share/doc/qt/html/collection.html
-share/doc/qt/html/coloriconv.png
-share/doc/qt/html/colortable.png
share/doc/qt/html/commonproblems.html
share/doc/qt/html/concrete-connections.png
-share/doc/qt/html/containers.png
share/doc/qt/html/coordsys.html
share/doc/qt/html/coordsys.png
share/doc/qt/html/credits.html
@@ -486,7 +487,6 @@ share/doc/qt/html/customlayout.html
share/doc/qt/html/customstyles.html
share/doc/qt/html/database-connections.png
share/doc/qt/html/database.html
-share/doc/qt/html/database.png
share/doc/qt/html/datastreamformat.html
share/doc/qt/html/datetimewidgets.png
share/doc/qt/html/dclock-example.html
@@ -532,29 +532,21 @@ share/doc/qt/html/dialog3layout.png
share/doc/qt/html/dialog3sample.png
share/doc/qt/html/dialogs.html
share/doc/qt/html/dirview-example.html
-share/doc/qt/html/display.png
share/doc/qt/html/distributingqt.html
share/doc/qt/html/dnd.html
share/doc/qt/html/doneandnext.png
-share/doc/qt/html/dragaction.png
share/doc/qt/html/draganddrop.html
share/doc/qt/html/dragdrop-example.html
share/doc/qt/html/drawdemo-example.html
share/doc/qt/html/drawlines-example.html
share/doc/qt/html/edit-dbtable-dialog.png
-share/doc/qt/html/editconn.png
-share/doc/qt/html/editconn1.png
-share/doc/qt/html/editconn2.png
-share/doc/qt/html/editconn3.png
share/doc/qt/html/editcopy.png
share/doc/qt/html/editcut.png
share/doc/qt/html/editfind.png
-share/doc/qt/html/editfunc.png
share/doc/qt/html/editions.html
share/doc/qt/html/editpaste.png
share/doc/qt/html/editredo.png
share/doc/qt/html/editundo.png
-share/doc/qt/html/editvar.png
share/doc/qt/html/emb-accel.html
share/doc/qt/html/emb-charinput.html
share/doc/qt/html/emb-classes.html
@@ -583,8 +575,6 @@ share/doc/qt/html/filesave.png
share/doc/qt/html/finddialog.png
share/doc/qt/html/focus.html
share/doc/qt/html/forever-example.html
-share/doc/qt/html/formsettings.png
-share/doc/qt/html/forwdec.png
share/doc/qt/html/frames.png
share/doc/qt/html/ftpclient-example.html
share/doc/qt/html/functions.html
@@ -592,6 +582,8 @@ share/doc/qt/html/geomanagement.html
share/doc/qt/html/geometry.html
share/doc/qt/html/geometry.png
share/doc/qt/html/gpl.html
+share/doc/qt/html/graph.g1n
+share/doc/qt/html/grapher-nsplugin-example.html
share/doc/qt/html/graphics.html
share/doc/qt/html/gridlayout.png
share/doc/qt/html/groupbox-w.png
@@ -613,19 +605,14 @@ share/doc/qt/html/iconview-simple_dd-main-cpp.html
share/doc/qt/html/iconview-simple_dd-main-h.html
share/doc/qt/html/iconview.html
share/doc/qt/html/images.html
-share/doc/qt/html/incimp.png
share/doc/qt/html/index
share/doc/qt/html/index.html
-share/doc/qt/html/input.png
share/doc/qt/html/inputdialogs.png
share/doc/qt/html/install-win.html
share/doc/qt/html/install-x11.html
share/doc/qt/html/installation.html
share/doc/qt/html/io.html
share/doc/qt/html/keyfeatures30.html
-share/doc/qt/html/laycoloriconv.png
-share/doc/qt/html/laycolortable.png
-share/doc/qt/html/laymainwidg.png
share/doc/qt/html/layout-example.html
share/doc/qt/html/layout.html
share/doc/qt/html/layout1.png
@@ -658,25 +645,46 @@ share/doc/qt/html/metaobjects.html
share/doc/qt/html/misc.html
share/doc/qt/html/moc.html
share/doc/qt/html/modules.html
-share/doc/qt/html/motif-customwidget-example.html
-share/doc/qt/html/motif-dialog-example.html
-share/doc/qt/html/motif-examples.html
-share/doc/qt/html/motif-extension.html
share/doc/qt/html/movies-example.html
share/doc/qt/html/multimedia.html
-share/doc/qt/html/mwwiz.png
-share/doc/qt/html/mwwiz2.png
+share/doc/qt/html/mw-actiongroup.png
+share/doc/qt/html/mw-addmainwidg.png
+share/doc/qt/html/mw-addmenuitem.png
+share/doc/qt/html/mw-coloriconv.png
+share/doc/qt/html/mw-colortable.png
+share/doc/qt/html/mw-colortool1.png
+share/doc/qt/html/mw-colortool2.png
+share/doc/qt/html/mw-conn1.png
+share/doc/qt/html/mw-conn2.png
+share/doc/qt/html/mw-conn3.png
+share/doc/qt/html/mw-conn4.png
+share/doc/qt/html/mw-dragaction.png
+share/doc/qt/html/mw-editforw.png
+share/doc/qt/html/mw-editfunc.png
+share/doc/qt/html/mw-editincimp.png
+share/doc/qt/html/mw-editvar.png
+share/doc/qt/html/mw-laycoloriconv.png
+share/doc/qt/html/mw-laycolortable.png
+share/doc/qt/html/mw-laymainwidg.png
+share/doc/qt/html/mw-menuwiz.png
+share/doc/qt/html/mw-newfile.png
+share/doc/qt/html/mw-objexplor.png
+share/doc/qt/html/mw-previewform.png
+share/doc/qt/html/mw-projset.png
+share/doc/qt/html/mw-propedit.png
+share/doc/qt/html/mw-settoolwiz.png
+share/doc/qt/html/mw-startdesign.png
+share/doc/qt/html/mw-toolbarpits.png
+share/doc/qt/html/netscape-plugin.html
share/doc/qt/html/network-examples.html
share/doc/qt/html/network.html
share/doc/qt/html/networkprotocol-example.html
-share/doc/qt/html/newfiledialog.png
-share/doc/qt/html/newopendialog.png
share/doc/qt/html/next.png
share/doc/qt/html/nextunfinished.png
+share/doc/qt/html/nsplugin-examples.html
share/doc/qt/html/object.html
share/doc/qt/html/objectmodel.html
share/doc/qt/html/objecttrees.html
-share/doc/qt/html/objexplor.png
share/doc/qt/html/opengl-box-example.html
share/doc/qt/html/opengl-examples.html
share/doc/qt/html/opengl-gear-example.html
@@ -705,14 +713,11 @@ share/doc/qt/html/popup-example.html
share/doc/qt/html/porting.html
share/doc/qt/html/porting2.html
share/doc/qt/html/prev.png
-share/doc/qt/html/previewform.png
share/doc/qt/html/prevunfinished.png
share/doc/qt/html/primes.html
share/doc/qt/html/process-example.html
share/doc/qt/html/progress-example.html
share/doc/qt/html/progressbar-example.html
-share/doc/qt/html/projset.png
-share/doc/qt/html/propedit.png
share/doc/qt/html/properties.html
share/doc/qt/html/propertydocs
share/doc/qt/html/propertyindex
@@ -892,21 +897,7 @@ share/doc/qt/html/qcustomevent-members.html
share/doc/qt/html/qcustomevent.html
share/doc/qt/html/qcustommenuitem-members.html
share/doc/qt/html/qcustommenuitem.html
-share/doc/qt/html/qd-buttonstoolbuttons3.png
-share/doc/qt/html/qd-chooseanimage.png
-share/doc/qt/html/qd-chooseapixmap.png
-share/doc/qt/html/qd-chooseimages.png
share/doc/qt/html/qd-colortool-name.png
-share/doc/qt/html/qd-colortool1.png
-share/doc/qt/html/qd-colortool2.png
-share/doc/qt/html/qd-configmainfile.png
-share/doc/qt/html/qd-containertoolbuttons3.png
-share/doc/qt/html/qd-createtemplate.png
-share/doc/qt/html/qd-customwidgettoolbutton.png
-share/doc/qt/html/qd-custwiddeftab.png
-share/doc/qt/html/qd-custwidproptab.png
-share/doc/qt/html/qd-custwidslotstab.png
-share/doc/qt/html/qd-databasetoolbuttons3.png
share/doc/qt/html/qd-databrowserwzd.png
share/doc/qt/html/qd-databrowserwzdpage2.png
share/doc/qt/html/qd-databrowserwzdpage3.png
@@ -922,66 +913,10 @@ share/doc/qt/html/qd-dataviewwzd.png
share/doc/qt/html/qd-dataviewwzdpage2.png
share/doc/qt/html/qd-dataviewwzdpage3.png
share/doc/qt/html/qd-dataviewwzdpage4.png
-share/doc/qt/html/qd-displaytoolbuttons3.png
-share/doc/qt/html/qd-editclassvariables.png
-share/doc/qt/html/qd-editcustwidsigtab.png
-share/doc/qt/html/qd-editforwarddeclarations.png
-share/doc/qt/html/qd-editiconview.png
-share/doc/qt/html/qd-editincludesindeclaration.png
-share/doc/qt/html/qd-editincludesinimplementation.png
-share/doc/qt/html/qd-editlistbox.png
-share/doc/qt/html/qd-editlistview.png
-share/doc/qt/html/qd-editlistviewcolumns.png
-share/doc/qt/html/qd-editmenu1.png
-share/doc/qt/html/qd-editpalettedialog.png
-share/doc/qt/html/qd-editpreferencesc++.png
-share/doc/qt/html/qd-editpreferencesgeneral.png
-share/doc/qt/html/qd-edittablecolumns.png
-share/doc/qt/html/qd-edittablerows.png
-share/doc/qt/html/qd-edittoolbuttons3.png
-share/doc/qt/html/qd-filemenu1.png
-share/doc/qt/html/qd-filenew2.png
-share/doc/qt/html/qd-fileopen.png
-share/doc/qt/html/qd-fileoverviewwindow.png
-share/doc/qt/html/qd-filesaveasdialog.png
-share/doc/qt/html/qd-filesaveformasdialog.png
-share/doc/qt/html/qd-filesaveformdialog.png
-share/doc/qt/html/qd-filesaveprojectsettingsdialog.png
-share/doc/qt/html/qd-filetoolbuttons3.png
-share/doc/qt/html/qd-finddirectorydialog.png
-share/doc/qt/html/qd-helpmenu.png
share/doc/qt/html/qd-helptoolbuttons3.png
-share/doc/qt/html/qd-inputtoolbuttons3.png
-share/doc/qt/html/qd-layoutmenu1.png
-share/doc/qt/html/qd-layouttoolbuttons3.png
share/doc/qt/html/qd-mainwinwzd.png
share/doc/qt/html/qd-mainwinwzdpage2.png
-share/doc/qt/html/qd-objexpwindowwidgettab.png
-share/doc/qt/html/qd-objexpwinsourcetab.png
-share/doc/qt/html/qd-pagetitle.png
-share/doc/qt/html/qd-previewmenu.png
-share/doc/qt/html/qd-projectaddfile.png
-share/doc/qt/html/qd-projectdbaseconnections.png
-share/doc/qt/html/qd-projectimages.png
-share/doc/qt/html/qd-projectmenu.png
-share/doc/qt/html/qd-projectsettingsc++tabdialog.png
-share/doc/qt/html/qd-projectsettingsdialog.png
-share/doc/qt/html/qd-propedsigtab.png
-share/doc/qt/html/qd-propedwinproptab.png
-share/doc/qt/html/qd-searchfindtextdialog.png
-share/doc/qt/html/qd-searchgotoline.png
-share/doc/qt/html/qd-searchmenu.png
-share/doc/qt/html/qd-searchreplacetext.png
-share/doc/qt/html/qd-searchttoolbuttons3.png
-share/doc/qt/html/qd-selectcolordialog.png
-share/doc/qt/html/qd-selectfontdialog.png
-share/doc/qt/html/qd-textdialog.png
-share/doc/qt/html/qd-title.png
-share/doc/qt/html/qd-toolsmenu.png
-share/doc/qt/html/qd-toolstoolbuttons4.png
-share/doc/qt/html/qd-tunepalettedialog.png
-share/doc/qt/html/qd-viewstoolbuttons5.png
-share/doc/qt/html/qd-windowmenu1.png
+share/doc/qt/html/qd-preface.png
share/doc/qt/html/qdatabrowser-h.html
share/doc/qt/html/qdatabrowser-members.html
share/doc/qt/html/qdatabrowser.html
@@ -1423,21 +1358,12 @@ share/doc/qt/html/qmimesourcefactory-members.html
share/doc/qt/html/qmimesourcefactory.html
share/doc/qt/html/qmlined-m.png
share/doc/qt/html/qmlined-w.png
-share/doc/qt/html/qmotif-h.html
-share/doc/qt/html/qmotif-members.html
-share/doc/qt/html/qmotif.html
-share/doc/qt/html/qmotifdialog-h.html
-share/doc/qt/html/qmotifdialog-members.html
-share/doc/qt/html/qmotifdialog.html
share/doc/qt/html/qmotifplusstyle-h.html
share/doc/qt/html/qmotifplusstyle-members.html
share/doc/qt/html/qmotifplusstyle.html
share/doc/qt/html/qmotifstyle-h.html
share/doc/qt/html/qmotifstyle-members.html
share/doc/qt/html/qmotifstyle.html
-share/doc/qt/html/qmotifwidget-h.html
-share/doc/qt/html/qmotifwidget-members.html
-share/doc/qt/html/qmotifwidget.html
share/doc/qt/html/qmouse_qws-h.html
share/doc/qt/html/qmousedriverfactory-members.html
share/doc/qt/html/qmousedriverfactory.html
@@ -1470,6 +1396,15 @@ share/doc/qt/html/qnetworkoperation.html
share/doc/qt/html/qnetworkprotocol-h.html
share/doc/qt/html/qnetworkprotocol-members.html
share/doc/qt/html/qnetworkprotocol.html
+share/doc/qt/html/qnp-h.html
+share/doc/qt/html/qnpinstance-members.html
+share/doc/qt/html/qnpinstance.html
+share/doc/qt/html/qnplugin-members.html
+share/doc/qt/html/qnplugin.html
+share/doc/qt/html/qnpstream-members.html
+share/doc/qt/html/qnpstream.html
+share/doc/qt/html/qnpwidget-members.html
+share/doc/qt/html/qnpwidget.html
share/doc/qt/html/qobject-h.html
share/doc/qt/html/qobject-members.html
share/doc/qt/html/qobject.html
@@ -1594,6 +1529,20 @@ share/doc/qt/html/qregion.html
share/doc/qt/html/qresizeevent-members.html
share/doc/qt/html/qresizeevent.html
share/doc/qt/html/qrtlcodec-h.html
+share/doc/qt/html/qs-addwidg.png
+share/doc/qt/html/qs-editconn1.png
+share/doc/qt/html/qs-editconn2.png
+share/doc/qt/html/qs-editfunc.png
+share/doc/qt/html/qs-editlistbox1.png
+share/doc/qt/html/qs-laygrid.png
+share/doc/qt/html/qs-layhoriz.png
+share/doc/qt/html/qs-layvert.png
+share/doc/qt/html/qs-newdlg.png
+share/doc/qt/html/qs-projset.png
+share/doc/qt/html/qs-pushbutt.png
+share/doc/qt/html/qs-spacers.png
+share/doc/qt/html/qs-taborder.png
+share/doc/qt/html/qs-txtlbl.png
share/doc/qt/html/qscrbar-m.png
share/doc/qt/html/qscrbar-w.png
share/doc/qt/html/qscreen-members.html
@@ -1654,6 +1603,7 @@ share/doc/qt/html/qslider-m.png
share/doc/qt/html/qslider-members.html
share/doc/qt/html/qslider-w.png
share/doc/qt/html/qslider.html
+share/doc/qt/html/qsmetric.png
share/doc/qt/html/qsocket-h.html
share/doc/qt/html/qsocket-members.html
share/doc/qt/html/qsocket.html
@@ -1993,15 +1943,76 @@ share/doc/qt/html/qxmlreader-members.html
share/doc/qt/html/qxmlreader.html
share/doc/qt/html/qxmlsimplereader-members.html
share/doc/qt/html/qxmlsimplereader.html
-share/doc/qt/html/qxtwidget-h.html
-share/doc/qt/html/qxtwidget-members.html
-share/doc/qt/html/qxtwidget.html
share/doc/qt/html/rangecontrols-example.html
+share/doc/qt/html/rd-add.png
+share/doc/qt/html/rd-chooseanimage.png
+share/doc/qt/html/rd-chooseapixmap.png
+share/doc/qt/html/rd-configmf.png
+share/doc/qt/html/rd-configtb.png
+share/doc/qt/html/rd-cwidgdef.png
+share/doc/qt/html/rd-cwidgprop.png
+share/doc/qt/html/rd-cwidgsig.png
+share/doc/qt/html/rd-cwidgslot.png
+share/doc/qt/html/rd-dbconn.png
+share/doc/qt/html/rd-ediconview.png
+share/doc/qt/html/rd-editincdec.png
+share/doc/qt/html/rd-edittext1.png
+share/doc/qt/html/rd-edittext2.png
+share/doc/qt/html/rd-edlistbox.png
+share/doc/qt/html/rd-edlistview.png
+share/doc/qt/html/rd-edlistview2.png
+share/doc/qt/html/rd-edpalette.png
+share/doc/qt/html/rd-edtablecol.png
+share/doc/qt/html/rd-edtablerow.png
+share/doc/qt/html/rd-find.png
+share/doc/qt/html/rd-formset.png
+share/doc/qt/html/rd-goto.png
+share/doc/qt/html/rd-image.png
+share/doc/qt/html/rd-open.png
+share/doc/qt/html/rd-pagetitle.png
+share/doc/qt/html/rd-prefedit1.png
+share/doc/qt/html/rd-prefgen1.png
+share/doc/qt/html/rd-projset.png
+share/doc/qt/html/rd-projset2.png
+share/doc/qt/html/rd-replace.png
+share/doc/qt/html/rd-saveas.png
+share/doc/qt/html/rd-saveform.png
+share/doc/qt/html/rd-saveformas.png
+share/doc/qt/html/rd-saveprojset.png
+share/doc/qt/html/rd-selcolor.png
+share/doc/qt/html/rd-selfont.png
+share/doc/qt/html/rd-startdesigntab2.png
+share/doc/qt/html/rd-template.png
+share/doc/qt/html/rd-text.png
+share/doc/qt/html/rd-title.png
+share/doc/qt/html/rd-tunepalette.png
share/doc/qt/html/removed20.html
share/doc/qt/html/richtext-example.html
share/doc/qt/html/rintersect.png
+share/doc/qt/html/rmo-editmenu.png
+share/doc/qt/html/rmo-filemenu.png
+share/doc/qt/html/rmo-helpmenu.png
+share/doc/qt/html/rmo-layoutmenu.png
+share/doc/qt/html/rmo-previewmenu.png
+share/doc/qt/html/rmo-projectmenu.png
+share/doc/qt/html/rmo-searchmenu.png
+share/doc/qt/html/rmo-toolsmenu.png
+share/doc/qt/html/rmo-windowmenu.png
share/doc/qt/html/rot-example.html
share/doc/qt/html/rsubtract.png
+share/doc/qt/html/rtb-edit.png
+share/doc/qt/html/rtb-file.png
+share/doc/qt/html/rtb-layout.png
+share/doc/qt/html/rtb-search.png
+share/doc/qt/html/rtb-tbbuttons.png
+share/doc/qt/html/rtb-tbcontain.png
+share/doc/qt/html/rtb-tbcustom.png
+share/doc/qt/html/rtb-tbdatabase.png
+share/doc/qt/html/rtb-tbdisplay.png
+share/doc/qt/html/rtb-tbinput.png
+share/doc/qt/html/rtb-tbviews.png
+share/doc/qt/html/rtb-toolbox.png
+share/doc/qt/html/rtb-tools.png
share/doc/qt/html/runion.png
share/doc/qt/html/rxor.png
share/doc/qt/html/scaling.png
@@ -2142,11 +2153,10 @@ share/doc/qt/html/timers.html
share/doc/qt/html/titleindex
share/doc/qt/html/toggleaction-example.html
share/doc/qt/html/toolbar.png
-share/doc/qt/html/toolbarpits.png
-share/doc/qt/html/toolbox.png
share/doc/qt/html/tools-list.html
share/doc/qt/html/tools.html
share/doc/qt/html/tooltip-example.html
+share/doc/qt/html/trivial-nsplugin-example.html
share/doc/qt/html/troll.html
share/doc/qt/html/tt1_en.png
share/doc/qt/html/tt1_la.png
@@ -2192,11 +2202,14 @@ share/doc/qt/html/unsmooth.png
share/doc/qt/html/validateaccelerators.png
share/doc/qt/html/validatephrases.png
share/doc/qt/html/validatepunctuation.png
-share/doc/qt/html/vieweditconn.png
-share/doc/qt/html/views.png
share/doc/qt/html/whatsthis
share/doc/qt/html/whatsthis.png
share/doc/qt/html/widgets-example.html
+share/doc/qt/html/win-objexplor1.png
+share/doc/qt/html/win-objexplor2.png
+share/doc/qt/html/win-projoverview.png
+share/doc/qt/html/win-propedit1.png
+share/doc/qt/html/win-propedit2.png
share/doc/qt/html/winsystem.html
share/doc/qt/html/wizard-example.html
share/doc/qt/html/wizard-wizard-cpp.html
@@ -2236,6 +2249,8 @@ share/qt/mkspecs/hpux-acc/qmake.conf
share/qt/mkspecs/hpux-acc/qplatformdefs.h
share/qt/mkspecs/hpux-cc/qmake.conf
share/qt/mkspecs/hpux-cc/qplatformdefs.h
+share/qt/mkspecs/hpux-g++-64/qmake.conf
+share/qt/mkspecs/hpux-g++-64/qplatformdefs.h
share/qt/mkspecs/hpux-g++/qmake.conf
share/qt/mkspecs/hpux-g++/qplatformdefs.h
share/qt/mkspecs/hurd-g++/qmake.conf
@@ -2258,6 +2273,8 @@ share/qt/mkspecs/linux-kcc/qmake.conf
share/qt/mkspecs/linux-kcc/qplatformdefs.h
share/qt/mkspecs/linux-pgcc/qmake.conf
share/qt/mkspecs/linux-pgcc/qplatformdefs.h
+share/qt/mkspecs/lynxos-g++/qmake.conf
+share/qt/mkspecs/lynxos-g++/qplatformdefs.h
share/qt/mkspecs/mac9-mwerks/mwerksapp.xml
share/qt/mkspecs/mac9-mwerks/mwerkslib.xml
share/qt/mkspecs/mac9-mwerks/qmake.conf
@@ -2299,7 +2316,6 @@ share/qt/mkspecs/tru64-cxx/qmake.conf
share/qt/mkspecs/tru64-cxx/qplatformdefs.h
share/qt/mkspecs/tru64-g++/qmake.conf
share/qt/mkspecs/tru64-g++/qplatformdefs.h
-share/qt/mkspecs/ultrix-g++/qmake.conf
share/qt/mkspecs/unixware-cc/qmake.conf
share/qt/mkspecs/unixware-cc/qplatformdefs.h
share/qt/mkspecs/unixware-g++/qmake.conf
@@ -2307,6 +2323,7 @@ share/qt/mkspecs/unixware-g++/qplatformdefs.h
share/qt/mkspecs/win32-borland/qmake.conf
share/qt/mkspecs/win32-borland/qplatformdefs.h
share/qt/mkspecs/win32-g++/qmake.conf
+share/qt/mkspecs/win32-g++/qplatformdefs.h
share/qt/mkspecs/win32-icc/qmake.conf
share/qt/mkspecs/win32-icc/qplatformdefs.h
share/qt/mkspecs/win32-icc/win32app.dsp
@@ -2319,7 +2336,6 @@ share/qt/mkspecs/win32-msvc/qplatformdefs.h
share/qt/mkspecs/win32-msvc/win32app.dsp
share/qt/mkspecs/win32-msvc/win32dll.dsp
share/qt/mkspecs/win32-msvc/win32lib.dsp
-share/qt/mkspecs/win32-visage/qmake.conf
share/qt/mkspecs/win32-watcom/qmake.conf
share/qt/phrasebooks/danish.qph
share/qt/phrasebooks/dutch.qph
@@ -2330,11 +2346,6 @@ share/qt/phrasebooks/italian.qph
share/qt/phrasebooks/norwegian.qph
share/qt/phrasebooks/spanish.qph
share/qt/phrasebooks/swedish.qph
-lib/plugins/designer/libcppeditor.so
-lib/plugins/designer/libdlgplugin.so
-lib/plugins/designer/libkdevdlgplugin.so
-lib/plugins/designer/librcplugin.so
-lib/plugins/designer/libwizards.so
share/qt/templates/Configuration_Dialog.ui
share/qt/templates/Dialog_with_Buttons_(Bottom).ui
share/qt/templates/Dialog_with_Buttons_(Right).ui
@@ -2342,7 +2353,6 @@ share/qt/templates/Tab_Dialog.ui
@dirrm share/qt/templates
@dirrm share/qt/phrasebooks
@dirrm share/qt/mkspecs/win32-watcom
-@dirrm share/qt/mkspecs/win32-visage
@dirrm share/qt/mkspecs/win32-msvc.net
@dirrm share/qt/mkspecs/win32-msvc
@dirrm share/qt/mkspecs/win32-icc
@@ -2350,7 +2360,6 @@ share/qt/templates/Tab_Dialog.ui
@dirrm share/qt/mkspecs/win32-borland
@dirrm share/qt/mkspecs/unixware-g++
@dirrm share/qt/mkspecs/unixware-cc
-@dirrm share/qt/mkspecs/ultrix-g++
@dirrm share/qt/mkspecs/tru64-g++
@dirrm share/qt/mkspecs/tru64-cxx
@dirrm share/qt/mkspecs/solaris-kcc
@@ -2369,6 +2378,7 @@ share/qt/templates/Tab_Dialog.ui
@dirrm share/qt/mkspecs/macx-mwerks
@dirrm share/qt/mkspecs/macx-g++
@dirrm share/qt/mkspecs/mac9-mwerks
+@dirrm share/qt/mkspecs/lynxos-g++
@dirrm share/qt/mkspecs/linux-pgcc
@dirrm share/qt/mkspecs/linux-kcc
@dirrm share/qt/mkspecs/linux-icc
@@ -2379,6 +2389,7 @@ share/qt/templates/Tab_Dialog.ui
@dirrm share/qt/mkspecs/irix-cc-64
@dirrm share/qt/mkspecs/irix-cc
@dirrm share/qt/mkspecs/hurd-g++
+@dirrm share/qt/mkspecs/hpux-g++-64
@dirrm share/qt/mkspecs/hpux-g++
@dirrm share/qt/mkspecs/hpux-cc
@dirrm share/qt/mkspecs/hpux-acc-o64
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 799f3115b043..3340b4bd78e5 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= qt
-PORTVERSION= 3.1.1
-PORTREVISION= 5
+PORTVERSION= 3.1.2
CATEGORIES?= x11-toolkits
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
ftp://ftp.silug.org/pub/qt/ \
diff --git a/x11-toolkits/qt32/distinfo b/x11-toolkits/qt32/distinfo
index f0b3fd135bad..b63babb92bf5 100644
--- a/x11-toolkits/qt32/distinfo
+++ b/x11-toolkits/qt32/distinfo
@@ -1 +1 @@
-MD5 (KDE/qt-x11-free-3.1.1.tar.bz2) = 977b9f59eed14f33343a797544b5418a
+MD5 (KDE/qt-x11-free-3.1.2.tar.bz2) = 156591717687799c69cf3f8b64a898f2
diff --git a/x11-toolkits/qt32/files/patch-qfiledialog.cpp b/x11-toolkits/qt32/files/patch-qfiledialog.cpp
deleted file mode 100644
index 79ae98e8f03b..000000000000
--- a/x11-toolkits/qt32/files/patch-qfiledialog.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dialogs/qfiledialog.cpp Thu Nov 7 14:07:21 2002
-+++ /cvs/qt-copy/src/dialogs/qfiledialog.cpp Thu Nov 21 13:06:09 2002
-@@ -3170,7 +3170,7 @@
- user = dr.mid( 1, i-1 ).local8Bit();
- dr = dr.mid( i, dr.length() );
- struct passwd *pw;
--#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-+#if 0
- struct passwd mt_pw;
- char buffer[2048];
- if ( ::getpwnam_r( user, &mt_pw, buffer, 2048, &pw ) == 0 && pw == &mt_pw )
diff --git a/x11-toolkits/qt32/files/patch-qlistview.cpp b/x11-toolkits/qt32/files/patch-qlistview.cpp
new file mode 100644
index 000000000000..73882d3e9746
--- /dev/null
+++ b/x11-toolkits/qt32/files/patch-qlistview.cpp
@@ -0,0 +1,11 @@
+--- src/widgets/qlistview.cpp.orig Mon Feb 24 09:30:39 2003
++++ src/widgets/qlistview.cpp Mon May 12 19:42:07 2003
+@@ -6215,7 +6215,7 @@
+
+ void QListView::ensureItemVisible( const QListViewItem * i )
+ {
+- if ( !i )
++ if ( !i || !i->isVisible() )
+ return;
+
+ QListViewItem *parent = i->parent();
diff --git a/x11-toolkits/qt32/files/patch-qlock.cpp b/x11-toolkits/qt32/files/patch-qlock.cpp
deleted file mode 100644
index ee610b2d46b2..000000000000
--- a/x11-toolkits/qt32/files/patch-qlock.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/kernel/qlock.cpp.orig Mon Dec 9 04:40:45 2002
-+++ src/kernel/qlock.cpp Sun Dec 29 05:31:54 2002
-@@ -41,6 +41,7 @@
- #include <sys/file.h>
- #else
- #include <sys/types.h>
-+#include <sys/ipc.h>
- #include <sys/sem.h>
- #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) \
- || defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_BSDI)
diff --git a/x11-toolkits/qt32/files/patch-qpopupmenu.cpp b/x11-toolkits/qt32/files/patch-qpopupmenu.cpp
new file mode 100644
index 000000000000..78affc105b4a
--- /dev/null
+++ b/x11-toolkits/qt32/files/patch-qpopupmenu.cpp
@@ -0,0 +1,11 @@
+--- src/widgets/qpopupmenu.cpp.orig Mon May 12 19:44:39 2003
++++ src/widgets/qpopupmenu.cpp Mon May 12 19:45:42 2003
+@@ -1739,7 +1739,7 @@
+ if ( style().styleHint(QStyle::SH_PopupMenu_SloppySubMenus, this) &&
+ d->mouseMoveBuffer.contains( e->pos() ) ) {
+ actItem = item;
+- popupSubMenuLater( style().styleHint(QStyle::SH_PopupMenu_SubMenuPopupDelay, this) * 2,
++ popupSubMenuLater( style().styleHint(QStyle::SH_PopupMenu_SubMenuPopupDelay, this) * 6,
+ this );
+ return;
+ }
diff --git a/x11-toolkits/qt32/files/patch-qtextedit.cpp b/x11-toolkits/qt32/files/patch-qtextedit.cpp
new file mode 100644
index 000000000000..7c22203692de
--- /dev/null
+++ b/x11-toolkits/qt32/files/patch-qtextedit.cpp
@@ -0,0 +1,20 @@
+--- src/widgets/qtextedit.cpp.orig Mon Feb 24 09:30:37 2003
++++ src/widgets/qtextedit.cpp Mon May 12 19:50:19 2003
+@@ -1863,7 +1863,7 @@
+ }
+ setModified();
+ emit textChanged();
+- emit selectionChanged();
++ emit copyAvailable( doc->hasSelection( QTextDocument::Standard ) );
+ }
+
+ /*!
+@@ -4801,7 +4801,7 @@
+ return;
+ if ( doc->hasSelection( QTextDocument::Standard ) )
+ removeSelectedText();
+- if ( !m->provides( st.data() ) )
++ if ( !QRichTextDrag::canDecode( m ) )
+ return;
+ QString t;
+ if ( !QRichTextDrag::decode( m, t, st.data(), subtype ) )
diff --git a/x11-toolkits/qt32/pkg-plist b/x11-toolkits/qt32/pkg-plist
index b0ded5e60e8a..20be8e28e214 100644
--- a/x11-toolkits/qt32/pkg-plist
+++ b/x11-toolkits/qt32/pkg-plist
@@ -14,6 +14,11 @@ bin/qmake
bin/qtconfig
bin/qvfb
bin/uic
+include/jri.h
+include/jri_md.h
+include/jritypes.h
+include/npapi.h
+include/npupp.h
include/private/qapplication_p.h
include/private/qcolor_p.h
include/private/qcom_p.h
@@ -214,11 +219,8 @@ include/qmime.h
include/qmlined.h
include/qmngio.h
include/qmodules.h
-include/qmotif.h
-include/qmotifdialog.h
include/qmotifplusstyle.h
include/qmotifstyle.h
-include/qmotifwidget.h
include/qmovie.h
include/qmsgbox.h
include/qmultilinedit.h
@@ -227,6 +229,7 @@ include/qmutex.h
include/qnamespace.h
include/qnetwork.h
include/qnetworkprotocol.h
+include/qnp.h
include/qobjcoll.h
include/qobjdefs.h
include/qobject.h
@@ -387,36 +390,38 @@ include/qwindow.h
include/qwindowdefs.h
include/qwindowsstyle.h
include/qwindowsxpstyle.h
+include/qwinexport.h
include/qwizard.h
include/qwmatrix.h
include/qworkspace.h
include/qxml.h
-include/qxtwidget.h
lib/libdesigner.a
lib/libdesigner.prl
lib/libeditor.a
lib/libeditor.prl
lib/libqassistantclient.a
lib/libqassistantclient.prl
-lib/libqmotif.prl
+lib/libqnp.prl
lib/libqt-mt.prl
lib/libqt-mt.so
lib/libqt-mt.so.3
lib/libqt-mt.so.3.1
-lib/libqt-mt.so.3.1.1
+lib/libqt-mt.so.3.1.2
lib/libqui.prl
lib/libqui.so
lib/libqui.so.1
lib/libqui.so.1.0
lib/libqui.so.1.0.0
+lib/plugins/designer/libcppeditor.so
+lib/plugins/designer/libdlgplugin.so
+lib/plugins/designer/libkdevdlgplugin.so
+lib/plugins/designer/librcplugin.so
+lib/plugins/designer/libwizards.so
share/doc/qt/html/aboutqt.html
share/doc/qt/html/abstract-connections.png
share/doc/qt/html/abstractwidgets.html
share/doc/qt/html/accelerators.html
share/doc/qt/html/aclock-example.html
-share/doc/qt/html/actiongroup.png
-share/doc/qt/html/addmainwidg.png
-share/doc/qt/html/addmenuitem.png
share/doc/qt/html/addressbook-example.html
share/doc/qt/html/advanced.html
share/doc/qt/html/annotated.html
@@ -441,7 +446,6 @@ share/doc/qt/html/brush-styles.png
share/doc/qt/html/bughowto.html
share/doc/qt/html/buttongroup-w.png
share/doc/qt/html/buttongroups-example.html
-share/doc/qt/html/buttons.png
share/doc/qt/html/buyhowto.html
share/doc/qt/html/canvas-chart-example.html
share/doc/qt/html/canvas-example.html
@@ -471,11 +475,8 @@ share/doc/qt/html/classchart.html
share/doc/qt/html/classes.html
share/doc/qt/html/clientserver-example.html
share/doc/qt/html/collection.html
-share/doc/qt/html/coloriconv.png
-share/doc/qt/html/colortable.png
share/doc/qt/html/commonproblems.html
share/doc/qt/html/concrete-connections.png
-share/doc/qt/html/containers.png
share/doc/qt/html/coordsys.html
share/doc/qt/html/coordsys.png
share/doc/qt/html/credits.html
@@ -486,7 +487,6 @@ share/doc/qt/html/customlayout.html
share/doc/qt/html/customstyles.html
share/doc/qt/html/database-connections.png
share/doc/qt/html/database.html
-share/doc/qt/html/database.png
share/doc/qt/html/datastreamformat.html
share/doc/qt/html/datetimewidgets.png
share/doc/qt/html/dclock-example.html
@@ -532,29 +532,21 @@ share/doc/qt/html/dialog3layout.png
share/doc/qt/html/dialog3sample.png
share/doc/qt/html/dialogs.html
share/doc/qt/html/dirview-example.html
-share/doc/qt/html/display.png
share/doc/qt/html/distributingqt.html
share/doc/qt/html/dnd.html
share/doc/qt/html/doneandnext.png
-share/doc/qt/html/dragaction.png
share/doc/qt/html/draganddrop.html
share/doc/qt/html/dragdrop-example.html
share/doc/qt/html/drawdemo-example.html
share/doc/qt/html/drawlines-example.html
share/doc/qt/html/edit-dbtable-dialog.png
-share/doc/qt/html/editconn.png
-share/doc/qt/html/editconn1.png
-share/doc/qt/html/editconn2.png
-share/doc/qt/html/editconn3.png
share/doc/qt/html/editcopy.png
share/doc/qt/html/editcut.png
share/doc/qt/html/editfind.png
-share/doc/qt/html/editfunc.png
share/doc/qt/html/editions.html
share/doc/qt/html/editpaste.png
share/doc/qt/html/editredo.png
share/doc/qt/html/editundo.png
-share/doc/qt/html/editvar.png
share/doc/qt/html/emb-accel.html
share/doc/qt/html/emb-charinput.html
share/doc/qt/html/emb-classes.html
@@ -583,8 +575,6 @@ share/doc/qt/html/filesave.png
share/doc/qt/html/finddialog.png
share/doc/qt/html/focus.html
share/doc/qt/html/forever-example.html
-share/doc/qt/html/formsettings.png
-share/doc/qt/html/forwdec.png
share/doc/qt/html/frames.png
share/doc/qt/html/ftpclient-example.html
share/doc/qt/html/functions.html
@@ -592,6 +582,8 @@ share/doc/qt/html/geomanagement.html
share/doc/qt/html/geometry.html
share/doc/qt/html/geometry.png
share/doc/qt/html/gpl.html
+share/doc/qt/html/graph.g1n
+share/doc/qt/html/grapher-nsplugin-example.html
share/doc/qt/html/graphics.html
share/doc/qt/html/gridlayout.png
share/doc/qt/html/groupbox-w.png
@@ -613,19 +605,14 @@ share/doc/qt/html/iconview-simple_dd-main-cpp.html
share/doc/qt/html/iconview-simple_dd-main-h.html
share/doc/qt/html/iconview.html
share/doc/qt/html/images.html
-share/doc/qt/html/incimp.png
share/doc/qt/html/index
share/doc/qt/html/index.html
-share/doc/qt/html/input.png
share/doc/qt/html/inputdialogs.png
share/doc/qt/html/install-win.html
share/doc/qt/html/install-x11.html
share/doc/qt/html/installation.html
share/doc/qt/html/io.html
share/doc/qt/html/keyfeatures30.html
-share/doc/qt/html/laycoloriconv.png
-share/doc/qt/html/laycolortable.png
-share/doc/qt/html/laymainwidg.png
share/doc/qt/html/layout-example.html
share/doc/qt/html/layout.html
share/doc/qt/html/layout1.png
@@ -658,25 +645,46 @@ share/doc/qt/html/metaobjects.html
share/doc/qt/html/misc.html
share/doc/qt/html/moc.html
share/doc/qt/html/modules.html
-share/doc/qt/html/motif-customwidget-example.html
-share/doc/qt/html/motif-dialog-example.html
-share/doc/qt/html/motif-examples.html
-share/doc/qt/html/motif-extension.html
share/doc/qt/html/movies-example.html
share/doc/qt/html/multimedia.html
-share/doc/qt/html/mwwiz.png
-share/doc/qt/html/mwwiz2.png
+share/doc/qt/html/mw-actiongroup.png
+share/doc/qt/html/mw-addmainwidg.png
+share/doc/qt/html/mw-addmenuitem.png
+share/doc/qt/html/mw-coloriconv.png
+share/doc/qt/html/mw-colortable.png
+share/doc/qt/html/mw-colortool1.png
+share/doc/qt/html/mw-colortool2.png
+share/doc/qt/html/mw-conn1.png
+share/doc/qt/html/mw-conn2.png
+share/doc/qt/html/mw-conn3.png
+share/doc/qt/html/mw-conn4.png
+share/doc/qt/html/mw-dragaction.png
+share/doc/qt/html/mw-editforw.png
+share/doc/qt/html/mw-editfunc.png
+share/doc/qt/html/mw-editincimp.png
+share/doc/qt/html/mw-editvar.png
+share/doc/qt/html/mw-laycoloriconv.png
+share/doc/qt/html/mw-laycolortable.png
+share/doc/qt/html/mw-laymainwidg.png
+share/doc/qt/html/mw-menuwiz.png
+share/doc/qt/html/mw-newfile.png
+share/doc/qt/html/mw-objexplor.png
+share/doc/qt/html/mw-previewform.png
+share/doc/qt/html/mw-projset.png
+share/doc/qt/html/mw-propedit.png
+share/doc/qt/html/mw-settoolwiz.png
+share/doc/qt/html/mw-startdesign.png
+share/doc/qt/html/mw-toolbarpits.png
+share/doc/qt/html/netscape-plugin.html
share/doc/qt/html/network-examples.html
share/doc/qt/html/network.html
share/doc/qt/html/networkprotocol-example.html
-share/doc/qt/html/newfiledialog.png
-share/doc/qt/html/newopendialog.png
share/doc/qt/html/next.png
share/doc/qt/html/nextunfinished.png
+share/doc/qt/html/nsplugin-examples.html
share/doc/qt/html/object.html
share/doc/qt/html/objectmodel.html
share/doc/qt/html/objecttrees.html
-share/doc/qt/html/objexplor.png
share/doc/qt/html/opengl-box-example.html
share/doc/qt/html/opengl-examples.html
share/doc/qt/html/opengl-gear-example.html
@@ -705,14 +713,11 @@ share/doc/qt/html/popup-example.html
share/doc/qt/html/porting.html
share/doc/qt/html/porting2.html
share/doc/qt/html/prev.png
-share/doc/qt/html/previewform.png
share/doc/qt/html/prevunfinished.png
share/doc/qt/html/primes.html
share/doc/qt/html/process-example.html
share/doc/qt/html/progress-example.html
share/doc/qt/html/progressbar-example.html
-share/doc/qt/html/projset.png
-share/doc/qt/html/propedit.png
share/doc/qt/html/properties.html
share/doc/qt/html/propertydocs
share/doc/qt/html/propertyindex
@@ -892,21 +897,7 @@ share/doc/qt/html/qcustomevent-members.html
share/doc/qt/html/qcustomevent.html
share/doc/qt/html/qcustommenuitem-members.html
share/doc/qt/html/qcustommenuitem.html
-share/doc/qt/html/qd-buttonstoolbuttons3.png
-share/doc/qt/html/qd-chooseanimage.png
-share/doc/qt/html/qd-chooseapixmap.png
-share/doc/qt/html/qd-chooseimages.png
share/doc/qt/html/qd-colortool-name.png
-share/doc/qt/html/qd-colortool1.png
-share/doc/qt/html/qd-colortool2.png
-share/doc/qt/html/qd-configmainfile.png
-share/doc/qt/html/qd-containertoolbuttons3.png
-share/doc/qt/html/qd-createtemplate.png
-share/doc/qt/html/qd-customwidgettoolbutton.png
-share/doc/qt/html/qd-custwiddeftab.png
-share/doc/qt/html/qd-custwidproptab.png
-share/doc/qt/html/qd-custwidslotstab.png
-share/doc/qt/html/qd-databasetoolbuttons3.png
share/doc/qt/html/qd-databrowserwzd.png
share/doc/qt/html/qd-databrowserwzdpage2.png
share/doc/qt/html/qd-databrowserwzdpage3.png
@@ -922,66 +913,10 @@ share/doc/qt/html/qd-dataviewwzd.png
share/doc/qt/html/qd-dataviewwzdpage2.png
share/doc/qt/html/qd-dataviewwzdpage3.png
share/doc/qt/html/qd-dataviewwzdpage4.png
-share/doc/qt/html/qd-displaytoolbuttons3.png
-share/doc/qt/html/qd-editclassvariables.png
-share/doc/qt/html/qd-editcustwidsigtab.png
-share/doc/qt/html/qd-editforwarddeclarations.png
-share/doc/qt/html/qd-editiconview.png
-share/doc/qt/html/qd-editincludesindeclaration.png
-share/doc/qt/html/qd-editincludesinimplementation.png
-share/doc/qt/html/qd-editlistbox.png
-share/doc/qt/html/qd-editlistview.png
-share/doc/qt/html/qd-editlistviewcolumns.png
-share/doc/qt/html/qd-editmenu1.png
-share/doc/qt/html/qd-editpalettedialog.png
-share/doc/qt/html/qd-editpreferencesc++.png
-share/doc/qt/html/qd-editpreferencesgeneral.png
-share/doc/qt/html/qd-edittablecolumns.png
-share/doc/qt/html/qd-edittablerows.png
-share/doc/qt/html/qd-edittoolbuttons3.png
-share/doc/qt/html/qd-filemenu1.png
-share/doc/qt/html/qd-filenew2.png
-share/doc/qt/html/qd-fileopen.png
-share/doc/qt/html/qd-fileoverviewwindow.png
-share/doc/qt/html/qd-filesaveasdialog.png
-share/doc/qt/html/qd-filesaveformasdialog.png
-share/doc/qt/html/qd-filesaveformdialog.png
-share/doc/qt/html/qd-filesaveprojectsettingsdialog.png
-share/doc/qt/html/qd-filetoolbuttons3.png
-share/doc/qt/html/qd-finddirectorydialog.png
-share/doc/qt/html/qd-helpmenu.png
share/doc/qt/html/qd-helptoolbuttons3.png
-share/doc/qt/html/qd-inputtoolbuttons3.png
-share/doc/qt/html/qd-layoutmenu1.png
-share/doc/qt/html/qd-layouttoolbuttons3.png
share/doc/qt/html/qd-mainwinwzd.png
share/doc/qt/html/qd-mainwinwzdpage2.png
-share/doc/qt/html/qd-objexpwindowwidgettab.png
-share/doc/qt/html/qd-objexpwinsourcetab.png
-share/doc/qt/html/qd-pagetitle.png
-share/doc/qt/html/qd-previewmenu.png
-share/doc/qt/html/qd-projectaddfile.png
-share/doc/qt/html/qd-projectdbaseconnections.png
-share/doc/qt/html/qd-projectimages.png
-share/doc/qt/html/qd-projectmenu.png
-share/doc/qt/html/qd-projectsettingsc++tabdialog.png
-share/doc/qt/html/qd-projectsettingsdialog.png
-share/doc/qt/html/qd-propedsigtab.png
-share/doc/qt/html/qd-propedwinproptab.png
-share/doc/qt/html/qd-searchfindtextdialog.png
-share/doc/qt/html/qd-searchgotoline.png
-share/doc/qt/html/qd-searchmenu.png
-share/doc/qt/html/qd-searchreplacetext.png
-share/doc/qt/html/qd-searchttoolbuttons3.png
-share/doc/qt/html/qd-selectcolordialog.png
-share/doc/qt/html/qd-selectfontdialog.png
-share/doc/qt/html/qd-textdialog.png
-share/doc/qt/html/qd-title.png
-share/doc/qt/html/qd-toolsmenu.png
-share/doc/qt/html/qd-toolstoolbuttons4.png
-share/doc/qt/html/qd-tunepalettedialog.png
-share/doc/qt/html/qd-viewstoolbuttons5.png
-share/doc/qt/html/qd-windowmenu1.png
+share/doc/qt/html/qd-preface.png
share/doc/qt/html/qdatabrowser-h.html
share/doc/qt/html/qdatabrowser-members.html
share/doc/qt/html/qdatabrowser.html
@@ -1423,21 +1358,12 @@ share/doc/qt/html/qmimesourcefactory-members.html
share/doc/qt/html/qmimesourcefactory.html
share/doc/qt/html/qmlined-m.png
share/doc/qt/html/qmlined-w.png
-share/doc/qt/html/qmotif-h.html
-share/doc/qt/html/qmotif-members.html
-share/doc/qt/html/qmotif.html
-share/doc/qt/html/qmotifdialog-h.html
-share/doc/qt/html/qmotifdialog-members.html
-share/doc/qt/html/qmotifdialog.html
share/doc/qt/html/qmotifplusstyle-h.html
share/doc/qt/html/qmotifplusstyle-members.html
share/doc/qt/html/qmotifplusstyle.html
share/doc/qt/html/qmotifstyle-h.html
share/doc/qt/html/qmotifstyle-members.html
share/doc/qt/html/qmotifstyle.html
-share/doc/qt/html/qmotifwidget-h.html
-share/doc/qt/html/qmotifwidget-members.html
-share/doc/qt/html/qmotifwidget.html
share/doc/qt/html/qmouse_qws-h.html
share/doc/qt/html/qmousedriverfactory-members.html
share/doc/qt/html/qmousedriverfactory.html
@@ -1470,6 +1396,15 @@ share/doc/qt/html/qnetworkoperation.html
share/doc/qt/html/qnetworkprotocol-h.html
share/doc/qt/html/qnetworkprotocol-members.html
share/doc/qt/html/qnetworkprotocol.html
+share/doc/qt/html/qnp-h.html
+share/doc/qt/html/qnpinstance-members.html
+share/doc/qt/html/qnpinstance.html
+share/doc/qt/html/qnplugin-members.html
+share/doc/qt/html/qnplugin.html
+share/doc/qt/html/qnpstream-members.html
+share/doc/qt/html/qnpstream.html
+share/doc/qt/html/qnpwidget-members.html
+share/doc/qt/html/qnpwidget.html
share/doc/qt/html/qobject-h.html
share/doc/qt/html/qobject-members.html
share/doc/qt/html/qobject.html
@@ -1594,6 +1529,20 @@ share/doc/qt/html/qregion.html
share/doc/qt/html/qresizeevent-members.html
share/doc/qt/html/qresizeevent.html
share/doc/qt/html/qrtlcodec-h.html
+share/doc/qt/html/qs-addwidg.png
+share/doc/qt/html/qs-editconn1.png
+share/doc/qt/html/qs-editconn2.png
+share/doc/qt/html/qs-editfunc.png
+share/doc/qt/html/qs-editlistbox1.png
+share/doc/qt/html/qs-laygrid.png
+share/doc/qt/html/qs-layhoriz.png
+share/doc/qt/html/qs-layvert.png
+share/doc/qt/html/qs-newdlg.png
+share/doc/qt/html/qs-projset.png
+share/doc/qt/html/qs-pushbutt.png
+share/doc/qt/html/qs-spacers.png
+share/doc/qt/html/qs-taborder.png
+share/doc/qt/html/qs-txtlbl.png
share/doc/qt/html/qscrbar-m.png
share/doc/qt/html/qscrbar-w.png
share/doc/qt/html/qscreen-members.html
@@ -1654,6 +1603,7 @@ share/doc/qt/html/qslider-m.png
share/doc/qt/html/qslider-members.html
share/doc/qt/html/qslider-w.png
share/doc/qt/html/qslider.html
+share/doc/qt/html/qsmetric.png
share/doc/qt/html/qsocket-h.html
share/doc/qt/html/qsocket-members.html
share/doc/qt/html/qsocket.html
@@ -1993,15 +1943,76 @@ share/doc/qt/html/qxmlreader-members.html
share/doc/qt/html/qxmlreader.html
share/doc/qt/html/qxmlsimplereader-members.html
share/doc/qt/html/qxmlsimplereader.html
-share/doc/qt/html/qxtwidget-h.html
-share/doc/qt/html/qxtwidget-members.html
-share/doc/qt/html/qxtwidget.html
share/doc/qt/html/rangecontrols-example.html
+share/doc/qt/html/rd-add.png
+share/doc/qt/html/rd-chooseanimage.png
+share/doc/qt/html/rd-chooseapixmap.png
+share/doc/qt/html/rd-configmf.png
+share/doc/qt/html/rd-configtb.png
+share/doc/qt/html/rd-cwidgdef.png
+share/doc/qt/html/rd-cwidgprop.png
+share/doc/qt/html/rd-cwidgsig.png
+share/doc/qt/html/rd-cwidgslot.png
+share/doc/qt/html/rd-dbconn.png
+share/doc/qt/html/rd-ediconview.png
+share/doc/qt/html/rd-editincdec.png
+share/doc/qt/html/rd-edittext1.png
+share/doc/qt/html/rd-edittext2.png
+share/doc/qt/html/rd-edlistbox.png
+share/doc/qt/html/rd-edlistview.png
+share/doc/qt/html/rd-edlistview2.png
+share/doc/qt/html/rd-edpalette.png
+share/doc/qt/html/rd-edtablecol.png
+share/doc/qt/html/rd-edtablerow.png
+share/doc/qt/html/rd-find.png
+share/doc/qt/html/rd-formset.png
+share/doc/qt/html/rd-goto.png
+share/doc/qt/html/rd-image.png
+share/doc/qt/html/rd-open.png
+share/doc/qt/html/rd-pagetitle.png
+share/doc/qt/html/rd-prefedit1.png
+share/doc/qt/html/rd-prefgen1.png
+share/doc/qt/html/rd-projset.png
+share/doc/qt/html/rd-projset2.png
+share/doc/qt/html/rd-replace.png
+share/doc/qt/html/rd-saveas.png
+share/doc/qt/html/rd-saveform.png
+share/doc/qt/html/rd-saveformas.png
+share/doc/qt/html/rd-saveprojset.png
+share/doc/qt/html/rd-selcolor.png
+share/doc/qt/html/rd-selfont.png
+share/doc/qt/html/rd-startdesigntab2.png
+share/doc/qt/html/rd-template.png
+share/doc/qt/html/rd-text.png
+share/doc/qt/html/rd-title.png
+share/doc/qt/html/rd-tunepalette.png
share/doc/qt/html/removed20.html
share/doc/qt/html/richtext-example.html
share/doc/qt/html/rintersect.png
+share/doc/qt/html/rmo-editmenu.png
+share/doc/qt/html/rmo-filemenu.png
+share/doc/qt/html/rmo-helpmenu.png
+share/doc/qt/html/rmo-layoutmenu.png
+share/doc/qt/html/rmo-previewmenu.png
+share/doc/qt/html/rmo-projectmenu.png
+share/doc/qt/html/rmo-searchmenu.png
+share/doc/qt/html/rmo-toolsmenu.png
+share/doc/qt/html/rmo-windowmenu.png
share/doc/qt/html/rot-example.html
share/doc/qt/html/rsubtract.png
+share/doc/qt/html/rtb-edit.png
+share/doc/qt/html/rtb-file.png
+share/doc/qt/html/rtb-layout.png
+share/doc/qt/html/rtb-search.png
+share/doc/qt/html/rtb-tbbuttons.png
+share/doc/qt/html/rtb-tbcontain.png
+share/doc/qt/html/rtb-tbcustom.png
+share/doc/qt/html/rtb-tbdatabase.png
+share/doc/qt/html/rtb-tbdisplay.png
+share/doc/qt/html/rtb-tbinput.png
+share/doc/qt/html/rtb-tbviews.png
+share/doc/qt/html/rtb-toolbox.png
+share/doc/qt/html/rtb-tools.png
share/doc/qt/html/runion.png
share/doc/qt/html/rxor.png
share/doc/qt/html/scaling.png
@@ -2142,11 +2153,10 @@ share/doc/qt/html/timers.html
share/doc/qt/html/titleindex
share/doc/qt/html/toggleaction-example.html
share/doc/qt/html/toolbar.png
-share/doc/qt/html/toolbarpits.png
-share/doc/qt/html/toolbox.png
share/doc/qt/html/tools-list.html
share/doc/qt/html/tools.html
share/doc/qt/html/tooltip-example.html
+share/doc/qt/html/trivial-nsplugin-example.html
share/doc/qt/html/troll.html
share/doc/qt/html/tt1_en.png
share/doc/qt/html/tt1_la.png
@@ -2192,11 +2202,14 @@ share/doc/qt/html/unsmooth.png
share/doc/qt/html/validateaccelerators.png
share/doc/qt/html/validatephrases.png
share/doc/qt/html/validatepunctuation.png
-share/doc/qt/html/vieweditconn.png
-share/doc/qt/html/views.png
share/doc/qt/html/whatsthis
share/doc/qt/html/whatsthis.png
share/doc/qt/html/widgets-example.html
+share/doc/qt/html/win-objexplor1.png
+share/doc/qt/html/win-objexplor2.png
+share/doc/qt/html/win-projoverview.png
+share/doc/qt/html/win-propedit1.png
+share/doc/qt/html/win-propedit2.png
share/doc/qt/html/winsystem.html
share/doc/qt/html/wizard-example.html
share/doc/qt/html/wizard-wizard-cpp.html
@@ -2236,6 +2249,8 @@ share/qt/mkspecs/hpux-acc/qmake.conf
share/qt/mkspecs/hpux-acc/qplatformdefs.h
share/qt/mkspecs/hpux-cc/qmake.conf
share/qt/mkspecs/hpux-cc/qplatformdefs.h
+share/qt/mkspecs/hpux-g++-64/qmake.conf
+share/qt/mkspecs/hpux-g++-64/qplatformdefs.h
share/qt/mkspecs/hpux-g++/qmake.conf
share/qt/mkspecs/hpux-g++/qplatformdefs.h
share/qt/mkspecs/hurd-g++/qmake.conf
@@ -2258,6 +2273,8 @@ share/qt/mkspecs/linux-kcc/qmake.conf
share/qt/mkspecs/linux-kcc/qplatformdefs.h
share/qt/mkspecs/linux-pgcc/qmake.conf
share/qt/mkspecs/linux-pgcc/qplatformdefs.h
+share/qt/mkspecs/lynxos-g++/qmake.conf
+share/qt/mkspecs/lynxos-g++/qplatformdefs.h
share/qt/mkspecs/mac9-mwerks/mwerksapp.xml
share/qt/mkspecs/mac9-mwerks/mwerkslib.xml
share/qt/mkspecs/mac9-mwerks/qmake.conf
@@ -2299,7 +2316,6 @@ share/qt/mkspecs/tru64-cxx/qmake.conf
share/qt/mkspecs/tru64-cxx/qplatformdefs.h
share/qt/mkspecs/tru64-g++/qmake.conf
share/qt/mkspecs/tru64-g++/qplatformdefs.h
-share/qt/mkspecs/ultrix-g++/qmake.conf
share/qt/mkspecs/unixware-cc/qmake.conf
share/qt/mkspecs/unixware-cc/qplatformdefs.h
share/qt/mkspecs/unixware-g++/qmake.conf
@@ -2307,6 +2323,7 @@ share/qt/mkspecs/unixware-g++/qplatformdefs.h
share/qt/mkspecs/win32-borland/qmake.conf
share/qt/mkspecs/win32-borland/qplatformdefs.h
share/qt/mkspecs/win32-g++/qmake.conf
+share/qt/mkspecs/win32-g++/qplatformdefs.h
share/qt/mkspecs/win32-icc/qmake.conf
share/qt/mkspecs/win32-icc/qplatformdefs.h
share/qt/mkspecs/win32-icc/win32app.dsp
@@ -2319,7 +2336,6 @@ share/qt/mkspecs/win32-msvc/qplatformdefs.h
share/qt/mkspecs/win32-msvc/win32app.dsp
share/qt/mkspecs/win32-msvc/win32dll.dsp
share/qt/mkspecs/win32-msvc/win32lib.dsp
-share/qt/mkspecs/win32-visage/qmake.conf
share/qt/mkspecs/win32-watcom/qmake.conf
share/qt/phrasebooks/danish.qph
share/qt/phrasebooks/dutch.qph
@@ -2330,11 +2346,6 @@ share/qt/phrasebooks/italian.qph
share/qt/phrasebooks/norwegian.qph
share/qt/phrasebooks/spanish.qph
share/qt/phrasebooks/swedish.qph
-lib/plugins/designer/libcppeditor.so
-lib/plugins/designer/libdlgplugin.so
-lib/plugins/designer/libkdevdlgplugin.so
-lib/plugins/designer/librcplugin.so
-lib/plugins/designer/libwizards.so
share/qt/templates/Configuration_Dialog.ui
share/qt/templates/Dialog_with_Buttons_(Bottom).ui
share/qt/templates/Dialog_with_Buttons_(Right).ui
@@ -2342,7 +2353,6 @@ share/qt/templates/Tab_Dialog.ui
@dirrm share/qt/templates
@dirrm share/qt/phrasebooks
@dirrm share/qt/mkspecs/win32-watcom
-@dirrm share/qt/mkspecs/win32-visage
@dirrm share/qt/mkspecs/win32-msvc.net
@dirrm share/qt/mkspecs/win32-msvc
@dirrm share/qt/mkspecs/win32-icc
@@ -2350,7 +2360,6 @@ share/qt/templates/Tab_Dialog.ui
@dirrm share/qt/mkspecs/win32-borland
@dirrm share/qt/mkspecs/unixware-g++
@dirrm share/qt/mkspecs/unixware-cc
-@dirrm share/qt/mkspecs/ultrix-g++
@dirrm share/qt/mkspecs/tru64-g++
@dirrm share/qt/mkspecs/tru64-cxx
@dirrm share/qt/mkspecs/solaris-kcc
@@ -2369,6 +2378,7 @@ share/qt/templates/Tab_Dialog.ui
@dirrm share/qt/mkspecs/macx-mwerks
@dirrm share/qt/mkspecs/macx-g++
@dirrm share/qt/mkspecs/mac9-mwerks
+@dirrm share/qt/mkspecs/lynxos-g++
@dirrm share/qt/mkspecs/linux-pgcc
@dirrm share/qt/mkspecs/linux-kcc
@dirrm share/qt/mkspecs/linux-icc
@@ -2379,6 +2389,7 @@ share/qt/templates/Tab_Dialog.ui
@dirrm share/qt/mkspecs/irix-cc-64
@dirrm share/qt/mkspecs/irix-cc
@dirrm share/qt/mkspecs/hurd-g++
+@dirrm share/qt/mkspecs/hpux-g++-64
@dirrm share/qt/mkspecs/hpux-g++
@dirrm share/qt/mkspecs/hpux-cc
@dirrm share/qt/mkspecs/hpux-acc-o64
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 799f3115b043..3340b4bd78e5 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= qt
-PORTVERSION= 3.1.1
-PORTREVISION= 5
+PORTVERSION= 3.1.2
CATEGORIES?= x11-toolkits
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
ftp://ftp.silug.org/pub/qt/ \
diff --git a/x11-toolkits/qt33/distinfo b/x11-toolkits/qt33/distinfo
index f0b3fd135bad..b63babb92bf5 100644
--- a/x11-toolkits/qt33/distinfo
+++ b/x11-toolkits/qt33/distinfo
@@ -1 +1 @@
-MD5 (KDE/qt-x11-free-3.1.1.tar.bz2) = 977b9f59eed14f33343a797544b5418a
+MD5 (KDE/qt-x11-free-3.1.2.tar.bz2) = 156591717687799c69cf3f8b64a898f2
diff --git a/x11-toolkits/qt33/files/patch-qfiledialog.cpp b/x11-toolkits/qt33/files/patch-qfiledialog.cpp
deleted file mode 100644
index 79ae98e8f03b..000000000000
--- a/x11-toolkits/qt33/files/patch-qfiledialog.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dialogs/qfiledialog.cpp Thu Nov 7 14:07:21 2002
-+++ /cvs/qt-copy/src/dialogs/qfiledialog.cpp Thu Nov 21 13:06:09 2002
-@@ -3170,7 +3170,7 @@
- user = dr.mid( 1, i-1 ).local8Bit();
- dr = dr.mid( i, dr.length() );
- struct passwd *pw;
--#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-+#if 0
- struct passwd mt_pw;
- char buffer[2048];
- if ( ::getpwnam_r( user, &mt_pw, buffer, 2048, &pw ) == 0 && pw == &mt_pw )
diff --git a/x11-toolkits/qt33/files/patch-qlistview.cpp b/x11-toolkits/qt33/files/patch-qlistview.cpp
new file mode 100644
index 000000000000..73882d3e9746
--- /dev/null
+++ b/x11-toolkits/qt33/files/patch-qlistview.cpp
@@ -0,0 +1,11 @@
+--- src/widgets/qlistview.cpp.orig Mon Feb 24 09:30:39 2003
++++ src/widgets/qlistview.cpp Mon May 12 19:42:07 2003
+@@ -6215,7 +6215,7 @@
+
+ void QListView::ensureItemVisible( const QListViewItem * i )
+ {
+- if ( !i )
++ if ( !i || !i->isVisible() )
+ return;
+
+ QListViewItem *parent = i->parent();
diff --git a/x11-toolkits/qt33/files/patch-qlock.cpp b/x11-toolkits/qt33/files/patch-qlock.cpp
deleted file mode 100644
index ee610b2d46b2..000000000000
--- a/x11-toolkits/qt33/files/patch-qlock.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/kernel/qlock.cpp.orig Mon Dec 9 04:40:45 2002
-+++ src/kernel/qlock.cpp Sun Dec 29 05:31:54 2002
-@@ -41,6 +41,7 @@
- #include <sys/file.h>
- #else
- #include <sys/types.h>
-+#include <sys/ipc.h>
- #include <sys/sem.h>
- #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) \
- || defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_BSDI)
diff --git a/x11-toolkits/qt33/files/patch-qpopupmenu.cpp b/x11-toolkits/qt33/files/patch-qpopupmenu.cpp
new file mode 100644
index 000000000000..78affc105b4a
--- /dev/null
+++ b/x11-toolkits/qt33/files/patch-qpopupmenu.cpp
@@ -0,0 +1,11 @@
+--- src/widgets/qpopupmenu.cpp.orig Mon May 12 19:44:39 2003
++++ src/widgets/qpopupmenu.cpp Mon May 12 19:45:42 2003
+@@ -1739,7 +1739,7 @@
+ if ( style().styleHint(QStyle::SH_PopupMenu_SloppySubMenus, this) &&
+ d->mouseMoveBuffer.contains( e->pos() ) ) {
+ actItem = item;
+- popupSubMenuLater( style().styleHint(QStyle::SH_PopupMenu_SubMenuPopupDelay, this) * 2,
++ popupSubMenuLater( style().styleHint(QStyle::SH_PopupMenu_SubMenuPopupDelay, this) * 6,
+ this );
+ return;
+ }
diff --git a/x11-toolkits/qt33/files/patch-qtextedit.cpp b/x11-toolkits/qt33/files/patch-qtextedit.cpp
new file mode 100644
index 000000000000..7c22203692de
--- /dev/null
+++ b/x11-toolkits/qt33/files/patch-qtextedit.cpp
@@ -0,0 +1,20 @@
+--- src/widgets/qtextedit.cpp.orig Mon Feb 24 09:30:37 2003
++++ src/widgets/qtextedit.cpp Mon May 12 19:50:19 2003
+@@ -1863,7 +1863,7 @@
+ }
+ setModified();
+ emit textChanged();
+- emit selectionChanged();
++ emit copyAvailable( doc->hasSelection( QTextDocument::Standard ) );
+ }
+
+ /*!
+@@ -4801,7 +4801,7 @@
+ return;
+ if ( doc->hasSelection( QTextDocument::Standard ) )
+ removeSelectedText();
+- if ( !m->provides( st.data() ) )
++ if ( !QRichTextDrag::canDecode( m ) )
+ return;
+ QString t;
+ if ( !QRichTextDrag::decode( m, t, st.data(), subtype ) )
diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist
index b0ded5e60e8a..20be8e28e214 100644
--- a/x11-toolkits/qt33/pkg-plist
+++ b/x11-toolkits/qt33/pkg-plist
@@ -14,6 +14,11 @@ bin/qmake
bin/qtconfig
bin/qvfb
bin/uic
+include/jri.h
+include/jri_md.h
+include/jritypes.h
+include/npapi.h
+include/npupp.h
include/private/qapplication_p.h
include/private/qcolor_p.h
include/private/qcom_p.h
@@ -214,11 +219,8 @@ include/qmime.h
include/qmlined.h
include/qmngio.h
include/qmodules.h
-include/qmotif.h
-include/qmotifdialog.h
include/qmotifplusstyle.h
include/qmotifstyle.h
-include/qmotifwidget.h
include/qmovie.h
include/qmsgbox.h
include/qmultilinedit.h
@@ -227,6 +229,7 @@ include/qmutex.h
include/qnamespace.h
include/qnetwork.h
include/qnetworkprotocol.h
+include/qnp.h
include/qobjcoll.h
include/qobjdefs.h
include/qobject.h
@@ -387,36 +390,38 @@ include/qwindow.h
include/qwindowdefs.h
include/qwindowsstyle.h
include/qwindowsxpstyle.h
+include/qwinexport.h
include/qwizard.h
include/qwmatrix.h
include/qworkspace.h
include/qxml.h
-include/qxtwidget.h
lib/libdesigner.a
lib/libdesigner.prl
lib/libeditor.a
lib/libeditor.prl
lib/libqassistantclient.a
lib/libqassistantclient.prl
-lib/libqmotif.prl
+lib/libqnp.prl
lib/libqt-mt.prl
lib/libqt-mt.so
lib/libqt-mt.so.3
lib/libqt-mt.so.3.1
-lib/libqt-mt.so.3.1.1
+lib/libqt-mt.so.3.1.2
lib/libqui.prl
lib/libqui.so
lib/libqui.so.1
lib/libqui.so.1.0
lib/libqui.so.1.0.0
+lib/plugins/designer/libcppeditor.so
+lib/plugins/designer/libdlgplugin.so
+lib/plugins/designer/libkdevdlgplugin.so
+lib/plugins/designer/librcplugin.so
+lib/plugins/designer/libwizards.so
share/doc/qt/html/aboutqt.html
share/doc/qt/html/abstract-connections.png
share/doc/qt/html/abstractwidgets.html
share/doc/qt/html/accelerators.html
share/doc/qt/html/aclock-example.html
-share/doc/qt/html/actiongroup.png
-share/doc/qt/html/addmainwidg.png
-share/doc/qt/html/addmenuitem.png
share/doc/qt/html/addressbook-example.html
share/doc/qt/html/advanced.html
share/doc/qt/html/annotated.html
@@ -441,7 +446,6 @@ share/doc/qt/html/brush-styles.png
share/doc/qt/html/bughowto.html
share/doc/qt/html/buttongroup-w.png
share/doc/qt/html/buttongroups-example.html
-share/doc/qt/html/buttons.png
share/doc/qt/html/buyhowto.html
share/doc/qt/html/canvas-chart-example.html
share/doc/qt/html/canvas-example.html
@@ -471,11 +475,8 @@ share/doc/qt/html/classchart.html
share/doc/qt/html/classes.html
share/doc/qt/html/clientserver-example.html
share/doc/qt/html/collection.html
-share/doc/qt/html/coloriconv.png
-share/doc/qt/html/colortable.png
share/doc/qt/html/commonproblems.html
share/doc/qt/html/concrete-connections.png
-share/doc/qt/html/containers.png
share/doc/qt/html/coordsys.html
share/doc/qt/html/coordsys.png
share/doc/qt/html/credits.html
@@ -486,7 +487,6 @@ share/doc/qt/html/customlayout.html
share/doc/qt/html/customstyles.html
share/doc/qt/html/database-connections.png
share/doc/qt/html/database.html
-share/doc/qt/html/database.png
share/doc/qt/html/datastreamformat.html
share/doc/qt/html/datetimewidgets.png
share/doc/qt/html/dclock-example.html
@@ -532,29 +532,21 @@ share/doc/qt/html/dialog3layout.png
share/doc/qt/html/dialog3sample.png
share/doc/qt/html/dialogs.html
share/doc/qt/html/dirview-example.html
-share/doc/qt/html/display.png
share/doc/qt/html/distributingqt.html
share/doc/qt/html/dnd.html
share/doc/qt/html/doneandnext.png
-share/doc/qt/html/dragaction.png
share/doc/qt/html/draganddrop.html
share/doc/qt/html/dragdrop-example.html
share/doc/qt/html/drawdemo-example.html
share/doc/qt/html/drawlines-example.html
share/doc/qt/html/edit-dbtable-dialog.png
-share/doc/qt/html/editconn.png
-share/doc/qt/html/editconn1.png
-share/doc/qt/html/editconn2.png
-share/doc/qt/html/editconn3.png
share/doc/qt/html/editcopy.png
share/doc/qt/html/editcut.png
share/doc/qt/html/editfind.png
-share/doc/qt/html/editfunc.png
share/doc/qt/html/editions.html
share/doc/qt/html/editpaste.png
share/doc/qt/html/editredo.png
share/doc/qt/html/editundo.png
-share/doc/qt/html/editvar.png
share/doc/qt/html/emb-accel.html
share/doc/qt/html/emb-charinput.html
share/doc/qt/html/emb-classes.html
@@ -583,8 +575,6 @@ share/doc/qt/html/filesave.png
share/doc/qt/html/finddialog.png
share/doc/qt/html/focus.html
share/doc/qt/html/forever-example.html
-share/doc/qt/html/formsettings.png
-share/doc/qt/html/forwdec.png
share/doc/qt/html/frames.png
share/doc/qt/html/ftpclient-example.html
share/doc/qt/html/functions.html
@@ -592,6 +582,8 @@ share/doc/qt/html/geomanagement.html
share/doc/qt/html/geometry.html
share/doc/qt/html/geometry.png
share/doc/qt/html/gpl.html
+share/doc/qt/html/graph.g1n
+share/doc/qt/html/grapher-nsplugin-example.html
share/doc/qt/html/graphics.html
share/doc/qt/html/gridlayout.png
share/doc/qt/html/groupbox-w.png
@@ -613,19 +605,14 @@ share/doc/qt/html/iconview-simple_dd-main-cpp.html
share/doc/qt/html/iconview-simple_dd-main-h.html
share/doc/qt/html/iconview.html
share/doc/qt/html/images.html
-share/doc/qt/html/incimp.png
share/doc/qt/html/index
share/doc/qt/html/index.html
-share/doc/qt/html/input.png
share/doc/qt/html/inputdialogs.png
share/doc/qt/html/install-win.html
share/doc/qt/html/install-x11.html
share/doc/qt/html/installation.html
share/doc/qt/html/io.html
share/doc/qt/html/keyfeatures30.html
-share/doc/qt/html/laycoloriconv.png
-share/doc/qt/html/laycolortable.png
-share/doc/qt/html/laymainwidg.png
share/doc/qt/html/layout-example.html
share/doc/qt/html/layout.html
share/doc/qt/html/layout1.png
@@ -658,25 +645,46 @@ share/doc/qt/html/metaobjects.html
share/doc/qt/html/misc.html
share/doc/qt/html/moc.html
share/doc/qt/html/modules.html
-share/doc/qt/html/motif-customwidget-example.html
-share/doc/qt/html/motif-dialog-example.html
-share/doc/qt/html/motif-examples.html
-share/doc/qt/html/motif-extension.html
share/doc/qt/html/movies-example.html
share/doc/qt/html/multimedia.html
-share/doc/qt/html/mwwiz.png
-share/doc/qt/html/mwwiz2.png
+share/doc/qt/html/mw-actiongroup.png
+share/doc/qt/html/mw-addmainwidg.png
+share/doc/qt/html/mw-addmenuitem.png
+share/doc/qt/html/mw-coloriconv.png
+share/doc/qt/html/mw-colortable.png
+share/doc/qt/html/mw-colortool1.png
+share/doc/qt/html/mw-colortool2.png
+share/doc/qt/html/mw-conn1.png
+share/doc/qt/html/mw-conn2.png
+share/doc/qt/html/mw-conn3.png
+share/doc/qt/html/mw-conn4.png
+share/doc/qt/html/mw-dragaction.png
+share/doc/qt/html/mw-editforw.png
+share/doc/qt/html/mw-editfunc.png
+share/doc/qt/html/mw-editincimp.png
+share/doc/qt/html/mw-editvar.png
+share/doc/qt/html/mw-laycoloriconv.png
+share/doc/qt/html/mw-laycolortable.png
+share/doc/qt/html/mw-laymainwidg.png
+share/doc/qt/html/mw-menuwiz.png
+share/doc/qt/html/mw-newfile.png
+share/doc/qt/html/mw-objexplor.png
+share/doc/qt/html/mw-previewform.png
+share/doc/qt/html/mw-projset.png
+share/doc/qt/html/mw-propedit.png
+share/doc/qt/html/mw-settoolwiz.png
+share/doc/qt/html/mw-startdesign.png
+share/doc/qt/html/mw-toolbarpits.png
+share/doc/qt/html/netscape-plugin.html
share/doc/qt/html/network-examples.html
share/doc/qt/html/network.html
share/doc/qt/html/networkprotocol-example.html
-share/doc/qt/html/newfiledialog.png
-share/doc/qt/html/newopendialog.png
share/doc/qt/html/next.png
share/doc/qt/html/nextunfinished.png
+share/doc/qt/html/nsplugin-examples.html
share/doc/qt/html/object.html
share/doc/qt/html/objectmodel.html
share/doc/qt/html/objecttrees.html
-share/doc/qt/html/objexplor.png
share/doc/qt/html/opengl-box-example.html
share/doc/qt/html/opengl-examples.html
share/doc/qt/html/opengl-gear-example.html
@@ -705,14 +713,11 @@ share/doc/qt/html/popup-example.html
share/doc/qt/html/porting.html
share/doc/qt/html/porting2.html
share/doc/qt/html/prev.png
-share/doc/qt/html/previewform.png
share/doc/qt/html/prevunfinished.png
share/doc/qt/html/primes.html
share/doc/qt/html/process-example.html
share/doc/qt/html/progress-example.html
share/doc/qt/html/progressbar-example.html
-share/doc/qt/html/projset.png
-share/doc/qt/html/propedit.png
share/doc/qt/html/properties.html
share/doc/qt/html/propertydocs
share/doc/qt/html/propertyindex
@@ -892,21 +897,7 @@ share/doc/qt/html/qcustomevent-members.html
share/doc/qt/html/qcustomevent.html
share/doc/qt/html/qcustommenuitem-members.html
share/doc/qt/html/qcustommenuitem.html
-share/doc/qt/html/qd-buttonstoolbuttons3.png
-share/doc/qt/html/qd-chooseanimage.png
-share/doc/qt/html/qd-chooseapixmap.png
-share/doc/qt/html/qd-chooseimages.png
share/doc/qt/html/qd-colortool-name.png
-share/doc/qt/html/qd-colortool1.png
-share/doc/qt/html/qd-colortool2.png
-share/doc/qt/html/qd-configmainfile.png
-share/doc/qt/html/qd-containertoolbuttons3.png
-share/doc/qt/html/qd-createtemplate.png
-share/doc/qt/html/qd-customwidgettoolbutton.png
-share/doc/qt/html/qd-custwiddeftab.png
-share/doc/qt/html/qd-custwidproptab.png
-share/doc/qt/html/qd-custwidslotstab.png
-share/doc/qt/html/qd-databasetoolbuttons3.png
share/doc/qt/html/qd-databrowserwzd.png
share/doc/qt/html/qd-databrowserwzdpage2.png
share/doc/qt/html/qd-databrowserwzdpage3.png
@@ -922,66 +913,10 @@ share/doc/qt/html/qd-dataviewwzd.png
share/doc/qt/html/qd-dataviewwzdpage2.png
share/doc/qt/html/qd-dataviewwzdpage3.png
share/doc/qt/html/qd-dataviewwzdpage4.png
-share/doc/qt/html/qd-displaytoolbuttons3.png
-share/doc/qt/html/qd-editclassvariables.png
-share/doc/qt/html/qd-editcustwidsigtab.png
-share/doc/qt/html/qd-editforwarddeclarations.png
-share/doc/qt/html/qd-editiconview.png
-share/doc/qt/html/qd-editincludesindeclaration.png
-share/doc/qt/html/qd-editincludesinimplementation.png
-share/doc/qt/html/qd-editlistbox.png
-share/doc/qt/html/qd-editlistview.png
-share/doc/qt/html/qd-editlistviewcolumns.png
-share/doc/qt/html/qd-editmenu1.png
-share/doc/qt/html/qd-editpalettedialog.png
-share/doc/qt/html/qd-editpreferencesc++.png
-share/doc/qt/html/qd-editpreferencesgeneral.png
-share/doc/qt/html/qd-edittablecolumns.png
-share/doc/qt/html/qd-edittablerows.png
-share/doc/qt/html/qd-edittoolbuttons3.png
-share/doc/qt/html/qd-filemenu1.png
-share/doc/qt/html/qd-filenew2.png
-share/doc/qt/html/qd-fileopen.png
-share/doc/qt/html/qd-fileoverviewwindow.png
-share/doc/qt/html/qd-filesaveasdialog.png
-share/doc/qt/html/qd-filesaveformasdialog.png
-share/doc/qt/html/qd-filesaveformdialog.png
-share/doc/qt/html/qd-filesaveprojectsettingsdialog.png
-share/doc/qt/html/qd-filetoolbuttons3.png
-share/doc/qt/html/qd-finddirectorydialog.png
-share/doc/qt/html/qd-helpmenu.png
share/doc/qt/html/qd-helptoolbuttons3.png
-share/doc/qt/html/qd-inputtoolbuttons3.png
-share/doc/qt/html/qd-layoutmenu1.png
-share/doc/qt/html/qd-layouttoolbuttons3.png
share/doc/qt/html/qd-mainwinwzd.png
share/doc/qt/html/qd-mainwinwzdpage2.png
-share/doc/qt/html/qd-objexpwindowwidgettab.png
-share/doc/qt/html/qd-objexpwinsourcetab.png
-share/doc/qt/html/qd-pagetitle.png
-share/doc/qt/html/qd-previewmenu.png
-share/doc/qt/html/qd-projectaddfile.png
-share/doc/qt/html/qd-projectdbaseconnections.png
-share/doc/qt/html/qd-projectimages.png
-share/doc/qt/html/qd-projectmenu.png
-share/doc/qt/html/qd-projectsettingsc++tabdialog.png
-share/doc/qt/html/qd-projectsettingsdialog.png
-share/doc/qt/html/qd-propedsigtab.png
-share/doc/qt/html/qd-propedwinproptab.png
-share/doc/qt/html/qd-searchfindtextdialog.png
-share/doc/qt/html/qd-searchgotoline.png
-share/doc/qt/html/qd-searchmenu.png
-share/doc/qt/html/qd-searchreplacetext.png
-share/doc/qt/html/qd-searchttoolbuttons3.png
-share/doc/qt/html/qd-selectcolordialog.png
-share/doc/qt/html/qd-selectfontdialog.png
-share/doc/qt/html/qd-textdialog.png
-share/doc/qt/html/qd-title.png
-share/doc/qt/html/qd-toolsmenu.png
-share/doc/qt/html/qd-toolstoolbuttons4.png
-share/doc/qt/html/qd-tunepalettedialog.png
-share/doc/qt/html/qd-viewstoolbuttons5.png
-share/doc/qt/html/qd-windowmenu1.png
+share/doc/qt/html/qd-preface.png
share/doc/qt/html/qdatabrowser-h.html
share/doc/qt/html/qdatabrowser-members.html
share/doc/qt/html/qdatabrowser.html
@@ -1423,21 +1358,12 @@ share/doc/qt/html/qmimesourcefactory-members.html
share/doc/qt/html/qmimesourcefactory.html
share/doc/qt/html/qmlined-m.png
share/doc/qt/html/qmlined-w.png
-share/doc/qt/html/qmotif-h.html
-share/doc/qt/html/qmotif-members.html
-share/doc/qt/html/qmotif.html
-share/doc/qt/html/qmotifdialog-h.html
-share/doc/qt/html/qmotifdialog-members.html
-share/doc/qt/html/qmotifdialog.html
share/doc/qt/html/qmotifplusstyle-h.html
share/doc/qt/html/qmotifplusstyle-members.html
share/doc/qt/html/qmotifplusstyle.html
share/doc/qt/html/qmotifstyle-h.html
share/doc/qt/html/qmotifstyle-members.html
share/doc/qt/html/qmotifstyle.html
-share/doc/qt/html/qmotifwidget-h.html
-share/doc/qt/html/qmotifwidget-members.html
-share/doc/qt/html/qmotifwidget.html
share/doc/qt/html/qmouse_qws-h.html
share/doc/qt/html/qmousedriverfactory-members.html
share/doc/qt/html/qmousedriverfactory.html
@@ -1470,6 +1396,15 @@ share/doc/qt/html/qnetworkoperation.html
share/doc/qt/html/qnetworkprotocol-h.html
share/doc/qt/html/qnetworkprotocol-members.html
share/doc/qt/html/qnetworkprotocol.html
+share/doc/qt/html/qnp-h.html
+share/doc/qt/html/qnpinstance-members.html
+share/doc/qt/html/qnpinstance.html
+share/doc/qt/html/qnplugin-members.html
+share/doc/qt/html/qnplugin.html
+share/doc/qt/html/qnpstream-members.html
+share/doc/qt/html/qnpstream.html
+share/doc/qt/html/qnpwidget-members.html
+share/doc/qt/html/qnpwidget.html
share/doc/qt/html/qobject-h.html
share/doc/qt/html/qobject-members.html
share/doc/qt/html/qobject.html
@@ -1594,6 +1529,20 @@ share/doc/qt/html/qregion.html
share/doc/qt/html/qresizeevent-members.html
share/doc/qt/html/qresizeevent.html
share/doc/qt/html/qrtlcodec-h.html
+share/doc/qt/html/qs-addwidg.png
+share/doc/qt/html/qs-editconn1.png
+share/doc/qt/html/qs-editconn2.png
+share/doc/qt/html/qs-editfunc.png
+share/doc/qt/html/qs-editlistbox1.png
+share/doc/qt/html/qs-laygrid.png
+share/doc/qt/html/qs-layhoriz.png
+share/doc/qt/html/qs-layvert.png
+share/doc/qt/html/qs-newdlg.png
+share/doc/qt/html/qs-projset.png
+share/doc/qt/html/qs-pushbutt.png
+share/doc/qt/html/qs-spacers.png
+share/doc/qt/html/qs-taborder.png
+share/doc/qt/html/qs-txtlbl.png
share/doc/qt/html/qscrbar-m.png
share/doc/qt/html/qscrbar-w.png
share/doc/qt/html/qscreen-members.html
@@ -1654,6 +1603,7 @@ share/doc/qt/html/qslider-m.png
share/doc/qt/html/qslider-members.html
share/doc/qt/html/qslider-w.png
share/doc/qt/html/qslider.html
+share/doc/qt/html/qsmetric.png
share/doc/qt/html/qsocket-h.html
share/doc/qt/html/qsocket-members.html
share/doc/qt/html/qsocket.html
@@ -1993,15 +1943,76 @@ share/doc/qt/html/qxmlreader-members.html
share/doc/qt/html/qxmlreader.html
share/doc/qt/html/qxmlsimplereader-members.html
share/doc/qt/html/qxmlsimplereader.html
-share/doc/qt/html/qxtwidget-h.html
-share/doc/qt/html/qxtwidget-members.html
-share/doc/qt/html/qxtwidget.html
share/doc/qt/html/rangecontrols-example.html
+share/doc/qt/html/rd-add.png
+share/doc/qt/html/rd-chooseanimage.png
+share/doc/qt/html/rd-chooseapixmap.png
+share/doc/qt/html/rd-configmf.png
+share/doc/qt/html/rd-configtb.png
+share/doc/qt/html/rd-cwidgdef.png
+share/doc/qt/html/rd-cwidgprop.png
+share/doc/qt/html/rd-cwidgsig.png
+share/doc/qt/html/rd-cwidgslot.png
+share/doc/qt/html/rd-dbconn.png
+share/doc/qt/html/rd-ediconview.png
+share/doc/qt/html/rd-editincdec.png
+share/doc/qt/html/rd-edittext1.png
+share/doc/qt/html/rd-edittext2.png
+share/doc/qt/html/rd-edlistbox.png
+share/doc/qt/html/rd-edlistview.png
+share/doc/qt/html/rd-edlistview2.png
+share/doc/qt/html/rd-edpalette.png
+share/doc/qt/html/rd-edtablecol.png
+share/doc/qt/html/rd-edtablerow.png
+share/doc/qt/html/rd-find.png
+share/doc/qt/html/rd-formset.png
+share/doc/qt/html/rd-goto.png
+share/doc/qt/html/rd-image.png
+share/doc/qt/html/rd-open.png
+share/doc/qt/html/rd-pagetitle.png
+share/doc/qt/html/rd-prefedit1.png
+share/doc/qt/html/rd-prefgen1.png
+share/doc/qt/html/rd-projset.png
+share/doc/qt/html/rd-projset2.png
+share/doc/qt/html/rd-replace.png
+share/doc/qt/html/rd-saveas.png
+share/doc/qt/html/rd-saveform.png
+share/doc/qt/html/rd-saveformas.png
+share/doc/qt/html/rd-saveprojset.png
+share/doc/qt/html/rd-selcolor.png
+share/doc/qt/html/rd-selfont.png
+share/doc/qt/html/rd-startdesigntab2.png
+share/doc/qt/html/rd-template.png
+share/doc/qt/html/rd-text.png
+share/doc/qt/html/rd-title.png
+share/doc/qt/html/rd-tunepalette.png
share/doc/qt/html/removed20.html
share/doc/qt/html/richtext-example.html
share/doc/qt/html/rintersect.png
+share/doc/qt/html/rmo-editmenu.png
+share/doc/qt/html/rmo-filemenu.png
+share/doc/qt/html/rmo-helpmenu.png
+share/doc/qt/html/rmo-layoutmenu.png
+share/doc/qt/html/rmo-previewmenu.png
+share/doc/qt/html/rmo-projectmenu.png
+share/doc/qt/html/rmo-searchmenu.png
+share/doc/qt/html/rmo-toolsmenu.png
+share/doc/qt/html/rmo-windowmenu.png
share/doc/qt/html/rot-example.html
share/doc/qt/html/rsubtract.png
+share/doc/qt/html/rtb-edit.png
+share/doc/qt/html/rtb-file.png
+share/doc/qt/html/rtb-layout.png
+share/doc/qt/html/rtb-search.png
+share/doc/qt/html/rtb-tbbuttons.png
+share/doc/qt/html/rtb-tbcontain.png
+share/doc/qt/html/rtb-tbcustom.png
+share/doc/qt/html/rtb-tbdatabase.png
+share/doc/qt/html/rtb-tbdisplay.png
+share/doc/qt/html/rtb-tbinput.png
+share/doc/qt/html/rtb-tbviews.png
+share/doc/qt/html/rtb-toolbox.png
+share/doc/qt/html/rtb-tools.png
share/doc/qt/html/runion.png
share/doc/qt/html/rxor.png
share/doc/qt/html/scaling.png
@@ -2142,11 +2153,10 @@ share/doc/qt/html/timers.html
share/doc/qt/html/titleindex
share/doc/qt/html/toggleaction-example.html
share/doc/qt/html/toolbar.png
-share/doc/qt/html/toolbarpits.png
-share/doc/qt/html/toolbox.png
share/doc/qt/html/tools-list.html
share/doc/qt/html/tools.html
share/doc/qt/html/tooltip-example.html
+share/doc/qt/html/trivial-nsplugin-example.html
share/doc/qt/html/troll.html
share/doc/qt/html/tt1_en.png
share/doc/qt/html/tt1_la.png
@@ -2192,11 +2202,14 @@ share/doc/qt/html/unsmooth.png
share/doc/qt/html/validateaccelerators.png
share/doc/qt/html/validatephrases.png
share/doc/qt/html/validatepunctuation.png
-share/doc/qt/html/vieweditconn.png
-share/doc/qt/html/views.png
share/doc/qt/html/whatsthis
share/doc/qt/html/whatsthis.png
share/doc/qt/html/widgets-example.html
+share/doc/qt/html/win-objexplor1.png
+share/doc/qt/html/win-objexplor2.png
+share/doc/qt/html/win-projoverview.png
+share/doc/qt/html/win-propedit1.png
+share/doc/qt/html/win-propedit2.png
share/doc/qt/html/winsystem.html
share/doc/qt/html/wizard-example.html
share/doc/qt/html/wizard-wizard-cpp.html
@@ -2236,6 +2249,8 @@ share/qt/mkspecs/hpux-acc/qmake.conf
share/qt/mkspecs/hpux-acc/qplatformdefs.h
share/qt/mkspecs/hpux-cc/qmake.conf
share/qt/mkspecs/hpux-cc/qplatformdefs.h
+share/qt/mkspecs/hpux-g++-64/qmake.conf
+share/qt/mkspecs/hpux-g++-64/qplatformdefs.h
share/qt/mkspecs/hpux-g++/qmake.conf
share/qt/mkspecs/hpux-g++/qplatformdefs.h
share/qt/mkspecs/hurd-g++/qmake.conf
@@ -2258,6 +2273,8 @@ share/qt/mkspecs/linux-kcc/qmake.conf
share/qt/mkspecs/linux-kcc/qplatformdefs.h
share/qt/mkspecs/linux-pgcc/qmake.conf
share/qt/mkspecs/linux-pgcc/qplatformdefs.h
+share/qt/mkspecs/lynxos-g++/qmake.conf
+share/qt/mkspecs/lynxos-g++/qplatformdefs.h
share/qt/mkspecs/mac9-mwerks/mwerksapp.xml
share/qt/mkspecs/mac9-mwerks/mwerkslib.xml
share/qt/mkspecs/mac9-mwerks/qmake.conf
@@ -2299,7 +2316,6 @@ share/qt/mkspecs/tru64-cxx/qmake.conf
share/qt/mkspecs/tru64-cxx/qplatformdefs.h
share/qt/mkspecs/tru64-g++/qmake.conf
share/qt/mkspecs/tru64-g++/qplatformdefs.h
-share/qt/mkspecs/ultrix-g++/qmake.conf
share/qt/mkspecs/unixware-cc/qmake.conf
share/qt/mkspecs/unixware-cc/qplatformdefs.h
share/qt/mkspecs/unixware-g++/qmake.conf
@@ -2307,6 +2323,7 @@ share/qt/mkspecs/unixware-g++/qplatformdefs.h
share/qt/mkspecs/win32-borland/qmake.conf
share/qt/mkspecs/win32-borland/qplatformdefs.h
share/qt/mkspecs/win32-g++/qmake.conf
+share/qt/mkspecs/win32-g++/qplatformdefs.h
share/qt/mkspecs/win32-icc/qmake.conf
share/qt/mkspecs/win32-icc/qplatformdefs.h
share/qt/mkspecs/win32-icc/win32app.dsp
@@ -2319,7 +2336,6 @@ share/qt/mkspecs/win32-msvc/qplatformdefs.h
share/qt/mkspecs/win32-msvc/win32app.dsp
share/qt/mkspecs/win32-msvc/win32dll.dsp
share/qt/mkspecs/win32-msvc/win32lib.dsp
-share/qt/mkspecs/win32-visage/qmake.conf
share/qt/mkspecs/win32-watcom/qmake.conf
share/qt/phrasebooks/danish.qph
share/qt/phrasebooks/dutch.qph
@@ -2330,11 +2346,6 @@ share/qt/phrasebooks/italian.qph
share/qt/phrasebooks/norwegian.qph
share/qt/phrasebooks/spanish.qph
share/qt/phrasebooks/swedish.qph
-lib/plugins/designer/libcppeditor.so
-lib/plugins/designer/libdlgplugin.so
-lib/plugins/designer/libkdevdlgplugin.so
-lib/plugins/designer/librcplugin.so
-lib/plugins/designer/libwizards.so
share/qt/templates/Configuration_Dialog.ui
share/qt/templates/Dialog_with_Buttons_(Bottom).ui
share/qt/templates/Dialog_with_Buttons_(Right).ui
@@ -2342,7 +2353,6 @@ share/qt/templates/Tab_Dialog.ui
@dirrm share/qt/templates
@dirrm share/qt/phrasebooks
@dirrm share/qt/mkspecs/win32-watcom
-@dirrm share/qt/mkspecs/win32-visage
@dirrm share/qt/mkspecs/win32-msvc.net
@dirrm share/qt/mkspecs/win32-msvc
@dirrm share/qt/mkspecs/win32-icc
@@ -2350,7 +2360,6 @@ share/qt/templates/Tab_Dialog.ui
@dirrm share/qt/mkspecs/win32-borland
@dirrm share/qt/mkspecs/unixware-g++
@dirrm share/qt/mkspecs/unixware-cc
-@dirrm share/qt/mkspecs/ultrix-g++
@dirrm share/qt/mkspecs/tru64-g++
@dirrm share/qt/mkspecs/tru64-cxx
@dirrm share/qt/mkspecs/solaris-kcc
@@ -2369,6 +2378,7 @@ share/qt/templates/Tab_Dialog.ui
@dirrm share/qt/mkspecs/macx-mwerks
@dirrm share/qt/mkspecs/macx-g++
@dirrm share/qt/mkspecs/mac9-mwerks
+@dirrm share/qt/mkspecs/lynxos-g++
@dirrm share/qt/mkspecs/linux-pgcc
@dirrm share/qt/mkspecs/linux-kcc
@dirrm share/qt/mkspecs/linux-icc
@@ -2379,6 +2389,7 @@ share/qt/templates/Tab_Dialog.ui
@dirrm share/qt/mkspecs/irix-cc-64
@dirrm share/qt/mkspecs/irix-cc
@dirrm share/qt/mkspecs/hurd-g++
+@dirrm share/qt/mkspecs/hpux-g++-64
@dirrm share/qt/mkspecs/hpux-g++
@dirrm share/qt/mkspecs/hpux-cc
@dirrm share/qt/mkspecs/hpux-acc-o64
diff --git a/x11-wm/kdeartwork3/Makefile b/x11-wm/kdeartwork3/Makefile
index 85bf2299441f..acbc259570da 100644
--- a/x11-wm/kdeartwork3/Makefile
+++ b/x11-wm/kdeartwork3/Makefile
@@ -26,6 +26,27 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3
+KDE_BUILD_PLIST=yes
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if exists(${X11BASE}/bin/xscreensaver)
+WITH_XS= yes
+.endif # exists(${X11BASE}/bin/xscreensaver)
+
+.if exists(${X11BASE}/bin/screensaver-properties-capplet)
+WITH_XSGNOME= yes
+.endif # exists(${X11BASE}/bin/screensaver-properties-capplet)
+
+.if defined(WITH_XS) && !defined(WITH_XSGNOME)
+BUILD_DEPENDS+= xscreensaver:${PORTSDIR}/x11/xscreensaver
+PLIST_APPEND+= plist.xs
+.endif # defined(WITH_XS)
+
+.if defined(WITH_XSGNOME)
+BUILD_DEPENDS+= screensaver-properties-capplet:${PORTSDIR}/x11/xscreensaver-gnome
+PLIST_APPEND+= plist.xs
+.endif # defined(WITH_XSGNOME)
+
+.include <bsd.port.post.mk>
diff --git a/x11-wm/kdeartwork3/distinfo b/x11-wm/kdeartwork3/distinfo
index 8fa7e0e71b39..4f91b9b06152 100644
--- a/x11-wm/kdeartwork3/distinfo
+++ b/x11-wm/kdeartwork3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeartwork-3.1.1.tar.bz2) = aaf6a2a8736f448766cd190685606d6a
+MD5 (KDE/kdeartwork-3.1.2.tar.bz2) = 0ac7fda2acfa32ce26913ff864722e44
diff --git a/x11-wm/kdeartwork3/files/patch-configure b/x11-wm/kdeartwork3/files/patch-configure
new file mode 100644
index 000000000000..88893ee6c34a
--- /dev/null
+++ b/x11-wm/kdeartwork3/files/patch-configure
@@ -0,0 +1,57 @@
+--- configure.orig Sun May 11 14:21:07 2003
++++ configure Sun May 11 14:22:34 2003
+@@ -24849,12 +24849,12 @@
+ IFS=$old_IFS
+
+
+- echo "$as_me:$LINENO: checking for lib/xscreensaver/flame" >&5
+-echo $ECHO_N "checking for lib/xscreensaver/flame... $ECHO_C" >&6
++ echo "$as_me:$LINENO: checking for bin/xscreensaver-hacks/flame" >&5
++echo $ECHO_N "checking for bin/xscreensaver-hacks/flame... $ECHO_C" >&6
+ if test -n "$XSCREENSAVER"; then
+ kde_cv_path="$XSCREENSAVER";
+ else
+- kde_cache=`echo lib/xscreensaver/flame | sed 'y%./+-%__p_%'`
++ kde_cache=`echo bin/xscreensaver-hacks/flame | sed 'y%./+-%__p_%'`
+
+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24870,16 +24870,16 @@
+ IFS=$kde_save_IFS
+
+ for dir in $dirs; do
+- if test -x "$dir/lib/xscreensaver/flame"; then
++ if test -x "$dir/bin/xscreensaver-hacks/flame"; then
+ if test -n ""
+ then
+- evalstr="$dir/lib/xscreensaver/flame 2>&1 "
++ evalstr="$dir/bin/xscreensaver-hacks/flame 2>&1 "
+ if eval $evalstr; then
+- kde_cv_path="$dir/lib/xscreensaver/flame"
++ kde_cv_path="$dir/bin/xscreensaver-hacks/flame"
+ break
+ fi
+ else
+- kde_cv_path="$dir/lib/xscreensaver/flame"
++ kde_cv_path="$dir/bin/xscreensaver-hacks/flame"
+ break
+ fi
+ fi
+@@ -24923,7 +24923,7 @@
+ XSCREENSAVER_CONFIG=NO
+ for i in $xscreensaver_prefixes ;
+ do
+- for j in lib/xscreensaver/config/flame.xml;
++ for j in share/xscreensaver/config/flame.xml;
+ do
+ echo "configure: 24928: $i/$j" >&5
+ if test -r "$i/$j"; then
+@@ -24954,7 +24954,7 @@
+ XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/lib/X11/xscreensaver/config"
+ fi
+ else
+- XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/lib/xscreensaver/config"
++ XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/share/xscreensaver/config"
+ fi
+ echo "$as_me:$LINENO: result: $XSCREENSAVER_CONFIG" >&5
+ echo "${ECHO_T}$XSCREENSAVER_CONFIG" >&6
diff --git a/x11-themes/kdeartwork4/pkg-plist b/x11-wm/kdeartwork3/files/plist.base
index 615ceacadfba..1e8ab383dfa6 100644
--- a/x11-themes/kdeartwork4/pkg-plist
+++ b/x11-wm/kdeartwork3/files/plist.base
@@ -5604,120 +5604,3 @@ share/wallpapers/simple_wallpaper.jpg
share/wallpapers/sunday_brunch.jpg
share/wallpapers/vegetative_fog.jpg
share/wallpapers/winter_theme_1.jpg
-@dirrm share/wallpapers
-@dirrm share/sounds
-@dirrm share/icons/slick/48x48/mimetypes
-@dirrm share/icons/slick/48x48/filesystems
-@dirrm share/icons/slick/48x48/devices
-@dirrm share/icons/slick/48x48/apps
-@dirrm share/icons/slick/48x48/actions
-@dirrm share/icons/slick/48x48
-@dirrm share/icons/slick/32x32/mimetypes
-@dirrm share/icons/slick/32x32/filesystems
-@dirrm share/icons/slick/32x32/devices
-@dirrm share/icons/slick/32x32/apps
-@dirrm share/icons/slick/32x32/actions
-@dirrm share/icons/slick/32x32
-@dirrm share/icons/slick/22x22/actions
-@dirrm share/icons/slick/22x22
-@dirrm share/icons/slick/16x16/mimetypes
-@dirrm share/icons/slick/16x16/filesystems
-@dirrm share/icons/slick/16x16/devices
-@dirrm share/icons/slick/16x16/apps
-@dirrm share/icons/slick/16x16/actions
-@dirrm share/icons/slick/16x16
-@dirrm share/icons/slick
-@dirrm share/icons/kdeclassic/64x64/mimetypes
-@dirrm share/icons/kdeclassic/64x64/filesystems
-@dirrm share/icons/kdeclassic/64x64
-@dirrm share/icons/kdeclassic/48x48/mimetypes
-@dirrm share/icons/kdeclassic/48x48/filesystems
-@dirrm share/icons/kdeclassic/48x48/devices
-@dirrm share/icons/kdeclassic/48x48/apps
-@dirrm share/icons/kdeclassic/48x48/actions
-@dirrm share/icons/kdeclassic/48x48
-@dirrm share/icons/kdeclassic/32x32/mimetypes
-@dirrm share/icons/kdeclassic/32x32/filesystems
-@dirrm share/icons/kdeclassic/32x32/devices
-@dirrm share/icons/kdeclassic/32x32/apps
-@dirrm share/icons/kdeclassic/32x32/actions
-@dirrm share/icons/kdeclassic/32x32
-@dirrm share/icons/kdeclassic/22x22/mimetypes
-@dirrm share/icons/kdeclassic/22x22/apps
-@dirrm share/icons/kdeclassic/22x22/actions
-@dirrm share/icons/kdeclassic/22x22
-@dirrm share/icons/kdeclassic/16x16/mimetypes
-@dirrm share/icons/kdeclassic/16x16/filesystems
-@dirrm share/icons/kdeclassic/16x16/devices
-@dirrm share/icons/kdeclassic/16x16/apps
-@dirrm share/icons/kdeclassic/16x16/actions
-@dirrm share/icons/kdeclassic/16x16
-@dirrm share/icons/kdeclassic
-@dirrm share/icons/ikons/64x64/filesystems
-@dirrm share/icons/ikons/64x64/apps
-@dirrm share/icons/ikons/64x64
-@dirrm share/icons/ikons/48x48/mimetypes
-@dirrm share/icons/ikons/48x48/filesystems
-@dirrm share/icons/ikons/48x48/devices
-@dirrm share/icons/ikons/48x48/apps
-@dirrm share/icons/ikons/48x48
-@dirrm share/icons/ikons/32x32/mimetypes
-@dirrm share/icons/ikons/32x32/filesystems
-@dirrm share/icons/ikons/32x32/devices
-@dirrm share/icons/ikons/32x32/apps
-@dirrm share/icons/ikons/32x32
-@dirrm share/icons/ikons/22x22/apps
-@dirrm share/icons/ikons/22x22/actions
-@dirrm share/icons/ikons/22x22
-@dirrm share/icons/ikons/16x16/mimetypes
-@dirrm share/icons/ikons/16x16/filesystems
-@dirrm share/icons/ikons/16x16/devices
-@dirrm share/icons/ikons/16x16/apps
-@dirrm share/icons/ikons/16x16/actions
-@dirrm share/icons/ikons/16x16
-@dirrm share/icons/ikons
-@dirrm share/icons/Technical/48x48/mimetypes
-@dirrm share/icons/Technical/48x48/filesystems
-@dirrm share/icons/Technical/48x48
-@dirrm share/icons/Technical/32x32/mimetypes
-@dirrm share/icons/Technical/32x32/filesystems
-@dirrm share/icons/Technical/32x32/actions
-@dirrm share/icons/Technical/32x32
-@dirrm share/icons/Technical
-@dirrm share/icons/Locolor/32x32/mimetypes
-@dirrm share/icons/Locolor/32x32/filesystems
-@dirrm share/icons/Locolor/32x32/devices
-@dirrm share/icons/Locolor/32x32/apps
-@dirrm share/icons/Locolor/32x32/actions
-@dirrm share/icons/Locolor/32x32
-@dirrm share/icons/Locolor/16x16/mimetypes
-@dirrm share/icons/Locolor/16x16/filesystems
-@dirrm share/icons/Locolor/16x16/devices
-@dirrm share/icons/Locolor/16x16/apps
-@dirrm share/icons/Locolor/16x16/actions
-@dirrm share/icons/Locolor/16x16
-@dirrm share/icons/Locolor
-@dirrm share/icons
-@dirrm share/apps/kworldclock/maps/rainfall
-@dirrm share/apps/kworldclock/maps/mggd
-@dirrm share/apps/kworldclock/maps/depths
-@dirrm share/apps/kworldclock/maps/caida_bw
-@dirrm share/apps/kworldclock/maps/caida
-@dirrm share/apps/kworldclock/maps/bio
-@dirrm share/apps/kworldclock/maps/alt
-@dirrm share/apps/kworldclock/maps
-@dirrm share/apps/kworldclock
-@dirrm share/apps/kwin/icewm-themes/Model
-@dirrm share/apps/kwin/icewm-themes/MenschMaschine
-@dirrm share/apps/kwin/icewm-themes
-@dirrm share/apps/kwin
-@dirrm share/apps/kstyle/themes
-@dirrm share/apps/kstyle
-@dirrm share/apps/kscreensaver
-@dirrm share/apps
-@dirrm share/applnk/System/ScreenSavers
-@dirrm share/applnk/System
-@dirrm share/applnk
-@dirrm lib/kde3/plugins/styles
-@dirrm lib/kde3/plugins
-@dirrm lib/kde3
diff --git a/x11-wm/kdeartwork3/files/plist.base.rm b/x11-wm/kdeartwork3/files/plist.base.rm
new file mode 100644
index 000000000000..a862242a0bf7
--- /dev/null
+++ b/x11-wm/kdeartwork3/files/plist.base.rm
@@ -0,0 +1,117 @@
+@dirrm share/wallpapers
+@dirrm share/sounds
+@dirrm share/icons/slick/48x48/mimetypes
+@dirrm share/icons/slick/48x48/filesystems
+@dirrm share/icons/slick/48x48/devices
+@dirrm share/icons/slick/48x48/apps
+@dirrm share/icons/slick/48x48/actions
+@dirrm share/icons/slick/48x48
+@dirrm share/icons/slick/32x32/mimetypes
+@dirrm share/icons/slick/32x32/filesystems
+@dirrm share/icons/slick/32x32/devices
+@dirrm share/icons/slick/32x32/apps
+@dirrm share/icons/slick/32x32/actions
+@dirrm share/icons/slick/32x32
+@dirrm share/icons/slick/22x22/actions
+@dirrm share/icons/slick/22x22
+@dirrm share/icons/slick/16x16/mimetypes
+@dirrm share/icons/slick/16x16/filesystems
+@dirrm share/icons/slick/16x16/devices
+@dirrm share/icons/slick/16x16/apps
+@dirrm share/icons/slick/16x16/actions
+@dirrm share/icons/slick/16x16
+@dirrm share/icons/slick
+@dirrm share/icons/kdeclassic/64x64/mimetypes
+@dirrm share/icons/kdeclassic/64x64/filesystems
+@dirrm share/icons/kdeclassic/64x64
+@dirrm share/icons/kdeclassic/48x48/mimetypes
+@dirrm share/icons/kdeclassic/48x48/filesystems
+@dirrm share/icons/kdeclassic/48x48/devices
+@dirrm share/icons/kdeclassic/48x48/apps
+@dirrm share/icons/kdeclassic/48x48/actions
+@dirrm share/icons/kdeclassic/48x48
+@dirrm share/icons/kdeclassic/32x32/mimetypes
+@dirrm share/icons/kdeclassic/32x32/filesystems
+@dirrm share/icons/kdeclassic/32x32/devices
+@dirrm share/icons/kdeclassic/32x32/apps
+@dirrm share/icons/kdeclassic/32x32/actions
+@dirrm share/icons/kdeclassic/32x32
+@dirrm share/icons/kdeclassic/22x22/mimetypes
+@dirrm share/icons/kdeclassic/22x22/apps
+@dirrm share/icons/kdeclassic/22x22/actions
+@dirrm share/icons/kdeclassic/22x22
+@dirrm share/icons/kdeclassic/16x16/mimetypes
+@dirrm share/icons/kdeclassic/16x16/filesystems
+@dirrm share/icons/kdeclassic/16x16/devices
+@dirrm share/icons/kdeclassic/16x16/apps
+@dirrm share/icons/kdeclassic/16x16/actions
+@dirrm share/icons/kdeclassic/16x16
+@dirrm share/icons/kdeclassic
+@dirrm share/icons/ikons/64x64/filesystems
+@dirrm share/icons/ikons/64x64/apps
+@dirrm share/icons/ikons/64x64
+@dirrm share/icons/ikons/48x48/mimetypes
+@dirrm share/icons/ikons/48x48/filesystems
+@dirrm share/icons/ikons/48x48/devices
+@dirrm share/icons/ikons/48x48/apps
+@dirrm share/icons/ikons/48x48
+@dirrm share/icons/ikons/32x32/mimetypes
+@dirrm share/icons/ikons/32x32/filesystems
+@dirrm share/icons/ikons/32x32/devices
+@dirrm share/icons/ikons/32x32/apps
+@dirrm share/icons/ikons/32x32
+@dirrm share/icons/ikons/22x22/apps
+@dirrm share/icons/ikons/22x22/actions
+@dirrm share/icons/ikons/22x22
+@dirrm share/icons/ikons/16x16/mimetypes
+@dirrm share/icons/ikons/16x16/filesystems
+@dirrm share/icons/ikons/16x16/devices
+@dirrm share/icons/ikons/16x16/apps
+@dirrm share/icons/ikons/16x16/actions
+@dirrm share/icons/ikons/16x16
+@dirrm share/icons/ikons
+@dirrm share/icons/Technical/48x48/mimetypes
+@dirrm share/icons/Technical/48x48/filesystems
+@dirrm share/icons/Technical/48x48
+@dirrm share/icons/Technical/32x32/mimetypes
+@dirrm share/icons/Technical/32x32/filesystems
+@dirrm share/icons/Technical/32x32/actions
+@dirrm share/icons/Technical/32x32
+@dirrm share/icons/Technical
+@dirrm share/icons/Locolor/32x32/mimetypes
+@dirrm share/icons/Locolor/32x32/filesystems
+@dirrm share/icons/Locolor/32x32/devices
+@dirrm share/icons/Locolor/32x32/apps
+@dirrm share/icons/Locolor/32x32/actions
+@dirrm share/icons/Locolor/32x32
+@dirrm share/icons/Locolor/16x16/mimetypes
+@dirrm share/icons/Locolor/16x16/filesystems
+@dirrm share/icons/Locolor/16x16/devices
+@dirrm share/icons/Locolor/16x16/apps
+@dirrm share/icons/Locolor/16x16/actions
+@dirrm share/icons/Locolor/16x16
+@dirrm share/icons/Locolor
+@dirrm share/icons
+@dirrm share/apps/kworldclock/maps/rainfall
+@dirrm share/apps/kworldclock/maps/mggd
+@dirrm share/apps/kworldclock/maps/depths
+@dirrm share/apps/kworldclock/maps/caida_bw
+@dirrm share/apps/kworldclock/maps/caida
+@dirrm share/apps/kworldclock/maps/bio
+@dirrm share/apps/kworldclock/maps/alt
+@dirrm share/apps/kworldclock/maps
+@dirrm share/apps/kworldclock
+@dirrm share/apps/kwin/icewm-themes/Model
+@dirrm share/apps/kwin/icewm-themes/MenschMaschine
+@dirrm share/apps/kwin/icewm-themes
+@dirrm share/apps/kwin
+@dirrm share/apps/kstyle/themes
+@dirrm share/apps/kstyle
+@dirrm share/apps/kscreensaver
+@dirrm share/apps
+@dirrm share/applnk/System/ScreenSavers
+@dirrm share/applnk/System
+@dirrm share/applnk
+@dirrm lib/kde3/plugins/styles
+@dirrm lib/kde3/plugins
+@dirrm lib/kde3
diff --git a/x11-wm/kdeartwork3/files/plist.xs b/x11-wm/kdeartwork3/files/plist.xs
new file mode 100644
index 000000000000..9d5aabc15f64
--- /dev/null
+++ b/x11-wm/kdeartwork3/files/plist.xs
@@ -0,0 +1,176 @@
+bin/kxsconfig
+bin/kxsrun
+share/applnk/System/ScreenSavers/anemone.desktop
+share/applnk/System/ScreenSavers/ant.desktop
+share/applnk/System/ScreenSavers/apollonian.desktop
+share/applnk/System/ScreenSavers/atlantis.desktop
+share/applnk/System/ScreenSavers/attraction.desktop
+share/applnk/System/ScreenSavers/blaster.desktop
+share/applnk/System/ScreenSavers/blitspin.desktop
+share/applnk/System/ScreenSavers/bouboule.desktop
+share/applnk/System/ScreenSavers/boxed.desktop
+share/applnk/System/ScreenSavers/braid.desktop
+share/applnk/System/ScreenSavers/bsod.desktop
+share/applnk/System/ScreenSavers/bubble3d.desktop
+share/applnk/System/ScreenSavers/bubbles.desktop
+share/applnk/System/ScreenSavers/bumps.desktop
+share/applnk/System/ScreenSavers/cage.desktop
+share/applnk/System/ScreenSavers/ccurve.desktop
+share/applnk/System/ScreenSavers/circuit.desktop
+share/applnk/System/ScreenSavers/compass.desktop
+share/applnk/System/ScreenSavers/coral.desktop
+share/applnk/System/ScreenSavers/critical.desktop
+share/applnk/System/ScreenSavers/crystal.desktop
+share/applnk/System/ScreenSavers/cubenetic.desktop
+share/applnk/System/ScreenSavers/cynosure.desktop
+share/applnk/System/ScreenSavers/dangerball.desktop
+share/applnk/System/ScreenSavers/decayscreen.desktop
+share/applnk/System/ScreenSavers/deco.desktop
+share/applnk/System/ScreenSavers/deluxe.desktop
+share/applnk/System/ScreenSavers/demon.desktop
+share/applnk/System/ScreenSavers/discrete.desktop
+share/applnk/System/ScreenSavers/distort.desktop
+share/applnk/System/ScreenSavers/drift.desktop
+share/applnk/System/ScreenSavers/endgame.desktop
+share/applnk/System/ScreenSavers/engine.desktop
+share/applnk/System/ScreenSavers/epicycle.desktop
+share/applnk/System/ScreenSavers/euler2d.desktop
+share/applnk/System/ScreenSavers/extrusion.desktop
+share/applnk/System/ScreenSavers/fadeplot.desktop
+share/applnk/System/ScreenSavers/flag.desktop
+share/applnk/System/ScreenSavers/flame.desktop
+share/applnk/System/ScreenSavers/flipscreen3d.desktop
+share/applnk/System/ScreenSavers/flow.desktop
+share/applnk/System/ScreenSavers/fluidballs.desktop
+share/applnk/System/ScreenSavers/forest.desktop
+share/applnk/System/ScreenSavers/galaxy.desktop
+share/applnk/System/ScreenSavers/gears.desktop
+share/applnk/System/ScreenSavers/gflux.desktop
+share/applnk/System/ScreenSavers/glforestfire.desktop
+share/applnk/System/ScreenSavers/glplanet.desktop
+share/applnk/System/ScreenSavers/glsnake.desktop
+share/applnk/System/ScreenSavers/gltext.desktop
+share/applnk/System/ScreenSavers/goop.desktop
+share/applnk/System/ScreenSavers/grav.desktop
+share/applnk/System/ScreenSavers/greynetic.desktop
+share/applnk/System/ScreenSavers/halo.desktop
+share/applnk/System/ScreenSavers/helix.desktop
+share/applnk/System/ScreenSavers/hopalong.desktop
+share/applnk/System/ScreenSavers/hyperball.desktop
+share/applnk/System/ScreenSavers/hypercube.desktop
+share/applnk/System/ScreenSavers/ifs.desktop
+share/applnk/System/ScreenSavers/imsmap.desktop
+share/applnk/System/ScreenSavers/interference.desktop
+share/applnk/System/ScreenSavers/jigsaw.desktop
+share/applnk/System/ScreenSavers/juggle.desktop
+share/applnk/System/ScreenSavers/julia.desktop
+share/applnk/System/ScreenSavers/kaleidescope.desktop
+share/applnk/System/ScreenSavers/kumppa.desktop
+share/applnk/System/ScreenSavers/lament.desktop
+share/applnk/System/ScreenSavers/laser.desktop
+share/applnk/System/ScreenSavers/lavalite.desktop
+share/applnk/System/ScreenSavers/lightning.desktop
+share/applnk/System/ScreenSavers/lisa.desktop
+share/applnk/System/ScreenSavers/lissie.desktop
+share/applnk/System/ScreenSavers/lmorph.desktop
+share/applnk/System/ScreenSavers/loop.desktop
+share/applnk/System/ScreenSavers/maze.desktop
+share/applnk/System/ScreenSavers/menger.desktop
+share/applnk/System/ScreenSavers/moebius.desktop
+share/applnk/System/ScreenSavers/moire.desktop
+share/applnk/System/ScreenSavers/moire2.desktop
+share/applnk/System/ScreenSavers/molecule.desktop
+share/applnk/System/ScreenSavers/morph3d.desktop
+share/applnk/System/ScreenSavers/mountain.desktop
+share/applnk/System/ScreenSavers/munch.desktop
+share/applnk/System/ScreenSavers/nerverot.desktop
+share/applnk/System/ScreenSavers/noseguy.desktop
+share/applnk/System/ScreenSavers/pedal.desktop
+share/applnk/System/ScreenSavers/penetrate.desktop
+share/applnk/System/ScreenSavers/penrose.desktop
+share/applnk/System/ScreenSavers/petri.desktop
+share/applnk/System/ScreenSavers/phosphor.desktop
+share/applnk/System/ScreenSavers/pipes.desktop
+share/applnk/System/ScreenSavers/pixmaps.desktop
+share/applnk/System/ScreenSavers/polyominoes.desktop
+share/applnk/System/ScreenSavers/pulsar.desktop
+share/applnk/System/ScreenSavers/pyro.desktop
+share/applnk/System/ScreenSavers/qix.desktop
+share/applnk/System/ScreenSavers/queens.desktop
+share/applnk/System/ScreenSavers/rd-bomb.desktop
+share/applnk/System/ScreenSavers/ripples.desktop
+share/applnk/System/ScreenSavers/rocks.desktop
+share/applnk/System/ScreenSavers/rorschach.desktop
+share/applnk/System/ScreenSavers/rotor.desktop
+share/applnk/System/ScreenSavers/rotzoomer.desktop
+share/applnk/System/ScreenSavers/rubik.desktop
+share/applnk/System/ScreenSavers/sballs.desktop
+share/applnk/System/ScreenSavers/shadebobs.desktop
+share/applnk/System/ScreenSavers/sierpinski.desktop
+share/applnk/System/ScreenSavers/sierpinski3d.desktop
+share/applnk/System/ScreenSavers/slidescreen.desktop
+share/applnk/System/ScreenSavers/slip.desktop
+share/applnk/System/ScreenSavers/sonar.desktop
+share/applnk/System/ScreenSavers/speedmine.desktop
+share/applnk/System/ScreenSavers/sphere.desktop
+share/applnk/System/ScreenSavers/spheremonics.desktop
+share/applnk/System/ScreenSavers/spiral.desktop
+share/applnk/System/ScreenSavers/spotlight.desktop
+share/applnk/System/ScreenSavers/sproingies.desktop
+share/applnk/System/ScreenSavers/squiral.desktop
+share/applnk/System/ScreenSavers/stairs.desktop
+share/applnk/System/ScreenSavers/starfish.desktop
+share/applnk/System/ScreenSavers/starwars.desktop
+share/applnk/System/ScreenSavers/stonerview.desktop
+share/applnk/System/ScreenSavers/strange.desktop
+share/applnk/System/ScreenSavers/superquadrics.desktop
+share/applnk/System/ScreenSavers/swirl.desktop
+share/applnk/System/ScreenSavers/t3d.desktop
+share/applnk/System/ScreenSavers/thornbird.desktop
+share/applnk/System/ScreenSavers/triangle.desktop
+share/applnk/System/ScreenSavers/truchet.desktop
+share/applnk/System/ScreenSavers/twang.desktop
+share/applnk/System/ScreenSavers/vermiculate.desktop
+share/applnk/System/ScreenSavers/vidwhacker.desktop
+share/applnk/System/ScreenSavers/vines.desktop
+share/applnk/System/ScreenSavers/wander.desktop
+share/applnk/System/ScreenSavers/webcollage.desktop
+share/applnk/System/ScreenSavers/whirlwindwarp.desktop
+share/applnk/System/ScreenSavers/whirlygig.desktop
+share/applnk/System/ScreenSavers/worm.desktop
+share/applnk/System/ScreenSavers/xflame.desktop
+share/applnk/System/ScreenSavers/xjack.desktop
+share/applnk/System/ScreenSavers/xlyap.desktop
+share/applnk/System/ScreenSavers/xmatrix.desktop
+share/applnk/System/ScreenSavers/xrayswarm.desktop
+share/applnk/System/ScreenSavers/xspirograph.desktop
+share/applnk/System/ScreenSavers/xsublim.desktop
+share/applnk/System/ScreenSavers/xteevee.desktop
+share/applnk/System/ScreenSavers/zoom.desktop
+share/config/antrc
+share/config/attractionrc
+share/config/bouboulerc
+share/config/bubblesrc
+share/config/coralrc
+share/config/crystalrc
+share/config/decayscreenrc
+share/config/deluxerc
+share/config/demonrc
+share/config/driftrc
+share/config/epicyclerc
+share/config/fadeplotrc
+share/config/flamerc
+share/config/flowrc
+share/config/forestrc
+share/config/gearsrc
+share/config/gooprc
+share/config/gravrc
+share/config/halorc
+share/config/imsmaprc
+share/config/interferencerc
+share/config/kumpparc
+share/config/laserrc
+share/config/lissierc
+share/config/penroserc
+share/config/rocksrc
+share/config/sliprc
diff --git a/x11-wm/kdeartwork3/files/plist.xs.rm b/x11-wm/kdeartwork3/files/plist.xs.rm
new file mode 100644
index 000000000000..b0ceca4d1202
--- /dev/null
+++ b/x11-wm/kdeartwork3/files/plist.xs.rm
@@ -0,0 +1 @@
+@dirrm share/config
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 432cddcea474..1ae4170f6ed5 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -7,11 +7,11 @@
#
PORTNAME= kdebase
-PORTVERSION= ${KDE_VERSION}a
+PORTVERSION= ${KDE_VERSION}
PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${KDE_VERSION}a/src
+MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index 4240fef3d834..2c406b62b08c 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdebase-3.1.1a.tar.bz2) = 66069257f56c7e8b931c853029e2b093
+MD5 (KDE/kdebase-3.1.2.tar.bz2) = a90feb5273e9f524a2b19d9021ece7a6
+
diff --git a/x11/kde4-baseapps/files/plist.base b/x11/kde4-baseapps/files/plist.base
index 80a9509368eb..31f8e3f166f0 100644
--- a/x11/kde4-baseapps/files/plist.base
+++ b/x11/kde4-baseapps/files/plist.base
@@ -2783,6 +2783,7 @@ share/services/konq_sidebartng.desktop
share/services/konq_textview.desktop
share/services/konq_treeview.desktop
share/services/konqueror_config.desktop
+share/services/konsole-script.desktop
share/services/konsolepart.desktop
share/services/kshorturifilter.desktop
share/services/kuriikwsfilter.desktop
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 432cddcea474..1ae4170f6ed5 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -7,11 +7,11 @@
#
PORTNAME= kdebase
-PORTVERSION= ${KDE_VERSION}a
+PORTVERSION= ${KDE_VERSION}
PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${KDE_VERSION}a/src
+MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index 4240fef3d834..2c406b62b08c 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdebase-3.1.1a.tar.bz2) = 66069257f56c7e8b931c853029e2b093
+MD5 (KDE/kdebase-3.1.2.tar.bz2) = a90feb5273e9f524a2b19d9021ece7a6
+
diff --git a/x11/kde4-runtime/files/plist.base b/x11/kde4-runtime/files/plist.base
index 80a9509368eb..31f8e3f166f0 100644
--- a/x11/kde4-runtime/files/plist.base
+++ b/x11/kde4-runtime/files/plist.base
@@ -2783,6 +2783,7 @@ share/services/konq_sidebartng.desktop
share/services/konq_textview.desktop
share/services/konq_treeview.desktop
share/services/konqueror_config.desktop
+share/services/konsole-script.desktop
share/services/konsolepart.desktop
share/services/kshorturifilter.desktop
share/services/kuriikwsfilter.desktop
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 432cddcea474..1ae4170f6ed5 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -7,11 +7,11 @@
#
PORTNAME= kdebase
-PORTVERSION= ${KDE_VERSION}a
+PORTVERSION= ${KDE_VERSION}
PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${KDE_VERSION}a/src
+MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index 4240fef3d834..2c406b62b08c 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdebase-3.1.1a.tar.bz2) = 66069257f56c7e8b931c853029e2b093
+MD5 (KDE/kdebase-3.1.2.tar.bz2) = a90feb5273e9f524a2b19d9021ece7a6
+
diff --git a/x11/kde4-workspace/files/plist.base b/x11/kde4-workspace/files/plist.base
index 80a9509368eb..31f8e3f166f0 100644
--- a/x11/kde4-workspace/files/plist.base
+++ b/x11/kde4-workspace/files/plist.base
@@ -2783,6 +2783,7 @@ share/services/konq_sidebartng.desktop
share/services/konq_textview.desktop
share/services/konq_treeview.desktop
share/services/konqueror_config.desktop
+share/services/konsole-script.desktop
share/services/konsolepart.desktop
share/services/kshorturifilter.desktop
share/services/kuriikwsfilter.desktop
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 432cddcea474..1ae4170f6ed5 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -7,11 +7,11 @@
#
PORTNAME= kdebase
-PORTVERSION= ${KDE_VERSION}a
+PORTVERSION= ${KDE_VERSION}
PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${KDE_VERSION}a/src
+MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 4240fef3d834..2c406b62b08c 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdebase-3.1.1a.tar.bz2) = 66069257f56c7e8b931c853029e2b093
+MD5 (KDE/kdebase-3.1.2.tar.bz2) = a90feb5273e9f524a2b19d9021ece7a6
+
diff --git a/x11/kdebase3/files/plist.base b/x11/kdebase3/files/plist.base
index 80a9509368eb..31f8e3f166f0 100644
--- a/x11/kdebase3/files/plist.base
+++ b/x11/kdebase3/files/plist.base
@@ -2783,6 +2783,7 @@ share/services/konq_sidebartng.desktop
share/services/konq_textview.desktop
share/services/konq_treeview.desktop
share/services/konqueror_config.desktop
+share/services/konsole-script.desktop
share/services/konsolepart.desktop
share/services/kshorturifilter.desktop
share/services/kuriikwsfilter.desktop
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 432cddcea474..1ae4170f6ed5 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -7,11 +7,11 @@
#
PORTNAME= kdebase
-PORTVERSION= ${KDE_VERSION}a
+PORTVERSION= ${KDE_VERSION}
PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${KDE_VERSION}a/src
+MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index 4240fef3d834..2c406b62b08c 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdebase-3.1.1a.tar.bz2) = 66069257f56c7e8b931c853029e2b093
+MD5 (KDE/kdebase-3.1.2.tar.bz2) = a90feb5273e9f524a2b19d9021ece7a6
+
diff --git a/x11/kdebase4-runtime/files/plist.base b/x11/kdebase4-runtime/files/plist.base
index 80a9509368eb..31f8e3f166f0 100644
--- a/x11/kdebase4-runtime/files/plist.base
+++ b/x11/kdebase4-runtime/files/plist.base
@@ -2783,6 +2783,7 @@ share/services/konq_sidebartng.desktop
share/services/konq_textview.desktop
share/services/konq_treeview.desktop
share/services/konqueror_config.desktop
+share/services/konsole-script.desktop
share/services/konsolepart.desktop
share/services/kshorturifilter.desktop
share/services/kuriikwsfilter.desktop
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 432cddcea474..1ae4170f6ed5 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -7,11 +7,11 @@
#
PORTNAME= kdebase
-PORTVERSION= ${KDE_VERSION}a
+PORTVERSION= ${KDE_VERSION}
PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${KDE_VERSION}a/src
+MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index 4240fef3d834..2c406b62b08c 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdebase-3.1.1a.tar.bz2) = 66069257f56c7e8b931c853029e2b093
+MD5 (KDE/kdebase-3.1.2.tar.bz2) = a90feb5273e9f524a2b19d9021ece7a6
+
diff --git a/x11/kdebase4-workspace/files/plist.base b/x11/kdebase4-workspace/files/plist.base
index 80a9509368eb..31f8e3f166f0 100644
--- a/x11/kdebase4-workspace/files/plist.base
+++ b/x11/kdebase4-workspace/files/plist.base
@@ -2783,6 +2783,7 @@ share/services/konq_sidebartng.desktop
share/services/konq_textview.desktop
share/services/konq_treeview.desktop
share/services/konqueror_config.desktop
+share/services/konsole-script.desktop
share/services/konsolepart.desktop
share/services/kshorturifilter.desktop
share/services/kuriikwsfilter.desktop
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 432cddcea474..1ae4170f6ed5 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -7,11 +7,11 @@
#
PORTNAME= kdebase
-PORTVERSION= ${KDE_VERSION}a
+PORTVERSION= ${KDE_VERSION}
PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${KDE_VERSION}a/src
+MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index 4240fef3d834..2c406b62b08c 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdebase-3.1.1a.tar.bz2) = 66069257f56c7e8b931c853029e2b093
+MD5 (KDE/kdebase-3.1.2.tar.bz2) = a90feb5273e9f524a2b19d9021ece7a6
+
diff --git a/x11/kdebase4/files/plist.base b/x11/kdebase4/files/plist.base
index 80a9509368eb..31f8e3f166f0 100644
--- a/x11/kdebase4/files/plist.base
+++ b/x11/kdebase4/files/plist.base
@@ -2783,6 +2783,7 @@ share/services/konq_sidebartng.desktop
share/services/konq_textview.desktop
share/services/konq_treeview.desktop
share/services/konqueror_config.desktop
+share/services/konsole-script.desktop
share/services/konsolepart.desktop
share/services/kshorturifilter.desktop
share/services/kuriikwsfilter.desktop
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index f6eda1c101c2..a7a376c53513 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -7,15 +7,15 @@
#
PORTNAME= kdelibs
-PORTVERSION= ${KDE_VERSION}a
+PORTVERSION= ${KDE_VERSION}
PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${KDE_VERSION}a/src
+MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
-COMMENT= This is the base set of libraries needed by KDE programs
+COMMENT= This is the base set of libraries needed by KDE programs
BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
@@ -63,7 +63,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
KDE_BUILD_PLIST= yes
# kabc (the addressbook backend) can use ldap if it's available
.if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so)
-LIB_DEPENDS+= libldap.so:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap21
PLIST_APPEND+= plist.ldap
.endif
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index f75781c8d9b1..0841ea17391a 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-3.1.1a.tar.bz2) = 77cc0b44b43ea239cb3f8e37d7814f1a
+MD5 (KDE/kdelibs-3.1.2.tar.bz2) = 2b896ce9a6942e4cc4fe1758236bafa3
diff --git a/x11/kdelibs3/files/patch-kdoctools::xmlizer b/x11/kdelibs3/files/patch-kdoctools::xmlizer
deleted file mode 100644
index cf46f6cbca33..000000000000
--- a/x11/kdelibs3/files/patch-kdoctools::xmlizer
+++ /dev/null
@@ -1,8 +0,0 @@
---- kdoctools/xmlizer.orig Wed Jan 29 17:17:40 2003
-+++ kdoctools/xmlizer Wed Jan 29 17:17:57 2003
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#! /usr/bin/env python
-
- import re, sys, os, string
-
diff --git a/x11/kdelibs3/files/plist.base b/x11/kdelibs3/files/plist.base
index f5458c52a237..1d4814ba46db 100644
--- a/x11/kdelibs3/files/plist.base
+++ b/x11/kdelibs3/files/plist.base
@@ -103,6 +103,7 @@ include/kabc/distributionlistdialog.h
include/kabc/distributionlisteditor.h
include/kabc/errorhandler.h
include/kabc/field.h
+include/kabc/format.h
include/kabc/formatfactory.h
include/kabc/formatplugin.h
include/kabc/geo.h
@@ -3868,19 +3869,6 @@ share/servicetypes/ktexteditorplugin.desktop
share/servicetypes/kurifilterplugin.desktop
share/servicetypes/renamedlgplugin.desktop
share/servicetypes/scriptinterface.desktop
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/bg/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/fo/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/lt/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/no-NY/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/stylesheets
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/wa/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/xh/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/xx/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/zh-CN/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xsl/indexing
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xsl/javahelp
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xsl/template
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
diff --git a/x11/kdelibs3/files/plist.base.rm b/x11/kdelibs3/files/plist.base.rm
index 279b61cf447a..b5d360213c9b 100644
--- a/x11/kdelibs3/files/plist.base.rm
+++ b/x11/kdelibs3/files/plist.base.rm
@@ -13,19 +13,6 @@
@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html || true
@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html || true
@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xsl/template || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xsl/javahelp || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xsl/indexing || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/zh-CN/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/xx/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/xh/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/wa/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/stylesheets || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/no-NY/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/lt/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/fo/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/bg/entities || true
@dirrm share/servicetypes
@dirrm share/services/kded
@dirrm share/services
@@ -111,17 +98,12 @@
@dirrm share/apps/ksgmltools2/docbook/xsl/html
@dirrm share/apps/ksgmltools2/docbook/xsl/common
@dirrm share/apps/ksgmltools2/docbook/xsl
-@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.2
@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent
@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2
@dirrm share/apps/ksgmltools2/docbook
@dirrm share/apps/ksgmltools2/customization/zh-TW/entities
@dirrm share/apps/ksgmltools2/customization/zh-TW
-@dirrm share/apps/ksgmltools2/customization/zh-CN
-@dirrm share/apps/ksgmltools2/customization/xx
@dirrm share/apps/ksgmltools2/customization/xsl
-@dirrm share/apps/ksgmltools2/customization/xh
-@dirrm share/apps/ksgmltools2/customization/wa
@dirrm share/apps/ksgmltools2/customization/uk/entities
@dirrm share/apps/ksgmltools2/customization/uk
@dirrm share/apps/ksgmltools2/customization/tr/entities
@@ -146,13 +128,11 @@
@dirrm share/apps/ksgmltools2/customization/pl
@dirrm share/apps/ksgmltools2/customization/obsolete
@dirrm share/apps/ksgmltools2/customization/no/entities
-@dirrm share/apps/ksgmltools2/customization/no-NY
@dirrm share/apps/ksgmltools2/customization/no
@dirrm share/apps/ksgmltools2/customization/nn/entities
@dirrm share/apps/ksgmltools2/customization/nn
@dirrm share/apps/ksgmltools2/customization/nl/entities
@dirrm share/apps/ksgmltools2/customization/nl
-@dirrm share/apps/ksgmltools2/customization/lt
@dirrm share/apps/ksgmltools2/customization/ko/entities
@dirrm share/apps/ksgmltools2/customization/ko
@dirrm share/apps/ksgmltools2/customization/ja/entities
@@ -167,7 +147,6 @@
@dirrm share/apps/ksgmltools2/customization/he
@dirrm share/apps/ksgmltools2/customization/fr/entities
@dirrm share/apps/ksgmltools2/customization/fr
-@dirrm share/apps/ksgmltools2/customization/fo
@dirrm share/apps/ksgmltools2/customization/fi/entities
@dirrm share/apps/ksgmltools2/customization/fi
@dirrm share/apps/ksgmltools2/customization/et/entities
@@ -190,7 +169,6 @@
@dirrm share/apps/ksgmltools2/customization/cs
@dirrm share/apps/ksgmltools2/customization/ca/entities
@dirrm share/apps/ksgmltools2/customization/ca
-@dirrm share/apps/ksgmltools2/customization/bg
@dirrm share/apps/ksgmltools2/customization/af/entities
@dirrm share/apps/ksgmltools2/customization/af
@dirrm share/apps/ksgmltools2/customization
@@ -260,3 +238,4 @@
@dirrm include/kate
@dirrm include/kabc
@dirrm include/dom
+@unexec /bin/rmdir %D/include/arts || true
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index f6eda1c101c2..a7a376c53513 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -7,15 +7,15 @@
#
PORTNAME= kdelibs
-PORTVERSION= ${KDE_VERSION}a
+PORTVERSION= ${KDE_VERSION}
PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${KDE_VERSION}a/src
+MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
-COMMENT= This is the base set of libraries needed by KDE programs
+COMMENT= This is the base set of libraries needed by KDE programs
BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
@@ -63,7 +63,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
KDE_BUILD_PLIST= yes
# kabc (the addressbook backend) can use ldap if it's available
.if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so)
-LIB_DEPENDS+= libldap.so:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap21
PLIST_APPEND+= plist.ldap
.endif
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index f75781c8d9b1..0841ea17391a 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-3.1.1a.tar.bz2) = 77cc0b44b43ea239cb3f8e37d7814f1a
+MD5 (KDE/kdelibs-3.1.2.tar.bz2) = 2b896ce9a6942e4cc4fe1758236bafa3
diff --git a/x11/kdelibs4/files/patch-kdoctools::xmlizer b/x11/kdelibs4/files/patch-kdoctools::xmlizer
deleted file mode 100644
index cf46f6cbca33..000000000000
--- a/x11/kdelibs4/files/patch-kdoctools::xmlizer
+++ /dev/null
@@ -1,8 +0,0 @@
---- kdoctools/xmlizer.orig Wed Jan 29 17:17:40 2003
-+++ kdoctools/xmlizer Wed Jan 29 17:17:57 2003
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#! /usr/bin/env python
-
- import re, sys, os, string
-
diff --git a/x11/kdelibs4/files/plist.base b/x11/kdelibs4/files/plist.base
index f5458c52a237..1d4814ba46db 100644
--- a/x11/kdelibs4/files/plist.base
+++ b/x11/kdelibs4/files/plist.base
@@ -103,6 +103,7 @@ include/kabc/distributionlistdialog.h
include/kabc/distributionlisteditor.h
include/kabc/errorhandler.h
include/kabc/field.h
+include/kabc/format.h
include/kabc/formatfactory.h
include/kabc/formatplugin.h
include/kabc/geo.h
@@ -3868,19 +3869,6 @@ share/servicetypes/ktexteditorplugin.desktop
share/servicetypes/kurifilterplugin.desktop
share/servicetypes/renamedlgplugin.desktop
share/servicetypes/scriptinterface.desktop
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/bg/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/fo/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/lt/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/no-NY/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/stylesheets
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/wa/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/xh/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/xx/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/zh-CN/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xsl/indexing
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xsl/javahelp
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xsl/template
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
diff --git a/x11/kdelibs4/files/plist.base.rm b/x11/kdelibs4/files/plist.base.rm
index 279b61cf447a..b5d360213c9b 100644
--- a/x11/kdelibs4/files/plist.base.rm
+++ b/x11/kdelibs4/files/plist.base.rm
@@ -13,19 +13,6 @@
@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html || true
@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html || true
@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xsl/template || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xsl/javahelp || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xsl/indexing || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/zh-CN/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/xx/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/xh/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/wa/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/stylesheets || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/no-NY/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/lt/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/fo/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/bg/entities || true
@dirrm share/servicetypes
@dirrm share/services/kded
@dirrm share/services
@@ -111,17 +98,12 @@
@dirrm share/apps/ksgmltools2/docbook/xsl/html
@dirrm share/apps/ksgmltools2/docbook/xsl/common
@dirrm share/apps/ksgmltools2/docbook/xsl
-@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.2
@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent
@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2
@dirrm share/apps/ksgmltools2/docbook
@dirrm share/apps/ksgmltools2/customization/zh-TW/entities
@dirrm share/apps/ksgmltools2/customization/zh-TW
-@dirrm share/apps/ksgmltools2/customization/zh-CN
-@dirrm share/apps/ksgmltools2/customization/xx
@dirrm share/apps/ksgmltools2/customization/xsl
-@dirrm share/apps/ksgmltools2/customization/xh
-@dirrm share/apps/ksgmltools2/customization/wa
@dirrm share/apps/ksgmltools2/customization/uk/entities
@dirrm share/apps/ksgmltools2/customization/uk
@dirrm share/apps/ksgmltools2/customization/tr/entities
@@ -146,13 +128,11 @@
@dirrm share/apps/ksgmltools2/customization/pl
@dirrm share/apps/ksgmltools2/customization/obsolete
@dirrm share/apps/ksgmltools2/customization/no/entities
-@dirrm share/apps/ksgmltools2/customization/no-NY
@dirrm share/apps/ksgmltools2/customization/no
@dirrm share/apps/ksgmltools2/customization/nn/entities
@dirrm share/apps/ksgmltools2/customization/nn
@dirrm share/apps/ksgmltools2/customization/nl/entities
@dirrm share/apps/ksgmltools2/customization/nl
-@dirrm share/apps/ksgmltools2/customization/lt
@dirrm share/apps/ksgmltools2/customization/ko/entities
@dirrm share/apps/ksgmltools2/customization/ko
@dirrm share/apps/ksgmltools2/customization/ja/entities
@@ -167,7 +147,6 @@
@dirrm share/apps/ksgmltools2/customization/he
@dirrm share/apps/ksgmltools2/customization/fr/entities
@dirrm share/apps/ksgmltools2/customization/fr
-@dirrm share/apps/ksgmltools2/customization/fo
@dirrm share/apps/ksgmltools2/customization/fi/entities
@dirrm share/apps/ksgmltools2/customization/fi
@dirrm share/apps/ksgmltools2/customization/et/entities
@@ -190,7 +169,6 @@
@dirrm share/apps/ksgmltools2/customization/cs
@dirrm share/apps/ksgmltools2/customization/ca/entities
@dirrm share/apps/ksgmltools2/customization/ca
-@dirrm share/apps/ksgmltools2/customization/bg
@dirrm share/apps/ksgmltools2/customization/af/entities
@dirrm share/apps/ksgmltools2/customization/af
@dirrm share/apps/ksgmltools2/customization
@@ -260,3 +238,4 @@
@dirrm include/kate
@dirrm include/kabc
@dirrm include/dom
+@unexec /bin/rmdir %D/include/arts || true