Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Jul 2014 18:23:55 +0000 (UTC)
From:      Max Brazhnikov <makc@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r363089 - in head/cad/openscad: . files
Message-ID:  <201407271823.s6RINtDW056094@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: makc
Date: Sun Jul 27 18:23:54 2014
New Revision: 363089
URL: http://svnweb.freebsd.org/changeset/ports/363089
QAT: https://qat.redports.org/buildarchive/r363089/

Log:
  cad/openscad:
  - Update to 2014.03
  - Update MASTER_SITES
  - Switch dependency from math/eigen2 to math/eigen3
  - USES+= desktop-file-utils pkgconfig
  - Remove patch, pass required bits to qmake instead
  
  PR:		191788
  Approved by:	maintainer timeout (17 days)

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

Modified: head/cad/openscad/Makefile
==============================================================================
--- head/cad/openscad/Makefile	Sun Jul 27 18:14:31 2014	(r363088)
+++ head/cad/openscad/Makefile	Sun Jul 27 18:23:54 2014	(r363089)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	openscad
-PORTVERSION=	2013.01
+PORTVERSION=	2014.03
 CATEGORIES=	cad
-MASTER_SITES=	GOOGLE_CODE
+MASTER_SITES=	http://files.openscad.org/
 DISTNAME=	openscad-${PORTVERSION}.src
 
 MAINTAINER=	mr@FreeBSD.org
