summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/python-devel/Makefile6
-rw-r--r--lang/python25/Makefile6
-rw-r--r--lang/python26/Makefile6
-rw-r--r--lang/python27/Makefile6
-rw-r--r--lang/python30/Makefile6
-rw-r--r--lang/python31/Makefile6
-rw-r--r--lang/python32/Makefile6
7 files changed, 21 insertions, 21 deletions
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index 9123c5f9471f..68a24f15b852 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -43,7 +43,7 @@ OPTIONS= THREADS "Enable thread support" on \
.include <bsd.port.pre.mk>
-.if defined(WITH_THREADS)
+.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
.if defined(WITHOUT_HUGE_STACK_SIZE)
@@ -57,9 +57,9 @@ CONFIGURE_ARGS+= --without-threads
.if defined(LDFLAGS)
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
.endif # defined(LDFLAGS)
-.endif # defined(WITH_THREADS)
+.endif # !defined(WITHOUT_THREADS)
-.if defined(WITHOUT_UCS2)
+.if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
CONFIGURE_ARGS+= --enable-unicode=ucs4
.endif
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 9123c5f9471f..68a24f15b852 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -43,7 +43,7 @@ OPTIONS= THREADS "Enable thread support" on \
.include <bsd.port.pre.mk>
-.if defined(WITH_THREADS)
+.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
.if defined(WITHOUT_HUGE_STACK_SIZE)
@@ -57,9 +57,9 @@ CONFIGURE_ARGS+= --without-threads
.if defined(LDFLAGS)
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
.endif # defined(LDFLAGS)
-.endif # defined(WITH_THREADS)
+.endif # !defined(WITHOUT_THREADS)
-.if defined(WITHOUT_UCS2)
+.if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
CONFIGURE_ARGS+= --enable-unicode=ucs4
.endif
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 9123c5f9471f..68a24f15b852 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -43,7 +43,7 @@ OPTIONS= THREADS "Enable thread support" on \
.include <bsd.port.pre.mk>
-.if defined(WITH_THREADS)
+.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
.if defined(WITHOUT_HUGE_STACK_SIZE)
@@ -57,9 +57,9 @@ CONFIGURE_ARGS+= --without-threads
.if defined(LDFLAGS)
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
.endif # defined(LDFLAGS)
-.endif # defined(WITH_THREADS)
+.endif # !defined(WITHOUT_THREADS)
-.if defined(WITHOUT_UCS2)
+.if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
CONFIGURE_ARGS+= --enable-unicode=ucs4
.endif
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 9123c5f9471f..68a24f15b852 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -43,7 +43,7 @@ OPTIONS= THREADS "Enable thread support" on \
.include <bsd.port.pre.mk>
-.if defined(WITH_THREADS)
+.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
.if defined(WITHOUT_HUGE_STACK_SIZE)
@@ -57,9 +57,9 @@ CONFIGURE_ARGS+= --without-threads
.if defined(LDFLAGS)
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
.endif # defined(LDFLAGS)
-.endif # defined(WITH_THREADS)
+.endif # !defined(WITHOUT_THREADS)
-.if defined(WITHOUT_UCS2)
+.if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
CONFIGURE_ARGS+= --enable-unicode=ucs4
.endif
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 9123c5f9471f..68a24f15b852 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -43,7 +43,7 @@ OPTIONS= THREADS "Enable thread support" on \
.include <bsd.port.pre.mk>
-.if defined(WITH_THREADS)
+.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
.if defined(WITHOUT_HUGE_STACK_SIZE)
@@ -57,9 +57,9 @@ CONFIGURE_ARGS+= --without-threads
.if defined(LDFLAGS)
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
.endif # defined(LDFLAGS)
-.endif # defined(WITH_THREADS)
+.endif # !defined(WITHOUT_THREADS)
-.if defined(WITHOUT_UCS2)
+.if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
CONFIGURE_ARGS+= --enable-unicode=ucs4
.endif
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 9123c5f9471f..68a24f15b852 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -43,7 +43,7 @@ OPTIONS= THREADS "Enable thread support" on \
.include <bsd.port.pre.mk>
-.if defined(WITH_THREADS)
+.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
.if defined(WITHOUT_HUGE_STACK_SIZE)
@@ -57,9 +57,9 @@ CONFIGURE_ARGS+= --without-threads
.if defined(LDFLAGS)
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
.endif # defined(LDFLAGS)
-.endif # defined(WITH_THREADS)
+.endif # !defined(WITHOUT_THREADS)
-.if defined(WITHOUT_UCS2)
+.if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
CONFIGURE_ARGS+= --enable-unicode=ucs4
.endif
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 9123c5f9471f..68a24f15b852 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -43,7 +43,7 @@ OPTIONS= THREADS "Enable thread support" on \
.include <bsd.port.pre.mk>
-.if defined(WITH_THREADS)
+.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
.if defined(WITHOUT_HUGE_STACK_SIZE)
@@ -57,9 +57,9 @@ CONFIGURE_ARGS+= --without-threads
.if defined(LDFLAGS)
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
.endif # defined(LDFLAGS)
-.endif # defined(WITH_THREADS)
+.endif # !defined(WITHOUT_THREADS)
-.if defined(WITHOUT_UCS2)
+.if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
CONFIGURE_ARGS+= --enable-unicode=ucs4
.endif