3 files changed, 24 insertions, 16 deletions

diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index 8d816a896fde..a5b60433c208 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -1,29 +1,26 @@
-# New ports collection makefile for:	openscad
-# Date created:				17 August 2011
 # Whom:					Michael Reifenberger <mr@freebsd.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	openscad
-PORTVERSION=	2011.12
-PORTREVISION=	1
+PORTVERSION=	2013.01
 CATEGORIES=	cad
-MASTER_SITES=	https://cloud.github.com/downloads/openscad/openscad/
+MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	openscad-${PORTVERSION}.src
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	The programmer's solid 3D CAD modeller
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
-		flex:${PORTSDIR}/textproc/flex \
+		${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
 		${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2 \
 		${LOCALBASE}/include/boost/tuple/tuple.hpp:${PORTSDIR}/devel/boost-libs
 #RUN_DEPENDS=	${LOCALBASE}/include/boost/tuple/tuple.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	GLU.1:${PORTSDIR}/graphics/libGLU \
-		gmp.10:${PORTSDIR}/math/gmp \
-		mpfr.4:${PORTSDIR}/math/mpfr \
-		CGAL.5:${PORTSDIR}/math/cgal \
+LIB_DEPENDS=	GLU:${PORTSDIR}/graphics/libGLU \
+		gmp:${PORTSDIR}/math/gmp \
+		mpfr:${PORTSDIR}/math/mpfr \
+		CGAL:${PORTSDIR}/math/cgal \
 		opencsg:${PORTSDIR}/graphics/opencsg
 
 USE_GL=		glew
@@ -35,11 +32,15 @@ QMAKE_FLAGS =		VERSION=${PORTVERSION}
 MAKE_ENV =		INSTALL_ROOT=${DESTDIR}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-pre-configure:
+post-patch:
 	${REINPLACE_CMD} -e 's,XXXFLEXXX,"${LOCALBASE}/bin/flex",' \
 		${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
 
 do-configure:
 	cd ${WRKSRC} && \
diff --git a/cad/openscad/distinfo b/cad/openscad/distinfo
index d0c37e8032b7..e5f268cf9e14 100644
--- a/cad/openscad/distinfo
+++ b/cad/openscad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openscad-2011.12.src.tar.gz) = 507e12bb2a4bb556ee8fcdce9779860d89071e924678b2200d82fdb5fae7583d
-SIZE (openscad-2011.12.src.tar.gz) = 3247723
+SHA256 (openscad-2013.01.src.tar.gz) = 2ef078b588c42f7ba873850f40a4695c6a47f3805d1560717dd3f98fe8082007
+SIZE (openscad-2013.01.src.tar.gz) = 3459766
diff --git a/cad/openscad/pkg-plist b/cad/openscad/pkg-plist
index 16d65334eb02..3498d72524ed 100644
--- a/cad/openscad/pkg-plist
+++ b/cad/openscad/pkg-plist
@@ -1,4 +1,6 @@
 bin/openscad
+share/applications/openscad.desktop
+share/pixmaps/openscad.png
 %%DATADIR%%/examples/example001.scad
 %%DATADIR%%/examples/example002.scad
 %%DATADIR%%/examples/example003.scad
@@ -28,13 +30,17 @@ bin/openscad
 %%DATADIR%%/examples/example020.scad
 %%DATADIR%%/examples/example021.scad
 %%DATADIR%%/examples/example022.scad
+%%DATADIR%%/examples/example023.scad
 %%DATADIR%%/libraries/MCAD/openscad_testing.py
 %%DATADIR%%/libraries/MCAD/bearing.scad
 %%DATADIR%%/libraries/MCAD/boxes.scad
+%%DATADIR%%/libraries/MCAD/fonts.scad
 %%DATADIR%%/libraries/MCAD/hardware.scad
+%%DATADIR%%/libraries/MCAD/lego_compatibility.scad
+%%DATADIR%%/libraries/MCAD/math.scad
+%%DATADIR%%/libraries/MCAD/multiply.scad
 %%DATADIR%%/libraries/MCAD/servos.scad
 %%DATADIR%%/libraries/MCAD/teardrop.scad
-%%DATADIR%%/libraries/MCAD/math.scad
 %%DATADIR%%/libraries/MCAD/transformations.scad
 %%DATADIR%%/libraries/MCAD/gridbeam.scad
 %%DATADIR%%/libraries/MCAD/curves.scad
@@ -75,3 +81,4 @@ bin/openscad
 @dirrm %%DATADIR%%/libraries
 @dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%
+@dirrmtry share/applications