From 203aeb85578a1c8f6834e577b7453cfc0cccd36d Mon Sep 17 00:00:00 2001 From: perky Date: Thu, 27 May 2004 15:58:02 +0000 Subject: - Update to Python 2.3.4. - Test WITHOUT_* instead of WITH_* for values which are on by default so that package build clusters detect correctly. --- lang/python/Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lang/python/Makefile') diff --git a/lang/python/Makefile b/lang/python/Makefile index 149b35f9877d..59648c58b0c8 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -6,8 +6,7 @@ # PORTNAME= python -PORTVERSION= 2.3.3 -PORTREVISION= 5 +PORTVERSION= 2.3.4 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -40,12 +39,12 @@ TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} OPTIONS= THREADS "Enable thread support" on \ HUGE_STACK_SIZE "Use a larger thread stack" off \ - UCS2 "Use UCS2 instead of UCS4 for unicode support" off \ + UCS4 "Use UCS4 for unicode support" on \ PYMALLOC "Uses python's internal malloc" on .include -.if defined(WITH_THREADS) +.if !defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --with-threads CFLAGS+= ${PTHREAD_CFLAGS} .if defined(WITHOUT_HUGE_STACK_SIZE) @@ -61,7 +60,7 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" .endif # defined(LDFLAGS) .endif # defined(WITH_THREADS) -.if defined(WITHOUT_UCS2) +.if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2) CONFIGURE_ARGS+= --enable-unicode=ucs4 .endif -- cgit