Update py-coro to latest version (2001.02.02).

PR:		28105
Submitted by:	Hye-Shik Chang <perky@python.or.kr>

6 files changed, 131 insertions, 94 deletions

diff --git a/devel/py-coro/Makefile b/devel/py-coro/Makefile
index c5d4fc385aa2..f00d8ba9ad7e 100644
--- a/devel/py-coro/Makefile
+++ b/devel/py-coro/Makefile
@@ -6,49 +6,55 @@
 #
 
 PORTNAME=		coro
-PORTVERSION=		20000424
+PORTVERSION=		2001.02.02
 CATEGORIES=		devel python
-MASTER_SITES=		http://www.egroups.com/files/python-coro/egroups/
+MASTER_SITES=		http://www.dotfunk.com/projects/coro/
 PKGNAMEPREFIX=		py-
-DISTNAME=		egp-coro-20000424
+DISTNAME=		${PORTNAME}_${PORTVERSION:S/./_/g}
 
 MAINTAINER=		kbyanc@posi.net
 
-BUILD_DEPENDS=		${LOCALBASE}/lib/libcoro.a:${PORTSDIR}/devel/libcoro \
-			python1.5:${PORTSDIR}/lang/python15
-RUN_DEPENDS=		python1.5:${PORTSDIR}/lang/python15
+BUILD_DEPENDS=		${LOCALBASE}/lib/libcoro.a:${PORTSDIR}/devel/libcoro
 
