aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gellekum <tg@FreeBSD.org>1997-08-06 06:40:31 +0000
committerThomas Gellekum <tg@FreeBSD.org>1997-08-06 06:40:31 +0000
commit84dd2a8a1b2c0a7b75664e363085cb40906340cf (patch)
tree95a587ec99bc1a5f0f54018d07d73cb1f2380cca
parent2d6d2cfa58a0d25b4c190105e0d99c3938cfba6f (diff)
downloadports-84dd2a8a1b2c0a7b75664e363085cb40906340cf.tar.gz
ports-84dd2a8a1b2c0a7b75664e363085cb40906340cf.zip
Notes
-rw-r--r--lang/python+ipv6/Makefile12
-rw-r--r--lang/python+ipv6/files/Setup2
-rw-r--r--lang/python-devel/Makefile12
-rw-r--r--lang/python-devel/files/Setup2
-rw-r--r--lang/python/Makefile12
-rw-r--r--lang/python/files/Setup2
-rw-r--r--lang/python15/Makefile12
-rw-r--r--lang/python15/files/Setup2
-rw-r--r--lang/python20/Makefile12
-rw-r--r--lang/python20/files/Setup2
-rw-r--r--lang/python21/Makefile12
-rw-r--r--lang/python21/files/Setup2
-rw-r--r--lang/python22/Makefile12
-rw-r--r--lang/python22/files/Setup2
-rw-r--r--lang/python23/Makefile12
-rw-r--r--lang/python23/files/Setup2
-rw-r--r--lang/python24/Makefile12
-rw-r--r--lang/python24/files/Setup2
-rw-r--r--lang/python25/Makefile12
-rw-r--r--lang/python25/files/Setup2
-rw-r--r--lang/python26/Makefile12
-rw-r--r--lang/python26/files/Setup2
-rw-r--r--lang/python27/Makefile12
-rw-r--r--lang/python27/files/Setup2
-rw-r--r--lang/python30/Makefile12
-rw-r--r--lang/python30/files/Setup2
-rw-r--r--lang/python31/Makefile12
-rw-r--r--lang/python31/files/Setup2
-rw-r--r--lang/python32/Makefile12
-rw-r--r--lang/python32/files/Setup2
30 files changed, 105 insertions, 105 deletions
diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile
index 328328c89ddb..349211934c37 100644
--- a/lang/python+ipv6/Makefile
+++ b/lang/python+ipv6/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+ipv6/files/Setup b/lang/python+ipv6/files/Setup
index 31336ca6fccf..7a6b60916c47 100644
--- a/lang/python+ipv6/files/Setup
+++ b/lang/python+ipv6/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:
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index 328328c89ddb..349211934c37 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/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-devel/files/Setup b/lang/python-devel/files/Setup
index 31336ca6fccf..7a6b60916c47 100644
--- a/lang/python-devel/files/Setup
+++ b/lang/python-devel/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:
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:
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index 328328c89ddb..349211934c37 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/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/python15/files/Setup b/lang/python15/files/Setup
index 31336ca6fccf..7a6b60916c47 100644
--- a/lang/python15/files/Setup
+++ b/lang/python15/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:
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 328328c89ddb..349211934c37 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/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/python20/files/Setup b/lang/python20/files/Setup
index 31336ca6fccf..7a6b60916c47 100644
--- a/lang/python20/files/Setup
+++ b/lang/python20/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:
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 328328c89ddb..349211934c37 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/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/python21/files/Setup b/lang/python21/files/Setup
index 31336ca6fccf..7a6b60916c47 100644
--- a/lang/python21/files/Setup
+++ b/lang/python21/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:
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index 328328c89ddb..349211934c37 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/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/python22/files/Setup b/lang/python22/files/Setup
index 31336ca6fccf..7a6b60916c47 100644
--- a/lang/python22/files/Setup
+++ b/lang/python22/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:
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 328328c89ddb..349211934c37 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/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/python23/files/Setup b/lang/python23/files/Setup
index 31336ca6fccf..7a6b60916c47 100644
--- a/lang/python23/files/Setup
+++ b/lang/python23/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:
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 328328c89ddb..349211934c37 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/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/python24/files/Setup b/lang/python24/files/Setup
index 31336ca6fccf..7a6b60916c47 100644
--- a/lang/python24/files/Setup
+++ b/lang/python24/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:
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 328328c89ddb..349211934c37 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/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/python25/files/Setup b/lang/python25/files/Setup
index 31336ca6fccf..7a6b60916c47 100644
--- a/lang/python25/files/Setup
+++ b/lang/python25/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:
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 328328c89ddb..349211934c37 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/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/python26/files/Setup b/lang/python26/files/Setup
index 31336ca6fccf..7a6b60916c47 100644
--- a/lang/python26/files/Setup
+++ b/lang/python26/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:
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 328328c89ddb..349211934c37 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/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/python27/files/Setup b/lang/python27/files/Setup
index 31336ca6fccf..7a6b60916c47 100644
--- a/lang/python27/files/Setup
+++ b/lang/python27/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:
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 328328c89ddb..349211934c37 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/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/python30/files/Setup b/lang/python30/files/Setup
index 31336ca6fccf..7a6b60916c47 100644
--- a/lang/python30/files/Setup
+++ b/lang/python30/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:
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 328328c89ddb..349211934c37 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/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/python31/files/Setup b/lang/python31/files/Setup
index 31336ca6fccf..7a6b60916c47 100644
--- a/lang/python31/files/Setup
+++ b/lang/python31/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:
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 328328c89ddb..349211934c37 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/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/python32/files/Setup b/lang/python32/files/Setup
index 31336ca6fccf..7a6b60916c47 100644
--- a/lang/python32/files/Setup
+++ b/lang/python32/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: