- Update kdevplatform to 1.1.0.

- Update kdevelop to 4.1.0.
- Update kdevelop-php to 1.1.0.
- Use bsd.port.options.mk.

Submitted by:	Douglas Carmichael <dcarmich@dcarmichael.net> via e-mail
Approved by:	tabthorpe (mentor)

3 files changed, 67 insertions, 51 deletions

diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile
index 9634d39045b3..61c47c8e88fd 100644
--- a/devel/kdevelop-kde4/Makefile
+++ b/devel/kdevelop-kde4/Makefile
@@ -14,12 +14,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Opensource IDE based on KDevPlatform, KDE and Qt libraries
 
-LIB_DEPENDS+=	kdevplatforminterfaces.1:${PORTSDIR}/devel/kdevplatform
+LIB_DEPENDS+=	kdevplatforminterfaces.2:${PORTSDIR}/devel/kdevplatform
 
 USE_BZIP2=	yes
-USE_CMAKE=	yes
-USE_GMAKE=	yes
-USE_KDE4=	kdelibs kdeprefix automoc4 workspace
+USE_KDE4=	automoc4 kdehier kdelibs kdeprefix workspace
 KDE4_BUILDENV=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib assistant assistantclient clucene \
@@ -27,15 +25,25 @@ QT_COMPONENTS=	corelib assistant assistantclient clucene \
 		opengl qt3support qtestlib script sql svg \
 		scripttools webkit xml xmlpatterns phonon \
 		qmake_build moc_build uic_build rcc_build
+MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	PHP	"Install PHP support" on
+OPTIONS=	OKTETA	"Install Okteta plugin" on \
+		PHP	"Install PHP support" on
 
 LATEST_LINK=	${PORTNAME}-kde4
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.ifdef(WITH_PHP)
-RUN_DEPENDS+=	kdevelop-php>=0:${PORTSDIR}/devel/kdevelop-php
+.ifndef(WITHOUT_OKTETA)
+LIB_DEPENDS+=	oktetacore.5:${PORTSDIR}/misc/kdeutils4
+PLIST_SUB+=	OKTETA=""
+.else
+CMAKE_ARGS+=	WITH_LibOkteta:BOOL=FALSE
+PLIST_SUB+=	OKTETA="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+.ifndef(WITHOUT_PHP)
+RUN_DEPENDS+=	${PREFIX}/lib/kde4/kdevphplanguagesupport.so:${PORTSDIR}/devel/kdevelop-php
+.endif
+
+.include <bsd.port.mk>
diff --git a/devel/kdevelop-kde4/distinfo b/devel/kdevelop-kde4/distinfo
index 85418de811b0..4a14cba6c678 100644
--- a/devel/kdevelop-kde4/distinfo
+++ b/devel/kdevelop-kde4/distinfo
@@ -1,3 +1,2 @@
-MD5 (KDE/kdevelop-4.0.0.tar.bz2) = 9f63a0f68bc30d34c79f935386fb512d
-SHA256 (KDE/kdevelop-4.0.0.tar.bz2) = d7b51b0ed4671eb1b0b19129f11d9aa11c8bcc1bee4b76c28d7ac670a683dc32
-SIZE (KDE/kdevelop-4.0.0.tar.bz2) = 4679166
+SHA256 (KDE/kdevelop-4.1.0.tar.bz2) = 9b23fb2fb2fd9dbe3a5aea755e00c9956b1de933f1a665ac66a5c64bf2e99e47
+SIZE (KDE/kdevelop-4.1.0.tar.bz2) = 5003866
diff --git a/devel/kdevelop-kde4/pkg-plist b/devel/kdevelop-kde4/pkg-plist
index 7f2f93d58eeb..379c87560aca 100644
--- a/devel/kdevelop-kde4/pkg-plist
+++ b/devel/kdevelop-kde4/pkg-plist
@@ -1,6 +1,4 @@
 bin/kdevelop
-bin/kdevelop.bin
-include/kdevelop/cmake/icmakebuilder.h
 include/kdevelop/make/imakebuilder.h
 lib/kde4/kcm_kdev_makebuilder.so
 lib/kde4/kcm_kdevcmake_settings.so
@@ -12,7 +10,9 @@ lib/kde4/kdevcpplanguagesupport.so
 lib/kde4/kdevcustommakemanager.so
 lib/kde4/kdevgdb.so
 lib/kde4/kdevindent.so
+lib/kde4/kdevkdeprovider.so
 lib/kde4/kdevmakebuilder.so
+%%OKTETA%%lib/kde4/kdevokteta.so
 lib/kde4/kdevqthelp.so
 lib/libkdev4cmakecommon.so
 lib/libkdev4cppduchain.so
@@ -54,6 +54,7 @@ share/apps/kdevelop/icons/hicolor/16x16/actions/variablenew.png
 share/apps/kdevelop/icons/hicolor/22x22/actions/classnew.png
 share/apps/kdevelop/icons/hicolor/22x22/actions/classwiz.png
 share/apps/kdevelop/icons/hicolor/22x22/actions/configure_file.png
+share/apps/kdevelop/icons/hicolor/22x22/actions/dbgjumpto.png
 share/apps/kdevelop/icons/hicolor/22x22/actions/dbgmemview.png
 share/apps/kdevelop/icons/hicolor/22x22/actions/dbgnext.png
 share/apps/kdevelop/icons/hicolor/22x22/actions/dbgnextinst.png
@@ -136,6 +137,7 @@ share/apps/kdevgdb/printers/gdbinit
 share/apps/kdevgdb/printers/kde4.py
 share/apps/kdevgdb/printers/libstdcxx.py
 share/apps/kdevgdb/printers/qt4.py
+%%OKTETA%%share/apps/kdevokteta/kdevokteta.rc
 share/config/kdeveloprc
 share/icons/hicolor/128x128/apps/cmake.png
 share/icons/hicolor/16x16/apps/cmake.png
@@ -154,9 +156,10 @@ share/kde4/services/kdevcppsupport.desktop
 share/kde4/services/kdevcustommakemanager.desktop
 share/kde4/services/kdevgdb.desktop
 share/kde4/services/kdevindent.desktop
+share/kde4/services/kdevkdeprovider.desktop
 share/kde4/services/kdevmakebuilder.desktop
+%%OKTETA%%share/kde4/services/kdevokteta.desktop
 share/kde4/services/kdevqthelp.desktop
-share/locale/ca/LC_MESSAGES/desktop_extragear-sdk_kdevelop.mo
 share/locale/ca/LC_MESSAGES/kdevcmake.mo
 share/locale/ca/LC_MESSAGES/kdevcmakebuilder.mo
 share/locale/ca/LC_MESSAGES/kdevcpp.mo
@@ -165,8 +168,8 @@ share/locale/ca/LC_MESSAGES/kdevelop.mo
 share/locale/ca/LC_MESSAGES/kdevformatters.mo
 share/locale/ca/LC_MESSAGES/kdevgdb.mo
 share/locale/ca/LC_MESSAGES/kdevmakebuilder.mo
+share/locale/ca/LC_MESSAGES/kdevokteta.mo
 share/locale/ca/LC_MESSAGES/kdevqthelp.mo
-share/locale/ca@valencia/LC_MESSAGES/desktop_extragear-sdk_kdevelop.mo
 share/locale/ca@valencia/LC_MESSAGES/kdevcmake.mo
 share/locale/ca@valencia/LC_MESSAGES/kdevcmakebuilder.mo
 share/locale/ca@valencia/LC_MESSAGES/kdevcpp.mo
@@ -176,7 +179,6 @@ share/locale/ca@valencia/LC_MESSAGES/kdevformatters.mo
 share/locale/ca@valencia/LC_MESSAGES/kdevgdb.mo
 share/locale/ca@valencia/LC_MESSAGES/kdevmakebuilder.mo
 share/locale/ca@valencia/LC_MESSAGES/kdevqthelp.mo
