Patch configure so it will detect Berkeley DB properly and

the port will build the kdictplugin for kbabel.

Bug reported by: Dofri Jonsson <imp@hell.is>

4 files changed, 96 insertions, 2 deletions

diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 7ba537187ffa..39d150bccc03 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdesdk
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -15,7 +16,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Software Development Kit
 
-LIB_DEPENDS=	db41:${PORTSDIR}/databases/db41
+LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4
 
 CONFLICTS=	umbrello-*
 
@@ -31,6 +32,10 @@ GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
+pre-configure:
+	@${REINPLACE_CMD} -e 's|-I$$ac_db_includes|-I${LOCALBASE}/include/db41|g' \
+			-e 's|ac_db_name="db"|ac_db_name="db4"|g' ${WRKSRC}/configure
+
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 
 .include <bsd.port.mk>
diff --git a/devel/kdesdk3/pkg-plist b/devel/kdesdk3/pkg-plist
index 5d5ece5ff752..9a900ea84719 100644
--- a/devel/kdesdk3/pkg-plist
+++ b/devel/kdesdk3/pkg-plist
@@ -100,6 +100,8 @@ lib/kde3/kbabel_whitespacetool.la
 lib/kde3/kbabel_whitespacetool.so
 lib/kde3/kbabel_xmltool.la
 lib/kde3/kbabel_xmltool.so
+lib/kde3/kbabeldict_dbsearchengine.la
+lib/kde3/kbabeldict_dbsearchengine.so
 lib/kde3/kbabeldict_poauxiliary.la
 lib/kde3/kbabeldict_poauxiliary.so
 lib/kde3/kbabeldict_pocompendium.la
@@ -691,6 +693,7 @@ share/icons/locolor/32x32/mimetypes/umbrellofile.png
 share/mimelnk/application/x-kcachegrind.desktop
 share/mimelnk/application/x-umbrello.desktop
 share/services/cvsservice.desktop
+share/services/dbsearchengine.desktop
 share/services/designerthumbnail.desktop
 share/services/kbabel_accelstool.desktop
 share/services/kbabel_argstool.desktop
@@ -725,12 +728,38 @@ share/servicetypes/kbabeldict_module.desktop
 share/servicetypes/kbabelfilter.desktop
 share/servicetypes/komparenavigationpart.desktop
 share/servicetypes/kompareviewpart.desktop
+@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/hicolor/48x48/apps
 @dirrm share/icons/hicolor/48x48
 @dirrm share/icons/hicolor/32x32/mimetypes
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32
 @dirrm share/icons/hicolor/16x16/mimetypes
+@dirrm share/icons/hicolor/16x16/apps
+@dirrm share/icons/hicolor/16x16
+@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
+@dirrm share/icons/crystalsvg/22x22/apps
+@dirrm share/icons/crystalsvg/22x22
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/icons/crystalsvg/16x16
+@dirrm share/icons/crystalsvg/128x128/apps
+@dirrm share/icons/crystalsvg/128x128
+@dirrm share/icons/crystalsvg
+@dirrm share/icons
 @dirrm share/doc/HTML/en/umbrello/pics
 @dirrm share/doc/HTML/en/umbrello
 @dirrm share/doc/HTML/en/kompare
@@ -738,11 +767,15 @@ share/servicetypes/kompareviewpart.desktop
 @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/umbrello/pics
 @dirrm share/apps/umbrello/headings
 @dirrm share/apps/umbrello
 @dirrm share/apps/kuiviewerpart
 @dirrm share/apps/kuiviewer
+@dirrm share/apps/kstyle/themes
+@dirrm share/apps/kstyle
 @dirrm share/apps/komparepart
 @dirrm share/apps/kompare/icons/locolor/32x32/apps
 @dirrm share/apps/kompare/icons/locolor/32x32
@@ -760,6 +793,7 @@ share/servicetypes/kompareviewpart.desktop
 @dirrm share/apps/kompare/icons/crystalsvg
 @dirrm share/apps/kompare/icons
 @dirrm share/apps/kompare
+@dirrm share/apps/kconf_update
 @dirrm share/apps/kcachegrind/icons/hicolor/32x32/actions
 @dirrm share/apps/kcachegrind/icons/hicolor/32x32
 @dirrm share/apps/kcachegrind/icons/hicolor/22x22/actions
@@ -801,7 +835,15 @@ share/servicetypes/kompareviewpart.desktop
 @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/cervisiapart
 @dirrm share/apps/cervisia
 @dirrm share/apps/catalogmanager