@@ -13,29 +13,25 @@ COMMENT=	The programmer's solid 3D CAD m
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
-		${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2 \
+		${LOCALBASE}/libdata/pkgconfig/eigen3.pc:${PORTSDIR}/math/eigen3 \
 		${LOCALBASE}/include/boost/tuple/tuple.hpp:${PORTSDIR}/devel/boost-libs
 LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
 		libmpfr.so:${PORTSDIR}/math/mpfr \
 		libCGAL.so:${PORTSDIR}/math/cgal \
 		libopencsg.so:${PORTSDIR}/graphics/opencsg
 
-USES=		bison qmake
+USES=		bison desktop-file-utils pkgconfig qmake
 USE_GL=		glu glew
 USE_QT4=	corelib gui opengl moc_build uic_build rcc_build
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
-QMAKE_ENV=	EIGEN2DIR=${LOCALBASE}/include/eigen2
-QMAKE_ARGS+=	VERSION=${PORTVERSION}
+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,XXXFLEXXX,"${LOCALBASE}/bin/flex",' \
+	${REINPLACE_CMD} -e 's,share/man,man,' \
 		${WRKSRC}/openscad.pro
-	${REINPLACE_CMD} -e 's,XXXBISONXXX,"${LOCALBASE}/bin/bison",' \
-		${WRKSRC}/openscad.pro
-	${REINPLACE_CMD} -e 's,$$$$PREFIX,${PREFIX},' \
-		${WRKSRC}/openscad.pro
-	${REINPLACE_CMD} -e 's#/usr/local/bin/flex#${LOCALBASE}/bin/flex#g' \
-		${WRKSRC}/flex.pri
 
 .include <bsd.port.mk>

Modified: head/cad/openscad/distinfo
==============================================================================
--- head/cad/openscad/distinfo	Sun Jul 27 18:14:31 2014	(r363088)
+++ head/cad/openscad/distinfo	Sun Jul 27 18:23:54 2014	(r363089)
@@ -1,2 +1,2 @@
-SHA256 (openscad-2013.01.src.tar.gz) = 2ef078b588c42f7ba873850f40a4695c6a47f3805d1560717dd3f98fe8082007
-SIZE (openscad-2013.01.src.tar.gz) = 3459766
+SHA256 (openscad-2014.03.src.tar.gz) = 865fdc637a3ceb0678d35e88995411d8e70e8a7937625d7ede147a1570a561c3
+SIZE (openscad-2014.03.src.tar.gz) = 4417283

Modified: head/cad/openscad/pkg-plist
==============================================================================
--- head/cad/openscad/pkg-plist	Sun Jul 27 18:14:31 2014	(r363088)
+++ head/cad/openscad/pkg-plist	Sun Jul 27 18:23:54 2014	(r363089)
@@ -1,6 +1,7 @@
 bin/openscad
+man/man1/openscad.1.gz
+share/appdata/openscad.appdata.xml
 share/applications/openscad.desktop
-share/pixmaps/openscad.png
 %%DATADIR%%/examples/example001.scad
 %%DATADIR%%/examples/example002.scad
 %%DATADIR%%/examples/example003.scad
@@ -31,53 +32,61 @@ share/pixmaps/openscad.png
 %%DATADIR%%/examples/example021.scad
 %%DATADIR%%/examples/example022.scad
 %%DATADIR%%/examples/example023.scad
-%%DATADIR%%/libraries/MCAD/openscad_testing.py
+%%DATADIR%%/examples/example024.scad
+%%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/gridbeam.scad
-%%DATADIR%%/libraries/MCAD/curves.scad
-%%DATADIR%%/libraries/MCAD/README.markdown
-%%DATADIR%%/libraries/MCAD/TODO
-%%DATADIR%%/libraries/MCAD/constants.scad
-%%DATADIR%%/libraries/MCAD/screw.scad
-%%DATADIR%%/libraries/MCAD/metric_fastners.scad
-%%DATADIR%%/libraries/MCAD/bitmap/bitmap.scad
-%%DATADIR%%/libraries/MCAD/bitmap/README
-%%DATADIR%%/libraries/MCAD/bitmap/height_map.scad
-%%DATADIR%%/libraries/MCAD/bitmap/name_tag.scad
-%%DATADIR%%/libraries/MCAD/bitmap/letter_necklace.scad
-%%DATADIR%%/libraries/MCAD/bitmap/alphabet_block.scad
-%%DATADIR%%/libraries/MCAD/involute_gears.scad
-%%DATADIR%%/libraries/MCAD/3d_triangle.scad
-%%DATADIR%%/libraries/MCAD/get_submodules.py
-%%DATADIR%%/libraries/MCAD/polyholes.scad
-%%DATADIR%%/libraries/MCAD/nuts_and_bolts.scad
-%%DATADIR%%/libraries/MCAD/utilities.scad
-%%DATADIR%%/libraries/MCAD/stepper.scad
 %%DATADIR%%/libraries/MCAD/triangles.scad
-%%DATADIR%%/libraries/MCAD/motors.scad
 %%DATADIR%%/libraries/MCAD/trochoids.scad
-%%DATADIR%%/libraries/MCAD/test_mcad.py
-%%DATADIR%%/libraries/MCAD/__init__.py
-%%DATADIR%%/libraries/MCAD/lgpl-2.1.txt
-%%DATADIR%%/libraries/MCAD/regular_shapes.scad
-%%DATADIR%%/libraries/MCAD/openscad_utils.py
-%%DATADIR%%/libraries/MCAD/shapes.scad
-%%DATADIR%%/libraries/MCAD/materials.scad
-%%DATADIR%%/libraries/MCAD/test_docs.py
-%%DATADIR%%/libraries/MCAD/gears.scad
 %%DATADIR%%/libraries/MCAD/units.scad
 %%DATADIR%%/libraries/MCAD/unregular_shapes.scad
+%%DATADIR%%/libraries/MCAD/utilities.scad
+share/pixmaps/openscad.png
+@dirrmtry share/appdata
+@dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%/libraries/MCAD/SolidPython
+@dirrm %%DATADIR%%/libraries/MCAD/ThingDoc
 @dirrm %%DATADIR%%/libraries/MCAD/bitmap
 @dirrm %%DATADIR%%/libraries/MCAD
 @dirrm %%DATADIR%%/libraries
-@dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%



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