- The port devel/py-functional has been repo-copied to

  devel/py-xoltar-toolkit, so:

  - Update devel/py-xoltar-toolkit to the latest version (2001.06.01) of the
    Xoltar Toolkit, which bundles an updated functional.py module with some
    supporting modules.
  - Remove all files from devel/py-functional
  - Update the category Makefile to reflect the change.

Approved by:	Jacques Vidrine <nectar@FreeBSD.org>, maintainer

11 files changed, 42 insertions, 87 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 0bcea3767133..4882f8794e77 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -458,7 +458,6 @@
     SUBDIR += ptl
     SUBDIR += py-coro
     SUBDIR += py-cxx
-    SUBDIR += py-functional
     SUBDIR += py-game
     SUBDIR += py-grouch
     SUBDIR += py-htmlkit
@@ -469,6 +468,7 @@
     SUBDIR += py-orbit
     SUBDIR += py-twisted
     SUBDIR += py-unit
+    SUBDIR += py-xoltar-toolkit
     SUBDIR += pychecker
     SUBDIR += qt-designer
     SUBDIR += qtarch
diff --git a/devel/py-functional/Makefile b/devel/py-functional/Makefile
deleted file mode 100644
index b4d45e9c7531..000000000000
--- a/devel/py-functional/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Ports collection Makefile for:	py-functional
-# Date created:				10/03/2000
-# Whom:					nectar@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=		functional
-PORTVERSION=		0.5
-CATEGORIES=		devel python
-# The functional.py distfile disappeared.
-# I'm storing it on MASTER_SITE_LOCAL until I get around to
-# making a port of the xoltar-toolkit.
-#MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-#MASTER_SITE_SUBDIR=	xoltar-toolkit
-PKGNAMEPREFIX=		py-
-DISTNAME=		functional.py
-EXTRACT_SUFX=		.gz
-
-MAINTAINER=		nectar@FreeBSD.org
-
-EXTRACT_AFTER_ARGS=	> ${DISTNAME}
-USE_PYTHON=		yes
-NO_WRKSUBDIR=		yes
-
-do-build:
-	@cd ${WRKSRC} && ${PYTHON_CMD} -c 'import functional'
-	@cd ${WRKSRC} && ${PYTHON_CMD} -O -c 'import functional'
-
-do-install:
-.for f in functional.py functional.pyc functional.pyo
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PYTHON_SITELIBDIR}/${f}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/devel/py-functional/distinfo b/devel/py-functional/distinfo
deleted file mode 100644
index 5a3a6210e21f..000000000000
--- a/devel/py-functional/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (functional.py.gz) = 149eb64411d87323630dd1539a9b5a56
diff --git a/devel/py-functional/pkg-comment b/devel/py-functional/pkg-comment
deleted file mode 100644
index 052d3dfcf98a..000000000000
--- a/devel/py-functional/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Python module implementing some functional programming idioms
diff --git a/devel/py-functional/pkg-descr b/devel/py-functional/pkg-descr
deleted file mode 100644
index 5d61c960fe35..000000000000
--- a/devel/py-functional/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-A Python module which provides support for a functional style of Python
-programming.
-
-It includes support for closures, curried functions, lazy expressions,
-lazy tuples (functional programming languages call these lazy lists, but
-since lists are mutable in Python, tuples are closer in meaning), and
-lazy equivalents for map, filter, reduce, and zip. Also includes some
-higher-order functions for composing functions and such.
-
-To use, just
-
-   import functional
-
-WWW: http://sourceforge.net/projects/xoltar-toolkit/
diff --git a/devel/py-functional/pkg-plist b/devel/py-functional/pkg-plist
deleted file mode 100644
index 9e7b8a4b4db5..000000000000
--- a/devel/py-functional/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/%%PYTHON_VERSION%%/site-packages/functional.py
-lib/%%PYTHON_VERSION%%/site-packages/functional.pyc
-lib/%%PYTHON_VERSION%%/site-packages/functional.pyo
diff --git a/devel/py-xoltar-toolkit/Makefile b/devel/py-xoltar-toolkit/Makefile
index b4d45e9c7531..e9dc59287edf 100644
--- a/devel/py-xoltar-toolkit/Makefile
+++ b/devel/py-xoltar-toolkit/Makefile
@@ -5,31 +5,32 @@
 # $FreeBSD$
 #
 
-PORTNAME=		functional
-PORTVERSION=		0.5
-CATEGORIES=		devel python
-# The functional.py distfile disappeared.
-# I'm storing it on MASTER_SITE_LOCAL until I get around to
-# making a port of the xoltar-toolkit.
-#MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-#MASTER_SITE_SUBDIR=	xoltar-toolkit
-PKGNAMEPREFIX=		py-
-DISTNAME=		functional.py
-EXTRACT_SUFX=		.gz
+PORTNAME=	xoltar-toolkit
+PORTVERSION=	2001.06.01
+CATEGORIES=	devel python
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	${PORTNAME}-01jun01
 
