Update to KDevelop 1.2.

3 files changed, 53 insertions, 8 deletions

diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index dc8a0f0014a3..34b9fba7e1d4 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdevelop
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://fara.cs.uni-potsdam.de/pub/kdevelop/ \
 		ftp://129.187.206.68/pub/unix/ide/KDevelop/ \
@@ -19,22 +19,23 @@ MASTER_SITES=	ftp://fara.cs.uni-potsdam.de/pub/kdevelop/ \
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdeui.3:${PORTSDIR}/x11/kdelibs11
-RUN_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf
-
+#LIB_DEPENDS=	kdeui.3:${PORTSDIR}/x11/kdelibs11
 .if defined(WITH_OPTIONAL_DEPENDS)
-RUN_DEPENDS+=	automake:${PORTSDIR}/devel/automake \
-		kdbg:${PORTSDIR}/devel/kdbg \
+RUN_DEPENDS+=	kdbg:${PORTSDIR}/devel/kdbg \
 		${LOCALBASE}/share/doc/HTML/en/kdelibs/kdecore/index.html:${PORTSDIR}/devel/kdelibdocs \
 		ktranslator:${PORTSDIR}/devel/ktranslator \
 		kiconedit:${PORTSDIR}/graphics/kdegraphics11 \
 		glimpse:${PORTSDIR}/textproc/glimpse \
 		a2ps:${PORTSDIR}/print/a2ps43-letter
+
+USE_AUTOMAKE=	yes
+.else
+USE_AUTOCONF=	yes
 .endif
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_QT=		yes
+#USE_QT=		yes
 CONFIGURE_ARGS=	--with-qtdoc-dir=${X11BASE}/share/doc/qt/html \
 		--with-qt-includes=${X11BASE}/include/X11/qt \
 		--with-extra-includes=${LOCALBASE}/include \
diff --git a/devel/kdevelop/distinfo b/devel/kdevelop/distinfo
index d402b72a66b7..f314afe4a3f0 100644
--- a/devel/kdevelop/distinfo
+++ b/devel/kdevelop/distinfo
@@ -1 +1 @@
-MD5 (kdevelop-1.1.tar.gz) = 9e3aa056a7ad58f202d59bac378a024a
+MD5 (kdevelop-1.2.tar.gz) = 2d71393a931e62499f553e0a823ed586
diff --git a/devel/kdevelop/pkg-plist b/devel/kdevelop/pkg-plist
index 26fa5d2282ef..0261b0b69d89 100644
--- a/devel/kdevelop/pkg-plist
+++ b/devel/kdevelop/pkg-plist
@@ -12,6 +12,7 @@ share/apps/kdevelop/examples/kscribble-1.0.tar.gz
 share/apps/kdevelop/pics/about_logo.bmp
 share/apps/kdevelop/pics/customApp.bmp
 share/apps/kdevelop/pics/dlg_firstrun.bmp
+share/apps/kdevelop/pics/gnomeApp.bmp
 share/apps/kdevelop/pics/kAppWizard.bmp
 share/apps/kdevelop/pics/kdemdi.bmp
 share/apps/kdevelop/pics/mini/CTchildren.xpm
@@ -65,6 +66,7 @@ share/apps/kdevelop/pics/mini/kdlg_QScrollBar.xpm
 share/apps/kdevelop/pics/mini/kdlg_QSlider.xpm
 share/apps/kdevelop/pics/mini/kdlg_QSpinBox.xpm
 share/apps/kdevelop/pics/mini/kdlg_QWidget.xpm
+share/apps/kdevelop/pics/mini/mini-doc2.xpm
 share/apps/kdevelop/pics/miniApp.bmp
 share/apps/kdevelop/pics/normalApp.bmp
 share/apps/kdevelop/pics/normalOglApp.bmp
@@ -83,6 +85,7 @@ share/apps/kdevelop/templates/AUTHORS_template
 share/apps/kdevelop/templates/COPYING_template
 share/apps/kdevelop/templates/ChangeLog_template
 share/apps/kdevelop/templates/INSTALL_template
