Date: Wed, 6 Apr 2005 20:43:33 +0200 (CEST) From: Johan van Selst <johans@stack.nl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/79606: devel/py-coro: unbreak build on FreeBSD >= 5.x Message-ID: <20050406184333.1B5D017017@mud.stack.nl> Resent-Message-ID: <200504061850.j36Io5M8039790@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Apr 06 18:50:05 GMT 2005
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050406184333.1B5D017017>