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

devans at macports.org devans at macports.org
Mon Mar 25 07:30:58 PDT 2013


Revision: 104422
          https://trac.macports.org/changeset/104422
Author:   devans at macports.org
Date:     2013-03-25 07:30:58 -0700 (Mon, 25 Mar 2013)
Log Message:
-----------
inkscape-devel: update to bzr revision 12241
  * complete overhaul of autogen.sh, configure.ac
  * many bug fixes, general code cleanup
  * updated translations

Revision Links:
--------------
    https://trac.macports.org/changeset/12241

Modified Paths:
--------------
    trunk/dports/graphics/inkscape-devel/Portfile
    trunk/dports/graphics/inkscape-devel/files/patch-src-Makefile.am.diff

Removed Paths:
-------------
    trunk/dports/graphics/inkscape-devel/files/patch-autogen.sh.diff
    trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-automake-1.13.diff
    trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python26.diff
    trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python27.diff

Modified: trunk/dports/graphics/inkscape-devel/Portfile
===================================================================
--- trunk/dports/graphics/inkscape-devel/Portfile	2013-03-25 14:30:02 UTC (rev 104421)
+++ trunk/dports/graphics/inkscape-devel/Portfile	2013-03-25 14:30:58 UTC (rev 104422)
@@ -5,7 +5,7 @@
 
 name            inkscape-devel
 conflicts       inkscape
-set bzr_rev     12132
+set bzr_rev     12241
 version         0.48.99.${bzr_rev}
 epoch           1
 license         GPL-2 LGPL-2.1
@@ -26,6 +26,7 @@
                 grouping, and more.
 
 universal_variant no
+use_parallel_build no
 
 fetch.type      bzr
 bzr.url         lp:inkscape
@@ -34,6 +35,7 @@
 depends_build   port:pkgconfig \
                 port:autoconf \
                 port:automake \
+                port:libtool \
                 port:intltool \
                 path:bin/perl:perl5
 
@@ -47,6 +49,7 @@
                 port:boost \
                 port:ImageMagick \
                 port:libcdr \
+                port:libexif \
                 port:libvisio \
                 port:libwpg \
                 port:gtkspell2
@@ -55,17 +58,13 @@
     ui_msg "--->  Fetching source from bzr repository: this may take a while"
 }
 
-patchfiles      patch-autogen.sh.diff \
-                patch-configure.ac-automake-1.13.diff \
-                patch-src-Makefile.am.diff
+patchfiles       patch-src-Makefile.am.diff
 
 variant python26 conflicts python27 description {Configure to use Python version 2.6} {
     depends_lib-append \
         port:py26-lxml \
         port:py26-numpy
 
-    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
@@ -81,8 +80,6 @@
         port:py27-lxml \
         port:py27-numpy
 
-    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
@@ -95,13 +92,13 @@
 
 compiler.blacklist clang
 
-configure.cmd   {./autogen.sh && ./configure}
+configure.cmd   ./autogen.sh
 
 configure.args  --with-gnome-vfs \
-                --with-python \
                 --enable-lcms \
                 --enable-poppler-cairo \
-                --enable-dbusapi
+                --enable-dbusapi \
+                --disable-silent-rules
 
 configure.cppflags-append \
         -I${worksrcpath}/src/extension/script

Deleted: trunk/dports/graphics/inkscape-devel/files/patch-autogen.sh.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-autogen.sh.diff	2013-03-25 14:30:02 UTC (rev 104421)
+++ trunk/dports/graphics/inkscape-devel/files/patch-autogen.sh.diff	2013-03-25 14:30:58 UTC (rev 104422)
@@ -1,17 +0,0 @@
---- autogen.sh.orig	2012-12-29 13:41:38.000000000 -0800
-+++ autogen.sh	2012-12-29 14:08:33.000000000 -0800
-@@ -86,7 +86,13 @@
- 
- 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.11 --version) < /dev/null > /dev/null 2>&1; then
-+if (automake-1.13 --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOMAKE=automake-1.13
-+   ACLOCAL=aclocal-1.13
-+elif (automake-1.12 --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOMAKE=automake-1.12
-+   ACLOCAL=aclocal-1.12
-+elif (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

Deleted: trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-automake-1.13.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-automake-1.13.diff	2013-03-25 14:30:02 UTC (rev 104421)
+++ trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-automake-1.13.diff	2013-03-25 14:30:58 UTC (rev 104422)
@@ -1,17 +0,0 @@
---- configure.ac.orig	2012-12-30 01:18:47.000000000 -0800
-+++ configure.ac	2012-12-30 01:29:17.000000000 -0800
-@@ -21,12 +21,12 @@
-   export CC CXX
- ])
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- AC_LANG(C++)
- AC_ISC_POSIX
- AC_PROG_CXX
--AM_PROG_CC_STDC
-+AC_PROG_CC
- AM_PROG_AS
- AC_PROG_RANLIB
- AC_PROG_INTLTOOL(0.22)

Deleted: trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python26.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python26.diff	2013-03-25 14:30:02 UTC (rev 104421)
+++ trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python26.diff	2013-03-25 14:30:58 UTC (rev 104422)
@@ -1,16 +0,0 @@
---- configure.ac.orig	2012-12-29 13:17:57.000000000 -0800
-+++ configure.ac	2012-12-29 13:28:51.000000000 -0800
-@@ -473,11 +473,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

Deleted: trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python27.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python27.diff	2013-03-25 14:30:02 UTC (rev 104421)
+++ trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python27.diff	2013-03-25 14:30:58 UTC (rev 104422)
@@ -1,16 +0,0 @@
---- configure.ac.orig	2012-12-29 13:17:57.000000000 -0800
-+++ configure.ac	2012-12-29 13:28:51.000000000 -0800
-@@ -473,11 +473,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

Modified: trunk/dports/graphics/inkscape-devel/files/patch-src-Makefile.am.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-src-Makefile.am.diff	2013-03-25 14:30:02 UTC (rev 104421)
+++ trunk/dports/graphics/inkscape-devel/files/patch-src-Makefile.am.diff	2013-03-25 14:30:58 UTC (rev 104422)
@@ -1,6 +1,6 @@
---- src/Makefile.am.orig	2013-02-06 12:32:00.000000000 -0800
-+++ src/Makefile.am	2013-02-06 12:42:49.000000000 -0800
-@@ -225,7 +225,7 @@
+--- src/Makefile.am.orig	2013-03-24 11:20:42.000000000 -0700
++++ src/Makefile.am	2013-03-24 11:29:47.000000000 -0700
+@@ -221,7 +221,7 @@
  # someone updates the BZR working directory.
  inkscape-version.cpp: $(inkscape_version_deps)
  	VER_PREFIX="$(VERSION)";\
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130325/1ed55f1b/attachment.html>


More information about the macports-changes mailing list