svn commit: r486088 - in head: . math math/qwtplot3d math/qwtplot3d/files
Max Brazhnikov
makc at FreeBSD.org
Wed Nov 28 13:07:21 UTC 2018
Author: makc
Date: Wed Nov 28 13:07:18 2018
New Revision: 486088
URL: https://svnweb.freebsd.org/changeset/ports/486088
Log:
math/qwtplot3d:
- Readd math/qwtplot3d as Qt 5 reincarnation. math/qwtplot3d-qt4 can be merged
with this port, if anybody still cares for Qt 4.
- Take maintainership
Added:
head/math/qwtplot3d/
- copied from r323747, head/math/qwtplot3d/
head/math/qwtplot3d/files/patch-include_qwt3d__openglhelper.h (contents, props changed)
head/math/qwtplot3d/files/patch-src_qwt3d__lighting.cpp (contents, props changed)
Modified:
head/MOVED
head/math/Makefile
head/math/qwtplot3d/Makefile (contents, props changed)
head/math/qwtplot3d/distinfo (contents, props changed)
head/math/qwtplot3d/files/patch-qwtplot3d.pro (contents, props changed)
head/math/qwtplot3d/pkg-descr (contents, props changed)
head/math/qwtplot3d/pkg-plist (contents, props changed)
Modified: head/MOVED
==============================================================================
--- head/MOVED Wed Nov 28 12:46:46 2018 (r486087)
+++ head/MOVED Wed Nov 28 13:07:18 2018 (r486088)
@@ -4547,7 +4547,6 @@ math/fung-calc||2013-07-26|Has expired: Depends on Qt
math/koctave||2013-07-26|Has expired: Depends on Qt 3.x
math/kseg||2013-07-26|Has expired: Depends on Qt 3.x
math/pgcalc||2013-07-26|Has expired: Depends on Qt 3.x
-math/qwtplot3d||2013-07-26|Has expired: Depends on Qt 3.x
math/rkward||2013-07-26|Has expired: Depends on Qt 3.x
math/xgfe||2013-07-26|Has expired: Depends on Qt 3.x
misc/gwenview-i18n||2013-07-26|Has expired: Depends on Qt 3.x
Modified: head/math/Makefile
==============================================================================
--- head/math/Makefile Wed Nov 28 12:46:46 2018 (r486087)
+++ head/math/Makefile Wed Nov 28 13:07:18 2018 (r486088)
@@ -789,6 +789,7 @@
SUBDIR += qtiplot
SUBDIR += qtiplot-doc
SUBDIR += qtoctave
+ SUBDIR += qwtplot3d
SUBDIR += qwtplot3d-qt4
SUBDIR += randlib
SUBDIR += rapid
Modified: head/math/qwtplot3d/Makefile
==============================================================================
--- head/math/qwtplot3d/Makefile Fri Jul 26 19:14:50 2013 (r323747)
+++ head/math/qwtplot3d/Makefile Wed Nov 28 13:07:18 2018 (r486088)
@@ -1,48 +1,19 @@
-# ex:ts=8
-# Ports collection makefile for: qwtplot3d
-# Date created: Aug 30, 2004
-# Whom: ijliao
-#
# $FreeBSD$
-#
PORTNAME= qwtplot3d
PORTVERSION= 0.2.7
-PORTREVISION= 5
CATEGORIES= math
MASTER_SITES= SF
-EXTRACT_SUFX= .tgz
+PKGNAMESUFFIX= -qt5
-MAINTAINER= ports at FreeBSD.org
-COMMENT= A 3D plotting widget for scientific data and mathematical expressions
+MAINTAINER= makc at FreeBSD.org
+COMMENT= 3D plotting widgets for Qt
-BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
+USES= dos2unix gl qmake qt:5 tar:tgz
+USE_QT= core gui opengl widgets buildtools_build
+USE_GL= gl glu
+USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
-DEPRECATED= Depends on QT3; unmaintained
-EXPIRATION_DATE= 2013-07-01
-
-USE_QT_VER= 3
-USE_GL= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
-MAKE_ENV= QTDIR=${QT_PREFIX}
-USE_LDCONFIG= yes
-USE_DOS2UNIX= yes
-
-pre-build:
- cd ${WRKSRC}; qmake -spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ ${PORTNAME}.pro
- cd ${WRKSRC} && ${REINPLACE_CMD} -e \
- 's|^CC .*|CC=${CC}|; \
- s|^CXX .*|CXX=${CXX}|; \
- s|^LINK .*|LINK=${CXX}|' Makefile
-
-do-install:
- ${CP} ${WRKSRC}/include/* ${PREFIX}/include
- ${INSTALL_DATA} ${WRKSRC}/lib/libqwtplot3d.so.${PORTVERSION} ${PREFIX}/lib
- ${LN} -fs ${PREFIX}/lib/libqwtplot3d.so.${PORTVERSION} ${PREFIX}/lib/libqwtplot3d.so.0
- ${LN} -fs ${PREFIX}/lib/libqwtplot3d.so.${PORTVERSION} ${PREFIX}/lib/libqwtplot3d.so
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${EXAMPLESDIR}
- (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
-.endif
.include <bsd.port.mk>
Modified: head/math/qwtplot3d/distinfo
==============================================================================
--- head/math/qwtplot3d/distinfo Fri Jul 26 19:14:50 2013 (r323747)
+++ head/math/qwtplot3d/distinfo Wed Nov 28 13:07:18 2018 (r486088)
@@ -1,2 +1,3 @@
+TIMESTAMP = 1543181657
SHA256 (qwtplot3d-0.2.7.tgz) = 1208336b15e82e7a9d22cbc743e46f27e2fad716094a9c133138f259fa299a42
SIZE (qwtplot3d-0.2.7.tgz) = 183836
Added: head/math/qwtplot3d/files/patch-include_qwt3d__openglhelper.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/qwtplot3d/files/patch-include_qwt3d__openglhelper.h Wed Nov 28 13:07:18 2018 (r486088)
@@ -0,0 +1,10 @@
+--- include/qwt3d_openglhelper.h.orig 2018-11-26 20:04:53 UTC
++++ include/qwt3d_openglhelper.h
+@@ -6,6 +6,7 @@
+ #include <qgl.h>
+ #else
+ #include <QtOpenGL/qgl.h>
++#include <GL/glu.h>
+ #endif
+
+ namespace Qwt3D
Modified: head/math/qwtplot3d/files/patch-qwtplot3d.pro
==============================================================================
--- head/math/qwtplot3d/files/patch-qwtplot3d.pro Fri Jul 26 19:14:50 2013 (r323747)
+++ head/math/qwtplot3d/files/patch-qwtplot3d.pro Wed Nov 28 13:07:18 2018 (r486088)
@@ -1,15 +1,26 @@
---- ./qwtplot3d.pro.orig Tue Jun 26 18:33:59 2007
-+++ ./qwtplot3d.pro Tue Jun 26 18:34:38 2007
-@@ -3,7 +3,7 @@
+--- qwtplot3d.pro.orig 2018-11-26 20:18:41 UTC
++++ qwtplot3d.pro
+@@ -1,9 +1,9 @@
+ # pro file for building the makefile for qwtplot3d
+ #
- TARGET = qwtplot3d
+-TARGET = qwtplot3d
++TARGET = qwtplot3d-qt5
TEMPLATE = lib
-CONFIG += qt warn_on opengl thread zlib debug
+CONFIG += qt warn_on opengl thread zlib
MOC_DIR = tmp
OBJECTS_DIR = tmp
INCLUDEPATH = include
-@@ -21,7 +21,7 @@
+@@ -11,6 +11,7 @@ DEPENDPATH = include src
+ DESTDIR = lib
+ #DESTDIR = ../../../lib
+ QT += opengl
++unix:LIBS += -lGLU
+
+ win32:TEMPLATE = vclib
+ win32:CONFIG += dll exceptions
+@@ -21,7 +22,7 @@ win32:QMAKE_CXXFLAGS += $$QMAKE_CFLA
win32:CONFIG -= zlib
linux-g++:TMAKE_CXXFLAGS += -fno-exceptions
@@ -18,3 +29,28 @@
# Input
SOURCES += src/qwt3d_axis.cpp \
+@@ -81,8 +82,8 @@ HEADERS += include/qwt3d_surfaceplot.h \
+ include/qwt3d_multiplot.h
+
+ # gl2ps support
+-HEADERS+=3rdparty/gl2ps/gl2ps.h \
+- include/qwt3d_io_gl2ps.h
++# HEADERS+=3rdparty/gl2ps/gl2ps.h \
++HEADERS+= include/qwt3d_io_gl2ps.h
+
+ SOURCES+=src/qwt3d_io_gl2ps.cpp \
+ 3rdparty/gl2ps/gl2ps.c
+@@ -92,4 +93,11 @@ zlib {
+ DEFINES += GL2PS_HAVE_ZLIB
+ win32:LIBS += zlib.lib
+ unix:LIBS += -lz
+-}
+\ No newline at end of file
++}
++
++target.path = $$[QT_INSTALL_LIBS]
++
++headers.files = $$HEADERS
++headers.path = $$[QT_INSTALL_HEADERS]/qwtplot3d-qt5
++
++INSTALLS += target headers
Added: head/math/qwtplot3d/files/patch-src_qwt3d__lighting.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/qwtplot3d/files/patch-src_qwt3d__lighting.cpp Wed Nov 28 13:07:18 2018 (r486088)
@@ -0,0 +1,11 @@
+--- src/qwt3d_lighting.cpp.orig 2018-11-26 20:04:53 UTC
++++ src/qwt3d_lighting.cpp
+@@ -175,7 +175,7 @@ void Plot3D::applyLight(unsigned light)
+ glRotatef( lights_[light].rot.x-90, 1.0, 0.0, 0.0 );
+ glRotatef( lights_[light].rot.y , 0.0, 1.0, 0.0 );
+ glRotatef( lights_[light].rot.z , 0.0, 0.0, 1.0 );
+- GLfloat lightPos[4] = { lights_[light].shift.x, lights_[light].shift.y, lights_[light].shift.z, 1.0};
++ GLfloat lightPos[4] = { static_cast<GLfloat>(lights_[light].shift.x), static_cast<GLfloat>(lights_[light].shift.y), static_cast<GLfloat>(lights_[light].shift.z), 1.0};
+ GLenum le = lightEnum(light);
+ glLightfv(le, GL_POSITION, lightPos);
+ }
Modified: head/math/qwtplot3d/pkg-descr
==============================================================================
--- head/math/qwtplot3d/pkg-descr Fri Jul 26 19:14:50 2013 (r323747)
+++ head/math/qwtplot3d/pkg-descr Wed Nov 28 13:07:18 2018 (r486088)
@@ -1,24 +1,4 @@
-QwtPlot3D is not a program, but a feature-rich Qt/OpenGL-based C++ programming
-library. She provides essentially a bunch of 3D-widgets for programmers.
+QwtPlot3d is a feature-rich Qt/OpenGL-based C++ library. It provides
+Qt widgets for 3D plotting.
-Features
- * Parametric Surfaces
- * Lighting (experimental)
- * User defined visual objects
- * Scaling, rotating, shifting, zooming of data sets and mathematical
- functions
- * Interactive mouse and keyboard handling
- * Resolution changing on the fly
- * Reading from MESH and FEM data files
- * Data structures providing nodes and triangulation
- * Flat (2D) labeling
- * Wireframe, filled polygons, hidden line
- * Floor projections (Isolines, Data)
- * Free configurable (labeling, numbering; linear, log or user-defined
- transformations) and autoscalable axes
- * Free color model, and color legends
- * Flat/Gouraud shading
- * Pixmap output (all Qt supported formats)
- * Vector output (PostScript, EPS and PDF) via gl2ps
-
-WWW: http://qwtplot3d.sourceforge.net/
+WWW: http://qwtplot3d.sourceforge.net
Modified: head/math/qwtplot3d/pkg-plist
==============================================================================
--- head/math/qwtplot3d/pkg-plist Fri Jul 26 19:14:50 2013 (r323747)
+++ head/math/qwtplot3d/pkg-plist Wed Nov 28 13:07:18 2018 (r486088)
@@ -1,115 +1,32 @@
-include/qwt3d_autoptr.h
-include/qwt3d_autoscaler.h
-include/qwt3d_axis.h
-include/qwt3d_color.h
-include/qwt3d_colorlegend.h
-include/qwt3d_coordsys.h
-include/qwt3d_drawable.h
-include/qwt3d_enrichment.h
-include/qwt3d_enrichment_std.h
-include/qwt3d_function.h
-include/qwt3d_global.h
-include/qwt3d_graphplot.h
-include/qwt3d_gridmapping.h
-include/qwt3d_helper.h
-include/qwt3d_io.h
-include/qwt3d_io_gl2ps.h
-include/qwt3d_io_reader.h
-include/qwt3d_label.h
-include/qwt3d_mapping.h
-include/qwt3d_multiplot.h
-include/qwt3d_openglhelper.h
-include/qwt3d_parametricsurface.h
-include/qwt3d_plot.h
-include/qwt3d_portability.h
-include/qwt3d_scale.h
-include/qwt3d_surfaceplot.h
-include/qwt3d_types.h
-include/qwt3d_volumeplot.h
-lib/libqwtplot3d.so
-lib/libqwtplot3d.so.0
-lib/libqwtplot3d.so.0.2.7
-%%PORTDOCS%%%%EXAMPLESDIR%%/autoswitch/autoswitch.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/autoswitch/autoswitch.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/autoswitch/autoswitch.pro
-%%PORTDOCS%%%%EXAMPLESDIR%%/axes/axes.pro
-%%PORTDOCS%%%%EXAMPLESDIR%%/axes/src/axes.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/axes/src/axesmainwindow.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/axes/src/axesmainwindow.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/axes/src/axesmainwindowbase.ui
-%%PORTDOCS%%%%EXAMPLESDIR%%/axes/src/axesmainwindowbase4.ui
-%%PORTDOCS%%%%EXAMPLESDIR%%/axes/src/main.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/box.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/common.pro
-%%PORTDOCS%%%%EXAMPLESDIR%%/dsp.bat
-%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/enrichments.pro
-%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/enrichmentmainwindow.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/enrichmentmainwindow.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/enrichmentmainwindowbase.ui
-%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/enrichmentmainwindowbase4.ui
-%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/enrichments.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/enrichments.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/main.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/examples.pro
-%%PORTDOCS%%%%EXAMPLESDIR%%/examples.sln
-%%PORTDOCS%%%%EXAMPLESDIR%%/filecell.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/fileopen.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/filledmesh.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/floordata.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/floorempty.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/flooriso.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/floormesh.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/frame.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/grid.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/gridb.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/gridc.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/gridf.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/gridfr.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/gridl.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/gridr.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/hiddenline.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/icon.gif
-%%PORTDOCS%%%%EXAMPLESDIR%%/icon.ico
-%%PORTDOCS%%%%EXAMPLESDIR%%/icon.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/icon.rc
-%%PORTDOCS%%%%EXAMPLESDIR%%/images.qrc
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/mesh2.pro
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/colormapreader.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/colormapreader.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/designerworkaround.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/designerworkaround.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/femreader.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/functions.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/lightingdlg.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/lightingdlg.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/lightingdlgbase.ui
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/lightingdlgbase4.ui
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/lightingdlgbaseimpl.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/lightingdlgbaseimpl.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/main.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/mesh.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/mesh2mainwindow.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/mesh2mainwindow.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/mesh2mainwindowbase.ui
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/mesh2mainwindowbase4.ui
-%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/thesis.tex
-%%PORTDOCS%%%%EXAMPLESDIR%%/movie.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/nodata.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/none.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/normals.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/polygon.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/qwtplot.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/savecontent.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/scattered.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/simpleplot/simpleplot.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/simpleplot/simpleplot.pro
-%%PORTDOCS%%%%EXAMPLESDIR%%/wireframe.png
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/simpleplot
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/mesh2/src
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/mesh2
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/enrichments/src
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/enrichments
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/axes/src
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/axes
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/autoswitch
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_autoptr.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_autoscaler.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_axis.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_color.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_colorlegend.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_coordsys.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_drawable.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_enrichment.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_enrichment_std.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_function.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_global.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_graphplot.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_gridmapping.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_helper.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_io.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_io_gl2ps.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_io_reader.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_label.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_mapping.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_multiplot.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_openglhelper.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_parametricsurface.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_plot.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_portability.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_scale.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_surfaceplot.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_types.h
+%%QT_INCDIR%%/qwtplot3d-qt5/qwt3d_volumeplot.h
+%%QT_LIBDIR%%/libqwtplot3d-qt5.so
+%%QT_LIBDIR%%/libqwtplot3d-qt5.so.0
+%%QT_LIBDIR%%/libqwtplot3d-qt5.so.0.2
+%%QT_LIBDIR%%/libqwtplot3d-qt5.so.0.2.7
More information about the svn-ports-all
mailing list