diff options
| author | pav <pav@FreeBSD.org> | 2005-04-09 06:32:55 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2005-04-09 06:32:55 +0800 |
| commit | 5ad5887e0b025a4fe1c3b60c7c74c4aba1ffc836 (patch) | |
| tree | 454d51ecedd0d04cd2d4c5d785c51a5420ccc069 | |
| parent | 3c4ea15f348d7ca89a88ff6f4d6eaa8557900f1f (diff) | |
| download | freebsd-ports-gnome-5ad5887e0b025a4fe1c3b60c7c74c4aba1ffc836.tar.gz freebsd-ports-gnome-5ad5887e0b025a4fe1c3b60c7c74c4aba1ffc836.tar.zst freebsd-ports-gnome-5ad5887e0b025a4fe1c3b60c7c74c4aba1ffc836.zip | |
- Unbreak: 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
PR: ports/79606
Submitted by: Johan van Selst <johans@stack.nl>
| -rw-r--r-- | devel/py-coro/Makefile | 6 | ||||
| -rw-r--r-- | devel/py-coro/files/patch-coromodule::Makefile.pre.in | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/devel/py-coro/Makefile b/devel/py-coro/Makefile index 6c85c72f1e79..5f857c5f499c 100644 --- a/devel/py-coro/Makefile +++ b/devel/py-coro/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libcoro.a:${PORTSDIR}/devel/libcoro 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}" \ @@ -35,10 +35,6 @@ CORO_EXAMPLES= backdoor coro_fd coro_subproc coro_ehttpd \ .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 503000 -BROKEN= "Does not build on FreeBSD >= 5.x" -.endif - post-patch: .if ${PYTHON_REL} >= 230 @${REINPLACE_CMD} -e 's,@DEFS@,,g' ${WRKSRC}/coromodule/Makefile.pre.in diff --git a/devel/py-coro/files/patch-coromodule::Makefile.pre.in b/devel/py-coro/files/patch-coromodule::Makefile.pre.in index f874a0eb4cbe..9faa0a2d35cc 100644 --- a/devel/py-coro/files/patch-coromodule::Makefile.pre.in +++ b/devel/py-coro/files/patch-coromodule::Makefile.pre.in @@ -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 |