6 files changed, 84 insertions, 144 deletions

diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 2ce46cc21405..bd99628586bb 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -15,13 +15,14 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Software Development Kit
 
-LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
+LIB_DEPENDS=	db41:${PORTSDIR}/databases/db41
 
 USE_KDEBASE_VER=3
 PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
 INSTALLS_SHLIB=	yes
@@ -31,6 +32,9 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 .include <bsd.port.pre.mk>
 
+pre-configure::
+	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
+
 .include "${FILESDIR}/manpages.mk"
 
 .include <bsd.port.post.mk>
diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo
index 935bfe0c8241..72c6c57ee290 100644
--- a/devel/kdesdk3/distinfo
+++ b/devel/kdesdk3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdesdk-3.1.2.tar.bz2) = 279b42135756e0e3640cf5f6612f572d
+MD5 (KDE/kdesdk-3.1.3.tar.bz2) = 427586c481c0e503c197ff2d5aa3b81c
diff --git a/devel/kdesdk3/pkg-plist b/devel/kdesdk3/pkg-plist
index 7123dd4a6ae7..a958799d9593 100644
--- a/devel/kdesdk3/pkg-plist
+++ b/devel/kdesdk3/pkg-plist
@@ -61,8 +61,6 @@ lib/kde3/kfile_diff.la
 lib/kde3/kfile_diff.so
 lib/kde3/kfile_po.la
 lib/kde3/kfile_po.so
-lib/kde3/libdbsearchengine.la
-lib/kde3/libdbsearchengine.so
 lib/kde3/libkomparenavtreepart.la
 lib/kde3/libkomparenavtreepart.so
 lib/kde3/libkomparepart.la
@@ -356,7 +354,6 @@ share/apps/kbabel/pics/noflag.png
 share/apps/kbabel/pics/ok.png
 share/apps/kbabel/pics/pref_identity.png
 share/apps/kbabel/pics/splash.png
-share/apps/kbabeldict/modules/dbsearchengine.rc
 share/apps/kbabeldict/modules/poauxiliary.rc
 share/apps/kbabeldict/modules/pocompendium.rc
 share/apps/kbugbuster/kbugbusterui.rc
@@ -475,89 +472,58 @@ 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/icons/locolor/32x32/mimetypes
+@dirrm share/icons/locolor/16x16/mimetypes
 @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/doc/HTML/en/cervisia
+@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/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/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/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/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/cervisiapart
+@dirrm share/apps/cervisia
 @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
+@dirrm include/kbabel
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index 2ce46cc21405..bd99628586bb 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -15,13 +15,14 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Software Development Kit
 
-LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
+LIB_DEPENDS=	db41:${PORTSDIR}/databases/db41
 
 USE_KDEBASE_VER=3
 PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
 INSTALLS_SHLIB=	yes
@@ -31,6 +32,9 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 .include <bsd.port.pre.mk>
 
+pre-configure::
+	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
+
 .include "${FILESDIR}/manpages.mk"
 
 .include <bsd.port.post.mk>
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo
index 935bfe0c8241..72c6c57ee290 100644
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdesdk-3.1.2.tar.bz2) = 279b42135756e0e3640cf5f6612f572d
+MD5 (KDE/kdesdk-3.1.3.tar.bz2) = 427586c481c0e503c197ff2d5aa3b81c
diff --git a/devel/kdesdk4/pkg-plist b/devel/kdesdk4/pkg-plist
index 7123dd4a6ae7..a958799d9593 100644
--- a/devel/kdesdk4/pkg-plist
+++ b/devel/kdesdk4/pkg-plist
@@ -61,8 +61,6 @@ lib/kde3/kfile_diff.la
 lib/kde3/kfile_diff.so
 lib/kde3/kfile_po.la
 lib/kde3/kfile_po.so
-lib/kde3/libdbsearchengine.la
-lib/kde3/libdbsearchengine.so
 lib/kde3/libkomparenavtreepart.la
 lib/kde3/libkomparenavtreepart.so
 lib/kde3/libkomparepart.la
@@ -356,7 +354,6 @@ share/apps/kbabel/pics/noflag.png
 share/apps/kbabel/pics/ok.png
 share/apps/kbabel/pics/pref_identity.png
 share/apps/kbabel/pics/splash.png
-share/apps/kbabeldict/modules/dbsearchengine.rc
 share/apps/kbabeldict/modules/poauxiliary.rc
 share/apps/kbabeldict/modules/pocompendium.rc
 share/apps/kbugbuster/kbugbusterui.rc
@@ -475,89 +472,58 @@ 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/icons/locolor/32x32/mimetypes
+@dirrm share/icons/locolor/16x16/mimetypes
 @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/doc/HTML/en/cervisia
+@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/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/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/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/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/cervisiapart
+@dirrm share/apps/cervisia
 @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
+@dirrm include/kbabel