From a821cad16d83cd8b2939cfb7924f3f24e55b6b63 Mon Sep 17 00:00:00 2001 From: Max Brazhnikov Date: Wed, 9 Oct 2013 10:08:04 +0000 Subject: - Convert to USES= qmake - Bring stage support - Adjust DESKTOP_ENTRIES - Use options helpers - Use new LIB_DEPENDS syntax --- x11-toolkits/qwt5-designerplugin/Makefile | 11 ++-- x11-toolkits/qwt5/Makefile | 20 +++---- x11-toolkits/qwt5/files/Makefile.man | 87 ------------------------------- x11-toolkits/qwt5/pkg-plist | 87 +++++++++++++++++++++++++++++++ x11-toolkits/qwt6-designerplugin/Makefile | 11 ++-- x11-toolkits/qwt6/Makefile | 12 ++--- 6 files changed, 102 insertions(+), 126 deletions(-) delete mode 100644 x11-toolkits/qwt5/files/Makefile.man (limited to 'x11-toolkits') diff --git a/x11-toolkits/qwt5-designerplugin/Makefile b/x11-toolkits/qwt5-designerplugin/Makefile index 59156a325d19..6b5d45520987 100644 --- a/x11-toolkits/qwt5-designerplugin/Makefile +++ b/x11-toolkits/qwt5-designerplugin/Makefile @@ -11,12 +11,11 @@ COMMENT= Qt Designer plugin for Qwt LIB_DEPENDS= libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 +USES= gmake qmake USE_QT4= designer moc_build qmake_build rcc_build USE_BZIP2= yes -USE_GMAKE= yes -QMAKE_ARGS+= -recursive CONFIG+=QwtDesigner \ +QMAKE_ARGS+= CONFIG+=QwtDesigner \ PLUGINDIR=${PREFIX}/${QT_PLUGINDIR_REL} -HAS_CONFIGURE= yes PORTSCOUT= limit:^5\. STRIP_FILES= ${QT_PLUGINDIR_REL}/designer/libqwt_designer_plugin.so @@ -25,11 +24,7 @@ CONFIGURE_WRKSRC= ${WRKSRC}/designer BUILD_WRKSRC= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} -NO_STAGE= yes -do-configure: - (cd ${CONFIGURE_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}) - post-install: - ${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,} + ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,} .include diff --git a/x11-toolkits/qwt5/Makefile b/x11-toolkits/qwt5/Makefile index 2a797d0b6202..f06ffbad5ace 100644 --- a/x11-toolkits/qwt5/Makefile +++ b/x11-toolkits/qwt5/Makefile @@ -9,11 +9,9 @@ PKGNAMESUFFIX= 5 MAINTAINER= makc@FreeBSD.org COMMENT= Qt Widgets for Technical Applications +USES= gmake qmake USE_QT4= gui svg moc_build qmake_build USE_BZIP2= yes -USE_GMAKE= yes -QMAKE_ARGS+= -recursive PREFIX=${PREFIX} -HAS_CONFIGURE= yes USE_LDCONFIG= yes PORTSCOUT= limit:^5\. @@ -25,19 +23,13 @@ STRIP_FILES= lib/libqwt.so.${PORTVERSION} OPTIONS_DEFINE= DOCS -NO_STAGE= yes -.include -.include <${FILESDIR}/Makefile.man> - -do-configure: - (cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}) +.include post-install: - ${MKDIR} ${PREFIX}/man/man3 - ${INSTALL_MAN} ${WRKSRC}/doc/man/man3/Qwt* ${PREFIX}/man/man3 - ${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,} + ${INSTALL_MAN} ${WRKSRC}/doc/man/man3/Qwt* ${STAGEDIR}${PREFIX}/man/man3 + ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,} .if ${PORT_OPTIONS:MDOCS} - (cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} \* ${DOCSDIR}) + (cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .endif -.include +.include diff --git a/x11-toolkits/qwt5/files/Makefile.man b/x11-toolkits/qwt5/files/Makefile.man deleted file mode 100644 index 3a5658873815..000000000000 --- a/x11-toolkits/qwt5/files/Makefile.man +++ /dev/null @@ -1,87 +0,0 @@ -MAN3= QwtAbstractScale.3 \ - QwtAbstractScaleDraw.3 \ - QwtAbstractSlider.3 \ - QwtAlphaColorMap.3 \ - QwtAnalogClock.3 \ - QwtArrayData.3 \ - QwtArrowButton.3 \ - QwtCPointerData.3 \ - QwtClipper.3 \ - QwtColorMap.3 \ - QwtCompass.3 \ - QwtCompassMagnetNeedle.3 \ - QwtCompassRose.3 \ - QwtCompassWindArrow.3 \ - QwtCounter.3 \ - QwtCurveFitter.3 \ - QwtData.3 \ - QwtDial.3 \ - QwtDialNeedle.3 \ - QwtDialScaleDraw.3 \ - QwtDialSimpleNeedle.3 \ - QwtDoubleInterval.3 \ - QwtDoubleRange.3 \ - QwtDynGridLayout.3 \ - QwtEventPattern.3 \ - QwtEventPattern_KeyPattern.3 \ - QwtEventPattern_MousePattern.3 \ - QwtIntervalData.3 \ - QwtKnob.3 \ - QwtLegend.3 \ - QwtLegendItem.3 \ - QwtLegendItemManager.3 \ - QwtLinearColorMap.3 \ - QwtLinearScaleEngine.3 \ - QwtLog10ScaleEngine.3 \ - QwtMagnifier.3 \ - QwtMathMLTextEngine.3 \ - QwtMetricsMap.3 \ - QwtPainter.3 \ - QwtPanner.3 \ - QwtPicker.3 \ - QwtPickerClickPointMachine.3 \ - QwtPickerClickRectMachine.3 \ - QwtPickerDragPointMachine.3 \ - QwtPickerDragRectMachine.3 \ - QwtPickerMachine.3 \ - QwtPickerPolygonMachine.3 \ - QwtPlainTextEngine.3 \ - QwtPlot.3 \ - QwtPlotCanvas.3 \ - QwtPlotCurve.3 \ - QwtPlotDict.3 \ - QwtPlotGrid.3 \ - QwtPlotItem.3 \ - QwtPlotLayout.3 \ - QwtPlotMagnifier.3 \ - QwtPlotMarker.3 \ - QwtPlotPanner.3 \ - QwtPlotPicker.3 \ - QwtPlotPrintFilter.3 \ - QwtPlotRasterItem.3 \ - QwtPlotRescaler.3 \ - QwtPlotScaleItem.3 \ - QwtPlotSpectrogram.3 \ - QwtPlotSvgItem.3 \ - QwtPlotZoomer.3 \ - QwtPolygonFData.3 \ - QwtRasterData.3 \ - QwtRichTextEngine.3 \ - QwtRoundScaleDraw.3 \ - QwtScaleArithmetic.3 \ - QwtScaleDiv.3 \ - QwtScaleDraw.3 \ - QwtScaleEngine.3 \ - QwtScaleMap.3 \ - QwtScaleTransformation.3 \ - QwtScaleWidget.3 \ - QwtSimpleCompassRose.3 \ - QwtSlider.3 \ - QwtSpline.3 \ - QwtSplineCurveFitter.3 \ - QwtSymbol.3 \ - QwtText.3 \ - QwtTextEngine.3 \ - QwtTextLabel.3 \ - QwtThermo.3 \ - QwtWheel.3 diff --git a/x11-toolkits/qwt5/pkg-plist b/x11-toolkits/qwt5/pkg-plist index 616be914d978..7e3db30e4268 100644 --- a/x11-toolkits/qwt5/pkg-plist +++ b/x11-toolkits/qwt5/pkg-plist @@ -72,4 +72,91 @@ lib/libqwt.so lib/libqwt.so.5 lib/libqwt.so.%%SHLIB_VER%% lib/libqwt.so.%%SHLIB_SHVER%% +man/man3/QwtAbstractScale.3.gz +man/man3/QwtAbstractScaleDraw.3.gz +man/man3/QwtAbstractSlider.3.gz +man/man3/QwtAlphaColorMap.3.gz +man/man3/QwtAnalogClock.3.gz +man/man3/QwtArrayData.3.gz +man/man3/QwtArrowButton.3.gz +man/man3/QwtCPointerData.3.gz +man/man3/QwtClipper.3.gz +man/man3/QwtColorMap.3.gz +man/man3/QwtCompass.3.gz +man/man3/QwtCompassMagnetNeedle.3.gz +man/man3/QwtCompassRose.3.gz +man/man3/QwtCompassWindArrow.3.gz +man/man3/QwtCounter.3.gz +man/man3/QwtCurveFitter.3.gz +man/man3/QwtData.3.gz +man/man3/QwtDial.3.gz +man/man3/QwtDialNeedle.3.gz +man/man3/QwtDialScaleDraw.3.gz +man/man3/QwtDialSimpleNeedle.3.gz +man/man3/QwtDoubleInterval.3.gz +man/man3/QwtDoubleRange.3.gz +man/man3/QwtDynGridLayout.3.gz +man/man3/QwtEventPattern.3.gz +man/man3/QwtEventPattern_KeyPattern.3.gz +man/man3/QwtEventPattern_MousePattern.3.gz +man/man3/QwtIntervalData.3.gz +man/man3/QwtKnob.3.gz +man/man3/QwtLegend.3.gz +man/man3/QwtLegendItem.3.gz +man/man3/QwtLegendItemManager.3.gz +man/man3/QwtLinearColorMap.3.gz +man/man3/QwtLinearScaleEngine.3.gz +man/man3/QwtLog10ScaleEngine.3.gz +man/man3/QwtMagnifier.3.gz +man/man3/QwtMathMLTextEngine.3.gz +man/man3/QwtMetricsMap.3.gz +man/man3/QwtPainter.3.gz +man/man3/QwtPanner.3.gz +man/man3/QwtPicker.3.gz +man/man3/QwtPickerClickPointMachine.3.gz +man/man3/QwtPickerClickRectMachine.3.gz +man/man3/QwtPickerDragPointMachine.3.gz +man/man3/QwtPickerDragRectMachine.3.gz +man/man3/QwtPickerMachine.3.gz +man/man3/QwtPickerPolygonMachine.3.gz +man/man3/QwtPlainTextEngine.3.gz +man/man3/QwtPlot.3.gz +man/man3/QwtPlotCanvas.3.gz +man/man3/QwtPlotCurve.3.gz +man/man3/QwtPlotDict.3.gz +man/man3/QwtPlotGrid.3.gz +man/man3/QwtPlotItem.3.gz +man/man3/QwtPlotLayout.3.gz +man/man3/QwtPlotMagnifier.3.gz +man/man3/QwtPlotMarker.3.gz +man/man3/QwtPlotPanner.3.gz +man/man3/QwtPlotPicker.3.gz +man/man3/QwtPlotPrintFilter.3.gz +man/man3/QwtPlotRasterItem.3.gz +man/man3/QwtPlotRescaler.3.gz +man/man3/QwtPlotScaleItem.3.gz +man/man3/QwtPlotSpectrogram.3.gz +man/man3/QwtPlotSvgItem.3.gz +man/man3/QwtPlotZoomer.3.gz +man/man3/QwtPolygonFData.3.gz +man/man3/QwtRasterData.3.gz +man/man3/QwtRichTextEngine.3.gz +man/man3/QwtRoundScaleDraw.3.gz +man/man3/QwtScaleArithmetic.3.gz +man/man3/QwtScaleDiv.3.gz +man/man3/QwtScaleDraw.3.gz +man/man3/QwtScaleEngine.3.gz +man/man3/QwtScaleMap.3.gz +man/man3/QwtScaleTransformation.3.gz +man/man3/QwtScaleWidget.3.gz +man/man3/QwtSimpleCompassRose.3.gz +man/man3/QwtSlider.3.gz +man/man3/QwtSpline.3.gz +man/man3/QwtSplineCurveFitter.3.gz +man/man3/QwtSymbol.3.gz +man/man3/QwtText.3.gz +man/man3/QwtTextEngine.3.gz +man/man3/QwtTextLabel.3.gz +man/man3/QwtThermo.3.gz +man/man3/QwtWheel.3.gz @dirrm include/qwt diff --git a/x11-toolkits/qwt6-designerplugin/Makefile b/x11-toolkits/qwt6-designerplugin/Makefile index 155ec476c68c..4eb11f8035f6 100644 --- a/x11-toolkits/qwt6-designerplugin/Makefile +++ b/x11-toolkits/qwt6-designerplugin/Makefile @@ -11,12 +11,11 @@ COMMENT= Qt Designer plugin for Qwt LIB_DEPENDS= libqwt6.so:${PORTSDIR}/x11-toolkits/qwt6 +USES= gmake qmake USE_QT4= designer moc_build qmake_build rcc_build USE_BZIP2= yes -USE_GMAKE= yes -QMAKE_ARGS+= -recursive CONFIG+=QwtDesigner \ +QMAKE_ARGS+= CONFIG+=QwtDesigner \ PLUGINDIR=${PREFIX}/${QT_PLUGINDIR_REL} -HAS_CONFIGURE= yes PLIST_FILES= ${QT_PLUGINDIR_REL}/designer/libqwt6_designer_plugin.so PLIST_DIRSTRY= ${QT_PLUGINDIR_REL}/designer \ @@ -28,11 +27,7 @@ CONFIGURE_WRKSRC= ${WRKSRC}/designer BUILD_WRKSRC= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} -NO_STAGE= yes -do-configure: - (cd ${CONFIGURE_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}) - post-install: - ${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,} + ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,} .include diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile index d7d4e0e6f284..8fbd10240f84 100644 --- a/x11-toolkits/qwt6/Makefile +++ b/x11-toolkits/qwt6/Makefile @@ -9,11 +9,9 @@ PKGNAMESUFFIX= 6 MAINTAINER= makc@FreeBSD.org COMMENT= Qt Widgets for Technical Applications +USES= gmake qmake USE_QT4= gui opengl svg xml moc_build qmake_build USE_BZIP2= yes -USE_GMAKE= yes -QMAKE_ARGS+= -recursive PREFIX=${PREFIX} -HAS_CONFIGURE= yes USE_LDCONFIG= yes DOCSDIR= ${PREFIX}/share/doc/qwt6 @@ -28,7 +26,6 @@ STRIP_FILES= lib/libqwt6.so.${PORTVERSION} \ OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include post-patch: @@ -37,13 +34,10 @@ post-patch: qwt.prf textengines/textengines.pri && \ ${REINPLACE_CMD} -e '/INSTALLS.*doc/d' doc/doc.pro -do-configure: - (cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}) - post-install: - ${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,} + ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,} .if ${PORT_OPTIONS:MDOCS} - (cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} \* ${DOCSDIR}) + (cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .endif .include -- cgit v1.2.3