-CORO_MODULES=		coroutinemodule.so sendfilemodule.so
-CORO_PACKAGE=		coro corodns coromysql corourl \
-			coutil
-CORO_EXAMPLES= 		backdoor potato newpotato fringe \
-			coro_ehttpd crawler fifo
-CORO_DOCS=		README coro.txt
+USE_PYTHON=		yes
+PLIST_SUB+=		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
+MAKE_ENV=		PYTHON_VERSION=${PYTHON_VERSION:S/python//} \
+			EXTRA_INCLUDE="-I${LOCALBASE}/include" \
+			EXTRA_LIB="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=		installdir="${PREFIX}" \
+			PYTHON="${PYTHON_CMD}" \
+			prefix="${PREFIX}"
 
-post-build:
-	@${LOCALBASE}/bin/python \
-		${LOCALBASE}/lib/python1.5/compileall.py ${WRKSRC}
+COROMOD_MAKE=		cd ${WRKSRC}/coromodule && ${MAKE_ENV} ${MAKE}
+CORO_PACKAGE=		__init__ coro corodns coro_fd coro_subproc corodevice \
+			dnsclass dnslib dnsopcode dnstype fifo
+CORO_EXAMPLES= 		backdoor coro_fd coro_subproc coro_ehttpd \
+			corohttpd
+
+do-configure:
+	@${COROMOD_MAKE} -f Makefile.pre.in boot ${CONFIGURE_ARGS}
+
+do-build:
+	@${COROMOD_MAKE}
+
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/python1.5/site-packages
-	${MKDIR} ${PREFIX}/lib/python1.5/site-packages/coro
+	@${COROMOD_MAKE} install
+
+	${MKDIR} ${PYTHON_SITELIBDIR}
+	${MKDIR} ${PYTHON_SITELIBDIR}/coro
 	${MKDIR} ${PREFIX}/share/examples/py-coro
-.for i in ${CORO_MODULES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/lib/python1.5/site-packages
-.endfor
 .for i in ${CORO_PACKAGE}
-	${INSTALL_DATA} ${WRKSRC}/${i}.py ${WRKSRC}/$i.pyc \
-		${PREFIX}/lib/python1.5/site-packages/coro
+	${INSTALL_DATA} ${WRKSRC}/${i}.py* \
+		${PYTHON_SITELIBDIR}/coro
 .endfor
+.if !defined(NOPORTDOCS)
 .for i in ${CORO_EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${i}.py ${WRKSRC}/$i.pyc \
+	${INSTALL_DATA} ${WRKSRC}/${i}.py* \
 		${PREFIX}/share/examples/py-coro
 .endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/py-coro
-.for i in ${CORO_DOCS}
-	${INSTALL_MAN} ${WRKSRC}/${i} ${PREFIX}/share/doc/py-coro
-.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-coro/distinfo b/devel/py-coro/distinfo
index f32325f04b8c..ecff8924581b 100644
--- a/devel/py-coro/distinfo
+++ b/devel/py-coro/distinfo
@@ -1 +1 @@
-MD5 (egp-coro-20000424.tar.gz) = 92c70dcb9a20c795fc488fc6595c896d
+MD5 (coro_2001_02_02.tar.gz) = 02bc2fb90282fd10eb2b5fa67dd2819c
diff --git a/devel/py-coro/files/patch-aa b/devel/py-coro/files/patch-aa
deleted file mode 100644
index 7054fb171435..000000000000
--- a/devel/py-coro/files/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.orig	Mon Apr 24 12:51:16 2000
-+++ Makefile	Fri Jul  7 14:33:04 2000
-@@ -1,13 +1,14 @@
-+PREFIX?=	/usr/local
- MODULES=	coroutinemodule.so sendfilemodule.so
- OBJS=		coroutinemodule.o sendfilemodule.o
--INCLUDES=	-I/usr/local/include/python1.5 -I/usr/local/include
-+INCLUDES=	-I${LOCALBASE}/include/python1.5 -I${LOCALBASE}/include
- # the location of the coro archive:
--COROLIB=	/usr/local/lib/libcoro.a
--OPTS=	-g -Wall -O6
--#OPTS=	-g -Wall
-+COROLIB=	-L${LOCALBASE}/lib -lcoro
-+CFLAGS?=	-g -Wall -O6
-+#CFLAGS?=	-g -Wall
- 
--CC=	gcc
--LD=	ld
-+CC?=	gcc
-+LD?=	ld
- RM=	rm -f
- 
- all: ${OBJS} ${MODULES}
-@@ -23,7 +24,7 @@
- 	${LD} sendfilemodule.o -shared -o sendfilemodule.so
- 
- coroutinemodule.o: coroutinemodule.c
--	${CC} ${INCLUDES} ${OPTS} -c coroutinemodule.c
-+	${CC} ${CFLAGS} ${INCLUDES} -c coroutinemodule.c
- 
- sendfilemodule.o: sendfilemodule.c
--	${CC} ${INCLUDES} ${OPTS} -c sendfilemodule.c
-+	${CC} ${CFLAGS} ${INCLUDES} -c sendfilemodule.c
diff --git a/devel/py-coro/files/patch-coromodule::Makefile.pre.in b/devel/py-coro/files/patch-coromodule::Makefile.pre.in
new file mode 100644
index 000000000000..f874a0eb4cbe
--- /dev/null
+++ b/devel/py-coro/files/patch-coromodule::Makefile.pre.in
@@ -0,0 +1,44 @@
+--- coromodule/Makefile.pre.in.orig	Fri Feb  2 12:49:53 2001
++++ coromodule/Makefile.pre.in	Wed Jul  4 22:16:53 2001
+@@ -95,7 +95,7 @@
+ PYTHON=		python
+ 
+ # Add more -I and -D options here
+-CFLAGS=		$(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
++CFLAGS+=	$(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS) ${EXTRA_INCLUDE} ${EXTRA_LIB}
+ 
+ # These two variables can be set in Setup to merge extensions.
+ # See example[23].
+@@ -116,7 +116,7 @@
+ LINKCC=		@LINKCC@
+ SGI_ABI=	@SGI_ABI@
+ OPT=		@OPT@
+-LDFLAGS=	-rdynamic @LDFLAGS@
++LDFLAGS=	-rdynamic @LDFLAGS@ ${EXTRA_LIB}
+ LDLAST=		@LDLAST@
+ DEFS=		@DEFS@
+ LIBS=		@LIBS@
+@@ -168,7 +168,10 @@
+ MAKEFILE=	$(LIBPL)/Makefile
+ CONFIGC=	$(LIBPL)/config.c
+ CONFIGCIN=	$(LIBPL)/config.c.in
+-SETUP=		$(LIBPL)/Setup.thread $(LIBPL)/Setup.local $(LIBPL)/Setup
++SETUP=		$(LIBPL)/Setup.local $(LIBPL)/Setup
++.if ${PYTHON_VERSION} < 2.0
++SETUP+=		${LIBPL}/Setup.thread
++.endif
+ 
+ SYSLIBS=	$(LIBM) $(LIBC)
+ 
+@@ -217,9 +220,9 @@
+ 
+ # This runs makesetup *twice* to use the BASESETUP definition from Setup
+ config.c Makefile:	Makefile.pre Setup $(BASESETUP) $(MAKESETUP)
+-		$(MAKESETUP) \
++		ExtraLibs="${EXTRA_LIB}" $(MAKESETUP) \
+ 		 -m Makefile.pre -c $(CONFIGCIN) Setup -n $(BASESETUP) $(SETUP)
+-		$(MAKE) -f Makefile do-it-again
++		ExtraLibs="${EXTRA_LIB}" $(MAKE) -f Makefile do-it-again
+ 
+ # Internal target to run makesetup for the second time
+ do-it-again:
diff --git a/devel/py-coro/pkg-descr b/devel/py-coro/pkg-descr
index 163e97100acd..5fdc784bcdd6 100644
--- a/devel/py-coro/pkg-descr
+++ b/devel/py-coro/pkg-descr
@@ -13,7 +13,7 @@ From the README:
 	user-space.  Also, complexity is lower because you don't have to worry
 	about locking access to shared state.
 
-WWW: http://www.egroups.com/group/python-coro
+WWW: http://www.dotfunk.com/projects/coro/
 
   -Kelly
    kbyanc@posi.net
diff --git a/devel/py-coro/pkg-plist b/devel/py-coro/pkg-plist
index 42dcfb9650f1..27bf6ba1dc93 100644
--- a/devel/py-coro/pkg-plist
+++ b/devel/py-coro/pkg-plist
@@ -1,31 +1,51 @@
-lib/python1.5/site-packages/coro/coro.py
-lib/python1.5/site-packages/coro/coro.pyc
-lib/python1.5/site-packages/coro/corodns.py
-lib/python1.5/site-packages/coro/corodns.pyc
-lib/python1.5/site-packages/coro/coromysql.py
-lib/python1.5/site-packages/coro/coromysql.pyc
-lib/python1.5/site-packages/coro/corourl.py
-lib/python1.5/site-packages/coro/corourl.pyc
-lib/python1.5/site-packages/coro/coutil.py
-lib/python1.5/site-packages/coro/coutil.pyc
-lib/python1.5/site-packages/coroutinemodule.so
-lib/python1.5/site-packages/sendfilemodule.so
-share/doc/py-coro/README
-share/doc/py-coro/coro.txt
-share/examples/py-coro/backdoor.py
-share/examples/py-coro/backdoor.pyc
-share/examples/py-coro/coro_ehttpd.py
-share/examples/py-coro/coro_ehttpd.pyc
-share/examples/py-coro/crawler.py
-share/examples/py-coro/crawler.pyc
-share/examples/py-coro/fifo.py
-share/examples/py-coro/fifo.pyc
-share/examples/py-coro/fringe.py
-share/examples/py-coro/fringe.pyc
-share/examples/py-coro/newpotato.py
-share/examples/py-coro/newpotato.pyc
-share/examples/py-coro/potato.py
-share/examples/py-coro/potato.pyc
-@dirrm lib/python1.5/site-packages/coro
-@dirrm share/examples/py-coro
-@dirrm share/doc/py-coro
+%%PYTHON_SITELIBDIR%%/coroutinemodule.so
+%%PYTHON_SITELIBDIR%%/coro/__init__.py
+%%PYTHON_SITELIBDIR%%/coro/__init__.pyc
+%%PYTHON_SITELIBDIR%%/coro/__init__.pyo
+%%PYTHON_SITELIBDIR%%/coro/coro.py
+%%PYTHON_SITELIBDIR%%/coro/coro.pyc
+%%PYTHON_SITELIBDIR%%/coro/coro.pyo
+%%PYTHON_SITELIBDIR%%/coro/corodns.py
+%%PYTHON_SITELIBDIR%%/coro/corodns.pyc
+%%PYTHON_SITELIBDIR%%/coro/corodns.pyo
+%%PYTHON_SITELIBDIR%%/coro/coro_fd.py
+%%PYTHON_SITELIBDIR%%/coro/coro_fd.pyc
+%%PYTHON_SITELIBDIR%%/coro/coro_fd.pyo
+%%PYTHON_SITELIBDIR%%/coro/coro_subproc.py
+%%PYTHON_SITELIBDIR%%/coro/coro_subproc.pyc
+%%PYTHON_SITELIBDIR%%/coro/coro_subproc.pyo
+%%PYTHON_SITELIBDIR%%/coro/corodevice.py
+%%PYTHON_SITELIBDIR%%/coro/corodevice.pyc
+%%PYTHON_SITELIBDIR%%/coro/corodevice.pyo
+%%PYTHON_SITELIBDIR%%/coro/dnsclass.py
+%%PYTHON_SITELIBDIR%%/coro/dnsclass.pyc
+%%PYTHON_SITELIBDIR%%/coro/dnsclass.pyo
+%%PYTHON_SITELIBDIR%%/coro/dnslib.py
+%%PYTHON_SITELIBDIR%%/coro/dnslib.pyc
+%%PYTHON_SITELIBDIR%%/coro/dnslib.pyo
+%%PYTHON_SITELIBDIR%%/coro/dnsopcode.py
+%%PYTHON_SITELIBDIR%%/coro/dnsopcode.pyc
+%%PYTHON_SITELIBDIR%%/coro/dnsopcode.pyo
+%%PYTHON_SITELIBDIR%%/coro/dnstype.py
+%%PYTHON_SITELIBDIR%%/coro/dnstype.pyc
+%%PYTHON_SITELIBDIR%%/coro/dnstype.pyo
+%%PYTHON_SITELIBDIR%%/coro/fifo.py
+%%PYTHON_SITELIBDIR%%/coro/fifo.pyc
+%%PYTHON_SITELIBDIR%%/coro/fifo.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/coro
+%%PORTDOCS%%share/examples/py-coro/backdoor.py
+%%PORTDOCS%%share/examples/py-coro/backdoor.pyc
+%%PORTDOCS%%share/examples/py-coro/backdoor.pyo
+%%PORTDOCS%%share/examples/py-coro/coro_fd.py
+%%PORTDOCS%%share/examples/py-coro/coro_fd.pyc
+%%PORTDOCS%%share/examples/py-coro/coro_fd.pyo
+%%PORTDOCS%%share/examples/py-coro/coro_subproc.py
+%%PORTDOCS%%share/examples/py-coro/coro_subproc.pyc
+%%PORTDOCS%%share/examples/py-coro/coro_subproc.pyo
+%%PORTDOCS%%share/examples/py-coro/coro_ehttpd.py
+%%PORTDOCS%%share/examples/py-coro/coro_ehttpd.pyc
+%%PORTDOCS%%share/examples/py-coro/coro_ehttpd.pyo
+%%PORTDOCS%%share/examples/py-coro/corohttpd.py
+%%PORTDOCS%%share/examples/py-coro/corohttpd.pyc
+%%PORTDOCS%%share/examples/py-coro/corohttpd.pyo
+%%PORTDOCS%%@dirrm share/examples/py-coro