3 files changed, 90 insertions, 37 deletions

diff --git a/x11-toolkits/qwt/Makefile b/x11-toolkits/qwt/Makefile
index 3379f07a5cf3..efef9eae6329 100644
--- a/x11-toolkits/qwt/Makefile
+++ b/x11-toolkits/qwt/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	qwt
-PORTVERSION=	0.4.1
+PORTVERSION=	4.2.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=qwt
 
-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qwt widget library for technical purposes
 
+BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
+
 USE_QT_VER=	3
 USE_BZIP2=	yes
 MAKE_ENV=	CXXFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
@@ -23,28 +23,62 @@ MAKE_ENV=	CXXFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
 		LIBS="-L${X11BASE}/lib" \
 		QTDIR="${X11BASE}"	\
 		MOC=${MOC}
+INSTALLS_SHLIB=	yes
 
-MAN3=		Qwt.3			\
+MAN3=		QwtAnalogClock.3	\
+		QwtArrayData.3		\
 		QwtArrowButton.3	\
 		QwtAutoScale.3		\
+		QwtCPointerData.3	\
+		QwtCompass.3		\
+		QwtCompassMagnetNeedle.3	\
+		QwtCompassWindArrow.3	\
 		QwtCounter.3		\
 		QwtCurve.3		\
+		QwtData.3		\
 		QwtDblRange.3		\
 		QwtDiMap.3		\
+		QwtDial.3		\
+		QwtDialNeedle.3		\
+		QwtDialScaleDraw.3	\
+		QwtDialSimpleNeedle.3	\
+		QwtDoublePoint.3	\
+		QwtDoublePointData.3	\
+		QwtDoubleRect.3		\
+		QwtDoubleSize.3		\
+		QwtDynGridLayout.3	\
+		QwtEventPattern.3	\
 		QwtGrid.3		\
 		QwtKnob.3		\
 		QwtLegend.3		\
+		QwtLegendButton.3	\
 		QwtLegendItem.3		\
+		QwtLegendLabel.3	\
 		QwtMarker.3		\
+		QwtPaintBuffer.3	\
+		QwtPainter.3		\
+		QwtPicker.3		\
+		QwtPickerClickPointMachine.3	\
+		QwtPickerClickRectMachine.3	\
+		QwtPickerDragPointMachine.3	\
+		QwtPickerDragRectMachine.3	\
+		QwtPickerMachine.3		\
+		QwtPickerPolygonMachine.3	\
+		QwtPlainText.3		\
 		QwtPlot.3		\
 		QwtPlotCanvas.3		\
 		QwtPlotCurve.3		\
 		QwtPlotGrid.3		\
 		QwtPlotItem.3		\
+		QwtPlotLayout.3		\
 		QwtPlotMappedItem.3	\
 		QwtPlotMarker.3		\
+		QwtPlotPicker.3		\
 		QwtPlotPrintFilter.3	\
+		QwtPlotZoomer.3		\
+		QwtPushButton.3		\
 		QwtRect.3		\
+		QwtRichText.3		\
 		QwtScale.3		\
 		QwtScaleDiv.3		\
 		QwtScaleDraw.3		\
@@ -53,21 +87,20 @@ MAN3=		Qwt.3			\
 		QwtSliderBase.3		\
 		QwtSpline.3		\
 		QwtSymbol.3		\
+		QwtText.3		\
 		QwtThermo.3		\
 		QwtWheel.3		\
