Fixes a few minor Makefile issues I noticed while looking at this
again:
- Doesn't need cmake to build.
- Pass VERSION=${V} to qmake so that the embedded version strings
will be consistent rather than varying by build date.
- No need to run ${SUBST_CMD} on openscad.pro; there are no
substitutions to be made.
- Eliminate trailing white space.
ok?
Index: Makefile
===================================================================
RCS file: /home/mdempsky/anoncvs/cvs/ports/cad/openscad/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 29 Apr 2011 18:55:37 -0000 1.1.1.1
+++ Makefile 16 Aug 2011 16:21:49 -0000
@@ -2,7 +2,7 @@
COMMENT = the programmer's solid 3D CAD modeller
-V = 2011.04
+V = 2011.06
DISTNAME = openscad-${V}
CATEGORIES = cad
@@ -26,7 +26,6 @@ DISTFILES = openscad-${V}.src.tar.gz
MODULES = x11/qt4
BUILD_DEPENDS = devel/bison \
- devel/cmake \
devel/flex \
math/eigen2
LIB_DEPENDS = devel/boost \
@@ -35,16 +34,17 @@ LIB_DEPENDS = devel/boost \
graphics/glew \
graphics/opencsg \
math/cgal
-
-CONFIGURE_ENV = EIGEN2DIR=${LOCALBASE}/include/eigen2
+
+QMAKE_ENV = EIGEN2DIR=${LOCALBASE}/include/eigen2
+QMAKE_FLAGS = VERSION=${V}
MAKE_ENV = INSTALL_ROOT=${DESTDIR}
pre-configure:
- ${SUBST_CMD} ${WRKSRC}/openscad.pro
ln -sf ${LOCALBASE}/bin/gflex ${WRKDIR}/bin/flex
ln -sf ${LOCALBASE}/bin/bison ${WRKDIR}/bin/yacc
do-configure:
- cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} qmake4 openscad.pro
+ cd ${WRKSRC} && \
+ ${SETENV} ${QMAKE_ENV} qmake4 ${QMAKE_FLAGS} openscad.pro
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/mdempsky/anoncvs/cvs/ports/cad/openscad/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 29 Apr 2011 18:55:37 -0000 1.1.1.1
+++ distinfo 16 Aug 2011 16:21:59 -0000
@@ -1,5 +1,5 @@
-MD5 (openscad-2011.04.src.tar.gz) = 8fNqSmkCinD5F71nz45hyA==
-RMD160 (openscad-2011.04.src.tar.gz) = JGStMhXnSpVuek59AEghww481NI=
-SHA1 (openscad-2011.04.src.tar.gz) = AicvVzoRmbBLlizm93pWNio9hP0=
-SHA256 (openscad-2011.04.src.tar.gz) =
BmOK6MeK62wVsVQDs09yIpiUcz6vV9SpiLZQPfU1wDY=
-SIZE (openscad-2011.04.src.tar.gz) = 918915
+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
