Update to 5.2.1

Make MAKE_JOBS_SAFE

4 files changed, 80 insertions, 82 deletions

diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile
index 79e71d16c5fb..e519216c895e 100644
--- a/x11-toolkits/qwt6/Makefile
+++ b/x11-toolkits/qwt6/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qwt
-PORTVERSION=	5.2.0
-PORTREVISION=	1
+PORTVERSION=	5.2.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
 
@@ -21,6 +20,7 @@ USE_GMAKE=	yes
 QMAKE_ARGS+=	-unix -recursive PREFIX=${PREFIX}
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
 
 OPTIONS=	DESIGNER_PLUGIN "Install plugin for Qt Designer" on
 
@@ -39,13 +39,10 @@ PLIST_SUB+=	DESIGNER_PLUGIN="@comment "
 .endif
 
 do-configure:
-	(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKE_ARGS})
-
-post-configure:
-	${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
-		's|^CC .*|CC=${CC}|; s|^CXX .*|CXX=${CXX}|; s|^LINK .*|LINK=${CXX}|'
+	(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS})
 
 post-install:
+	${MKDIR} ${PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/Qwt* ${PREFIX}/man/man3
 	${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,}
 .if !defined(NOPORTDOCS)
diff --git a/x11-toolkits/qwt6/distinfo b/x11-toolkits/qwt6/distinfo
index 111b015d7090..9000501966ef 100644
--- a/x11-toolkits/qwt6/distinfo
+++ b/x11-toolkits/qwt6/distinfo
@@ -1,3 +1,3 @@
-MD5 (qwt-5.2.0.tar.bz2) = c60b4cfac271a41524402b3ae5197890
-SHA256 (qwt-5.2.0.tar.bz2) = 2b431a6e04cb939f71cdc03a343975162bd6f94bfc11b85227bdb44e9576f5ba
-SIZE (qwt-5.2.0.tar.bz2) = 1371877
+MD5 (qwt-5.2.1.tar.bz2) = 4a595b8db0ec3856b117836c1d60cb27
+SHA256 (qwt-5.2.1.tar.bz2) = e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f
+SIZE (qwt-5.2.1.tar.bz2) = 1926453
diff --git a/x11-toolkits/qwt6/files/patch-qwtconfig.pri b/x11-toolkits/qwt6/files/patch-qwtconfig.pri
index 8c4bf49f75f7..c88ac04ba21e 100644
--- a/x11-toolkits/qwt6/files/patch-qwtconfig.pri
+++ b/x11-toolkits/qwt6/files/patch-qwtconfig.pri
@@ -4,7 +4,7 @@
  VERSION      = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
  
  unix {
--    INSTALLBASE    = /usr/local/qwt-5.2.0
+-    INSTALLBASE    = /usr/local/qwt-5.2.1
 +    INSTALLBASE    = $$PREFIX
  }
  
diff --git a/x11-toolkits/qwt6/pkg-plist b/x11-toolkits/qwt6/pkg-plist
index fa0e49ca9713..d33fc8c81624 100644
--- a/x11-toolkits/qwt6/pkg-plist
+++ b/x11-toolkits/qwt6/pkg-plist
@@ -71,7 +71,7 @@ include/qwt/qwt_wheel.h
 lib/libqwt.so
 lib/libqwt.so.5
 lib/libqwt.so.5.2
-lib/libqwt.so.5.2.0
+lib/libqwt.so.5.2.1
 %%DESIGNER_PLUGIN%%lib/qt4/plugins/designer/libqwt_designer_plugin.so
 %%PORTDOCS%%%%DOCSDIR%%/analogclock.png
 %%PORTDOCS%%%%DOCSDIR%%/annotated.html
@@ -519,6 +519,7 @@ lib/libqwt.so.5.2.0
 %%PORTDOCS%%%%DOCSDIR%%/histogram.png
 %%PORTDOCS%%%%DOCSDIR%%/histogramscreenshots.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.qhp
 %%PORTDOCS%%%%DOCSDIR%%/inherit__graph__0.map
 %%PORTDOCS%%%%DOCSDIR%%/inherit__graph__0.md5
 %%PORTDOCS%%%%DOCSDIR%%/inherit__graph__0.png
@@ -640,76 +641,76 @@ lib/libqwt.so.5.2.0
 %%PORTDOCS%%%%DOCSDIR%%/knob.png
 %%PORTDOCS%%%%DOCSDIR%%/pages.html
 %%PORTDOCS%%%%DOCSDIR%%/plot.png
-%%PORTDOCS%%%%DOCSDIR%%/qwt__abstract__scale_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__abstract__scale__draw_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__abstract__slider_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__analog__clock_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__array_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__arrow__button_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__clipper_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__color__map_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__compass_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__compass__rose_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__counter_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__curve__fitter_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__data_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__dial_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__dial__needle_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__double__interval_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__double__range_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__double__rect_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__dyngrid__layout_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__event__pattern_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__global_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__interval__data_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__knob_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__layout__metrics_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__legend_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__legend__item_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__legend__itemmanager_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__magnifier_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__math_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__mathml__text__engine_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__paint__buffer_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__painter_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__panner_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__picker_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__picker__machine_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__canvas_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__curve_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__dict_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__grid_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__item_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__layout_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__magnifier_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__marker_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__panner_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__picker_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__printfilter_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__rasteritem_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__rescaler_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__scaleitem_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__spectrogram_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__svgitem_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__zoomer_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__polygon_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__raster__data_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__round__scale__draw_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__scale__div_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__scale__draw_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__scale__engine_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__scale__map_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__scale__widget_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__slider_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__spline_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__symbol_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__text_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__text__engine_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__text__label_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__thermo_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__valuelist_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__wheel_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__abstract__scale_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__abstract__scale__draw_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__abstract__slider_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__analog__clock_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__array_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__arrow__button_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__clipper_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__color__map_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__compass_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__compass__rose_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__counter_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__curve__fitter_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__data_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__dial_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__dial__needle_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__double__interval_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__double__range_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__double__rect_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__dyngrid__layout_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__event__pattern_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__global_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__interval__data_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__knob_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__layout__metrics_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__legend_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__legend__item_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__legend__itemmanager_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__magnifier_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__math_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__mathml__text__engine_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__paint__buffer_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__painter_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__panner_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__picker_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__picker__machine_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__canvas_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__curve_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__dict_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__grid_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__item_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__layout_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__magnifier_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__marker_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__panner_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__picker_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__printfilter_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__rasteritem_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__rescaler_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__scaleitem_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__spectrogram_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__svgitem_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__zoomer_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__polygon_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__raster__data_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__round__scale__draw_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__scale__div_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__scale__draw_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__scale__engine_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__scale__map_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__scale__widget_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__slider_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__spline_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__symbol_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__text_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__text__engine_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__text__label_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__thermo_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__valuelist_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__wheel_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwtinstall.html
 %%PORTDOCS%%%%DOCSDIR%%/qwtlicense.html
 %%PORTDOCS%%%%DOCSDIR%%/radio.png