From cdcb74a6ca010526e328afd5b132436783261b68 Mon Sep 17 00:00:00 2001 From: Rong-En Fan Date: Wed, 2 Apr 2008 09:06:34 +0000 Subject: - Resolve conflict between qwt 4.x and 5.x by rename libqwt to libqwt4 - Pass maintainership for x11-toolkits/qwt4 - Rename x11-toolkits/qwt to x11-toolkits/qwt4, x11-toolkits/qwt-devel to x11-toolkits/qwt5 PR: ports/119904 Submitted by: Max Brazhnikov (maintainer of x11-toolkits/qwt5) --- x11-toolkits/qwt4/Makefile | 117 +++++++++------------------------- x11-toolkits/qwt4/files/Makefile.man | 66 +++++++++++++++++++ x11-toolkits/qwt4/files/patch-qwt.pro | 11 ++++ x11-toolkits/qwt4/pkg-descr | 11 ++-- x11-toolkits/qwt4/pkg-plist | 106 +++++++++++++++--------------- 5 files changed, 166 insertions(+), 145 deletions(-) create mode 100644 x11-toolkits/qwt4/files/Makefile.man create mode 100644 x11-toolkits/qwt4/files/patch-qwt.pro (limited to 'x11-toolkits/qwt4') diff --git a/x11-toolkits/qwt4/Makefile b/x11-toolkits/qwt4/Makefile index d2e913ce6b21..5431d532ebe9 100644 --- a/x11-toolkits/qwt4/Makefile +++ b/x11-toolkits/qwt4/Makefile @@ -7,105 +7,50 @@ PORTNAME= qwt PORTVERSION= 4.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=qwt -MAINTAINER= ports@FreeBSD.org -COMMENT= Qwt widget library for technical purposes +MAINTAINER= makc@issp.ac.ru +COMMENT= Qwt widget library for technical purposes (old version) BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake -CONFLICTS= qwt-devel-5.* - USE_QT_VER= 3 USE_BZIP2= yes -MAKE_ENV= CXXFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ - INCPATH="-I${X11BASE}/include/qt2" \ - LIBS="-L${X11BASE}/lib" \ - QTDIR="${X11BASE}" \ - MOC=${MOC} +HAS_CONFIGURE= yes +CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" +MAKE_ENV+= MOC="${MOC}" QTDIR="${QT_PREFIX}" USE_LDCONFIG= yes +QMAKESPEC= ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ +QMAKE= ${LOCALBASE}/bin/qmake + PORTSCOUT= limit:^4\. +LATEST_LINK= qwt4 -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 \ - QwtScaleIf.3 \ - QwtSlider.3 \ - QwtSliderBase.3 \ - QwtSpline.3 \ - QwtSymbol.3 \ - QwtText.3 \ - QwtThermo.3 \ - QwtWheel.3 \ - qwt_math.h.3 +.include +.include <${FILESDIR}/Makefile.man> -pre-build: - cd ${WRKSRC}; qmake -spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ qwt.pro -o Makefile +do-configure: + @(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} -unix) -do-install: - ${INSTALL_DATA} ${WRKSRC}/lib/libqwt.so.${PORTVERSION} ${PREFIX}/lib/libqwt.so.${PORTVERSION:R:R} - ${LN} -fs libqwt.so.${PORTVERSION:R:R} ${PREFIX}/lib/libqwt.so - ${MKDIR} ${PREFIX}/include/qwt - ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qwt - ${INSTALL_MAN} ${WRKSRC}/doc/man/man3/Qwt* ${PREFIX}/man/man3 - ${INSTALL_MAN} ${WRKSRC}/doc/man/man3/qwt_math.h.3 ${PREFIX}/man/man3 +post-configure: + @(cd ${WRKSRC} && \ + ${REINPLACE_CMD} -e \ + 's|^CC .*|CC=${CC}|; \ + s|^CXX .*|CXX=${CXX}|; \ + s|^LINK .*|LINK=${CXX}|' \ + ${WRKSRC}/Makefile) -.include +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/lib/libqwt4.so.${PORTVERSION} ${PREFIX}/lib/libqwt4.so.${PORTVERSION:R:R} + ${LN} -fs ${PREFIX}/lib/libqwt4.so.${PORTVERSION:R:R} ${PREFIX}/lib/libqwt4.so + ${MKDIR} ${PREFIX}/include/qwt4 + ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qwt4 +.for f in ${MAN3} + ${INSTALL_MAN} ${WRKSRC}/doc/man/man3/${f:S/Qwt4/Qwt/} ${PREFIX}/man/man3/${f} +.endfor + +.include diff --git a/x11-toolkits/qwt4/files/Makefile.man b/x11-toolkits/qwt4/files/Makefile.man new file mode 100644 index 000000000000..04d524e06f35 --- /dev/null +++ b/x11-toolkits/qwt4/files/Makefile.man @@ -0,0 +1,66 @@ +MAN3= Qwt4AnalogClock.3 \ + Qwt4ArrayData.3 \ + Qwt4ArrowButton.3 \ + Qwt4AutoScale.3 \ + Qwt4CPointerData.3 \ + Qwt4Compass.3 \ + Qwt4CompassMagnetNeedle.3 \ + Qwt4CompassWindArrow.3 \ + Qwt4Counter.3 \ + Qwt4Curve.3 \ + Qwt4Data.3 \ + Qwt4DblRange.3 \ + Qwt4DiMap.3 \ + Qwt4Dial.3 \ + Qwt4DialNeedle.3 \ + Qwt4DialScaleDraw.3 \ + Qwt4DialSimpleNeedle.3 \ + Qwt4DoublePoint.3 \ + Qwt4DoublePointData.3 \ + Qwt4DoubleRect.3 \ + Qwt4DoubleSize.3 \ + Qwt4DynGridLayout.3 \ + Qwt4EventPattern.3 \ + Qwt4Grid.3 \ + Qwt4Knob.3 \ + Qwt4Legend.3 \ + Qwt4LegendButton.3 \ + Qwt4LegendItem.3 \ + Qwt4LegendLabel.3 \ + Qwt4Marker.3 \ + Qwt4PaintBuffer.3 \ + Qwt4Painter.3 \ + Qwt4Picker.3 \ + Qwt4PickerClickPointMachine.3 \ + Qwt4PickerClickRectMachine.3 \ + Qwt4PickerDragPointMachine.3 \ + Qwt4PickerDragRectMachine.3 \ + Qwt4PickerMachine.3 \ + Qwt4PickerPolygonMachine.3 \ + Qwt4PlainText.3 \ + Qwt4Plot.3 \ + Qwt4PlotCanvas.3 \ + Qwt4PlotCurve.3 \ + Qwt4PlotGrid.3 \ + Qwt4PlotItem.3 \ + Qwt4PlotLayout.3 \ + Qwt4PlotMappedItem.3 \ + Qwt4PlotMarker.3 \ + Qwt4PlotPicker.3 \ + Qwt4PlotPrintFilter.3 \ + Qwt4PlotZoomer.3 \ + Qwt4PushButton.3 \ + Qwt4Rect.3 \ + Qwt4RichText.3 \ + Qwt4Scale.3 \ + Qwt4ScaleDiv.3 \ + Qwt4ScaleDraw.3 \ + Qwt4ScaleIf.3 \ + Qwt4Slider.3 \ + Qwt4SliderBase.3 \ + Qwt4Spline.3 \ + Qwt4Symbol.3 \ + Qwt4Text.3 \ + Qwt4Thermo.3 \ + Qwt4Wheel.3 \ + qwt_math.h.3 diff --git a/x11-toolkits/qwt4/files/patch-qwt.pro b/x11-toolkits/qwt4/files/patch-qwt.pro new file mode 100644 index 000000000000..94701ce6aecf --- /dev/null +++ b/x11-toolkits/qwt4/files/patch-qwt.pro @@ -0,0 +1,11 @@ +--- ./qwt.pro.orig 2004-11-16 23:12:15.000000000 +0300 ++++ ./qwt.pro 2008-01-03 16:18:06.000000000 +0300 +@@ -17,7 +17,7 @@ + # interested in QwtPlot only, you can remove + # the lists at the end of this file. + +-TARGET = qwt ++TARGET = qwt4 + TEMPLATE = lib + + # Restrict usage of VERSION to unix. When VERSION is used on win32, the TARGET diff --git a/x11-toolkits/qwt4/pkg-descr b/x11-toolkits/qwt4/pkg-descr index 1b06bc84898a..6757bdc6b428 100644 --- a/x11-toolkits/qwt4/pkg-descr +++ b/x11-toolkits/qwt4/pkg-descr @@ -1,7 +1,6 @@ -Qwt is an extension to the Qt GUI library from Troll Tech AS. The Qwt library -contains widgets and componets which are primarily useful for technical and -scientifical purposes. It includes a 2-D plotting widget, different kinds of -sliders and much more. +This is Qt3 port of Qwt library version 4. The Qwt library contains +widgets and componets which are primarily useful for technical and +scientifical purposes. It includes a 2-D plotting widget, different +kinds of sliders and much more. -- Bob Bomar - +WWW: http://qwt.sourceforge.net/ diff --git a/x11-toolkits/qwt4/pkg-plist b/x11-toolkits/qwt4/pkg-plist index 89de0f9ff256..74a84351e563 100644 --- a/x11-toolkits/qwt4/pkg-plist +++ b/x11-toolkits/qwt4/pkg-plist @@ -1,53 +1,53 @@ -include/qwt/qwt.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_symbol.h -include/qwt/qwt_text.h -include/qwt/qwt_thermo.h -include/qwt/qwt_wheel.h -lib/libqwt.so -lib/libqwt.so.4 -@dirrm include/qwt +include/qwt4/qwt.h +include/qwt4/qwt_analog_clock.h +include/qwt4/qwt_array.h +include/qwt4/qwt_arrbtn.h +include/qwt4/qwt_autoscl.h +include/qwt4/qwt_compass.h +include/qwt4/qwt_compass_rose.h +include/qwt4/qwt_counter.h +include/qwt4/qwt_curve.h +include/qwt4/qwt_data.h +include/qwt4/qwt_dial.h +include/qwt4/qwt_dial_needle.h +include/qwt4/qwt_dimap.h +include/qwt4/qwt_double_rect.h +include/qwt4/qwt_drange.h +include/qwt4/qwt_dyngrid_layout.h +include/qwt4/qwt_event_pattern.h +include/qwt4/qwt_global.h +include/qwt4/qwt_grid.h +include/qwt4/qwt_knob.h +include/qwt4/qwt_layout_metrics.h +include/qwt4/qwt_legend.h +include/qwt4/qwt_marker.h +include/qwt4/qwt_math.h +include/qwt4/qwt_paint_buffer.h +include/qwt4/qwt_painter.h +include/qwt4/qwt_picker.h +include/qwt4/qwt_picker_machine.h +include/qwt4/qwt_plot.h +include/qwt4/qwt_plot_canvas.h +include/qwt4/qwt_plot_classes.h +include/qwt4/qwt_plot_dict.h +include/qwt4/qwt_plot_item.h +include/qwt4/qwt_plot_layout.h +include/qwt4/qwt_plot_picker.h +include/qwt4/qwt_plot_printfilter.h +include/qwt4/qwt_plot_zoomer.h +include/qwt4/qwt_push_button.h +include/qwt4/qwt_rect.h +include/qwt4/qwt_scale.h +include/qwt4/qwt_scldiv.h +include/qwt4/qwt_scldraw.h +include/qwt4/qwt_sclif.h +include/qwt4/qwt_sldbase.h +include/qwt4/qwt_slider.h +include/qwt4/qwt_spline.h +include/qwt4/qwt_symbol.h +include/qwt4/qwt_text.h +include/qwt4/qwt_thermo.h +include/qwt4/qwt_wheel.h +lib/libqwt4.so +lib/libqwt4.so.4 +@dirrm include/qwt4 -- cgit v1.2.3