4 files changed, 89 insertions, 45 deletions

diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 3969de82522b..da25fa410c82 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -6,55 +6,47 @@
 #
 
 PORTNAME=	kdevelop
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	devel
-MASTER_SITES=	ftp://fara.cs.uni-potsdam.de/pub/kdevelop/ \
-		ftp://129.187.206.68/pub/unix/ide/KDevelop/ \
-		ftp://ftp.bawue.de/pub/unix/KDevelop/ \
+MASTER_SITES=	ftp://ftp.e-technik.fh-muenchen.de/pub/unix/ide/KDevelop/ \
 		ftp://ftp.chg.ru/pub/X11/kdevelop/ \
-		ftp://gd.tuwien.ac.at/hci/KDevelop/ \
-		ftp://altair.dhs.org/pub/kdevelop/ \
-		ftp://apcs.shellx.org/pub/KDevelop/ \
-		ftp://ftp.mpg.goe.ni.schule.de/pub/linux/ide/KDevelop/
+		ftp://gd.tuwien.ac.at/hci/KDevelop/
 
 MAINTAINER=	ports@FreeBSD.org
 
+BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	kdeui.3:${PORTSDIR}/x11/kdelibs11
 .if defined(WITH_OPTIONAL_DEPENDS)
-RUN_DEPENDS+=	kdbg:${PORTSDIR}/devel/kdbg \
+RUN_DEPENDS+=	autoconf:${PORTSDIR}/devel/autoconf \
+		automake:${PORTSDIR}/deve/automake \
+		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_BZIP2=	yes
+USE_QT=		yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-#USE_QT=		yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	QTDIR="${X11BASE}" KDEDIR="${LOCALBASE}"
 CONFIGURE_ARGS=	--with-qtdoc-dir=${X11BASE}/share/doc/qt/html \
 		--with-qt-includes=${X11BASE}/include/X11/qt \
 		--with-extra-includes=${LOCALBASE}/include \
 		--with-extra-libs=${LOCALBASE}/lib
-MAKE_ENV=	CXX="${CXX}" SOMAJOR="${SOMAJOR}"
-SOMAJOR=	1
+MAKE_ARGS=	SOMAJOR="${SOMAJOR}"
+PLIST_SUB=	LIBVER="${SOMAJOR}"
 
-PLIST_SUB+=	LIBVER="${SOMAJOR}"
+SOMAJOR=	1
 
-pre-patch:
+pre-everything:
 .if !defined(WITH_OPTIONAL_DEPENDS)
-	@${ECHO}
-	@${ECHO} "You may define WITH_OPTIONAL_DEPENDS (make WITH_OPTIONAL_DEPENDS=YES)"
-	@${ECHO} "to automatically build the suggested programs to compliment kdevelop."
-	@${ECHO}
-	@sleep 1
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You may define WITH_OPTIONAL_DEPENDS (make WITH_OPTIONAL_DEPENDS=YES)"
+	@${ECHO_MSG} "to automatically build the suggested programs to compliment kdevelop."
+	@${ECHO_MSG}
 .endif
 
-post-patch:
-	@${LN} -sf /usr/include/g++/FlexLexer.h ${WRKSRC}
-
 .include <bsd.port.mk>
