3 files changed, 21 insertions, 14 deletions

diff --git a/devel/qdevelop/Makefile b/devel/qdevelop/Makefile
index 825bda7037cb..b42d416580c1 100644
--- a/devel/qdevelop/Makefile
+++ b/devel/qdevelop/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	qdevelop
-PORTVERSION=	0.25.2
+PORTVERSION=	0.26.1
 CATEGORIES=	devel kde
-MASTER_SITES=	http://qdevelop.free.fr/download/ \
-		ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
+MASTER_SITES=	http://qdevelop.org/public/release/
 
-MAINTAINER=	makc@issp.ac.ru
+MAINTAINER=	makc@FreeBSD.org
 COMMENT=	A development environment entirely dedicated to Qt4
 
 RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags \
 		qt4-sqlite-plugin>=0:${PORTSDIR}/databases/qt4-sqlite3-plugin
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc uic rcc sql network xml gui corelib assistant linguist designer
+QT_COMPONENTS=	gui sql network xml designer \
+		qmake_build moc_build uic_build rcc_build
 USE_CMAKE=	yes
 CMAKE_USE_PTHREAD=	yes
 
@@ -29,12 +29,20 @@ DESKTOP_ENTRIES=	"QDevelop" \
 			"Qt;KDE;Development;" \
 			"false"
 
+OPTIONS=	TOOLS "Install Qt4 dev. tools (qmake, moc, etc.)" on
+
+.include <bsd.port.pre.mk>
 .if !defined(WITHOUT_NLS)
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.if !defined(WITHOUT_TOOLS)
+QT_COMPONENTS+=	assistant_run linguist_run \
+		qmake_run moc_run uic_run rcc_run
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|\"qmake\"|\"qmake-qt4\"|g" \
 		-e "s|\"linguist\"|\"linguist-qt4\"|g" \
@@ -47,7 +55,7 @@ post-patch:
 		${WRKSRC}/src/toolscontrolimpl.cpp
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/qdevelop ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/qdevelop ${PREFIX}/bin/
 	@${INSTALL_DATA} ${WRKSRC}/resources/images/logo.png ${PREFIX}/share/pixmaps/qdevelop.png
 .if !defined(WITHOUT_NLS)
 	@${MKDIR} ${DATADIR}
@@ -55,9 +63,9 @@ do-install:
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for doc in ChangeLog.txt README.txt README.cmake copying
+.for doc in ChangeLog.txt README.txt
 	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/qdevelop/distinfo b/devel/qdevelop/distinfo
index 2e3dae9fb177..215530c22c4f 100644
--- a/devel/qdevelop/distinfo
+++ b/devel/qdevelop/distinfo
@@ -1,3 +1,3 @@
-MD5 (qdevelop-0.25.2.tar.gz) = 48c6d7d32d1b75bd789dc19decbbcbf1
-SHA256 (qdevelop-0.25.2.tar.gz) = d40e4f49d9c8521ab811b3baa357590388d995acc70692c991a54af34b1659d9
-SIZE (qdevelop-0.25.2.tar.gz) = 977529
+MD5 (qdevelop-0.26.1.tar.gz) = 82196807eec3551c2cfc97ececdb333e
+SHA256 (qdevelop-0.26.1.tar.gz) = f8ce865b6396487756f1a34dcd058203c7490ff1dcc636bfe9fead539a21d2ce
+SIZE (qdevelop-0.26.1.tar.gz) = 1049318
diff --git a/devel/qdevelop/pkg-plist b/devel/qdevelop/pkg-plist
index faeb138b7a30..f3c0f8a06c33 100644
--- a/devel/qdevelop/pkg-plist
+++ b/devel/qdevelop/pkg-plist
@@ -1,15 +1,15 @@
 bin/qdevelop
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.cmake
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/copying
 share/pixmaps/qdevelop.png
 %%NLS%%%%DATADIR%%/translations/QDevelop_Chinese.qm
 %%NLS%%%%DATADIR%%/translations/QDevelop_Czech.qm
 %%NLS%%%%DATADIR%%/translations/QDevelop_Dutch.qm
 %%NLS%%%%DATADIR%%/translations/QDevelop_French.qm
 %%NLS%%%%DATADIR%%/translations/QDevelop_German.qm
+%%NLS%%%%DATADIR%%/translations/QDevelop_Hungarian.qm
 %%NLS%%%%DATADIR%%/translations/QDevelop_Italian.qm
+%%NLS%%%%DATADIR%%/translations/QDevelop_Japanese.qm
 %%NLS%%%%DATADIR%%/translations/QDevelop_Polish.qm
 %%NLS%%%%DATADIR%%/translations/QDevelop_Portuguese.qm
 %%NLS%%%%DATADIR%%/translations/QDevelop_Russian.qm
@@ -20,4 +20,3 @@ share/pixmaps/qdevelop.png
 %%NLS%%@dirrm %%DATADIR%%/translations
 %%NLS%%@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/applications