-share/locale/da/LC_MESSAGES/desktop_extragear-sdk_kdevelop.mo
 share/locale/da/LC_MESSAGES/kdevcmake.mo
 share/locale/da/LC_MESSAGES/kdevcmakebuilder.mo
 share/locale/da/LC_MESSAGES/kdevcpp.mo
@@ -185,8 +187,8 @@ share/locale/da/LC_MESSAGES/kdevelop.mo
 share/locale/da/LC_MESSAGES/kdevformatters.mo
 share/locale/da/LC_MESSAGES/kdevgdb.mo
 share/locale/da/LC_MESSAGES/kdevmakebuilder.mo
+share/locale/da/LC_MESSAGES/kdevokteta.mo
 share/locale/da/LC_MESSAGES/kdevqthelp.mo
-share/locale/de/LC_MESSAGES/desktop_extragear-sdk_kdevelop.mo
 share/locale/de/LC_MESSAGES/kdevcmake.mo
 share/locale/de/LC_MESSAGES/kdevcmakebuilder.mo
 share/locale/de/LC_MESSAGES/kdevcpp.mo
@@ -196,7 +198,6 @@ share/locale/de/LC_MESSAGES/kdevformatters.mo
 share/locale/de/LC_MESSAGES/kdevgdb.mo
 share/locale/de/LC_MESSAGES/kdevmakebuilder.mo
 share/locale/de/LC_MESSAGES/kdevqthelp.mo
-share/locale/en_GB/LC_MESSAGES/desktop_extragear-sdk_kdevelop.mo
 share/locale/en_GB/LC_MESSAGES/kdevcmake.mo
 share/locale/en_GB/LC_MESSAGES/kdevcmakebuilder.mo
 share/locale/en_GB/LC_MESSAGES/kdevcpp.mo
@@ -205,8 +206,8 @@ share/locale/en_GB/LC_MESSAGES/kdevelop.mo
 share/locale/en_GB/LC_MESSAGES/kdevformatters.mo
 share/locale/en_GB/LC_MESSAGES/kdevgdb.mo
 share/locale/en_GB/LC_MESSAGES/kdevmakebuilder.mo
+share/locale/en_GB/LC_MESSAGES/kdevokteta.mo
 share/locale/en_GB/LC_MESSAGES/kdevqthelp.mo
-share/locale/es/LC_MESSAGES/desktop_extragear-sdk_kdevelop.mo
 share/locale/es/LC_MESSAGES/kdevcmake.mo
 share/locale/es/LC_MESSAGES/kdevcmakebuilder.mo
 share/locale/es/LC_MESSAGES/kdevcpp.mo
@@ -215,8 +216,8 @@ share/locale/es/LC_MESSAGES/kdevelop.mo
 share/locale/es/LC_MESSAGES/kdevformatters.mo
 share/locale/es/LC_MESSAGES/kdevgdb.mo
 share/locale/es/LC_MESSAGES/kdevmakebuilder.mo
+share/locale/es/LC_MESSAGES/kdevokteta.mo
 share/locale/es/LC_MESSAGES/kdevqthelp.mo
-share/locale/et/LC_MESSAGES/desktop_extragear-sdk_kdevelop.mo
 share/locale/et/LC_MESSAGES/kdevcmake.mo
 share/locale/et/LC_MESSAGES/kdevcmakebuilder.mo
 share/locale/et/LC_MESSAGES/kdevcpp.mo
@@ -225,18 +226,15 @@ share/locale/et/LC_MESSAGES/kdevelop.mo
 share/locale/et/LC_MESSAGES/kdevformatters.mo
 share/locale/et/LC_MESSAGES/kdevgdb.mo
 share/locale/et/LC_MESSAGES/kdevmakebuilder.mo
