aboutsummaryrefslogtreecommitdiffstats
path: root/lang/python
diff options
context:
space:
mode:
authortg <tg@FreeBSD.org>1997-08-06 14:40:31 +0800
committertg <tg@FreeBSD.org>1997-08-06 14:40:31 +0800
commitbfe9497be923d5e534df6fc31e894124ba66eae9 (patch)
treea0ef748396f9fa1c986519667948c60033dd206d /lang/python
parent456653b34654386578ac39438096f5205a321835 (diff)
downloadfreebsd-ports-gnome-bfe9497be923d5e534df6fc31e894124ba66eae9.tar.gz
freebsd-ports-gnome-bfe9497be923d5e534df6fc31e894124ba66eae9.tar.zst
freebsd-ports-gnome-bfe9497be923d5e534df6fc31e894124ba66eae9.zip
Fix tk-4.1 dependency. While I'm here, add libreadline support.
Diffstat (limited to 'lang/python')
-rw-r--r--lang/python/Makefile12
-rw-r--r--lang/python/files/Setup2
2 files changed, 7 insertions, 7 deletions
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 328328c89ddb..349211934c37 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -3,7 +3,7 @@
# Date created: 08 August 1995
# Whom: jkh
#
-# $Id: Makefile,v 1.14 1997/05/14 07:35:11 tg Exp $
+# $Id: Makefile,v 1.15 1997/06/02 11:42:56 tg Exp $
#
DISTNAME= python1.4
@@ -19,21 +19,21 @@ MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= tk41\\.1\\.:${PORTSDIR}/x11/tk41
WRKSRC= ${WRKDIR}/Python-1.4
-HAS_CONFIGURE= yes
-
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-readline
MAKE_FLAGS+= 'OPT=${CFLAGS}'
INSTALL_TARGET= install
MAN1= python.1
#
# If you want to use Python's thread module, you need to set WITH_THREADS
-# to 'yes', and you must have the FreeBSD threading c library (libc_r)
-# installed. See 'man 3 pthread' for details on libc_r.
+# to 'yes', and you must have the FreeBSD threading c library (libc_r)
+# installed. See 'man 3 pthread' for details on libc_r.
#
WITH_THREADS= yes
SETUP_FILE= 'Setup'
.if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes
-CONFIGURE_ARGS= --with-thread
+CONFIGURE_ARGS+= --with-thread
SETUP_FILE= 'Setup.thread'
.endif
diff --git a/lang/python/files/Setup b/lang/python/files/Setup
index 31336ca6fccf..7a6b60916c47 100644
--- a/lang/python/files/Setup
+++ b/lang/python/files/Setup
@@ -250,7 +250,7 @@ TKPATH=:$(DESTLIB)/tkinter
#_tkinter _tkinter.c -I/usr/openwin/include -I/usr/local/include -L/usr/openwin/lib -L/usr/local/lib -ltk4.1 -ltcl7.5 -lX11
# For generic system (may have to add -I/-L options to find X11):
#_tkinter _tkinter.c -I/usr/local/include -L/usr/local/lib -ltk4.1 -ltcl7.5 -lX11
-_tkinter _tkinter.c -I/usr/local/include -I/usr/X11R6/include -L/usr/local/lib -L/usr/X11R6/lib -ltk41 -ltcl75 -lX11
+_tkinter _tkinter.c -I${PREFIX}/include/tk4.1 -I${X11BASE}/include -L${PREFIX}/lib -L${X11BASE}/lib -ltk41 -ltcl75 -lX11
# Lance Ellinghaus's modules: