Compile in the PyTix extensions, now that we have Tix.

Change MAINTAINER from jkh to tg. OK'd by: Jordan.

4 files changed, 22 insertions, 5 deletions

diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index e622d281a97c..4e40e18bf9c2 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -3,18 +3,22 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.9 1996/11/12 02:18:59 obrien Exp $
+# $Id: Makefile,v 1.10 1996/11/17 06:12:49 obrien Exp $
 #
 
 DISTNAME=       python1.4
 PKGNAME=        python-1.4
 CATEGORIES=	lang
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
-		ftp://ftp.cwi.nl/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} PyTix-1.12.tar.gz
 
-MAINTAINER=	jkh@FreeBSD.org
+MAINTAINER=	tg@FreeBSD.org
 
-LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
+LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41 \
+		tix4141\\.1\\.:${PORTSDIR}/x11/tix
 
 WRKSRC=		${WRKDIR}/Python-1.4
 HAS_CONFIGURE=	yes
@@ -23,6 +27,14 @@ MAKE_FLAGS+=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
 MAN1=		python.1
 
+PYTIXSRC=	${WRKDIR}/PyTix-1.12
+
+post-extract:
+	@${ECHO_MSG} "===>   Add PyTix extensions to Python core"
+	${CP} ${PYTIXSRC}/Tkinter.py ${WRKSRC}/Lib/tkinter
+	${CP} ${PYTIXSRC}/Tix.py ${WRKSRC}/Lib/tkinter
+	${CP} ${PYTIXSRC}/_tkinter.c ${WRKSRC}/Modules
+
 post-configure:
 	${CP} ${FILESDIR}/Setup ${WRKSRC}/Modules
 
diff --git a/lang/python-devel/distinfo b/lang/python-devel/distinfo
index 45892ab16e06..cc24c78b4b9c 100644
--- a/lang/python-devel/distinfo
+++ b/lang/python-devel/distinfo
@@ -1 +1,2 @@
 MD5 (python1.4.tar.gz) = 341e3f3c688842024e70af6a99b5fb90
+MD5 (PyTix-1.12.tar.gz) = 03b90d29ee8f5c42ff0dbb920b1341af
diff --git a/lang/python-devel/files/Setup b/lang/python-devel/files/Setup
index fd3659ca7ff6..058c16107afb 100644
--- a/lang/python-devel/files/Setup
+++ b/lang/python-devel/files/Setup
@@ -249,7 +249,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/usr/local/include -I/usr/X11R6/include -L/usr/local/lib -L/usr/X11R6/lib -ltix4141 -ltk41 -ltcl75 -lX11
 
 
 # Lance Ellinghaus's modules:
diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist
index 869cda29b52f..9b16e4a30647 100644
--- a/lang/python-devel/pkg-plist
+++ b/lang/python-devel/pkg-plist
@@ -371,6 +371,8 @@ share/python1.4/test/test_select.py
 share/python1.4/test/test_select.pyc
 share/python1.4/test/test_signal.py
 share/python1.4/test/test_signal.pyc
+share/python1.4/test/test_strop.py
+share/python1.4/test/test_strop.pyc
 share/python1.4/test/test_support.py
 share/python1.4/test/test_support.pyc
 share/python1.4/test/test_thread.py
@@ -390,6 +392,8 @@ share/python1.4/tkinter/ScrolledText.py
 share/python1.4/tkinter/ScrolledText.pyc
 share/python1.4/tkinter/SimpleDialog.py
 share/python1.4/tkinter/SimpleDialog.pyc
+share/python1.4/tkinter/Tix.py
+share/python1.4/tkinter/Tix.pyc
 share/python1.4/tkinter/Tkconstants.py
 share/python1.4/tkinter/Tkconstants.pyc
 share/python1.4/tkinter/Tkinter.py