Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Apr 2018 18:14:40 +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: r468045 - in head/cad/openscad-devel: . files
Message-ID:  <201804221814.w3MIEexp016926@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mr
Date: Sun Apr 22 18:14:40 2018
New Revision: 468045
URL: https://svnweb.freebsd.org/changeset/ports/468045

Log:
  Add openscad-devel as of 2018.04.19
  
  PR:		227581

Added:
  head/cad/openscad-devel/
     - copied from r467385, head/cad/openscad/
  head/cad/openscad-devel/files/
  head/cad/openscad-devel/files/patch-openscad.pro   (contents, props changed)
  head/cad/openscad-devel/files/patch-src-ModuleCache.h   (contents, props changed)
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/Makefile	Sun Apr 15 12:26:55 2018	(r467385)
+++ head/cad/openscad-devel/Makefile	Sun Apr 22 18:14:40 2018	(r468045)
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	openscad
-PORTVERSION=	2015.03
-PORTREVISION=	16
+PORTVERSION=	2018.04.19
+#PORTREVISION=	1
 CATEGORIES=	cad
-MASTER_SITES=	http://files.openscad.org/
-DISTNAME=	openscad-${PORTVERSION}.src
+PKGNAMESUFFIX=  -devel
+DIST_SUBDIR=            ${PORTNAME}
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Programmer's solid 3D CAD modeller
@@ -21,11 +21,19 @@ LIB_DEPENDS=	libgmp.so:math/gmp \
 		libCGAL.so:math/cgal \
 		libqscintilla2_qt4.so:devel/qscintilla2 \
 		libharfbuzz.so:print/harfbuzz \
-		libopencsg.so:graphics/opencsg
+		libopencsg.so:graphics/opencsg \
+		libzip.so:archivers/libzip
 
+CONFLICTS=	openscad
+
+USE_GITHUB=     yes
+GH_ACCOUNT=     openscad
+GH_PROJECT=     openscad
+GH_TAGNAME=	179074dff8c23cbc0e651ce8463737df0006f4ca
+
 USES=		bison compiler:c++11-lang desktop-file-utils eigen:3 gettext-tools \
 		pkgconfig python:run qmake shebangfix
-SHEBANG_FILES=	libraries/MCAD/get_submodules.py
+#SHEBANG_FILES=	libraries/MCAD/get_submodules.py
 USE_GL=		glu glew
 USE_QT4=	corelib gui opengl moc_build uic_build rcc_build
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
@@ -33,10 +41,15 @@ QMAKE_ENV=	EIGENDIR=${LOCALBASE}/include/eigen3
 QMAKE_ARGS+=	VERSION=${PORTVERSION} \
 		QMAKE_LEX=${LOCALBASE}/bin/flex \
 		QMAKE_YAC=${LOCALBASE}/bin/bison
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,share/man,man,' \
 		${WRKSRC}/openscad.pro
+
+#.include <bsd.port.options.mk>
+#
+#.if ${ARCH} == i386 && ${OSVERSION} >= 1100000
+#USE_GCC=        yes
+#.endif
 
 .include <bsd.port.mk>

Modified: head/cad/openscad-devel/distinfo
==============================================================================
--- head/cad/openscad/distinfo	Sun Apr 15 12:26:55 2018	(r467385)
+++ head/cad/openscad-devel/distinfo	Sun Apr 22 18:14:40 2018	(r468045)
@@ -1,2 +1,3 @@
-SHA256 (openscad-2015.03.src.tar.gz) = 68ce08adc9e90c606ad948fe0f3405ce62b03b6bf34c45dd3dfc6b20c1846182
-SIZE (openscad-2015.03.src.tar.gz) = 12748351
+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

