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

devans at macports.org devans at macports.org
Sun Dec 30 02:37:13 PST 2012 

Revision: 100863
          https://trac.macports.org/changeset/100863
Author:   devans at macports.org
Date:     2012-12-30 02:37:13 -0800 (Sun, 30 Dec 2012)
Log Message:
-----------
inkscape-devel: update to bzr rev 11998, patch to build with automake 1.13.

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

Modified Paths:
--------------
    trunk/dports/graphics/inkscape-devel/Portfile
    trunk/dports/graphics/inkscape-devel/files/patch-autogen.sh.diff
    trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python26.diff
    trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python27.diff
    trunk/dports/graphics/inkscape-devel/files/patch-src-Makefile.am.diff

Added Paths:
-----------
    trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-automake-1.13.diff

Modified: trunk/dports/graphics/inkscape-devel/Portfile
===================================================================
--- trunk/dports/graphics/inkscape-devel/Portfile	2012-12-30 10:18:05 UTC (rev 100862)
+++ trunk/dports/graphics/inkscape-devel/Portfile	2012-12-30 10:37:13 UTC (rev 100863)
@@ -5,7 +5,7 @@
 
 name            inkscape-devel
 conflicts       inkscape
-set bzr_rev     11963
+set bzr_rev     11998
 version         0.48.99.${bzr_rev}
 epoch           1
 license         GPL-2 LGPL-2.1
@@ -50,15 +50,12 @@
                 port:libwpg \
                 port:gtkspell2
 
-#
-# external dependencies for included Python extensions
-#
-
 pre-fetch {
     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
 
 variant python26 conflicts python27 description {Configure to use Python version 2.6} {

Modified: trunk/dports/graphics/inkscape-devel/files/patch-autogen.sh.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-autogen.sh.diff	2012-12-30 10:18:05 UTC (rev 100862)
+++ trunk/dports/graphics/inkscape-devel/files/patch-autogen.sh.diff	2012-12-30 10:37:13 UTC (rev 100863)
@@ -1,11 +1,14 @@
---- autogen.sh.orig	2012-09-15 02:31:08.000000000 -0700
-+++ autogen.sh	2012-09-15 02:32:37.000000000 -0700
-@@ -86,7 +86,10 @@
+--- 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.12 --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

Added: 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	                        (rev 0)
+++ trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-automake-1.13.diff	2012-12-30 10:37:13 UTC (rev 100863)
@@ -0,0 +1,17 @@
+--- 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)

Modified: trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python26.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python26.diff	2012-12-30 10:18:05 UTC (rev 100862)
+++ trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python26.diff	2012-12-30 10:37:13 UTC (rev 100863)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2012-09-15 02:57:23.000000000 -0700
-+++ configure.ac	2012-09-15 03:04:48.000000000 -0700
-@@ -472,11 +472,11 @@
+--- 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

Modified: trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python27.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python27.diff	2012-12-30 10:18:05 UTC (rev 100862)
+++ trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python27.diff	2012-12-30 10:37:13 UTC (rev 100863)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2012-09-15 02:57:23.000000000 -0700
-+++ configure.ac	2012-09-15 03:04:48.000000000 -0700
-@@ -472,11 +472,11 @@
+--- 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

Modified: trunk/dports/graphics/inkscape-devel/files/patch-src-Makefile.am.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-src-Makefile.am.diff	2012-12-30 10:18:05 UTC (rev 100862)
+++ trunk/dports/graphics/inkscape-devel/files/patch-src-Makefile.am.diff	2012-12-30 10:37:13 UTC (rev 100863)
@@ -1,6 +1,6 @@
---- src/Makefile.am.orig	2012-10-22 10:46:59.000000000 -0700
-+++ src/Makefile.am	2012-10-22 10:47:23.000000000 -0700
-@@ -237,7 +237,7 @@
+--- src/Makefile.am.orig	2012-12-29 13:17:57.000000000 -0800
++++ src/Makefile.am	2012-12-29 13:28:51.000000000 -0800
+@@ -223,7 +223,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/20121230/ec2d921a/attachment-0001.html>

More information about the macports-changes mailing list