-		changes.3		\
-		install.3		\
-		qwt_math.h.3		\
-		screenshots.3
+		qwt_math.h.3
 
 pre-build:
 	cd ${WRKSRC}; qmake -spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ qwt.pro -o Makefile
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/libqwt.so.0.4.1 ${PREFIX}/lib
-	${LN} -fs libqwt.so.0.4.1 ${PREFIX}/lib/libqwt.so
+	${INSTALL_DATA} ${WRKSRC}/lib/libqwt.so.${PORTVERSION} ${PREFIX}/lib
+	${LN} -fs libqwt.so.${PORTVERSION} ${PREFIX}/lib/libqwt.so
 	${MKDIR} ${PREFIX}/include/qwt
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qwt
-	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/* ${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/Qwt* ${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/qwt_math.h.3 ${PREFIX}/man/man3
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qwt/distinfo b/x11-toolkits/qwt/distinfo
index ce18ad78d999..a436253ecda3 100644
--- a/x11-toolkits/qwt/distinfo
+++ b/x11-toolkits/qwt/distinfo
@@ -1,2 +1,2 @@
-MD5 (qwt-0.4.1.tar.bz2) = 45c64b0382c8963cfde026a6d2324f6d
-SIZE (qwt-0.4.1.tar.bz2) = 314036
+MD5 (qwt-4.2.0.tar.bz2) = 9c828c9a39a83df5d7fa9630ddf812a4
+SIZE (qwt-4.2.0.tar.bz2) = 973643
diff --git a/x11-toolkits/qwt/pkg-plist b/x11-toolkits/qwt/pkg-plist
index a7e3070ddf97..b36c1ab88a7b 100644
--- a/x11-toolkits/qwt/pkg-plist
+++ b/x11-toolkits/qwt/pkg-plist
@@ -1,33 +1,53 @@
-include/qwt/qwt_sldbase.h
-include/qwt/qwt_plot_classes.h
-include/qwt/qwt_scale.h
-include/qwt/qwt_sclif.h
-include/qwt/qwt_rect.h
-include/qwt/qwt_thermo.h
-include/qwt/qwt_marker.h
-include/qwt/qwt_math.h
-include/qwt/qwt_global.h
-include/qwt/qwt_curve.h
-include/qwt/qwt_autoscl.h
 include/qwt/qwt.h
-include/qwt/qwt_scldraw.h
-include/qwt/qwt_dimap.h
+include/qwt/qwt_analog_clock.h
+include/qwt/qwt_array.h
+include/qwt/qwt_arrbtn.h
+include/qwt/qwt_autoscl.h
+include/qwt/qwt_compass.h
+include/qwt/qwt_compass_rose.h
 include/qwt/qwt_counter.h
+include/qwt/qwt_curve.h
+include/qwt/qwt_data.h
+include/qwt/qwt_dial.h
+include/qwt/qwt_dial_needle.h
+include/qwt/qwt_dimap.h
+include/qwt/qwt_double_rect.h
+include/qwt/qwt_drange.h
+include/qwt/qwt_dyngrid_layout.h
+include/qwt/qwt_event_pattern.h
+include/qwt/qwt_global.h
+include/qwt/qwt_grid.h
+include/qwt/qwt_knob.h
+include/qwt/qwt_layout_metrics.h
+include/qwt/qwt_legend.h
+include/qwt/qwt_marker.h
+include/qwt/qwt_math.h
+include/qwt/qwt_paint_buffer.h
+include/qwt/qwt_painter.h
+include/qwt/qwt_picker.h
+include/qwt/qwt_picker_machine.h
+include/qwt/qwt_plot.h
+include/qwt/qwt_plot_canvas.h
+include/qwt/qwt_plot_classes.h
+include/qwt/qwt_plot_dict.h
+include/qwt/qwt_plot_item.h
+include/qwt/qwt_plot_layout.h
+include/qwt/qwt_plot_picker.h
+include/qwt/qwt_plot_printfilter.h
+include/qwt/qwt_plot_zoomer.h
+include/qwt/qwt_push_button.h
+include/qwt/qwt_rect.h
+include/qwt/qwt_scale.h
 include/qwt/qwt_scldiv.h
+include/qwt/qwt_scldraw.h
+include/qwt/qwt_sclif.h
+include/qwt/qwt_sldbase.h
 include/qwt/qwt_slider.h
 include/qwt/qwt_spline.h
-include/qwt/qwt_plot_item.h
-include/qwt/qwt_plot.h
-include/qwt/qwt_plot_dict.h
 include/qwt/qwt_symbol.h
-include/qwt/qwt_plot_printfilter.h
-include/qwt/qwt_plot_canvas.h
-include/qwt/qwt_arrbtn.h
+include/qwt/qwt_text.h
+include/qwt/qwt_thermo.h
 include/qwt/qwt_wheel.h
-include/qwt/qwt_grid.h
-include/qwt/qwt_knob.h
-include/qwt/qwt_drange.h
-include/qwt/qwt_legend.h
 lib/libqwt.so
-lib/libqwt.so.0.4.1
+lib/libqwt.so.4.2.0
 @dirrm include/qwt