svn commit: r556480 - in head/graphics/qvge: . files

[Alexey Dokuchaev]

Author: danfe
Date: Sat Nov 28 08:03:20 2020
New Revision: 556480
URL: https://svnweb.freebsd.org/changeset/ports/556480

Log:
  - Update QVGE to version 0.6.1
  - Upstream now prefers GraphViz for layouts, but OGDF can still be
    optionally used instead if needed
  - GC patches and sed(1)-based fixups that had been merged upstream
  - Use official program spelling (QVGE) in the port description

Added:
  head/graphics/qvge/files/patch-config.pri   (contents, props changed)
Deleted:
  head/graphics/qvge/files/patch-app.pri
  head/graphics/qvge/files/patch-commonui_ogdf_COGDFLayout.cpp
Modified:
  head/graphics/qvge/Makefile
  head/graphics/qvge/distinfo
  head/graphics/qvge/pkg-descr

Modified: head/graphics/qvge/Makefile
==============================================================================
--- head/graphics/qvge/Makefile	Sat Nov 28 06:14:00 2020	(r556479)
+++ head/graphics/qvge/Makefile	Sat Nov 28 08:03:20 2020	(r556480)
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	qvge
-PORTVERSION=	0.5.5
+PORTVERSION=	0.6.1
+DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics
 
 MAINTAINER=	danfe at FreeBSD.org
@@ -11,29 +12,32 @@ COMMENT=	Qt Visual Graph Editor
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
-LIB_DEPENDS=	libOGDF.so:math/ogdf
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	ArsMasiuk
 
-USES=		compiler:c++11-lang qt:5 xorg
+USES=		compiler:c++11-lang desktop-file-utils gl qt:5 \
+		shared-mime-info xorg
+USE_GL=		gl
 USE_QT=		buildtools_build qmake_build core gui network opengl \
-		printsupport widgets x11extras xml
+		printsupport svg widgets x11extras xml
 USE_XORG=	x11
 
 MAKE_ARGS=	INSTALL_ROOT=${STAGEDIR}
 WRKSRC_SUBDIR=	src
 
-PLIST_FILES=	bin/qvgeapp
+PLIST_FILES=	bin/qvgeapp share/appdata/qvge.appdata.xml \
+		share/applications/qvge.desktop \
+		share/mime/packages/application-xgr.xml \
+		share/pixmaps/qvge.png
 PORTDOCS=	CHANGES README.md
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS OGDF
+OGDF_DESC=	Use OGDF instead of GraphViz engine
 
-post-patch:
-	@${RM} -r ${BUILD_WRKSRC}/3rdParty/ogdf
-	@${REINPLACE_CMD} -e '/CONFIG += c++/s,14,11,' ${WRKSRC}/config.pri
-	@${REINPLACE_CMD} -e '/^USE_OGDF{/,+4d' ${WRKSRC}/qvgeapp.pro
-	@${REINPLACE_CMD} -e '/#include/s,math\.h,cmath,' ${WRKSRC}/qvge/CUtils.cpp
+OGDF_LIB_DEPENDS=	libOGDF.so:math/ogdf
+OGDF_QMAKE_ON=	CONFIG+=USE_OGDF
+OGDF_QMAKE_OFF=	CONFIG+=USE_GVGRAPH
+OGDF_RUN_DEPENDS_OFF=	dot:graphics/graphviz
 
 do-configure:
 	cd ${CONFIGURE_WRKSRC} && ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS}

Modified: head/graphics/qvge/distinfo
==============================================================================
--- head/graphics/qvge/distinfo	Sat Nov 28 06:14:00 2020	(r556479)
+++ head/graphics/qvge/distinfo	Sat Nov 28 08:03:20 2020	(r556480)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1592825045
-SHA256 (ArsMasiuk-qvge-0.5.5_GH0.tar.gz) = f4a8155f03653bde37c8c83c1ff1b7325b1dec7e1d4b2589cb38558211bf1f5a
-SIZE (ArsMasiuk-qvge-0.5.5_GH0.tar.gz) = 4225872
+TIMESTAMP = 1604900327
+SHA256 (ArsMasiuk-qvge-v0.6.1_GH0.tar.gz) = cc782e8fc609d2035d84099cf3545765731208f5ad55c466ce5fbe1afb8510fb
+SIZE (ArsMasiuk-qvge-v0.6.1_GH0.tar.gz) = 448727

Added: head/graphics/qvge/files/patch-config.pri
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/qvge/files/patch-config.pri	Sat Nov 28 08:03:20 2020	(r556480)
@@ -0,0 +1,31 @@
+--- config.pri.orig	2020-11-09 05:38:47 UTC
++++ config.pri
+@@ -6,7 +6,7 @@
+ # It can be used freely, maintaining the information above.
+ 
+ #CONFIG += USE_OGDF
+-CONFIG += USE_GVGRAPH
++#CONFIG += USE_GVGRAPH
+ #CONFIG += USE_BOOST
+ 
+ 
+@@ -15,8 +15,8 @@ USE_OGDF{
+     DEFINES += USE_OGDF
+ 
+     # system-specific OGDF setup
+-    OGDF_LIB_NAME = ogdf
+-    OGDF_LIB_PATH =
++    OGDF_LIB_NAME = OGDF
++    OGDF_LIB_PATH = /usr/local/lib # must not be empty
+     OGDF_INCLUDE_PATH = /usr/share/ogdf/include
+ }
+ 
+@@ -49,7 +49,7 @@ gcc{
+ 
+ # common config
+ QT += core gui widgets xml opengl network printsupport svg
+-CONFIG += c++14
++CONFIG += c++11
+ 
+ 
+ # output

Modified: head/graphics/qvge/pkg-descr
==============================================================================
--- head/graphics/qvge/pkg-descr	Sat Nov 28 06:14:00 2020	(r556479)
+++ head/graphics/qvge/pkg-descr	Sat Nov 28 08:03:20 2020	(r556480)
@@ -1,4 +1,4 @@
-qvge is a multi-platform graph editor written in C++/Qt.  Its main goal
+QVGE is a multi-platform graph editor written in C++/Qt.  Its main goal
 is to make possible visually edit two-dimensional graphs in a simple and
 intuitive way.