+share/apps/kdevelop/templates/MAM_shared_template
 share/apps/kdevelop/templates/README_template
 share/apps/kdevelop/templates/TODO_template
 share/apps/kdevelop/templates/c.tar.gz
@@ -90,6 +93,7 @@ share/apps/kdevelop/templates/cpp.tar.gz
 share/apps/kdevelop/templates/cpp_template
 share/apps/kdevelop/templates/cvsignore_template
 share/apps/kdevelop/templates/docbook_en_template
+share/apps/kdevelop/templates/gnome.tar.gz
 share/apps/kdevelop/templates/handbook_en_template
 share/apps/kdevelop/templates/header_template
 share/apps/kdevelop/templates/icon_template
@@ -172,6 +176,17 @@ share/doc/HTML/de/kdevelop/index-7.html
 share/doc/HTML/de/kdevelop/index-8.html
 share/doc/HTML/de/kdevelop/index-9.html
 share/doc/HTML/de/kdevelop/index.html
+share/doc/HTML/de/kdevelop/kde_libref/index-1.html
+share/doc/HTML/de/kdevelop/kde_libref/index-2.html
+share/doc/HTML/de/kdevelop/kde_libref/index-3.html
+share/doc/HTML/de/kdevelop/kde_libref/index-4.html
+share/doc/HTML/de/kdevelop/kde_libref/index-5.html
+share/doc/HTML/de/kdevelop/kde_libref/index-6.html
+share/doc/HTML/de/kdevelop/kde_libref/index-7.html
+share/doc/HTML/de/kdevelop/kde_libref/index-8.html
+share/doc/HTML/de/kdevelop/kde_libref/index-9.html
+share/doc/HTML/de/kdevelop/kde_libref/index.html
+share/doc/HTML/de/kdevelop/kde_libref/logotp3.png
 share/doc/HTML/de/kdevelop/logotp3.png
 share/doc/HTML/de/kdevelop/reference/C/index.html
 share/doc/HTML/de/kdevelop/tip.database
@@ -180,6 +195,8 @@ share/doc/HTML/de/kdevelop/tutorial/index-10.html
 share/doc/HTML/de/kdevelop/tutorial/index-11.html
 share/doc/HTML/de/kdevelop/tutorial/index-12.html
 share/doc/HTML/de/kdevelop/tutorial/index-13.html
+share/doc/HTML/de/kdevelop/tutorial/index-14.html
+share/doc/HTML/de/kdevelop/tutorial/index-15.html
 share/doc/HTML/de/kdevelop/tutorial/index-2.html
 share/doc/HTML/de/kdevelop/tutorial/index-3.html
 share/doc/HTML/de/kdevelop/tutorial/index-4.html
@@ -299,6 +316,27 @@ share/doc/HTML/es/kdevelop/reference/C/index.html
 share/doc/HTML/es/kdevelop/tip.database
 share/doc/HTML/es/kdevelop/welcome/index.html
 share/doc/HTML/es/kdevelop/welcome/logotp3.png
