1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-29 10:18:30 +00:00

Update to 6.1.0

This commit is contained in:
Max Brazhnikov 2013-07-14 15:27:05 +00:00
parent 3bc21e65a9
commit 69553f69c8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=322988
8 changed files with 61 additions and 39 deletions

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= qwt
PORTVERSION= 6.0.2
PORTVERSION= 6.1.0
CATEGORIES= x11-toolkits devel
MASTER_SITES= SF
PKGNAMESUFFIX= -designerplugin

View File

@ -1,2 +1,2 @@
SHA256 (qwt-6.0.2.tar.bz2) = 2e699ac426d96aa14c86e4b7199d6b849c7f65010927ac9cf58f16761ee3281f
SIZE (qwt-6.0.2.tar.bz2) = 2688469
SHA256 (qwt-6.1.0.tar.bz2) = a7e3d9f1db917d186a973c5f04a316bc9607c7c35794d7a16de323aba5e17402
SIZE (qwt-6.1.0.tar.bz2) = 3468850

View File

@ -1,7 +1,7 @@
--- ./designer/designer.pro.orig 2012-11-30 13:22:47.000000000 +0000
+++ ./designer/designer.pro 2012-12-13 12:55:56.229759237 +0000
@@ -19,7 +19,7 @@
CONFIG += warn_on
--- ./designer/designer.pro.orig 2013-05-30 15:18:27.753341000 +0000
+++ ./designer/designer.pro 2013-07-13 21:19:00.492115401 +0000
@@ -42,7 +42,7 @@
TEMPLATE = lib
- TARGET = qwt_designer_plugin
@ -9,16 +9,16 @@
DESTDIR = plugins/designer
@@ -35,7 +35,7 @@
LIBS += -L$${QWT_ROOT}/lib
}
@@ -95,7 +95,7 @@
LIBS += -L$${QWT_ROOT}/lib
}
- qwtAddLibrary(qwt)
+ qwtAddLibrary(qwt6)
- qwtAddLibrary(qwt)
+ qwtAddLibrary(qwt6)
contains(QWT_CONFIG, QwtDll) {
contains(QWT_CONFIG, QwtDll) {
@@ -63,7 +63,7 @@
@@ -124,7 +124,7 @@
RESOURCES += qwt_designer_plugin.qrc

View File

@ -1,14 +1,14 @@
# $FreeBSD$
PORTNAME= qwt
PORTVERSION= 6.0.2
PORTVERSION= 6.1.0
CATEGORIES= x11-toolkits
MASTER_SITES= SF
MAINTAINER= makc@FreeBSD.org
COMMENT= Qt Widgets for Technical Applications
USE_QT4= gui svg xml moc_build qmake_build
USE_QT4= gui opengl svg xml moc_build qmake_build
USE_BZIP2= yes
USE_GMAKE= yes
QMAKE_ARGS+= -recursive PREFIX=${PREFIX}
@ -35,7 +35,8 @@ OPTIONS_DEFINE= DOCS
post-patch:
cd ${WRKSRC} && \
${REINPLACE_CMD} -e 's,qwtAddLibrary(qwt),qwtAddLibrary(qwt6),g' \
qwt.prf textengines/textengines.pri
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})

View File

@ -1,2 +1,2 @@
SHA256 (qwt-6.0.2.tar.bz2) = 2e699ac426d96aa14c86e4b7199d6b849c7f65010927ac9cf58f16761ee3281f
SIZE (qwt-6.0.2.tar.bz2) = 2688469
SHA256 (qwt-6.1.0.tar.bz2) = a7e3d9f1db917d186a973c5f04a316bc9607c7c35794d7a16de323aba5e17402
SIZE (qwt-6.1.0.tar.bz2) = 3468850

View File

@ -1,5 +1,5 @@
--- ./qwtconfig.pri.orig 2011-08-01 14:33:53.000000000 +0000
+++ ./qwtconfig.pri 2011-08-19 09:57:08.979331152 +0000
--- ./qwtconfig.pri.orig 2013-05-30 15:18:27.767341000 +0000
+++ ./qwtconfig.pri 2013-07-13 21:02:00.112110333 +0000
@@ -19,7 +19,7 @@
QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
@ -18,16 +18,25 @@
QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
######################################################################
@@ -49,7 +49,7 @@
@@ -61,7 +61,7 @@
# with every Qt upgrade.
######################################################################
-QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features
+QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/share/qt4/mkspecs/features
# QWT_INSTALL_FEATURES = $${QT_INSTALL_PREFIX}/features
# QWT_INSTALL_FEATURES = $$[QT_INSTALL_PREFIX]/features
######################################################################
@@ -98,7 +98,7 @@
@@ -108,7 +108,7 @@
# to your qmake project file.
######################################################################
-#QWT_CONFIG += QwtMathML
+QWT_CONFIG += QwtMathML
######################################################################
# If you want to build the Qwt designer plugin,
@@ -116,7 +116,7 @@
# Otherwise you have to build it from the designer directory.
######################################################################
@ -35,4 +44,4 @@
+# QWT_CONFIG += QwtDesigner
######################################################################
# If you want to auto build the examples, enable the line below
# Compile all Qwt classes into the designer plugin instead

View File

@ -1,5 +1,5 @@
--- ./src/src.pro.orig 2012-11-30 13:22:47.000000000 +0000
+++ ./src/src.pro 2012-12-13 12:53:01.312756345 +0000
--- ./src/src.pro.orig 2013-05-30 15:18:27.693341000 +0000
+++ ./src/src.pro 2013-07-13 20:54:02.367114849 +0000
@@ -15,7 +15,7 @@
include( $${QWT_ROOT}/qwtfunctions.pri )
@ -9,12 +9,3 @@
DESTDIR = $${QWT_ROOT}/lib
@@ -221,7 +221,7 @@
unix:doc.files += $${QWT_ROOT}/doc/man
doc.path = $${QWT_INSTALL_DOCS}
-INSTALLS = target doc
+INSTALLS = target
CONFIG(lib_bundle) {

View File

@ -1,4 +1,5 @@
%%INCLUDEDIR%%/qwt.h
%%INCLUDEDIR%%/qwt_abstract_legend.h
%%INCLUDEDIR%%/qwt_abstract_scale.h
%%INCLUDEDIR%%/qwt_abstract_scale_draw.h
%%INCLUDEDIR%%/qwt_abstract_slider.h
@ -12,39 +13,49 @@
%%INCLUDEDIR%%/qwt_compat.h
%%INCLUDEDIR%%/qwt_counter.h
%%INCLUDEDIR%%/qwt_curve_fitter.h
%%INCLUDEDIR%%/qwt_date.h
%%INCLUDEDIR%%/qwt_date_scale_draw.h
%%INCLUDEDIR%%/qwt_date_scale_engine.h
%%INCLUDEDIR%%/qwt_dial.h
%%INCLUDEDIR%%/qwt_dial_needle.h
%%INCLUDEDIR%%/qwt_double_range.h
%%INCLUDEDIR%%/qwt_dyngrid_layout.h
%%INCLUDEDIR%%/qwt_event_pattern.h
%%INCLUDEDIR%%/qwt_global.h
%%INCLUDEDIR%%/qwt_graphic.h
%%INCLUDEDIR%%/qwt_interval.h
%%INCLUDEDIR%%/qwt_interval_symbol.h
%%INCLUDEDIR%%/qwt_knob.h
%%INCLUDEDIR%%/qwt_legend.h
%%INCLUDEDIR%%/qwt_legend_item.h
%%INCLUDEDIR%%/qwt_legend_itemmanager.h
%%INCLUDEDIR%%/qwt_legend_data.h
%%INCLUDEDIR%%/qwt_legend_label.h
%%INCLUDEDIR%%/qwt_magnifier.h
%%INCLUDEDIR%%/qwt_math.h
%%INCLUDEDIR%%/qwt_mathml_text_engine.h
%%INCLUDEDIR%%/qwt_matrix_raster_data.h
%%INCLUDEDIR%%/qwt_null_paintdevice.h
%%INCLUDEDIR%%/qwt_painter.h
%%INCLUDEDIR%%/qwt_painter_command.h
%%INCLUDEDIR%%/qwt_panner.h
%%INCLUDEDIR%%/qwt_picker.h
%%INCLUDEDIR%%/qwt_picker_machine.h
%%INCLUDEDIR%%/qwt_pixel_matrix.h
%%INCLUDEDIR%%/qwt_plot.h
%%INCLUDEDIR%%/qwt_plot_abstract_barchart.h
%%INCLUDEDIR%%/qwt_plot_barchart.h
%%INCLUDEDIR%%/qwt_plot_canvas.h
%%INCLUDEDIR%%/qwt_plot_curve.h
%%INCLUDEDIR%%/qwt_plot_dict.h
%%INCLUDEDIR%%/qwt_plot_directpainter.h
%%INCLUDEDIR%%/qwt_plot_glcanvas.h
%%INCLUDEDIR%%/qwt_plot_grid.h
%%INCLUDEDIR%%/qwt_plot_histogram.h
%%INCLUDEDIR%%/qwt_plot_intervalcurve.h
%%INCLUDEDIR%%/qwt_plot_item.h
%%INCLUDEDIR%%/qwt_plot_layout.h
%%INCLUDEDIR%%/qwt_plot_legenditem.h
%%INCLUDEDIR%%/qwt_plot_magnifier.h
%%INCLUDEDIR%%/qwt_plot_marker.h
%%INCLUDEDIR%%/qwt_plot_multi_barchart.h
%%INCLUDEDIR%%/qwt_plot_panner.h
%%INCLUDEDIR%%/qwt_plot_picker.h
%%INCLUDEDIR%%/qwt_plot_rasteritem.h
@ -52,14 +63,21 @@
%%INCLUDEDIR%%/qwt_plot_rescaler.h
%%INCLUDEDIR%%/qwt_plot_scaleitem.h
%%INCLUDEDIR%%/qwt_plot_seriesitem.h
%%INCLUDEDIR%%/qwt_plot_shapeitem.h
%%INCLUDEDIR%%/qwt_plot_spectrocurve.h
%%INCLUDEDIR%%/qwt_plot_spectrogram.h
%%INCLUDEDIR%%/qwt_plot_svgitem.h
%%INCLUDEDIR%%/qwt_plot_textlabel.h
%%INCLUDEDIR%%/qwt_plot_tradingcurve.h
%%INCLUDEDIR%%/qwt_plot_zoneitem.h
%%INCLUDEDIR%%/qwt_plot_zoomer.h
%%INCLUDEDIR%%/qwt_point_3d.h
%%INCLUDEDIR%%/qwt_point_data.h
%%INCLUDEDIR%%/qwt_point_mapper.h
%%INCLUDEDIR%%/qwt_point_polar.h
%%INCLUDEDIR%%/qwt_raster_data.h
%%INCLUDEDIR%%/qwt_round_scale_draw.h
%%INCLUDEDIR%%/qwt_samples.h
%%INCLUDEDIR%%/qwt_sampling_thread.h
%%INCLUDEDIR%%/qwt_scale_div.h
%%INCLUDEDIR%%/qwt_scale_draw.h
@ -67,6 +85,7 @@
%%INCLUDEDIR%%/qwt_scale_map.h
%%INCLUDEDIR%%/qwt_scale_widget.h
%%INCLUDEDIR%%/qwt_series_data.h
%%INCLUDEDIR%%/qwt_series_store.h
%%INCLUDEDIR%%/qwt_slider.h
%%INCLUDEDIR%%/qwt_spline.h
%%INCLUDEDIR%%/qwt_symbol.h
@ -75,7 +94,9 @@
%%INCLUDEDIR%%/qwt_text_engine.h
%%INCLUDEDIR%%/qwt_text_label.h
%%INCLUDEDIR%%/qwt_thermo.h
%%INCLUDEDIR%%/qwt_transform.h
%%INCLUDEDIR%%/qwt_wheel.h
%%INCLUDEDIR%%/qwt_widget_overlay.h
lib/libqwt6.so
lib/libqwt6.so.6
lib/libqwt6.so.%%SHLIB_VER%%