[73903] trunk/dports/graphics/inkscape-devel

devans at macports.org devans at macports.org
Sun Nov 28 13:35:40 PST 2010


Revision: 73903
          http://trac.macports.org/changeset/73903
Author:   devans at macports.org
Date:     2010-11-28 13:35:36 -0800 (Sun, 28 Nov 2010)
Log Message:
-----------
inkscape-devel: update to version 0.48.0.9914 (bzr trunk 9914) using python26. Close to 0.48.1.

Modified Paths:
--------------
    trunk/dports/graphics/inkscape-devel/Portfile
    trunk/dports/graphics/inkscape-devel/files/patch-configure.ac.diff

Removed Paths:
-------------
    trunk/dports/graphics/inkscape-devel/files/patch-autogen.sh.diff

Modified: trunk/dports/graphics/inkscape-devel/Portfile
===================================================================
--- trunk/dports/graphics/inkscape-devel/Portfile	2010-11-28 19:56:26 UTC (rev 73902)
+++ trunk/dports/graphics/inkscape-devel/Portfile	2010-11-28 21:35:36 UTC (rev 73903)
@@ -5,9 +5,8 @@
 
 name            inkscape-devel
 conflicts       inkscape
-set svn_rev     22457
-version         0.46.${svn_rev}
-revision        2
+set bzr_rev     9914
+version         0.48.0.${bzr_rev}
 epoch           1
 maintainers     devans
 categories      graphics gnome
@@ -15,7 +14,7 @@
 homepage        http://www.inkscape.org/
 
 description     Unstable development version of Inkscape from \
-                recent SVN leading up to release of version 0.47.
+                recent BZR leading up to release of version 0.49.
 
 long_description \
                 Inkscape is an open source SVG editor with \
@@ -27,73 +26,81 @@
 
 universal_variant no
 
-fetch.type      svn
+fetch.type      bzr
+bzr.url         lp:inkscape
+bzr.revision    ${bzr_rev}
 
-svn.url         http://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk
-svn.revision    ${svn_rev}
-worksrcdir      trunk
-
 depends_build   port:pkgconfig \
                 port:autoconf \
                 port:automake \
-                port:intltool
+                port:intltool \
+                path:bin/perl:perl5
 
 depends_lib     port:boehmgc \
+                port:gsl \
+                port:gtkmm \
+                port:gnome-vfs \
+                port:dbus-glib \
+                port:lcms \
                 port:poppler \
-                port:lcms \
+                port:boost \
+                port:ImageMagick \
                 port:libwpg \
-                port:ImageMagick \
-                port:gtkmm \
-                port:aspell-dict-en \
-                port:gtkspell2 \
-                port:gsl \
-                port:boost
+                port:gtkspell2 
 
-depends_run     port:ghostscript
+#
+# external dependencies for included Python extensions
+#
 
-patchfiles      patch-autogen.sh.diff \
-                patch-configure.ac.diff
+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
+
 configure.cmd   {./autogen.sh && ./configure}
 
-configure.args  \
-        --mandir=${prefix}/share/man \
-        --with-xft \
-        --with-gnome-vfs \
-        --with-perl \
-        --with-python \
-        --enable-poppler-cairo \
-        --enable-lcms \
-        --enable-inkboard
+configure.args  --with-xft \
+                --with-gnome-vfs \
+                --with-python \
+                --enable-lcms \
+                --enable-poppler-cairo \
+                --enable-dbusapi
 
+configure.python ${prefix}/bin/python2.6
+
 configure.cppflags-append \
         -I${worksrcpath}/src/extension/script
 
-variant no_x11 {
-    configure.args-delete --with-xft
-    configure.args-append --without-xft
-}
+default_variants disable_debugging
 
-variant enable_debugging description {Enable debugging. Executables not stripped} {
+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 enable_debugging]} {
-
-# if +enable_debugging is not set (default) strip the executables
-# this saves @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"
-    }
+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.5\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
+        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
 }
 
-livecheck.type           none
+post-activate {
+        system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
+}
+
+livecheck.type  none

Deleted: trunk/dports/graphics/inkscape-devel/files/patch-autogen.sh.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-autogen.sh.diff	2010-11-28 19:56:26 UTC (rev 73902)
+++ trunk/dports/graphics/inkscape-devel/files/patch-autogen.sh.diff	2010-11-28 21:35:36 UTC (rev 73903)
@@ -1,14 +0,0 @@
---- autogen.sh.orig	2009-06-20 21:56:52.000000000 -0700
-+++ autogen.sh	2009-06-20 21:58:39.000000000 -0700
-@@ -86,7 +86,10 @@
- 
- echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
- # Prefer earlier versions just so that the earliest supported version gets test coverage by developers.
--if (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
-+if (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOMAKE=automake-1.11
-+   ACLOCAL=aclocal-1.11
-+elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
-    AUTOMAKE=automake-1.10
-    ACLOCAL=aclocal-1.10
- elif (automake --version) < /dev/null > /dev/null 2>&1; then

Modified: trunk/dports/graphics/inkscape-devel/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-configure.ac.diff	2010-11-28 19:56:26 UTC (rev 73902)
+++ trunk/dports/graphics/inkscape-devel/files/patch-configure.ac.diff	2010-11-28 21:35:36 UTC (rev 73903)
@@ -1,16 +1,16 @@
---- configure.ac.orig	2009-06-20 22:20:09.000000000 -0700
-+++ configure.ac	2009-06-20 22:21:41.000000000 -0700
-@@ -449,11 +449,11 @@
+--- 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.5 -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.5
++        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/20101128/3e2d157f/attachment.html>


More information about the macports-changes mailing list