9 files changed, 126 insertions, 78 deletions

diff --git a/x11-toolkits/qwt-devel/Makefile b/x11-toolkits/qwt-devel/Makefile
index 25d6a6e59710..298920270976 100644
--- a/x11-toolkits/qwt-devel/Makefile
+++ b/x11-toolkits/qwt-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qwt
 PORTVERSION=	5.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-devel
@@ -15,39 +15,43 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	makc@issp.ac.ru
 COMMENT=	Qt Widgets for Technical Applications
 
-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
-
 CONFLICTS=	qwt-4.*
 
-USE_QT_VER=	3
+USE_QT_VER=	4
+QT_COMPONENTS=	gui moc qmake
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	QTDIR="${QT_PREFIX}"
+HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 OPTIONS=	DESIGNER_PLUGIN "Install plugin for Qt Designer" on
 
-QMAKE=		qmake
-QMAKESPEC=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-PLUGINDIR=	${PREFIX}/lib/kde3/plugins/designer
+PLUGINDIR=	${PREFIX}/lib/plugins/designer
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.man>
 
+QPRO_DIRS=	src
 .if !defined(WITHOUT_DESIGNER_PLUGIN)
+QPRO_DIRS+=	designer
+#QT_COMPONENTS+=	designer xml rcc
+BUILD_DEPENDS+=	${LOCALBASE}/bin/rcc:${PORTSDIR}/devel/qt4-rcc
+LIB_DEPENDS+=	QtXml:${PORTSDIR}/textproc/qt4-xml \
+		QtDesigner:${PORTSDIR}/devel/qt4-designer
 PLIST_SUB+=	DESIGNER_PLUGIN=""
 .else
 PLIST_SUB+=	DESIGNER_PLUGIN="@comment "
 .endif
 
-QPRO_DIRS=	src
-.if !defined(WITHOUT_DESIGNER_PLUGIN)
-QPRO_DIRS+=	designer
-.endif
+do-configure:
+.for d in ${QPRO_DIRS}
+	(cd ${WRKSRC}/${d} && ${SETENV} ${MAKE_ENV} \
+		${QMAKE} -unix)
+.endfor
 
-do-build:
+post-configure:
 .for d in ${QPRO_DIRS}
