On 2011-06-22, Pascal Stumpf <[email protected]> wrote:
> This works with 2.7. Tested on amd64.
I'd actually prefer to remove MODPY_VERSION, it will break
if we update, but it's more noticable that way so I think I'd
prefer this diff.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/scribus/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile 8 Jun 2011 17:37:37 -0000 1.37
+++ Makefile 22 Jun 2011 11:32:14 -0000
@@ -4,7 +4,7 @@ SHARED_ONLY= Yes
COMMENT= DTP program
DISTNAME= scribus-1.3.4
-REVISION = 14
+REVISION= 15
CATEGORIES= print
# These are actually internal modules, not generic shared libs
@@ -32,7 +32,6 @@ EXTRACT_SUFX= .tar.bz2
MODULES= x11/qt3 \
converters/libiconv \
lang/python
-MODPY_VERSION= 2.6
RUN_DEPENDS= misc/shared-mime-info \
devel/desktop-file-utils
Index: patches/patch-acinclude_m4
===================================================================
RCS file: /cvs/ports/print/scribus/patches/patch-acinclude_m4,v
retrieving revision 1.1
diff -u -p -r1.1 patch-acinclude_m4
--- patches/patch-acinclude_m4 12 Aug 2009 21:03:56 -0000 1.1
+++ patches/patch-acinclude_m4 22 Jun 2011 11:32:14 -0000
@@ -1,22 +1,24 @@
$OpenBSD: patch-acinclude_m4,v 1.1 2009/08/12 21:03:56 sthen Exp $
--- acinclude.m4.orig Sun May 27 22:05:55 2007
-+++ acinclude.m4 Mon Aug 10 21:22:51 2009
-@@ -4182,8 +4182,8 @@ fi
++++ acinclude.m4 Wed Jun 22 12:31:49 2011
+@@ -4182,8 +4182,9 @@ fi
AC_DEFUN([KDE_CHECK_PYTHON],
-[
- KDE_CHECK_PYTHON_INTERN("2.5",
++[KDE_CHECK_PYTHON_INTERN("2.7",
+[KDE_CHECK_PYTHON_INTERN("2.6",
+[KDE_CHECK_PYTHON_INTERN("2.5",
[KDE_CHECK_PYTHON_INTERN("2.4",
[KDE_CHECK_PYTHON_INTERN("2.3",
[KDE_CHECK_PYTHON_INTERN("2.2",
-@@ -4195,6 +4195,7 @@ AC_DEFUN([KDE_CHECK_PYTHON],
+@@ -4195,6 +4196,8 @@ AC_DEFUN([KDE_CHECK_PYTHON],
])
])
])
+ ])
++])
])
AC_DEFUN([KDE_CHECK_STL],
