diff options
author | drochner <drochner@pkgsrc.org> | 2011-05-06 09:32:49 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2011-05-06 09:32:49 +0000 |
commit | 3efe6841dbd1bb0452e87904d757f276d0a78205 (patch) | |
tree | fb075a1d66505cdbf8a8f77187c1ffb4e8f59c4e | |
parent | 613b1cae8e27fd846e4a3ea4a09c4bf0369576bc (diff) | |
download | pkgsrc-3efe6841dbd1bb0452e87904d757f276d0a78205.tar.gz |
make Python extensions work (adds Python dependency), add some
CHECK_INTERP_SKIPs to quell false warnings
bump PKGREV
-rw-r--r-- | graphics/inkscape/Makefile | 14 | ||||
-rw-r--r-- | graphics/inkscape/distinfo | 3 | ||||
-rw-r--r-- | graphics/inkscape/patches/patch-aq | 13 |
3 files changed, 27 insertions, 3 deletions
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index c168b173826..b9615a8375d 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.59 2011/04/22 13:43:48 obache Exp $ +# $NetBSD: Makefile,v 1.60 2011/05/06 09:32:49 drochner Exp $ DISTNAME= inkscape-0.48.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/} EXTRACT_SUFX= .tar.bz2 @@ -35,6 +35,15 @@ BUILDLINK_API_DEPENDS.poppler+= poppler>=0.5.9 UNLIMIT_RESOURCES= datasize +SUBST_CLASSES+= pypath +SUBST_STAGE.pypath= pre-configure +SUBST_FILES.pypath= src/extension/implementation/script.cpp +SUBST_VARS.pypath= PYTHONBIN +CHECK_INTERPRETER_SKIP+= share/inkscape/extensions/*.py + +# XXX I don't see where this is used +CHECK_INTERPRETER_SKIP+= share/inkscape/extensions/simplepath.rb + PKG_OPTIONS_VAR= PKG_OPTIONS.inkscape PKG_SUPPORTED_OPTIONS= gnome PKG_SUGGESTED_OPTIONS= gnome @@ -56,6 +65,7 @@ BUILDLINK_API_DEPENDS.poppler-includes+= poppler-includes>=0.12.2 .include "../../graphics/lcms/buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../lang/python/application.mk" .include "../../math/gsl/buildlink3.mk" .include "../../print/poppler-glib/buildlink3.mk" .include "../../print/poppler-includes/buildlink3.mk" diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo index 826dbb8188c..d8d615ba512 100644 --- a/graphics/inkscape/distinfo +++ b/graphics/inkscape/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.34 2011/02/05 07:57:15 adam Exp $ +$NetBSD: distinfo,v 1.35 2011/05/06 09:32:50 drochner Exp $ SHA1 (inkscape-0.48.1.tar.bz2) = 9727ed11cef31c2790bf2affbddf6a6ef352753f RMD160 (inkscape-0.48.1.tar.bz2) = 9e25e02258d1b1e4cce24474523e1b37e58aded6 @@ -17,3 +17,4 @@ SHA1 (patch-ak) = ec222b8d964b9b297d5284eef771411dd100f04e SHA1 (patch-al) = 1ab7727a232001e9962dd34f125b220cb0ea889c SHA1 (patch-am) = c2c018f272decf92fefe3838fc66cc0c8cf38dd8 SHA1 (patch-ap) = cd29bd178dc2c6c9456bc09d6663d6a25acc7da1 +SHA1 (patch-aq) = dd307f598741cd5f0ff35eb06dff7c685752a979 diff --git a/graphics/inkscape/patches/patch-aq b/graphics/inkscape/patches/patch-aq new file mode 100644 index 00000000000..0e1ea4d1a75 --- /dev/null +++ b/graphics/inkscape/patches/patch-aq @@ -0,0 +1,13 @@ +$NetBSD: patch-aq,v 1.1 2011/05/06 09:32:50 drochner Exp $ + +--- src/extension/implementation/script.cpp.orig 2010-07-13 03:48:40.000000000 +0000 ++++ src/extension/implementation/script.cpp +@@ -89,7 +89,7 @@ Script::interpreter_t const Script::inte + #ifdef WIN32 + {"python", "python-interpreter", "pythonw" }, + #else +- {"python", "python-interpreter", "python" }, ++ {"python", "python-interpreter", "@PYTHONBIN@" }, + #endif + {"ruby", "ruby-interpreter", "ruby" }, + {"shell", "shell-interpreter", "sh" }, |