--- lang/python27/Makefile (revision 361395) +++ lang/python27/Makefile (working copy) @@ -53,7 +53,7 @@ BINLINKS_SUB_TMPL= -e 's,smtpd,smtpd%%VERSION%%,' -e 's,(idle|pydoc|python-shared|python),\1%%VERSION%%,' BINLINKS_SUB_PYTHON_VER= ${BINLINKS_SUB_TMPL:S/%%VERSION%%/${PYTHON_VER}/g} -OPTIONS_DEFINE= THREADS SEM PTH PYMALLOC IPV6 FPECTL EXAMPLES NLS +OPTIONS_DEFINE= THREADS SEM PYMALLOC IPV6 FPECTL EXAMPLES NLS OPTIONS_DEFAULT= THREADS UCS4 PYMALLOC IPV6 OPTIONS_SINGLE= UCS @@ -84,20 +84,9 @@ SUB_LIST= SEM=${SEM_MSG} .if ${PORT_OPTIONS:MTHREADS} PLIST_SUB+= THREADS="" -.if ${PORT_OPTIONS:MPTH} -CONFIGURE_ARGS+= --with-pth --with-system-ffi -CONFIGURE_ENV+= ac_cv_pthread=no -LIB_DEPENDS+= libpth.so:${PORTSDIR}/devel/pth \ - libffi.so:${PORTSDIR}/devel/libffi -_PTH_CPPFLAGS= "-I${LOCALBASE}/include/pth" -_PTH_LDFLAGS= "-L${LOCALBASE}/lib/pth" -CPPFLAGS:= ${_PTH_CPPFLAGS} ${CPPFLAGS} -LDFLAGS+= ${_PTH_LDFLAGS} -.else CONFIGURE_ARGS+= --with-threads CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -.endif .else PLIST_SUB+= THREADS="@comment " CONFIGURE_ARGS+= --without-threads @@ -150,8 +139,6 @@ CONFIGURE_ARGS+= --disable-ipv6 CONFIGURE_ARGS+= --with-fpectl .endif -CONFIGURE_ENV+= OPT="${_PTH_CPPFLAGS}" - post-extract: # The distribution tarball for python 2.7 has permission bits for 'others' # set to 0. Later during install, we copy Tools and Demo to the installed