aboutsummaryrefslogtreecommitdiffstats
path: root/lang/python
diff options
context:
space:
mode:
authortg <tg@FreeBSD.org>1997-08-29 15:04:27 +0800
committertg <tg@FreeBSD.org>1997-08-29 15:04:27 +0800
commitc67fab318e1a7b71057771fb7b62fb736178f77b (patch)
treef364a6c2f37a465fbff1c0972d1320ad5a4771ba /lang/python
parent14d531aad3c27dfc717b7e8bffb32e201b0e8b33 (diff)
downloadfreebsd-ports-gnome-c67fab318e1a7b71057771fb7b62fb736178f77b.tar.gz
freebsd-ports-gnome-c67fab318e1a7b71057771fb7b62fb736178f77b.tar.zst
freebsd-ports-gnome-c67fab318e1a7b71057771fb7b62fb736178f77b.zip
Use tk-8.0. Minor makefile cleanups. Add some `@dirrm's in PLIST.
Diffstat (limited to 'lang/python')
-rw-r--r--lang/python/Makefile15
-rw-r--r--lang/python/distinfo2
-rw-r--r--lang/python/files/Setup2
-rw-r--r--lang/python/pkg-plist10
4 files changed, 22 insertions, 7 deletions
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 349211934c37..74dccf93bca3 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -3,21 +3,23 @@
# Date created: 08 August 1995
# Whom: jkh
#
-# $Id: Makefile,v 1.15 1997/06/02 11:42:56 tg Exp $
+# $Id: Makefile,v 1.16 1997/08/06 06:40:27 tg Exp $
#
DISTNAME= python1.4
PKGNAME= python-1.4
-CATEGORIES= lang tk41
+CATEGORIES= lang tk80
MASTER_SITES= ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/ \
ftp://www.python.org/pub/python/contrib/Graphics/Tkinter/ \
ftp://ftp.cwi.nl/pub/python/contrib/Graphics/Tkinter/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} _tkinter1.4.c
MAINTAINER= tg@FreeBSD.org
-LIB_DEPENDS= tk41\\.1\\.:${PORTSDIR}/x11/tk41
+LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
WRKSRC= ${WRKDIR}/Python-1.4
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-readline
@@ -31,12 +33,15 @@ MAN1= python.1
# installed. See 'man 3 pthread' for details on libc_r.
#
WITH_THREADS= yes
-SETUP_FILE= 'Setup'
+SETUP_FILE= Setup
.if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes
CONFIGURE_ARGS+= --with-thread
-SETUP_FILE= 'Setup.thread'
+SETUP_FILE= Setup.thread
.endif
+post-extract:
+ ${CP} ${DISTDIR}/_tkinter1.4.c ${WRKSRC}/Modules/_tkinter.c
+
post-configure:
${CP} ${FILESDIR}/${SETUP_FILE} ${WRKSRC}/Modules/Setup
diff --git a/lang/python/distinfo b/lang/python/distinfo
index cc24c78b4b9c..cace99566462 100644
--- a/lang/python/distinfo
+++ b/lang/python/distinfo
@@ -1,2 +1,2 @@
MD5 (python1.4.tar.gz) = 341e3f3c688842024e70af6a99b5fb90
-MD5 (PyTix-1.12.tar.gz) = 03b90d29ee8f5c42ff0dbb920b1341af
+MD5 (_tkinter1.4.c) = 118b13afb519c58cfcccb47849ab6090
diff --git a/lang/python/files/Setup b/lang/python/files/Setup
index 7a6b60916c47..cab0cf57b1a5 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${PREFIX}/include/tk4.1 -I${X11BASE}/include -L${PREFIX}/lib -L${X11BASE}/lib -ltk41 -ltcl75 -lX11
+_tkinter _tkinter.c -I${PREFIX}/include/tk8.0 -I${PREFIX}/include/tcl8.0 -I${X11BASE}/include -L${PREFIX}/lib -L${X11BASE}/lib -ltk80 -ltcl80 -lX11
# Lance Ellinghaus's modules:
diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist
index 9627f1baa33b..ea3e038516d4 100644
--- a/lang/python/pkg-plist
+++ b/lang/python/pkg-plist
@@ -475,3 +475,13 @@ share/python1.4/whichdb.pyc
share/python1.4/whrandom.pyc
share/python1.4/xdrlib.pyc
share/python1.4/zmod.pyc
+@dirrm include/python1.4
+@dirrm lib/python1.4/config
+@dirrm lib/python1.4/sharedmodules
+@dirrm lib/python1.4
+@dirrm share/python1.4/stdwin
+@dirrm share/python1.4/tkinter
+@dirrm share/python1.4/test
+@dirrm share/python1.4/freebsd
+@dirrm share/python1.4/stdwin
+@dirrm share/python1.4