-	(cd ${WRKSRC}/${d} && ${QMAKE} -spec ${QMAKESPEC} && \
+	(cd ${WRKSRC}/${d} && \
 	${REINPLACE_CMD} -e \
 		's|^CC .*|CC=${CC}|; \
 		 s|^CXX .*|CXX=${CXX}|; \
@@ -55,23 +59,25 @@ do-build:
 		 s|-pipe||; \
 		 s|^\(CFLAGS .*= \)|\1${CFLAGS}|; \
 		 s|^\(CXXFLAGS = \)|\1${CXXFLAGS}|' \
-		${WRKSRC}/${d}/Makefile && \
-	${SETENV} ${MAKE_ENV} ${GMAKE})
+		${WRKSRC}/${d}/Makefile)
+.endfor
+
+do-build:
+.for d in ${QPRO_DIRS}
+	(cd ${WRKSRC}/${d}; ${SETENV} ${MAKE_ENV} ${GMAKE})
 .endfor
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/libqwt.so.5.0.0 ${PREFIX}/lib/libqwt.so.5
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqwt.so.5.0.0 ${PREFIX}/lib/libqwt.so.5
 	${LN} -fs ${PREFIX}/lib/libqwt.so.5 ${PREFIX}/lib/libqwt.so
-	${MKDIR} ${PREFIX}/include/qwt && \
-	${INSTALL_DATA} ${WRKSRC}/src/*.h ${PREFIX}/include/qwt
+	(cd ${WRKSRC}/src/ && ${COPYTREE_SHARE} '*.h' ${PREFIX}/include/${PORTNAME})
 	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/Qwt* ${PREFIX}/man/man3
 .if !defined(WITHOUT_DESIGNER_PLUGIN)
 	${MKDIR} ${PLUGINDIR} && \
-	${INSTALL_DATA} ${WRKSRC}/designer/plugins/designer/libqwtplugin.so ${PLUGINDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/designer/plugins/designer/libqwt_designer_plugin.so ${PLUGINDIR}
 .endif
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/qwt && \
-	${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/qwt
+	(cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/qwt-devel/files/patch-src__qwt_painter.cpp b/x11-toolkits/qwt-devel/files/patch-src__qwt_painter.cpp
new file mode 100644
index 000000000000..b0e7680f620c
--- /dev/null
+++ b/x11-toolkits/qwt-devel/files/patch-src__qwt_painter.cpp
@@ -0,0 +1,11 @@
+--- ./src/qwt_painter.cpp.orig	Mon Feb 26 23:22:13 2007
++++ ./src/qwt_painter.cpp	Fri Jun  8 22:22:59 2007
+@@ -421,7 +421,7 @@
+ 
+     painter->save();
+ 
+-    painter->translate(scaledRect.x(), scaledRect.y());
++    painter->translate(scaledRect.x(), y);
+     layout->draw(painter, context);
+ 
+     painter->restore();
diff --git a/x11-toolkits/qwt-devel/pkg-plist b/x11-toolkits/qwt-devel/pkg-plist
index cfd85c4f274b..ea7d03b98497 100644
--- a/x11-toolkits/qwt-devel/pkg-plist
+++ b/x11-toolkits/qwt-devel/pkg-plist
@@ -66,7 +66,7 @@ include/qwt/qwt_valuelist.h
 include/qwt/qwt_wheel.h
 lib/libqwt.so
 lib/libqwt.so.5
-%%DESIGNER_PLUGIN%%lib/kde3/plugins/designer/libqwtplugin.so
+%%DESIGNER_PLUGIN%%lib/plugins/designer/libqwt_designer_plugin.so
 %%PORTDOCS%%%%DOCSDIR%%/analogclock.png
 %%PORTDOCS%%%%DOCSDIR%%/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_abstract_scale-members.html
@@ -902,7 +902,6 @@ lib/libqwt.so.5
 %%PORTDOCS%%%%DOCSDIR%%/tabs.css
 %%PORTDOCS%%%%DOCSDIR%%/todo.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%DESIGNER_PLUGIN%%@dirrmtry lib/kde3/plugins/designer/
-%%DESIGNER_PLUGIN%%@dirrmtry lib/kde3/plugins/
-%%DESIGNER_PLUGIN%%@dirrmtry lib/kde3/
+%%DESIGNER_PLUGIN%%@dirrmtry lib/plugins/designer
+%%DESIGNER_PLUGIN%%@dirrmtry lib/plugins
 @dirrm include/qwt
diff --git a/x11-toolkits/qwt5/Makefile b/x11-toolkits/qwt5/Makefile
index 25d6a6e59710..298920270976 100644
--- a/x11-toolkits/qwt5/Makefile
+++ b/x11-toolkits/qwt5/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qwt
 PORTVERSION=	5.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-devel
@@ -15,39 +15,43 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	makc@issp.ac.ru
 COMMENT=	Qt Widgets for Technical Applications
 
-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
-
 CONFLICTS=	qwt-4.*
 
-USE_QT_VER=	3
+USE_QT_VER=	4
+QT_COMPONENTS=	gui moc qmake
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	QTDIR="${QT_PREFIX}"
+HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 OPTIONS=	DESIGNER_PLUGIN "Install plugin for Qt Designer" on
 
-QMAKE=		qmake
-QMAKESPEC=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-PLUGINDIR=	${PREFIX}/lib/kde3/plugins/designer
+PLUGINDIR=	${PREFIX}/lib/plugins/designer
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.man>
 
+QPRO_DIRS=	src
 .if !defined(WITHOUT_DESIGNER_PLUGIN)
+QPRO_DIRS+=	designer
+#QT_COMPONENTS+=	designer xml rcc
+BUILD_DEPENDS+=	${LOCALBASE}/bin/rcc:${PORTSDIR}/devel/qt4-rcc
+LIB_DEPENDS+=	QtXml:${PORTSDIR}/textproc/qt4-xml \
+		QtDesigner:${PORTSDIR}/devel/qt4-designer
 PLIST_SUB+=	DESIGNER_PLUGIN=""
 .else
 PLIST_SUB+=	DESIGNER_PLUGIN="@comment "
 .endif
 
-QPRO_DIRS=	src
-.if !defined(WITHOUT_DESIGNER_PLUGIN)
-QPRO_DIRS+=	designer
-.endif
+do-configure:
+.for d in ${QPRO_DIRS}
+	(cd ${WRKSRC}/${d} && ${SETENV} ${MAKE_ENV} \
+		${QMAKE} -unix)
+.endfor
 
-do-build:
+post-configure:
 .for d in ${QPRO_DIRS}
-	(cd ${WRKSRC}/${d} && ${QMAKE} -spec ${QMAKESPEC} && \
+	(cd ${WRKSRC}/${d} && \
 	${REINPLACE_CMD} -e \
 		's|^CC .*|CC=${CC}|; \
 		 s|^CXX .*|CXX=${CXX}|; \
@@ -55,23 +59,25 @@ do-build:
 		 s|-pipe||; \
 		 s|^\(CFLAGS .*= \)|\1${CFLAGS}|; \
 		 s|^\(CXXFLAGS = \)|\1${CXXFLAGS}|' \
-		${WRKSRC}/${d}/Makefile && \
-	${SETENV} ${MAKE_ENV} ${GMAKE})
+		${WRKSRC}/${d}/Makefile)
+.endfor
+
+do-build:
+.for d in ${QPRO_DIRS}
+	(cd ${WRKSRC}/${d}; ${SETENV} ${MAKE_ENV} ${GMAKE})
 .endfor
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/libqwt.so.5.0.0 ${PREFIX}/lib/libqwt.so.5
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqwt.so.5.0.0 ${PREFIX}/lib/libqwt.so.5
 	${LN} -fs ${PREFIX}/lib/libqwt.so.5 ${PREFIX}/lib/libqwt.so
-	${MKDIR} ${PREFIX}/include/qwt && \
-	${INSTALL_DATA} ${WRKSRC}/src/*.h ${PREFIX}/include/qwt
+	(cd ${WRKSRC}/src/ && ${COPYTREE_SHARE} '*.h' ${PREFIX}/include/${PORTNAME})
 	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/Qwt* ${PREFIX}/man/man3
 .if !defined(WITHOUT_DESIGNER_PLUGIN)
 	${MKDIR} ${PLUGINDIR} && \
-	${INSTALL_DATA} ${WRKSRC}/designer/plugins/designer/libqwtplugin.so ${PLUGINDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/designer/plugins/designer/libqwt_designer_plugin.so ${PLUGINDIR}
 .endif
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/qwt && \
-	${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/qwt
+	(cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/qwt5/files/patch-src__qwt_painter.cpp b/x11-toolkits/qwt5/files/patch-src__qwt_painter.cpp
new file mode 100644
index 000000000000..b0e7680f620c
--- /dev/null
+++ b/x11-toolkits/qwt5/files/patch-src__qwt_painter.cpp
@@ -0,0 +1,11 @@
+--- ./src/qwt_painter.cpp.orig	Mon Feb 26 23:22:13 2007
++++ ./src/qwt_painter.cpp	Fri Jun  8 22:22:59 2007
+@@ -421,7 +421,7 @@
+ 
+     painter->save();
+ 
+-    painter->translate(scaledRect.x(), scaledRect.y());
++    painter->translate(scaledRect.x(), y);
+     layout->draw(painter, context);
+ 
+     painter->restore();
diff --git a/x11-toolkits/qwt5/pkg-plist b/x11-toolkits/qwt5/pkg-plist
index cfd85c4f274b..ea7d03b98497 100644
--- a/x11-toolkits/qwt5/pkg-plist
+++ b/x11-toolkits/qwt5/pkg-plist
@@ -66,7 +66,7 @@ include/qwt/qwt_valuelist.h
 include/qwt/qwt_wheel.h
 lib/libqwt.so
 lib/libqwt.so.5
-%%DESIGNER_PLUGIN%%lib/kde3/plugins/designer/libqwtplugin.so
+%%DESIGNER_PLUGIN%%lib/plugins/designer/libqwt_designer_plugin.so
 %%PORTDOCS%%%%DOCSDIR%%/analogclock.png
 %%PORTDOCS%%%%DOCSDIR%%/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_abstract_scale-members.html
@@ -902,7 +902,6 @@ lib/libqwt.so.5
 %%PORTDOCS%%%%DOCSDIR%%/tabs.css
 %%PORTDOCS%%%%DOCSDIR%%/todo.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%DESIGNER_PLUGIN%%@dirrmtry lib/kde3/plugins/designer/
-%%DESIGNER_PLUGIN%%@dirrmtry lib/kde3/plugins/
-%%DESIGNER_PLUGIN%%@dirrmtry lib/kde3/
+%%DESIGNER_PLUGIN%%@dirrmtry lib/plugins/designer
+%%DESIGNER_PLUGIN%%@dirrmtry lib/plugins
 @dirrm include/qwt
diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile
index 25d6a6e59710..298920270976 100644
--- a/x11-toolkits/qwt6/Makefile
+++ b/x11-toolkits/qwt6/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qwt
 PORTVERSION=	5.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-devel
@@ -15,39 +15,43 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	makc@issp.ac.ru
 COMMENT=	Qt Widgets for Technical Applications
 
-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
-
 CONFLICTS=	qwt-4.*
 
-USE_QT_VER=	3
+USE_QT_VER=	4
+QT_COMPONENTS=	gui moc qmake
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	QTDIR="${QT_PREFIX}"
+HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 OPTIONS=	DESIGNER_PLUGIN "Install plugin for Qt Designer" on
 
-QMAKE=		qmake
-QMAKESPEC=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-PLUGINDIR=	${PREFIX}/lib/kde3/plugins/designer
+PLUGINDIR=	${PREFIX}/lib/plugins/designer
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.man>
 
+QPRO_DIRS=	src
 .if !defined(WITHOUT_DESIGNER_PLUGIN)
+QPRO_DIRS+=	designer
+#QT_COMPONENTS+=	designer xml rcc
+BUILD_DEPENDS+=	${LOCALBASE}/bin/rcc:${PORTSDIR}/devel/qt4-rcc
+LIB_DEPENDS+=	QtXml:${PORTSDIR}/textproc/qt4-xml \
+		QtDesigner:${PORTSDIR}/devel/qt4-designer
 PLIST_SUB+=	DESIGNER_PLUGIN=""
 .else
 PLIST_SUB+=	DESIGNER_PLUGIN="@comment "
 .endif
 
-QPRO_DIRS=	src
-.if !defined(WITHOUT_DESIGNER_PLUGIN)
-QPRO_DIRS+=	designer
-.endif
+do-configure:
+.for d in ${QPRO_DIRS}
+	(cd ${WRKSRC}/${d} && ${SETENV} ${MAKE_ENV} \
+		${QMAKE} -unix)
+.endfor
 
-do-build:
+post-configure:
 .for d in ${QPRO_DIRS}
-	(cd ${WRKSRC}/${d} && ${QMAKE} -spec ${QMAKESPEC} && \
+	(cd ${WRKSRC}/${d} && \
 	${REINPLACE_CMD} -e \
 		's|^CC .*|CC=${CC}|; \
 		 s|^CXX .*|CXX=${CXX}|; \
@@ -55,23 +59,25 @@ do-build:
 		 s|-pipe||; \
 		 s|^\(CFLAGS .*= \)|\1${CFLAGS}|; \
 		 s|^\(CXXFLAGS = \)|\1${CXXFLAGS}|' \
-		${WRKSRC}/${d}/Makefile && \
-	${SETENV} ${MAKE_ENV} ${GMAKE})
+		${WRKSRC}/${d}/Makefile)
+.endfor
+
+do-build:
+.for d in ${QPRO_DIRS}
+	(cd ${WRKSRC}/${d}; ${SETENV} ${MAKE_ENV} ${GMAKE})
 .endfor
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/libqwt.so.5.0.0 ${PREFIX}/lib/libqwt.so.5
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqwt.so.5.0.0 ${PREFIX}/lib/libqwt.so.5
 	${LN} -fs ${PREFIX}/lib/libqwt.so.5 ${PREFIX}/lib/libqwt.so
-	${MKDIR} ${PREFIX}/include/qwt && \
-	${INSTALL_DATA} ${WRKSRC}/src/*.h ${PREFIX}/include/qwt
+	(cd ${WRKSRC}/src/ && ${COPYTREE_SHARE} '*.h' ${PREFIX}/include/${PORTNAME})
 	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/Qwt* ${PREFIX}/man/man3
 .if !defined(WITHOUT_DESIGNER_PLUGIN)
 	${MKDIR} ${PLUGINDIR} && \
-	${INSTALL_DATA} ${WRKSRC}/designer/plugins/designer/libqwtplugin.so ${PLUGINDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/designer/plugins/designer/libqwt_designer_plugin.so ${PLUGINDIR}
 .endif
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/qwt && \
-	${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/qwt
+	(cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/qwt6/files/patch-src__qwt_painter.cpp b/x11-toolkits/qwt6/files/patch-src__qwt_painter.cpp
new file mode 100644
index 000000000000..b0e7680f620c
--- /dev/null
+++ b/x11-toolkits/qwt6/files/patch-src__qwt_painter.cpp
@@ -0,0 +1,11 @@
+--- ./src/qwt_painter.cpp.orig	Mon Feb 26 23:22:13 2007
++++ ./src/qwt_painter.cpp	Fri Jun  8 22:22:59 2007
+@@ -421,7 +421,7 @@
+ 
+     painter->save();
+ 
+-    painter->translate(scaledRect.x(), scaledRect.y());
++    painter->translate(scaledRect.x(), y);
+     layout->draw(painter, context);
+ 
+     painter->restore();
diff --git a/x11-toolkits/qwt6/pkg-plist b/x11-toolkits/qwt6/pkg-plist
index cfd85c4f274b..ea7d03b98497 100644
--- a/x11-toolkits/qwt6/pkg-plist
+++ b/x11-toolkits/qwt6/pkg-plist
@@ -66,7 +66,7 @@ include/qwt/qwt_valuelist.h
 include/qwt/qwt_wheel.h
 lib/libqwt.so
 lib/libqwt.so.5
-%%DESIGNER_PLUGIN%%lib/kde3/plugins/designer/libqwtplugin.so
+%%DESIGNER_PLUGIN%%lib/plugins/designer/libqwt_designer_plugin.so
 %%PORTDOCS%%%%DOCSDIR%%/analogclock.png
 %%PORTDOCS%%%%DOCSDIR%%/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_abstract_scale-members.html
@@ -902,7 +902,6 @@ lib/libqwt.so.5
 %%PORTDOCS%%%%DOCSDIR%%/tabs.css
 %%PORTDOCS%%%%DOCSDIR%%/todo.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%DESIGNER_PLUGIN%%@dirrmtry lib/kde3/plugins/designer/
-%%DESIGNER_PLUGIN%%@dirrmtry lib/kde3/plugins/
-%%DESIGNER_PLUGIN%%@dirrmtry lib/kde3/
+%%DESIGNER_PLUGIN%%@dirrmtry lib/plugins/designer
+%%DESIGNER_PLUGIN%%@dirrmtry lib/plugins
 @dirrm include/qwt