+share/locale/et/LC_MESSAGES/kdevokteta.mo
 share/locale/et/LC_MESSAGES/kdevqthelp.mo
-share/locale/fr/LC_MESSAGES/desktop_extragear-sdk_kdevelop.mo
-share/locale/fr/LC_MESSAGES/kdevcmake.mo
-share/locale/fr/LC_MESSAGES/kdevcmakebuilder.mo
-share/locale/fr/LC_MESSAGES/kdevcpp.mo
-share/locale/fr/LC_MESSAGES/kdevcustommake.mo
-share/locale/fr/LC_MESSAGES/kdevelop.mo
-share/locale/fr/LC_MESSAGES/kdevformatters.mo
-share/locale/fr/LC_MESSAGES/kdevgdb.mo
-share/locale/fr/LC_MESSAGES/kdevmakebuilder.mo
-share/locale/fr/LC_MESSAGES/kdevqthelp.mo
-share/locale/gl/LC_MESSAGES/desktop_extragear-sdk_kdevelop.mo
+share/locale/fi/LC_MESSAGES/kdevcmake.mo
+share/locale/fi/LC_MESSAGES/kdevcmakebuilder.mo
+share/locale/fi/LC_MESSAGES/kdevcpp.mo
+share/locale/fi/LC_MESSAGES/kdevcustommake.mo
+share/locale/fi/LC_MESSAGES/kdevelop.mo
+share/locale/fi/LC_MESSAGES/kdevmakebuilder.mo
+share/locale/fi/LC_MESSAGES/kdevqthelp.mo
 share/locale/gl/LC_MESSAGES/kdevcmake.mo
 share/locale/gl/LC_MESSAGES/kdevcmakebuilder.mo
 share/locale/gl/LC_MESSAGES/kdevcpp.mo
@@ -246,7 +244,6 @@ share/locale/gl/LC_MESSAGES/kdevformatters.mo
 share/locale/gl/LC_MESSAGES/kdevgdb.mo
 share/locale/gl/LC_MESSAGES/kdevmakebuilder.mo
 share/locale/gl/LC_MESSAGES/kdevqthelp.mo
-share/locale/it/LC_MESSAGES/desktop_extragear-sdk_kdevelop.mo
 share/locale/it/LC_MESSAGES/kdevcmake.mo
 share/locale/it/LC_MESSAGES/kdevcmakebuilder.mo
 share/locale/it/LC_MESSAGES/kdevcpp.mo
@@ -255,8 +252,8 @@ share/locale/it/LC_MESSAGES/kdevelop.mo
 share/locale/it/LC_MESSAGES/kdevformatters.mo
 share/locale/it/LC_MESSAGES/kdevgdb.mo
 share/locale/it/LC_MESSAGES/kdevmakebuilder.mo
+share/locale/it/LC_MESSAGES/kdevokteta.mo
 share/locale/it/LC_MESSAGES/kdevqthelp.mo
-share/locale/nds/LC_MESSAGES/desktop_extragear-sdk_kdevelop.mo
 share/locale/nds/LC_MESSAGES/kdevcmake.mo
 share/locale/nds/LC_MESSAGES/kdevcmakebuilder.mo
 share/locale/nds/LC_MESSAGES/kdevcpp.mo
@@ -265,8 +262,18 @@ share/locale/nds/LC_MESSAGES/kdevelop.mo
 share/locale/nds/LC_MESSAGES/kdevformatters.mo
 share/locale/nds/LC_MESSAGES/kdevgdb.mo
 share/locale/nds/LC_MESSAGES/kdevmakebuilder.mo
+share/locale/nds/LC_MESSAGES/kdevokteta.mo
 share/locale/nds/LC_MESSAGES/kdevqthelp.mo