+@dirrm share/apps
+@dirrm share/applications/kde
+@dirrm share/applications
+@dirrm lib/kde3/plugins/styles
+@dirrm lib/kde3/plugins
+@dirrm lib/kde3
 @dirrm include/kbabel
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index 7ba537187ffa..39d150bccc03 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdesdk
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -15,7 +16,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Software Development Kit
 
-LIB_DEPENDS=	db41:${PORTSDIR}/databases/db41
+LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4
 
 CONFLICTS=	umbrello-*
 
@@ -31,6 +32,10 @@ GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
+pre-configure:
+	@${REINPLACE_CMD} -e 's|-I$$ac_db_includes|-I${LOCALBASE}/include/db41|g' \
+			-e 's|ac_db_name="db"|ac_db_name="db4"|g' ${WRKSRC}/configure
+
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 
 .include <bsd.port.mk>
diff --git a/devel/kdesdk4/pkg-plist b/devel/kdesdk4/pkg-plist
index 5d5ece5ff752..9a900ea84719 100644
--- a/devel/kdesdk4/pkg-plist
+++ b/devel/kdesdk4/pkg-plist
@@ -100,6 +100,8 @@ lib/kde3/kbabel_whitespacetool.la
 lib/kde3/kbabel_whitespacetool.so
 lib/kde3/kbabel_xmltool.la
 lib/kde3/kbabel_xmltool.so
+lib/kde3/kbabeldict_dbsearchengine.la
+lib/kde3/kbabeldict_dbsearchengine.so
 lib/kde3/kbabeldict_poauxiliary.la
 lib/kde3/kbabeldict_poauxiliary.so
 lib/kde3/kbabeldict_pocompendium.la
@@ -691,6 +693,7 @@ share/icons/locolor/32x32/mimetypes/umbrellofile.png
 share/mimelnk/application/x-kcachegrind.desktop
 share/mimelnk/application/x-umbrello.desktop
 share/services/cvsservice.desktop
+share/services/dbsearchengine.desktop
 share/services/designerthumbnail.desktop
 share/services/kbabel_accelstool.desktop
 share/services/kbabel_argstool.desktop
@@ -725,12 +728,38 @@ share/servicetypes/kbabeldict_module.desktop
 share/servicetypes/kbabelfilter.desktop
 share/servicetypes/komparenavigationpart.desktop
 share/servicetypes/kompareviewpart.desktop
+@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/hicolor/48x48/apps
 @dirrm share/icons/hicolor/48x48
 @dirrm share/icons/hicolor/32x32/mimetypes
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32
 @dirrm share/icons/hicolor/16x16/mimetypes
+@dirrm share/icons/hicolor/16x16/apps
+@dirrm share/icons/hicolor/16x16
+@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
+@dirrm share/icons/crystalsvg/22x22/apps
+@dirrm share/icons/crystalsvg/22x22
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/icons/crystalsvg/16x16
+@dirrm share/icons/crystalsvg/128x128/apps
+@dirrm share/icons/crystalsvg/128x128
+@dirrm share/icons/crystalsvg
+@dirrm share/icons
 @dirrm share/doc/HTML/en/umbrello/pics
 @dirrm share/doc/HTML/en/umbrello
 @dirrm share/doc/HTML/en/kompare
@@ -738,11 +767,15 @@ share/servicetypes/kompareviewpart.desktop
 @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/umbrello/pics
 @dirrm share/apps/umbrello/headings
 @dirrm share/apps/umbrello
 @dirrm share/apps/kuiviewerpart
 @dirrm share/apps/kuiviewer
+@dirrm share/apps/kstyle/themes
+@dirrm share/apps/kstyle
 @dirrm share/apps/komparepart
 @dirrm share/apps/kompare/icons/locolor/32x32/apps
 @dirrm share/apps/kompare/icons/locolor/32x32
@@ -760,6 +793,7 @@ share/servicetypes/kompareviewpart.desktop
 @dirrm share/apps/kompare/icons/crystalsvg
 @dirrm share/apps/kompare/icons
 @dirrm share/apps/kompare
+@dirrm share/apps/kconf_update
 @dirrm share/apps/kcachegrind/icons/hicolor/32x32/actions
 @dirrm share/apps/kcachegrind/icons/hicolor/32x32
 @dirrm share/apps/kcachegrind/icons/hicolor/22x22/actions
@@ -801,7 +835,15 @@ share/servicetypes/kompareviewpart.desktop
 @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/cervisiapart
 @dirrm share/apps/cervisia
 @dirrm share/apps/catalogmanager
+@dirrm share/apps
+@dirrm share/applications/kde
+@dirrm share/applications
+@dirrm lib/kde3/plugins/styles
+@dirrm lib/kde3/plugins
+@dirrm lib/kde3
 @dirrm include/kbabel