[85345] trunk/dports/graphics/inkscape-devel
devans at macports.org
devans at macports.org
Wed Oct 12 16:15:53 PDT 2011
Revision: 85345
http://trac.macports.org/changeset/85345
Author: devans at macports.org
Date: 2011-10-12 16:15:52 -0700 (Wed, 12 Oct 2011)
Log Message:
-----------
inkscape-devel: update to recent bzr trunk, add variants +python26 +python27, add license.
Modified Paths:
--------------
trunk/dports/graphics/inkscape-devel/Portfile
Added Paths:
-----------
trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python26.diff
trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python27.diff
Removed Paths:
-------------
trunk/dports/graphics/inkscape-devel/files/patch-configure.ac.diff
Modified: trunk/dports/graphics/inkscape-devel/Portfile
===================================================================
--- trunk/dports/graphics/inkscape-devel/Portfile 2011-10-12 23:09:45 UTC (rev 85344)
+++ trunk/dports/graphics/inkscape-devel/Portfile 2011-10-12 23:15:52 UTC (rev 85345)
@@ -5,17 +5,17 @@
name inkscape-devel
conflicts inkscape
-set bzr_rev 9914
-version 0.48.0.${bzr_rev}
-revision 1
+set bzr_rev 10672
+version 0.48.99.${bzr_rev}
epoch 1
+license GPL-2 LGPL-2.1
maintainers devans
categories graphics gnome
platforms darwin
homepage http://www.inkscape.org/
description Unstable development version of Inkscape from \
- recent BZR leading up to release of version 0.49.
+ recent BZR trunk leading up to release of version 0.49.
long_description \
Inkscape is an open source SVG editor with \
@@ -47,23 +47,56 @@
port:boost \
port:ImageMagick \
port:libwpg \
- port:gtkspell2
+ port:gtkspell2
#
# external dependencies for included Python extensions
#
-depends_lib-append \
- port:py26-lxml \
- port:py26-numpy \
- port:py26-xml
-
pre-fetch {
ui_msg "---> Fetching source from bzr repository: this may take a while"
}
-patchfiles patch-configure.ac.diff
+variant python26 conflicts python27 description {Configure to use Python version 2.6} {
+ depends_lib-append \
+ port:py26-lxml \
+ port:py26-numpy \
+ port:py26-xml
+ patchfiles-append patch-configure.ac-python26.diff
+
+ post-patch {
+ reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python2.6\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
+ reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.h
+ reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.cpp
+ }
+
+ configure.python \
+ ${prefix}/bin/python2.6
+}
+
+variant python27 conflicts python26 description {Configure to use Python version 2.7} {
+ depends_lib-append \
+ port:py27-lxml \
+ port:py27-numpy \
+ port:py27-xml
+
+ patchfiles-append patch-configure.ac-python27.diff
+
+ post-patch {
+ reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python2.7\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
+ reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.h
+ reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.cpp
+ }
+
+ configure.python \
+ ${prefix}/bin/python2.7
+}
+
+if {${configure.compiler} == "clang"} {
+ configure.compiler llvm-gcc-4.2
+}
+
configure.cmd {./autogen.sh && ./configure}
configure.args --with-xft \
@@ -73,33 +106,13 @@
--enable-poppler-cairo \
--enable-dbusapi
-configure.python ${prefix}/bin/python2.6
-
configure.cppflags-append \
-I${worksrcpath}/src/extension/script
-default_variants disable_debugging
-
-variant disable_debugging conflicts enable_debugging description {Disable debugging. Strip executables to save disk space} {
- # this variant strips the executables saving @200MB of disk space
- # at the cost of not being able to get meaningful debugging information
- # in the event of an application crash
- post-destroot {
- system "strip ${destroot}${prefix}/bin/inkscape"
- system "strip ${destroot}${prefix}/bin/inkview"
- }
+if {![variant_isset python26] && ![variant_isset python27]} {
+ default_variants +python27
}
-variant enable_debugging conflicts disable_debugging description {Enable debugging. Executables not stripped} {
- # does nothing but offer a counter-point to disable_debugging
-}
-
-post-patch {
- reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python2.6\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
- reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.h
- reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.cpp
-}
-
post-activate {
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
}
Added: trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python26.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python26.diff (rev 0)
+++ trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python26.diff 2011-10-12 23:15:52 UTC (rev 85345)
@@ -0,0 +1,16 @@
+--- configure.ac.orig 2011-10-08 15:47:21.000000000 -0700
++++ configure.ac 2011-10-08 15:56:38.000000000 -0700
+@@ -451,11 +451,11 @@
+ [with_python=$withval], [with_python=skipped])
+
+ if test "x$with_python" = "xyes"; then
+- checkPYTHON_CFLAGS=`python -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
++ checkPYTHON_CFLAGS=`${prefix}/bin/python2.6 -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
+ if test "$?" -gt "0"; then
+ with_python="no"
+ else
+- checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
++ checkPYTHON_LIBS=-lpython2.6
+ if test "$?" -gt "0"; then
+ with_python="no"
+ else
Added: trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python27.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python27.diff (rev 0)
+++ trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python27.diff 2011-10-12 23:15:52 UTC (rev 85345)
@@ -0,0 +1,16 @@
+--- configure.ac.orig 2011-10-08 15:47:21.000000000 -0700
++++ configure.ac 2011-10-08 15:56:38.000000000 -0700
+@@ -451,11 +451,11 @@
+ [with_python=$withval], [with_python=skipped])
+
+ if test "x$with_python" = "xyes"; then
+- checkPYTHON_CFLAGS=`python -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
++ checkPYTHON_CFLAGS=`${prefix}/bin/python2.7 -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
+ if test "$?" -gt "0"; then
+ with_python="no"
+ else
+- checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
++ checkPYTHON_LIBS=-lpython2.7
+ if test "$?" -gt "0"; then
+ with_python="no"
+ else
Deleted: trunk/dports/graphics/inkscape-devel/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-configure.ac.diff 2011-10-12 23:09:45 UTC (rev 85344)
+++ trunk/dports/graphics/inkscape-devel/files/patch-configure.ac.diff 2011-10-12 23:15:52 UTC (rev 85345)
@@ -1,16 +0,0 @@
---- configure.ac.orig 2010-11-22 01:11:03.000000000 -0800
-+++ configure.ac 2010-11-22 01:25:07.000000000 -0800
-@@ -493,11 +493,11 @@
- [with_python=$withval], [with_python=skipped])
-
- if test "x$with_python" = "xyes"; then
-- checkPYTHON_CFLAGS=`python -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
-+ checkPYTHON_CFLAGS=`${prefix}/bin/python2.6 -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
- if test "$?" -gt "0"; then
- with_python="no"
- else
-- checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
-+ checkPYTHON_LIBS=-lpython2.6
- if test "$?" -gt "0"; then
- with_python="no"
- else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111012/f500396f/attachment-0001.html>
More information about the macports-changes
mailing list