-share/locale/pt/LC_MESSAGES/desktop_extragear-sdk_kdevelop.mo
+share/locale/nl/LC_MESSAGES/kdevcmake.mo
+share/locale/nl/LC_MESSAGES/kdevcmakebuilder.mo
+share/locale/nl/LC_MESSAGES/kdevcpp.mo
+share/locale/nl/LC_MESSAGES/kdevcustommake.mo
+share/locale/nl/LC_MESSAGES/kdevelop.mo
+share/locale/nl/LC_MESSAGES/kdevformatters.mo
+share/locale/nl/LC_MESSAGES/kdevgdb.mo
+share/locale/nl/LC_MESSAGES/kdevmakebuilder.mo
+share/locale/nl/LC_MESSAGES/kdevokteta.mo
+share/locale/nl/LC_MESSAGES/kdevqthelp.mo
 share/locale/pt/LC_MESSAGES/kdevcmake.mo
 share/locale/pt/LC_MESSAGES/kdevcmakebuilder.mo
 share/locale/pt/LC_MESSAGES/kdevcpp.mo
@@ -275,8 +282,8 @@ share/locale/pt/LC_MESSAGES/kdevelop.mo
 share/locale/pt/LC_MESSAGES/kdevformatters.mo
 share/locale/pt/LC_MESSAGES/kdevgdb.mo
 share/locale/pt/LC_MESSAGES/kdevmakebuilder.mo
+share/locale/pt/LC_MESSAGES/kdevokteta.mo
 share/locale/pt/LC_MESSAGES/kdevqthelp.mo
-share/locale/pt_BR/LC_MESSAGES/desktop_extragear-sdk_kdevelop.mo
 share/locale/pt_BR/LC_MESSAGES/kdevcmake.mo
 share/locale/pt_BR/LC_MESSAGES/kdevcmakebuilder.mo
 share/locale/pt_BR/LC_MESSAGES/kdevcpp.mo
@@ -285,8 +292,19 @@ share/locale/pt_BR/LC_MESSAGES/kdevelop.mo
 share/locale/pt_BR/LC_MESSAGES/kdevformatters.mo
 share/locale/pt_BR/LC_MESSAGES/kdevgdb.mo
 share/locale/pt_BR/LC_MESSAGES/kdevmakebuilder.mo
+share/locale/pt_BR/LC_MESSAGES/kdevokteta.mo
 share/locale/pt_BR/LC_MESSAGES/kdevqthelp.mo
-share/locale/sv/LC_MESSAGES/desktop_extragear-sdk_kdevelop.mo
+share/locale/ru/LC_MESSAGES/kdevcmake.mo
+share/locale/ru/LC_MESSAGES/kdevcmakebuilder.mo
+share/locale/ru/LC_MESSAGES/kdevcpp.mo
+share/locale/ru/LC_MESSAGES/kdevcustommake.mo
+share/locale/ru/LC_MESSAGES/kdevelop.mo
+share/locale/ru/LC_MESSAGES/kdevformatters.mo
+share/locale/ru/LC_MESSAGES/kdevgdb.mo
+share/locale/ru/LC_MESSAGES/kdevmakebuilder.mo
+share/locale/ru/LC_MESSAGES/kdevokteta.mo
+share/locale/ru/LC_MESSAGES/kdevqthelp.mo
+share/locale/sl/LC_MESSAGES/kdevelop.mo
 share/locale/sv/LC_MESSAGES/kdevcmake.mo
 share/locale/sv/LC_MESSAGES/kdevcmakebuilder.mo
 share/locale/sv/LC_MESSAGES/kdevcpp.mo
@@ -295,18 +313,9 @@ share/locale/sv/LC_MESSAGES/kdevelop.mo
 share/locale/sv/LC_MESSAGES/kdevformatters.mo
 share/locale/sv/LC_MESSAGES/kdevgdb.mo
 share/locale/sv/LC_MESSAGES/kdevmakebuilder.mo
+share/locale/sv/LC_MESSAGES/kdevokteta.mo
 share/locale/sv/LC_MESSAGES/kdevqthelp.mo