-MAINTAINER=		nectar@FreeBSD.org
+MAINTAINER=	nectar@FreeBSD.org
 
-EXTRACT_AFTER_ARGS=	> ${DISTNAME}
-USE_PYTHON=		yes
-NO_WRKSUBDIR=		yes
+USE_PYTHON=	yes
+NO_WRKSUBDIR=	yes
+INSTALLDIR=	${PREFIX}/lib/${PYTHON_VERSION}/site-packages
 
 do-build:
-	@cd ${WRKSRC} && ${PYTHON_CMD} -c 'import functional'
-	@cd ${WRKSRC} && ${PYTHON_CMD} -O -c 'import functional'
+	@ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
+	@ ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 
 do-install:
-.for f in functional.py functional.pyc functional.pyo
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PYTHON_SITELIBDIR}/${f}
-.endfor
+	@ ${MKDIR} ${INSTALLDIR}
+	@ ${INSTALL_DATA} ${WRKSRC}/*.py* ${INSTALLDIR}
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@ ${MKDIR} ${DOCSDIR}
+	@ ${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-xoltar-toolkit/distinfo b/devel/py-xoltar-toolkit/distinfo
index 5a3a6210e21f..bff4d29d1b62 100644
--- a/devel/py-xoltar-toolkit/distinfo
+++ b/devel/py-xoltar-toolkit/distinfo
@@ -1 +1 @@
-MD5 (functional.py.gz) = 149eb64411d87323630dd1539a9b5a56
+MD5 (xoltar-toolkit-01jun01.tar.gz) = 7a8272fa24522446dc0268d2154c2396
diff --git a/devel/py-xoltar-toolkit/pkg-comment b/devel/py-xoltar-toolkit/pkg-comment
index 052d3dfcf98a..9bcadb7a5b25 100644
--- a/devel/py-xoltar-toolkit/pkg-comment
+++ b/devel/py-xoltar-toolkit/pkg-comment
@@ -1 +1 @@
-A Python module implementing some functional programming idioms
+Functional programming, lazy expressions and thread pools for Python
diff --git a/devel/py-xoltar-toolkit/pkg-descr b/devel/py-xoltar-toolkit/pkg-descr
index 5d61c960fe35..ef7776b3481c 100644
--- a/devel/py-xoltar-toolkit/pkg-descr
+++ b/devel/py-xoltar-toolkit/pkg-descr
@@ -1,14 +1,12 @@
-A Python module which provides support for a functional style of Python
-programming.
+The Xoltar Toolkit contains utility modules for Python, including functional
+programming support, lazy expressions and data structures, and thread pools.
 
 It includes support for closures, curried functions, lazy expressions,
 lazy tuples (functional programming languages call these lazy lists, but
-since lists are mutable in Python, tuples are closer in meaning), and
-lazy equivalents for map, filter, reduce, and zip. Also includes some
-higher-order functions for composing functions and such.
+since lists are mutable in Python, tuples are closer in meaning), and lazy
+equivalents for map, filter, reduce, and zip.  It also includes some
+higher-order functions for composing functions.
 
-To use, just
-
-   import functional
-
-WWW: http://sourceforge.net/projects/xoltar-toolkit/
+Author:   Bryn Keller <xoltar@sourceforge.net>
+WWW:      http://sourceforge.net/projects/xoltar-toolkit/
+See also: http://www-106.ibm.com/developerworks/library/l-prog.html
diff --git a/devel/py-xoltar-toolkit/pkg-plist b/devel/py-xoltar-toolkit/pkg-plist
index 9e7b8a4b4db5..c745043bc47a 100644
--- a/devel/py-xoltar-toolkit/pkg-plist
+++ b/devel/py-xoltar-toolkit/pkg-plist
@@ -1,3 +1,13 @@
+%%PORTDOCS%%share/doc/xoltar-toolkit/functional_changes.txt
+%%PORTDOCS%%share/doc/xoltar-toolkit/lazy_changes.txt
+%%PORTDOCS%%share/doc/xoltar-toolkit/threadpool_changes.txt
 lib/%%PYTHON_VERSION%%/site-packages/functional.py
 lib/%%PYTHON_VERSION%%/site-packages/functional.pyc
 lib/%%PYTHON_VERSION%%/site-packages/functional.pyo
+lib/%%PYTHON_VERSION%%/site-packages/lazy.py
+lib/%%PYTHON_VERSION%%/site-packages/lazy.pyc
+lib/%%PYTHON_VERSION%%/site-packages/lazy.pyo
+lib/%%PYTHON_VERSION%%/site-packages/threadpool.py
+lib/%%PYTHON_VERSION%%/site-packages/threadpool.pyc
+lib/%%PYTHON_VERSION%%/site-packages/threadpool.pyo
+%%PORTDOCS%%@dirrm share/doc/xoltar-toolkit