2 files changed, 44 insertions, 33 deletions

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: