diff options
| author | marino <marino@pkgsrc.org> | 2012-08-13 22:33:56 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-08-13 22:33:56 +0000 |
| commit | dfb4451bfd56a536e559ac252d08e4f021f96300 (patch) | |
| tree | f1ece73679dcc6e9ce322294ffb23a37e46788f7 /cad/openscad | |
| parent | 3c1e9e6446348a9975e45bd1071c48e62ed9536a (diff) | |
| download | pkgsrc-dfb4451bfd56a536e559ac252d08e4f021f96300.tar.gz | |
cad/openscad: Use wrappers for bison, USE_TOOLS-= flex
On DragonFly, the path for bison and lex were set to /usr/local/bin/bison
and /usr/local/bin/flex. These were basically hardcoded. The added
patches set the paths to "bison" and "flex" which pick up the
${WRKDIR}/.tools/bin/ and ${PREFIX}/bin versions instead.
flex was removed from USE_TOOLS because the pkgsrc FlexLexer.h can build
openscad and the one that comes with DragonFly can't. It was replaced
with the flex buildlink3 and it should work everywhere.
Diffstat (limited to 'cad/openscad')
| -rw-r--r-- | cad/openscad/Makefile | 8 | ||||
| -rw-r--r-- | cad/openscad/distinfo | 4 | ||||
| -rw-r--r-- | cad/openscad/patches/patch-bison.pri | 12 | ||||
| -rw-r--r-- | cad/openscad/patches/patch-flex.pri | 12 |
4 files changed, 32 insertions, 4 deletions
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile index b7c865e761c..8d886713792 100644 --- a/cad/openscad/Makefile +++ b/cad/openscad/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2012/07/02 13:37:36 adam Exp $ +# $NetBSD: Makefile,v 1.8 2012/08/13 22:33:56 marino Exp $ # PKGNAME= openscad-2011.12 DISTNAME= openscad-2011.12.src -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= cad MASTER_SITES= https://github.com/downloads/openscad/openscad/ @@ -19,7 +19,7 @@ PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR}/openscad-2011.12 USE_LANGUAGES= c c++ -USE_TOOLS+= cmake flex bison pkg-config +USE_TOOLS+= cmake bison pkg-config USE_LIBTOOL= yes SUBST_CLASSES+=prefix @@ -39,6 +39,8 @@ CHECK_INTERPRETER_SKIP+=share/openscad/libraries/MCAD/get_submodules.py pre-build: (cd ${WRKSRC} && ${QTDIR$}/bin/qmake) +# DragonFly requires FlexLexer.h from pkgsrc - base doesn't cut it. +.include "../../devel/flex/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" .include "../../devel/boost-headers/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" diff --git a/cad/openscad/distinfo b/cad/openscad/distinfo index 498f6a6c333..494bac71803 100644 --- a/cad/openscad/distinfo +++ b/cad/openscad/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.2 2012/02/28 10:57:19 reinoud Exp $ +$NetBSD: distinfo,v 1.3 2012/08/13 22:33:56 marino Exp $ SHA1 (openscad-2011.12.src.tar.gz) = b1379c3a0c5552e2bf00b7a0f2dbf9a55fbf4bd0 RMD160 (openscad-2011.12.src.tar.gz) = 0f7bf7452f04e0c929ea2a9acffab086e10ed053 Size (openscad-2011.12.src.tar.gz) = 3247723 bytes +SHA1 (patch-bison.pri) = 2a6e4fd58e5b75e1f9dbdcafb3a5d581e3d702b6 SHA1 (patch-eigen2.pri) = ac173f67fd187d7904aada40af44e9e4a5bb2a7b +SHA1 (patch-flex.pri) = 5d4228e1b4e5ce2584aa898816e25088445b1bdb SHA1 (patch-openscad.pro) = 72c9ab9eae1f124f88e741d9ad7c336b2e72eabb diff --git a/cad/openscad/patches/patch-bison.pri b/cad/openscad/patches/patch-bison.pri new file mode 100644 index 00000000000..1cf9da938cc --- /dev/null +++ b/cad/openscad/patches/patch-bison.pri @@ -0,0 +1,12 @@ +$NetBSD: patch-bison.pri,v 1.1 2012/08/13 22:33:56 marino Exp $ + +Force QMAKE_YACC to look at .tools/bin/bison + +--- bison.pri.orig 2011-12-17 17:00:38.000000000 +0000 ++++ bison.pri +@@ -27,3 +27,5 @@ unix:linux* { + QMAKE_YACC = /usr/bin/bison + } + } ++ ++QMAKE_YACC = bison diff --git a/cad/openscad/patches/patch-flex.pri b/cad/openscad/patches/patch-flex.pri new file mode 100644 index 00000000000..7a60bbeab94 --- /dev/null +++ b/cad/openscad/patches/patch-flex.pri @@ -0,0 +1,12 @@ +$NetBSD: patch-flex.pri,v 1.1 2012/08/13 22:33:56 marino Exp $ + +Force QMAKE_LEX to look at ${PREFIX}/bin/flex + +--- flex.pri.orig 2011-12-17 17:00:39.000000000 +0000 ++++ flex.pri +@@ -18,3 +18,5 @@ unix:linux* { + QMAKE_LEX = /usr/bin/flex + } + } ++ ++QMAKE_LEX = flex |