From owner-freebsd-ports Sat Jun 16 22:30:28 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 234B637B409 for ; Sat, 16 Jun 2001 22:30:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.3/8.11.3) id f5H5U1j50213; Sat, 16 Jun 2001 22:30:01 -0700 (PDT) (envelope-from gnats) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 90FC737B40C for ; Sat, 16 Jun 2001 22:29:19 -0700 (PDT) (envelope-from nobody@FreeBSD.org) Received: (from nobody@localhost) by freefall.freebsd.org (8.11.3/8.11.3) id f5H5TJ850135; Sat, 16 Jun 2001 22:29:19 -0700 (PDT) (envelope-from nobody) Message-Id: <200106170529.f5H5TJ850135@freefall.freebsd.org> Date: Sat, 16 Jun 2001 22:29:19 -0700 (PDT) From: Chang@FreeBSD.org, Hye-Shik To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/28220: Update port: devel/py-coro Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 28220 >Category: ports >Synopsis: Update port: devel/py-coro >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Jun 16 22:30:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Chang, Hye-Shik >Release: FreeBSD 4.3 >Organization: Yonsei University >Environment: FreeBSD akaraka.yonsei.ac.kr 4.3-STABLE FreeBSD 4.3-STABLE #0: Sat May 12 18:17:07 KST 2001 root@free.yonsei.ac.kr:/usr/src/sys/compile/RYOKO i386 >Description: I tried send this as trail of ports/26200, but It wasn't able. (I sended from 5 hosts. :( ) newly patched more generalized and more adaptable from PR/26200 and updated to new version. Notified by: kbyanc >How-To-Repeat: >Fix: diff -ruN devel/py-coro/Makefile local/py-coro/Makefile --- devel/py-coro/Makefile Fri Sep 8 21:23:54 2000 +++ local/py-coro/Makefile Wed Jun 13 03:56:20 2001 @@ -6,48 +6,54 @@ # 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 - -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 - -post-build: - @${LOCALBASE}/bin/python \ - ${LOCALBASE}/lib/python1.5/compileall.py ${WRKSRC} +BUILD_DEPENDS= ${LOCALBASE}/lib/libcoro.a:${PORTSDIR}/devel/libcoro + +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}" + +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 diff -ruN devel/py-coro/distinfo local/py-coro/distinfo --- devel/py-coro/distinfo Fri Jul 7 22:27:22 2000 +++ local/py-coro/distinfo Tue Jun 12 23:12:12 2001 @@ -1 +1 @@ -MD5 (egp-coro-20000424.tar.gz) = 92c70dcb9a20c795fc488fc6595c896d +MD5 (coro_2001_02_02.tar.gz) = 02bc2fb90282fd10eb2b5fa67dd2819c diff -ruN devel/py-coro/files/patch-aa local/py-coro/files/patch-aa --- devel/py-coro/files/patch-aa Fri Jul 7 22:27:22 2000 +++ local/py-coro/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -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 -ruN devel/py-coro/files/patch-coromodule::Makefile.pre.in local/py-coro/files/patch-coromodule::Makefile.pre.in --- devel/py-coro/files/patch-coromodule::Makefile.pre.in Thu Jan 1 09:00:00 1970 +++ local/py-coro/files/patch-coromodule::Makefile.pre.in Wed Jun 13 02:34:17 2001 @@ -0,0 +1,35 @@ +--- coromodule/Makefile.pre.in.orig Sat Feb 3 05:49:53 2001 ++++ coromodule/Makefile.pre.in Wed Jun 13 02:33:50 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]. +@@ -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 -ruN devel/py-coro/pkg-plist local/py-coro/pkg-plist --- devel/py-coro/pkg-plist Fri Jul 7 22:27:23 2000 +++ local/py-coro/pkg-plist Wed Jun 13 03:43:52 2001 @@ -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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message