From 626409e00088ae7977b4dae718a1936171d31571 Mon Sep 17 00:00:00 2001 From: jasper Date: Tue, 4 Nov 2008 22:48:17 +0000 Subject: [PATCH] - fix build with python 2.4 is also installed no bump required as nothing changes for system that only have 2.5, and if python 2.4 was present, it didn't build anyway. spotted by naddy@, thanks! --- net/telepathy/telepathy-mission-control/Makefile | 5 ++++- .../patches/patch-configure | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 net/telepathy/telepathy-mission-control/patches/patch-configure diff --git a/net/telepathy/telepathy-mission-control/Makefile b/net/telepathy/telepathy-mission-control/Makefile index 80d85f229bd..4e1e810f3e5 100644 --- a/net/telepathy/telepathy-mission-control/Makefile +++ b/net/telepathy/telepathy-mission-control/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2008/10/30 11:37:39 jasper Exp $ +# $OpenBSD: Makefile,v 1.8 2008/11/04 22:48:17 jasper Exp $ COMMENT= abstraction layer between apps and connection managers @@ -31,4 +31,7 @@ CONFIGURE_ARGS+= --enable-keyring=no CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +pre-configure: + ${SUBST_CMD} ${WRKSRC}/configure + .include diff --git a/net/telepathy/telepathy-mission-control/patches/patch-configure b/net/telepathy/telepathy-mission-control/patches/patch-configure new file mode 100644 index 00000000000..a2f141e6736 --- /dev/null +++ b/net/telepathy/telepathy-mission-control/patches/patch-configure @@ -0,0 +1,12 @@ +$OpenBSD: patch-configure,v 1.1 2008/11/04 22:48:17 jasper Exp $ +--- configure.orig Wed Jul 16 08:36:39 2008 ++++ configure Tue Nov 4 23:45:02 2008 +@@ -20238,7 +20238,7 @@ echo "$as_me: error: xsltproc (from the libxslt source + fi + + PYTHON= +-for ac_prog in python2.3 python2.4 python2.5 python ++for ac_prog in python${MODPY_VERSION} + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2