build with python 2.7; from Pascal Stumpf with tweak from me, ok rpointel@ landry@

This commit is contained in:
sthen 2011-06-22 13:50:43 +00:00
parent 8bad8255ca
commit b782db2e02
2 changed files with 8 additions and 7 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.37 2011/06/08 17:37:37 jasper Exp $
# $OpenBSD: Makefile,v 1.38 2011/06/22 13:50:43 sthen Exp $
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

View File

@ -1,22 +1,24 @@
$OpenBSD: patch-acinclude_m4,v 1.1 2009/08/12 21:03:56 sthen Exp $
$OpenBSD: patch-acinclude_m4,v 1.2 2011/06/22 13:50:43 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 14:43:58 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],