-share/locale/tr/LC_MESSAGES/desktop_extragear-sdk_kdevelop.mo
-share/locale/tr/LC_MESSAGES/kdevcmake.mo
-share/locale/tr/LC_MESSAGES/kdevcmakebuilder.mo
-share/locale/tr/LC_MESSAGES/kdevcpp.mo
-share/locale/tr/LC_MESSAGES/kdevcustommake.mo
-share/locale/tr/LC_MESSAGES/kdevelop.mo
-share/locale/tr/LC_MESSAGES/kdevformatters.mo
-share/locale/tr/LC_MESSAGES/kdevgdb.mo
-share/locale/tr/LC_MESSAGES/kdevmakebuilder.mo
-share/locale/tr/LC_MESSAGES/kdevqthelp.mo
-share/locale/uk/LC_MESSAGES/desktop_extragear-sdk_kdevelop.mo
+share/locale/th/LC_MESSAGES/kdevcustommake.mo
 share/locale/uk/LC_MESSAGES/kdevcmake.mo
 share/locale/uk/LC_MESSAGES/kdevcmakebuilder.mo
 share/locale/uk/LC_MESSAGES/kdevcpp.mo
@@ -315,8 +324,8 @@ share/locale/uk/LC_MESSAGES/kdevelop.mo
 share/locale/uk/LC_MESSAGES/kdevformatters.mo
 share/locale/uk/LC_MESSAGES/kdevgdb.mo
 share/locale/uk/LC_MESSAGES/kdevmakebuilder.mo
+share/locale/uk/LC_MESSAGES/kdevokteta.mo
 share/locale/uk/LC_MESSAGES/kdevqthelp.mo
-share/locale/zh_CN/LC_MESSAGES/desktop_extragear-sdk_kdevelop.mo
 share/locale/zh_CN/LC_MESSAGES/kdevcmake.mo
 share/locale/zh_CN/LC_MESSAGES/kdevcmakebuilder.mo
 share/locale/zh_CN/LC_MESSAGES/kdevcpp.mo
@@ -326,7 +335,6 @@ share/locale/zh_CN/LC_MESSAGES/kdevformatters.mo
 share/locale/zh_CN/LC_MESSAGES/kdevgdb.mo
 share/locale/zh_CN/LC_MESSAGES/kdevmakebuilder.mo
 share/locale/zh_CN/LC_MESSAGES/kdevqthelp.mo
-share/locale/zh_TW/LC_MESSAGES/desktop_extragear-sdk_kdevelop.mo
 share/locale/zh_TW/LC_MESSAGES/kdevcmake.mo
 share/locale/zh_TW/LC_MESSAGES/kdevcmakebuilder.mo
 share/locale/zh_TW/LC_MESSAGES/kdevcpp.mo
@@ -335,10 +343,12 @@ share/locale/zh_TW/LC_MESSAGES/kdevelop.mo
 share/locale/zh_TW/LC_MESSAGES/kdevformatters.mo
 share/locale/zh_TW/LC_MESSAGES/kdevgdb.mo
 share/locale/zh_TW/LC_MESSAGES/kdevmakebuilder.mo
+share/locale/zh_TW/LC_MESSAGES/kdevokteta.mo
 share/locale/zh_TW/LC_MESSAGES/kdevqthelp.mo
 share/mime/packages/kdevelop.xml
 share/mime/text/x-kdevelop.xml
 @dirrmtry share/mime/text
+%%OKTETA%%@dirrm share/apps/kdevokteta
 @dirrm share/apps/kdevgdb/printers
 @dirrm share/apps/kdevgdb
 @dirrm share/apps/kdevelop/pics
@@ -359,5 +369,4 @@ share/mime/text/x-kdevelop.xml
 @dirrmtry share/apps/kdevappwizard/templates
 @dirrmtry share/apps/kdevappwizard
 @dirrm include/kdevelop/make
-@dirrm include/kdevelop/cmake
 @dirrm include/kdevelop