Added: head/cad/openscad-devel/files/patch-openscad.pro
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/cad/openscad-devel/files/patch-openscad.pro	Sun Apr 22 18:14:40 2018	(r468045)
@@ -0,0 +1,11 @@
+--- openscad.pro.orig	2018-04-22 17:21:31.278695000 +0000
++++ openscad.pro	2018-04-22 17:21:39.335408000 +0000
+@@ -106,4 +106,8 @@
+ QT += widgets concurrent
+ 
++freebsd* {
++   LIBS += -lcompat
++}
++
+ netbsd* {
+    QMAKE_LFLAGS += -L/usr/X11R7/lib

Added: head/cad/openscad-devel/files/patch-src-ModuleCache.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/cad/openscad-devel/files/patch-src-ModuleCache.h	Sun Apr 22 18:14:40 2018	(r468045)
@@ -0,0 +1,8 @@
+--- src/ModuleCache.h.orig	2018-04-22 17:10:59.553926000 +0000
++++ src/ModuleCache.h	2018-04-22 17:11:26.751065000 +0000
+@@ -2,4 +2,5 @@
+ 
+ #include <string>
++#include <time.h>
+ #include <unordered_map>
+ 

Modified: head/cad/openscad-devel/pkg-plist
==============================================================================
--- head/cad/openscad/pkg-plist	Sun Apr 15 12:26:55 2018	(r467385)
+++ head/cad/openscad-devel/pkg-plist	Sun Apr 22 18:14:40 2018	(r468045)
@@ -76,6 +76,10 @@ share/mime/packages/openscad.xml
 %%DATADIR%%/examples/Old/example022.scad
 %%DATADIR%%/examples/Old/example023.scad
 %%DATADIR%%/examples/Old/example024.scad
+%%DATADIR%%/examples/Parametric/candleStand.json
+%%DATADIR%%/examples/Parametric/candleStand.scad
+%%DATADIR%%/examples/Parametric/sign.json
+%%DATADIR%%/examples/Parametric/sign.scad
 %%DATADIR%%/examples/examples.json
 %%DATADIR%%/fonts/05-osx-fonts.conf
 %%DATADIR%%/fonts/10-liberation.conf
@@ -96,59 +100,11 @@ share/mime/packages/openscad.xml
 %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-BoldItalic.ttf
 %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Italic.ttf
 %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Regular.ttf
-%%DATADIR%%/libraries/MCAD/2Dshapes.scad
-%%DATADIR%%/libraries/MCAD/3d_triangle.scad
-%%DATADIR%%/libraries/MCAD/README.markdown
-%%DATADIR%%/libraries/MCAD/TODO
-%%DATADIR%%/libraries/MCAD/__init__.py
-%%DATADIR%%/libraries/MCAD/bearing.scad
-%%DATADIR%%/libraries/MCAD/bitmap/README
-%%DATADIR%%/libraries/MCAD/bitmap/alphabet_block.scad
-%%DATADIR%%/libraries/MCAD/bitmap/bitmap.scad
-%%DATADIR%%/libraries/MCAD/bitmap/height_map.scad
-%%DATADIR%%/libraries/MCAD/bitmap/letter_necklace.scad
-%%DATADIR%%/libraries/MCAD/bitmap/name_tag.scad
-%%DATADIR%%/libraries/MCAD/boxes.scad
-%%DATADIR%%/libraries/MCAD/constants.scad
-%%DATADIR%%/libraries/MCAD/curves.scad
-%%DATADIR%%/libraries/MCAD/fonts.scad
-%%DATADIR%%/libraries/MCAD/gears.scad
-%%DATADIR%%/libraries/MCAD/get_submodules.py
-%%DATADIR%%/libraries/MCAD/gridbeam.scad
-%%DATADIR%%/libraries/MCAD/hardware.scad
-%%DATADIR%%/libraries/MCAD/involute_gears.scad
-%%DATADIR%%/libraries/MCAD/layouts.scad
-%%DATADIR%%/libraries/MCAD/lego_compatibility.scad
-%%DATADIR%%/libraries/MCAD/lgpl-2.1.txt
-%%DATADIR%%/libraries/MCAD/libtriangles.scad
-%%DATADIR%%/libraries/MCAD/materials.scad
-%%DATADIR%%/libraries/MCAD/math.scad
-%%DATADIR%%/libraries/MCAD/metric_fastners.scad
-%%DATADIR%%/libraries/MCAD/motors.scad
-%%DATADIR%%/libraries/MCAD/multiply.scad
-%%DATADIR%%/libraries/MCAD/nuts_and_bolts.scad
-%%DATADIR%%/libraries/MCAD/openscad_testing.py
-%%DATADIR%%/libraries/MCAD/openscad_utils.py
-%%DATADIR%%/libraries/MCAD/polyholes.scad
-%%DATADIR%%/libraries/MCAD/regular_shapes.scad
-%%DATADIR%%/libraries/MCAD/screw.scad
-%%DATADIR%%/libraries/MCAD/servos.scad
-%%DATADIR%%/libraries/MCAD/shapes.scad
-%%DATADIR%%/libraries/MCAD/stepper.scad
-%%DATADIR%%/libraries/MCAD/teardrop.scad
-%%DATADIR%%/libraries/MCAD/test_docs.py
-%%DATADIR%%/libraries/MCAD/test_mcad.py
-%%DATADIR%%/libraries/MCAD/transformations.scad
-%%DATADIR%%/libraries/MCAD/triangles.scad
-%%DATADIR%%/libraries/MCAD/trochoids.scad
-%%DATADIR%%/libraries/MCAD/units.scad
-%%DATADIR%%/libraries/MCAD/unregular_shapes.scad
-%%DATADIR%%/libraries/MCAD/utilities.scad
 %%DATADIR%%/locale/cs/LC_MESSAGES/openscad.mo
 %%DATADIR%%/locale/de/LC_MESSAGES/openscad.mo
 %%DATADIR%%/locale/es/LC_MESSAGES/openscad.mo
 %%DATADIR%%/locale/fr/LC_MESSAGES/openscad.mo
+%%DATADIR%%/locale/pl/LC_MESSAGES/openscad.mo
 %%DATADIR%%/locale/ru/LC_MESSAGES/openscad.mo
 share/pixmaps/openscad.png
-@dir %%DATADIR%%/libraries/MCAD/SolidPython
-@dir %%DATADIR%%/libraries/MCAD/ThingDoc
+@dir %%DATADIR%%/libraries/MCAD



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