diff --git a/devel/kdevelop/distinfo b/devel/kdevelop/distinfo
index f314afe4a3f0..c805d34257ec 100644
--- a/devel/kdevelop/distinfo
+++ b/devel/kdevelop/distinfo
@@ -1 +1 @@
-MD5 (kdevelop-1.2.tar.gz) = 2d71393a931e62499f553e0a823ed586
+MD5 (kdevelop-1.3.tar.bz2) = 9ccb2a7e65138633325c2847f087d4b8
diff --git a/devel/kdevelop/files/patch-af b/devel/kdevelop/files/patch-af
deleted file mode 100644
index e5a3a73cf4d4..000000000000
--- a/devel/kdevelop/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
---- kdlgloader/Makefile.in	Sun Feb 27 12:01:29 2000
-+++ kdlgloader/Makefile.in.new	Sun Feb 27 21:32:51 2000
-@@ -212,8 +212,8 @@
- 
- lib_LTLIBRARIES = libkdlgloader.la
- 
--SOMAJOR = 1
--SOMINOR = 0
-+SOMAJOR ?= 1
-+SOMINOR ?= 0
- 
- include_HEADERS = kdlgloader.h
- 
diff --git a/devel/kdevelop/pkg-plist b/devel/kdevelop/pkg-plist
index 0261b0b69d89..aef5db17f5f4 100644
--- a/devel/kdevelop/pkg-plist
+++ b/devel/kdevelop/pkg-plist
@@ -1,7 +1,10 @@
+bin/extractrc
+bin/kdevdlg2ui
 bin/kdevelop
+bin/kimport
+bin/one2two
 include/kdlgloader.h
 lib/libkdlgloader.a
-lib/libkdlgloader.la
 lib/libkdlgloader.so
 lib/libkdlgloader.so.%%LIBVER%%
 share/applnk/Development/.directory
@@ -88,6 +91,7 @@ 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/admin.tar.gz
 share/apps/kdevelop/templates/c.tar.gz
 share/apps/kdevelop/templates/cpp.tar.gz
 share/apps/kdevelop/templates/cpp_template
@@ -346,6 +350,17 @@ share/doc/HTML/fr/kdevelop/tutorial/index.html
 share/doc/HTML/fr/kdevelop/tutorial/logotp3.png
 share/doc/HTML/fr/kdevelop/welcome/index.html
 share/doc/HTML/fr/kdevelop/welcome/logotp3.png
+share/doc/HTML/hu/kdevelop/addendum/index-1.html
+share/doc/HTML/hu/kdevelop/addendum/index-2.html
+share/doc/HTML/hu/kdevelop/addendum/index-3.html
+share/doc/HTML/hu/kdevelop/addendum/index-4.html
+share/doc/HTML/hu/kdevelop/addendum/index-5.html
+share/doc/HTML/hu/kdevelop/addendum/index-6.html
+share/doc/HTML/hu/kdevelop/addendum/index-7.html
+share/doc/HTML/hu/kdevelop/addendum/index-8.html
+share/doc/HTML/hu/kdevelop/addendum/index-9.html
+share/doc/HTML/hu/kdevelop/addendum/index.html
+share/doc/HTML/hu/kdevelop/addendum/logotp3.png
 share/doc/HTML/hu/kdevelop/index-1.html
 share/doc/HTML/hu/kdevelop/index-10.html
 share/doc/HTML/hu/kdevelop/index-11.html
@@ -365,8 +380,57 @@ share/doc/HTML/hu/kdevelop/index-7.html
 share/doc/HTML/hu/kdevelop/index-8.html
 share/doc/HTML/hu/kdevelop/index-9.html
 share/doc/HTML/hu/kdevelop/index.html
+share/doc/HTML/hu/kdevelop/kde_libref/index-1.html
+share/doc/HTML/hu/kdevelop/kde_libref/index-2.html
+share/doc/HTML/hu/kdevelop/kde_libref/index-3.html
+share/doc/HTML/hu/kdevelop/kde_libref/index-4.html
+share/doc/HTML/hu/kdevelop/kde_libref/index-5.html
+share/doc/HTML/hu/kdevelop/kde_libref/index-6.html
+share/doc/HTML/hu/kdevelop/kde_libref/index-7.html
+share/doc/HTML/hu/kdevelop/kde_libref/index-8.html
+share/doc/HTML/hu/kdevelop/kde_libref/index-9.html
+share/doc/HTML/hu/kdevelop/kde_libref/index.html
+share/doc/HTML/hu/kdevelop/kde_libref/logotp3.png
 share/doc/HTML/hu/kdevelop/logotp3.png
+share/doc/HTML/hu/kdevelop/programming/index-1.html
+share/doc/HTML/hu/kdevelop/programming/index-10.html
+share/doc/HTML/hu/kdevelop/programming/index-11.html
+share/doc/HTML/hu/kdevelop/programming/index-12.html
+share/doc/HTML/hu/kdevelop/programming/index-13.html
+share/doc/HTML/hu/kdevelop/programming/index-14.html
+share/doc/HTML/hu/kdevelop/programming/index-15.html
+share/doc/HTML/hu/kdevelop/programming/index-16.html
+share/doc/HTML/hu/kdevelop/programming/index-17.html
+share/doc/HTML/hu/kdevelop/programming/index-18.html
+share/doc/HTML/hu/kdevelop/programming/index-19.html
+share/doc/HTML/hu/kdevelop/programming/index-2.html
+share/doc/HTML/hu/kdevelop/programming/index-3.html
+share/doc/HTML/hu/kdevelop/programming/index-4.html
+share/doc/HTML/hu/kdevelop/programming/index-5.html
+share/doc/HTML/hu/kdevelop/programming/index-6.html
+share/doc/HTML/hu/kdevelop/programming/index-7.html
+share/doc/HTML/hu/kdevelop/programming/index-8.html
+share/doc/HTML/hu/kdevelop/programming/index-9.html
+share/doc/HTML/hu/kdevelop/programming/index.html
+share/doc/HTML/hu/kdevelop/programming/logotp3.png
 share/doc/HTML/hu/kdevelop/tip.database
+share/doc/HTML/hu/kdevelop/tutorial/index-1.html
+share/doc/HTML/hu/kdevelop/tutorial/index-10.html
+share/doc/HTML/hu/kdevelop/tutorial/index-11.html
+share/doc/HTML/hu/kdevelop/tutorial/index-12.html
+share/doc/HTML/hu/kdevelop/tutorial/index-13.html
+share/doc/HTML/hu/kdevelop/tutorial/index-14.html
+share/doc/HTML/hu/kdevelop/tutorial/index-15.html
+share/doc/HTML/hu/kdevelop/tutorial/index-2.html
+share/doc/HTML/hu/kdevelop/tutorial/index-3.html
+share/doc/HTML/hu/kdevelop/tutorial/index-4.html
+share/doc/HTML/hu/kdevelop/tutorial/index-5.html
+share/doc/HTML/hu/kdevelop/tutorial/index-6.html
+share/doc/HTML/hu/kdevelop/tutorial/index-7.html
+share/doc/HTML/hu/kdevelop/tutorial/index-8.html
+share/doc/HTML/hu/kdevelop/tutorial/index-9.html
+share/doc/HTML/hu/kdevelop/tutorial/index.html
+share/doc/HTML/hu/kdevelop/tutorial/logotp3.png
 share/doc/HTML/hu/kdevelop/welcome/index.html
 share/doc/HTML/hu/kdevelop/welcome/logotp3.png
 share/doc/HTML/nl/kdevelop/tip.database
@@ -490,7 +554,6 @@ 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
@@ -504,6 +567,10 @@ share/mimelnk/application/x-kdevelop-project.kdelnk
 @dirrm share/doc/HTML/nl/kdevelop/welcome
 @dirrm share/doc/HTML/nl/kdevelop
 @dirrm share/doc/HTML/hu/kdevelop/welcome
+@dirrm share/doc/HTML/hu/kdevelop/tutorial
+@dirrm share/doc/HTML/hu/kdevelop/programming
+@dirrm share/doc/HTML/hu/kdevelop/kde_libref
+@dirrm share/doc/HTML/hu/kdevelop/addendum
 @dirrm share/doc/HTML/hu/kdevelop
 @dirrm share/doc/HTML/fr/kdevelop/welcome
 @dirrm share/doc/HTML/fr/kdevelop/tutorial
@@ -523,8 +590,6 @@ share/mimelnk/application/x-kdevelop-project.kdelnk
 @dirrm share/doc/HTML/en/kdevelop
 @dirrm share/doc/HTML/de/kdevelop/welcome
 @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