cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix python flavor; ok espie@

Browse Source
This commit is contained in:
matt 2002-03-23 23:37:53 +00:00
parent 0e8db5ca7f
commit 0ae151590e
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editors/cooledit/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2002/02/15 19:53:43 matt Exp $
# $OpenBSD: Makefile,v 1.11 2002/03/23 23:37:53 matt Exp $
COMMENT= "easy to use, graphical editor"
@ -13,9 +13,13 @@ MAINTAINER= Marc Espie <espie@openbsd.org>
FLAVORS= python
FLAVOR?=
PYTHON_VER= 2.2
.if ${FLAVOR:L:Mpython}
BUILD_DEPENDS+= :python-2.1*:lang/python/2.1
RUN_DEPENDS+= :python-2.1*:lang/python/2.1
BUILD_DEPENDS+= :python-${PYTHON_VER}*:lang/python/${PYTHON_VER}
RUN_DEPENDS+= :python-${PYTHON_VER}*:lang/python/${PYTHON_VER}
CFLAGS+= -pthread
CONFIGURE_ENV+= PYTHON_VER=${PYTHON_VER}
.else
CONFIGURE_ENV+= NOPYTHON=Yes
.endif

22
editors/cooledit/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.1.1.1 2001/01/08 22:39:54 espie Exp $
--- configure.orig Tue Aug 29 15:00:53 2000
+++ configure Sun Dec 24 16:40:28 2000
$OpenBSD: patch-configure,v 1.2 2002/03/23 23:37:53 matt Exp $
--- configure.orig Mon Sep 4 11:51:32 2000
+++ configure Wed Feb 20 13:26:22 2002
@@ -1968,15 +1968,17 @@ cat >> confdefs.h <<EOF
EOF
@ -27,21 +27,27 @@ $OpenBSD: patch-configure,v 1.1.1.1 2001/01/08 22:39:54 espie Exp $
cat >> confdefs.h <<EOF
#define XTERM_CMD "${XTERM_CMD}"
EOF
@@ -2839,13 +2841,13 @@ CFLAGS="$CFLAGS $X_CFLAGS"
@@ -2839,15 +2841,15 @@ CFLAGS="$CFLAGS $X_CFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS"
-
PYLIB=python1.5
LIBPY=python1.5
-PYLIB=python1.5
-LIBPY=python1.5
+PYLIB=python${PYTHON_VER}
+LIBPY=python${PYTHON_VER}
have_python_config=no
have_python_include=no
-echo $ac_n "checking for python version 1.5""... $ac_c" 1>&6
-echo "configure:2851: checking for python version 1.5" >&5
+if [ -z "$NOPYTHON" ]; then
echo $ac_n "checking for python version 1.5""... $ac_c" 1>&6
echo "configure:2851: checking for python version 1.5" >&5
+echo $ac_n "checking for python version ${PYTHON_VER}""... $ac_c" 1>&6
+echo "configure:2851: checking for python version ${PYTHON_VER}" >&5
EPATH=`echo $PATH | sed -e 's+/bin:+ +g' -e 's+:+ +g'`
@@ -2867,6 +2869,7 @@ for i in / /opt /usr /usr/local /usr/ccs
done
done