From johans@stack.nl  Wed Apr  6 18:42:44 2005
Return-Path: <johans@stack.nl>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CC46E16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Apr 2005 18:42:44 +0000 (GMT)
Received: from skynet.stack.nl (skynet.stack.nl [131.155.140.225])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DE6B243D5D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Apr 2005 18:42:43 +0000 (GMT)
	(envelope-from johans@stack.nl)
Received: by skynet.stack.nl (Postfix, from userid 65534)
	id 7A48440AF; Wed,  6 Apr 2005 20:42:57 +0200 (CEST)
Received: from mud.stack.nl (mud.stack.nl [IPv6:2001:610:1108:5011:207:e9ff:fe14:b498])
	by skynet.stack.nl (Postfix) with ESMTP id 2164A40AB
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Apr 2005 20:42:57 +0200 (CEST)
Received: by mud.stack.nl (Postfix, from userid 801)
	id 1B5D017017; Wed,  6 Apr 2005 20:43:33 +0200 (CEST)
Message-Id: <20050406184333.1B5D017017@mud.stack.nl>
Date: Wed,  6 Apr 2005 20:43:33 +0200 (CEST)
From: Johan van Selst <johans@stack.nl>
Reply-To: Johan van Selst <johans@stack.nl>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: devel/py-coro: unbreak build on FreeBSD >= 5.x
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         79606
>Category:       ports
>Synopsis:       devel/py-coro: unbreak build on FreeBSD >= 5.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 06 18:50:05 GMT 2005
>Closed-Date:    Fri Apr 08 22:33:09 GMT 2005
>Last-Modified:  Fri Apr 08 22:33:09 GMT 2005
>Originator:     Johan van Selst
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD mud.stack.nl 5.3-STABLE FreeBSD 5.3-STABLE #0: Mon Jan 31 22:31:14 CET 2005 root@mud.stack.nl:/usr/obj/usr/src/sys/mud i386


	
>Description:
	
	Recursive make variable definitions which may or may not be
	applied in obscure ways, confuse myself as well as make(1).
	Fix: rename the modified variable

>How-To-Repeat:
	
>Fix:

	


diff -uNr py-coro/Makefile py-coro/Makefile
--- py-coro/Makefile	Wed Apr  6 20:23:23 2005
+++ py-coro/Makefile	Wed Apr  6 20:28:13 2005
@@ -20,7 +20,7 @@
 USE_PYTHON=		yes
 USE_REINPLACE=		yes
 PLIST_SUB+=		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
-MAKE_ENV=		PYTHON_VERSION=${PYTHON_VERSION:S/python//} \
+MAKE_ENV=		SHORT_PYTHON_VERSION=${PYTHON_VERSION:S/python//} \
 			EXTRA_INCLUDE="-I${LOCALBASE}/include" \
 			EXTRA_LIB="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=		installdir="${PREFIX}" \
@@ -34,10 +34,6 @@
 			corohttpd
 
 .include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 503000
-BROKEN=		"Does not build on FreeBSD >= 5.x"
-.endif
 
 post-patch:
 .if ${PYTHON_REL} >= 230
diff -uNr py-coro/files/patch-coromodule::Makefile.pre.in py-coro/files/patch-coromodule::Makefile.pre.in
--- py-coro/files/patch-coromodule::Makefile.pre.in	Thu Jul  5 07:49:07 2001
+++ py-coro/files/patch-coromodule::Makefile.pre.in	Wed Apr  6 20:35:57 2005
@@ -24,7 +24,7 @@
  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
++.if ${SHORT_PYTHON_VERSION} < 2.0
 +SETUP+=		${LIBPL}/Setup.thread
 +.endif
  
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Fri Apr 8 22:33:02 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=79606 
>Unformatted:
