Update to openscad 2013.01. Tied to the Boost update.

From Amit Kulkarni.

ok sthen@
This commit is contained in:
brad 2013-03-08 01:36:59 +00:00
parent ff79dc1bd7
commit f106026a29
4 changed files with 78 additions and 26 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2011/09/16 08:48:02 espie Exp $
# $OpenBSD: Makefile,v 1.4 2013/03/08 01:36:59 brad Exp $
COMMENT = the programmer's solid 3D CAD modeller
V = 2011.06
V = 2013.01
DISTNAME = openscad-${V}
REVISION = 0
CATEGORIES = cad
@ -18,11 +17,13 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = CGAL GL GLEW GLU boost_program_options-mt \
boost_thread-mt c gmp lib/qt4/QtGui lib/qt4/QtOpenGL m \
mpfr opencsg pthread stdc++
WANTLIB += c m pthread stdc++
WANTLIB += CGAL GL GLEW GLU ICE lib/qt4/QtGui lib/qt4/QtOpenGL
WANTLIB += SM X11 Xext Xi Xinerama Xrender boost_filesystem-mt
WANTLIB += boost_program_options-mt boost_regex-mt boost_system-mt
WANTLIB += boost_thread-mt fontconfig freetype gmp mpfr opencsg
MASTER_SITES = https://github.com/downloads/openscad/openscad/
MASTER_SITES = https://openscad.googlecode.com/files/
DISTFILES = openscad-${V}.src.tar.gz
MODULES = x11/qt4
@ -36,6 +37,8 @@ LIB_DEPENDS = devel/boost \
graphics/opencsg \
math/cgal
RUN_DEPENDS = devel/desktop-file-utils
QMAKE_ENV = EIGEN2DIR=${LOCALBASE}/include/eigen2
QMAKE_FLAGS = VERSION=${V}
MAKE_ENV = INSTALL_ROOT=${DESTDIR}

View File

@ -1,5 +1,2 @@
MD5 (openscad-2011.06.src.tar.gz) = uEAkPPGi910BEPlskmZZXA==
RMD160 (openscad-2011.06.src.tar.gz) = 1dS1JT81GS/GrQNmQfy/F/22zS0=
SHA1 (openscad-2011.06.src.tar.gz) = MPHXJmHvVTWdlbaxb9oAW7gXfks=
SHA256 (openscad-2011.06.src.tar.gz) = aTwMoDNjnFLD0tEfTVN5Y9w6O8DS46LmPaRg9omMMNs=
SIZE (openscad-2011.06.src.tar.gz) = 920506
SHA256 (openscad-2013.01.src.tar.gz) = LvB4tYjEL3uoc4UPQKRpXGpH84BdFWBxfdP5j+gIIAc=
SIZE (openscad-2013.01.src.tar.gz) = 3459766

View File

@ -1,11 +1,12 @@
$OpenBSD: patch-boost_pri,v 1.1.1.1 2011/04/29 18:55:37 matthew Exp $
--- boost.pri.orig Thu Apr 28 13:38:05 2011
+++ boost.pri Thu Apr 28 13:38:12 2011
@@ -13,6 +13,6 @@ boost {
win32 {
LIBS += -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1
} else {
- LIBS += -lboost_thread -lboost_program_options
+ LIBS += -lboost_thread-mt -lboost_program_options-mt
}
}
$OpenBSD: patch-boost_pri,v 1.2 2013/03/08 01:36:59 brad Exp $
--- boost.pri.orig Fri Jan 18 13:09:12 2013
+++ boost.pri Fri Jan 18 13:13:08 2013
@@ -61,7 +61,7 @@ boost {
isEmpty(BOOST_LINK_FLAGS) {
unix|macx {
- BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options -lboost_filesystem -lboost_system -lboost_regex
+ BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt
}
}

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2011/04/29 18:55:37 matthew Exp $
@comment $OpenBSD: PLIST,v 1.2 2013/03/08 01:36:59 brad Exp $
@bin bin/openscad
share/applications/openscad.desktop
share/openscad/
share/openscad/examples/
share/openscad/examples/example001.scad
@ -31,6 +32,56 @@ share/openscad/examples/example019.scad
share/openscad/examples/example020.scad
share/openscad/examples/example021.scad
share/openscad/examples/example022.scad
share/openscad/examples/example023.scad
share/openscad/libraries/
share/openscad/libraries/boxes.scad
share/openscad/libraries/shapes.scad
share/openscad/libraries/MCAD/
share/openscad/libraries/MCAD/3d_triangle.scad
share/openscad/libraries/MCAD/README.markdown
share/openscad/libraries/MCAD/TODO
share/openscad/libraries/MCAD/__init__.py
share/openscad/libraries/MCAD/bearing.scad
share/openscad/libraries/MCAD/bitmap/
share/openscad/libraries/MCAD/bitmap/README
share/openscad/libraries/MCAD/bitmap/alphabet_block.scad
share/openscad/libraries/MCAD/bitmap/bitmap.scad
share/openscad/libraries/MCAD/bitmap/height_map.scad
share/openscad/libraries/MCAD/bitmap/letter_necklace.scad
share/openscad/libraries/MCAD/bitmap/name_tag.scad
share/openscad/libraries/MCAD/boxes.scad
share/openscad/libraries/MCAD/constants.scad
share/openscad/libraries/MCAD/curves.scad
share/openscad/libraries/MCAD/fonts.scad
share/openscad/libraries/MCAD/gears.scad
share/openscad/libraries/MCAD/get_submodules.py
share/openscad/libraries/MCAD/gridbeam.scad
share/openscad/libraries/MCAD/hardware.scad
share/openscad/libraries/MCAD/involute_gears.scad
share/openscad/libraries/MCAD/lego_compatibility.scad
share/openscad/libraries/MCAD/lgpl-2.1.txt
share/openscad/libraries/MCAD/materials.scad
share/openscad/libraries/MCAD/math.scad
share/openscad/libraries/MCAD/metric_fastners.scad
share/openscad/libraries/MCAD/motors.scad
share/openscad/libraries/MCAD/multiply.scad
share/openscad/libraries/MCAD/nuts_and_bolts.scad
share/openscad/libraries/MCAD/openscad_testing.py
share/openscad/libraries/MCAD/openscad_utils.py
share/openscad/libraries/MCAD/polyholes.scad
share/openscad/libraries/MCAD/regular_shapes.scad
share/openscad/libraries/MCAD/screw.scad
share/openscad/libraries/MCAD/servos.scad
share/openscad/libraries/MCAD/shapes.scad
share/openscad/libraries/MCAD/stepper.scad
share/openscad/libraries/MCAD/teardrop.scad
share/openscad/libraries/MCAD/test_docs.py
share/openscad/libraries/MCAD/test_mcad.py
share/openscad/libraries/MCAD/transformations.scad
share/openscad/libraries/MCAD/triangles.scad
share/openscad/libraries/MCAD/trochoids.scad
share/openscad/libraries/MCAD/units.scad
share/openscad/libraries/MCAD/unregular_shapes.scad
share/openscad/libraries/MCAD/utilities.scad
share/pixmaps/
share/pixmaps/openscad.png
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database