+share/doc/HTML/fr/kdevelop/programming/index-1.html
+share/doc/HTML/fr/kdevelop/programming/index-10.html
+share/doc/HTML/fr/kdevelop/programming/index-11.html
+share/doc/HTML/fr/kdevelop/programming/index-12.html
+share/doc/HTML/fr/kdevelop/programming/index-13.html
+share/doc/HTML/fr/kdevelop/programming/index-14.html
+share/doc/HTML/fr/kdevelop/programming/index-15.html
+share/doc/HTML/fr/kdevelop/programming/index-16.html
+share/doc/HTML/fr/kdevelop/programming/index-17.html
+share/doc/HTML/fr/kdevelop/programming/index-18.html
+share/doc/HTML/fr/kdevelop/programming/index-19.html
+share/doc/HTML/fr/kdevelop/programming/index-2.html
+share/doc/HTML/fr/kdevelop/programming/index-3.html
+share/doc/HTML/fr/kdevelop/programming/index-4.html
+share/doc/HTML/fr/kdevelop/programming/index-5.html
+share/doc/HTML/fr/kdevelop/programming/index-6.html
+share/doc/HTML/fr/kdevelop/programming/index-7.html
+share/doc/HTML/fr/kdevelop/programming/index-8.html
+share/doc/HTML/fr/kdevelop/programming/index-9.html
+share/doc/HTML/fr/kdevelop/programming/index.html
+share/doc/HTML/fr/kdevelop/programming/logotp3.png
 share/doc/HTML/fr/kdevelop/tip.database
 share/doc/HTML/fr/kdevelop/tutorial/index-1.html
 share/doc/HTML/fr/kdevelop/tutorial/index-2.html
@@ -317,6 +355,7 @@ share/doc/HTML/hu/kdevelop/index-14.html
 share/doc/HTML/hu/kdevelop/index-15.html
 share/doc/HTML/hu/kdevelop/index-16.html
 share/doc/HTML/hu/kdevelop/index-17.html
+share/doc/HTML/hu/kdevelop/index-18.html
 share/doc/HTML/hu/kdevelop/index-2.html
 share/doc/HTML/hu/kdevelop/index-3.html
 share/doc/HTML/hu/kdevelop/index-4.html
@@ -424,8 +463,10 @@ share/doc/HTML/zh_CN.GB2312/kdevelop/tutorial/index.html
 share/doc/HTML/zh_CN.GB2312/kdevelop/tutorial/logotp3.png
 share/doc/HTML/zh_CN.GB2312/kdevelop/welcome/index.html
 share/doc/HTML/zh_CN.GB2312/kdevelop/welcome/logotp3.png
+share/icons/development_package.xpm
 share/icons/kdevelop-project.xpm
 share/icons/kdevelop.xpm
+share/icons/mini/development_package.xpm
 share/icons/mini/kdevelop.xpm
 share/locale/cs/LC_MESSAGES/kdevelop.mo
 share/locale/da/LC_MESSAGES/kdevelop.mo
@@ -449,6 +490,7 @@ share/mimelnk/application/x-kdevelop-project.kdelnk
 @dirrm share/doc/HTML/zh_CN.GB2312/kdevelop/welcome
 @dirrm share/doc/HTML/zh_CN.GB2312/kdevelop/tutorial
 @dirrm share/doc/HTML/zh_CN.GB2312/kdevelop
+@dirrm share/doc/HTML/zh_CN.GB2312
 @dirrm share/doc/HTML/sv/kdevelop
 @dirrm share/doc/HTML/ru/kdevelop/welcome
 @dirrm share/doc/HTML/ru/kdevelop/tutorial
@@ -465,6 +507,7 @@ share/mimelnk/application/x-kdevelop-project.kdelnk
 @dirrm share/doc/HTML/hu/kdevelop
 @dirrm share/doc/HTML/fr/kdevelop/welcome
 @dirrm share/doc/HTML/fr/kdevelop/tutorial
+@dirrm share/doc/HTML/fr/kdevelop/programming
 @dirrm share/doc/HTML/fr/kdevelop
 @dirrm share/doc/HTML/es/kdevelop/welcome
 @dirrm share/doc/HTML/es/kdevelop/reference/C
@@ -482,6 +525,7 @@ share/mimelnk/application/x-kdevelop-project.kdelnk
 @dirrm share/doc/HTML/de/kdevelop/tutorial
 @dirrm share/doc/HTML/de/kdevelop/reference/C
 @dirrm share/doc/HTML/de/kdevelop/reference
+@dirrm share/doc/HTML/de/kdevelop/kde_libref
 @dirrm share/doc/HTML/de/kdevelop
 @dirrm share/apps/kdevelop/tools
 @dirrm share/apps/kdevelop/toolbar