Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Oct 2018 16:26:52 +0000 (UTC)
From:      Michael Reifenberger <mr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r482975 - in head/cad/openscad-devel: . files
Message-ID:  <201810251626.w9PGQqgV005436@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mr
Date: Thu Oct 25 16:26:52 2018
New Revision: 482975
URL: https://svnweb.freebsd.org/changeset/ports/482975

Log:
  Update 2018.10.22:
  	Unbreak with Boost 1.69
  	Drop dependency on -lcompat
  	Replace time.h with ctime
  
  PR:	232516
  Submitted by:	Jan Beich jbeich@

Deleted:
  head/cad/openscad-devel/files/
Modified:
  head/cad/openscad-devel/Makefile
  head/cad/openscad-devel/distinfo
  head/cad/openscad-devel/pkg-plist

Modified: head/cad/openscad-devel/Makefile
==============================================================================
--- head/cad/openscad-devel/Makefile	Thu Oct 25 15:59:36 2018	(r482974)
+++ head/cad/openscad-devel/Makefile	Thu Oct 25 16:26:52 2018	(r482975)
@@ -2,48 +2,44 @@
 # $FreeBSD$
 
 PORTNAME=	openscad
-PORTVERSION=	2018.04.19
-PORTREVISION=	5
+PORTVERSION=	2018.10.22
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
-DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	mr@FreeBSD.org
-COMMENT=	Programmer's solid 3D CAD modeller
+COMMENT=	Programmer's solid 3D CAD modeller #'
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
-		${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs
-LIB_DEPENDS=	libgmp.so:math/gmp \
-		libmpfr.so:math/mpfr \
+LIB_DEPENDS=	libzip.so:archivers/libzip \
+		libhidapi.so:comms/hidapi \
+		libboost_regex.so:devel/boost-libs \
+		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
+		libopencsg.so:graphics/opencsg \
 		libCGAL.so:math/cgal \
-		libqscintilla2_qt4.so:devel/qscintilla2 \
+		libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
-		libopencsg.so:graphics/opencsg \
-		libzip.so:archivers/libzip
+		libfontconfig.so:x11-fonts/fontconfig
 
 CONFLICTS=	openscad
 
-USES=		bison compiler:c++11-lang desktop-file-utils eigen:3 gettext-tools \
-		pkgconfig python:run qmake qt:4 shebangfix
+USES=		bison compiler:c++11-lib desktop-file-utils eigen:3 gettext \
+		pkgconfig qmake qt:5 shared-mime-info
 USE_GITHUB=	yes
-GH_ACCOUNT=	openscad
-GH_PROJECT=	openscad
-GH_TAGNAME=	179074dff8c23cbc0e651ce8463737df0006f4ca
+USE_GL=		gl glu glew
+USE_GNOME=	glib20 libxml2
+USE_QT=		buildtools_build core concurrent_build dbus gui multimedia widgets
+USE_XORG=	x11
+GH_TAGNAME=	b8160eac0cca045e091fa65c3f7fbe68fdfada59
+QMAKE_ARGS=	CONFIG+="experimental" VERSION=${PORTVERSION}
+# Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
+LDFLAGS+=	-Wl,--as-needed
 
-#SHEBANG_FILES=	libraries/MCAD/get_submodules.py
-USE_GL=		glu glew
-USE_QT=		corelib gui opengl moc_build uic_build rcc_build
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
-QMAKE_ENV=	EIGENDIR=${LOCALBASE}/include/eigen3
-QMAKE_ARGS+=	VERSION=${PORTVERSION} \
-		CONFIG+="experimental" \
-		QMAKE_LEX=${LOCALBASE}/bin/flex \
-		QMAKE_YAC=${LOCALBASE}/bin/bison
-
 post-patch:
+	@${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf
 	@${REINPLACE_CMD} -e 's,share/man,man,' \
 		${WRKSRC}/openscad.pro
 

Modified: head/cad/openscad-devel/distinfo
==============================================================================
--- head/cad/openscad-devel/distinfo	Thu Oct 25 15:59:36 2018	(r482974)
+++ head/cad/openscad-devel/distinfo	Thu Oct 25 16:26:52 2018	(r482975)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524416781
-SHA256 (openscad/openscad-openscad-2018.04.19-179074dff8c23cbc0e651ce8463737df0006f4ca_GH0.tar.gz) = 6ca736909959d72eba21a1d421fc215742d26dad5b70dabe72b37e29e025088a
-SIZE (openscad/openscad-openscad-2018.04.19-179074dff8c23cbc0e651ce8463737df0006f4ca_GH0.tar.gz) = 13915669
+TIMESTAMP = 1540263111
+SHA256 (openscad-openscad-2018.10.22-b8160eac0cca045e091fa65c3f7fbe68fdfada59_GH0.tar.gz) = d5692d8c617aaac58c3c14167044b7ea6220735771167280c2d372ceb93615bb
+SIZE (openscad-openscad-2018.10.22-b8160eac0cca045e091fa65c3f7fbe68fdfada59_GH0.tar.gz) = 13924891

Modified: head/cad/openscad-devel/pkg-plist
==============================================================================
--- head/cad/openscad-devel/pkg-plist	Thu Oct 25 15:59:36 2018	(r482974)
+++ head/cad/openscad-devel/pkg-plist	Thu Oct 25 16:26:52 2018	(r482975)
@@ -1,7 +1,7 @@
 bin/openscad
 man/man1/openscad.1.gz
-share/appdata/openscad.appdata.xml
 share/applications/openscad.desktop
+share/metainfo/org.openscad.OpenSCAD.appdata.xml
 share/mime/packages/openscad.xml
 %%DATADIR%%/color-schemes/editor/dark-background.json
 %%DATADIR%%/color-schemes/editor/light-background.json
@@ -24,6 +24,7 @@ share/mime/packages/openscad.xml
 %%DATADIR%%/color-schemes/render/tomorrow.json
 %%DATADIR%%/examples/Advanced/GEB.scad
 %%DATADIR%%/examples/Advanced/animation.scad
+%%DATADIR%%/examples/Advanced/assert.scad
 %%DATADIR%%/examples/Advanced/children.scad
 %%DATADIR%%/examples/Advanced/children_indexed.scad
 %%DATADIR%%/examples/Advanced/module_recursion.scad
@@ -41,6 +42,7 @@ share/mime/packages/openscad.xml
 %%DATADIR%%/examples/Basics/rotate_extrude.scad
 %%DATADIR%%/examples/Basics/text_on_cube.scad
 %%DATADIR%%/examples/COPYING-CC0.txt
+%%DATADIR%%/examples/Functions/echo.scad
 %%DATADIR%%/examples/Functions/functions.scad
 %%DATADIR%%/examples/Functions/list_comprehensions.scad
 %%DATADIR%%/examples/Functions/polygon_areas.scad



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810251626.w9PGQqgV005436>