Index: lang/python27/Makefile =================================================================== --- lang/python27/Makefile +++ lang/python27/Makefile @@ -2,7 +2,7 @@ PORTNAME= python27 PORTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} DISTNAME= Python-${PORTVERSION} @@ -15,7 +15,7 @@ BROKEN_SSL= openssl-devel -USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz shebangfix +USES= cpe ncurses pathfix pkgconfig readline:port ssl tar:xz shebangfix PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -115,6 +115,13 @@ .endif post-patch: +# readline shared library is present on base before FreeBSD 11 - r268461 +# force setup.py ignore base and use readline from ports +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 + ${REINPLACE_CMD} -e \ + "s|lib_dirs,\ \'readline\'|[\'${LOCALBASE}/lib\',\ \'.\'],\ \'readline\'|" \ + ${WRKSRC}/setup.py +.endif ${REINPLACE_CMD} -e 's|/usr/local/bin/python|${python_CMD}|' \ ${WRKSRC}/Lib/cgi.py @${REINPLACE_CMD} -e \ Index: lang/python33/Makefile =================================================================== --- lang/python33/Makefile +++ lang/python33/Makefile @@ -2,7 +2,7 @@ PORTNAME= python33 PORTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} DISTNAME= Python-${PORTVERSION} @@ -16,7 +16,7 @@ DEPRECATED= No longer receives bug fixes, only security updates. Please update to Python 3.5 EXPIRATION_DATE= 2017-09-01 -USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz shebangfix +USES= cpe ncurses pathfix pkgconfig readline:port ssl tar:xz shebangfix PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -108,6 +108,13 @@ .endif post-patch: +# readline shared library is present on base before FreeBSD 11 - r268461 +# force setup.py ignore base and use readline from ports +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 + ${REINPLACE_CMD} -e \ + "s|lib_dirs,\ \'readline\'|[\'${LOCALBASE}/lib\',\ \'.\'],\ \'readline\'|" \ + ${WRKSRC}/setup.py +.endif ${REINPLACE_CMD} -e 's|/usr/local/bin/python|${python_CMD}|' \ ${WRKSRC}/Lib/cgi.py .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS) Index: lang/python34/Makefile =================================================================== --- lang/python34/Makefile +++ lang/python34/Makefile @@ -3,7 +3,7 @@ PORTNAME= python34 PORTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} DISTNAME= Python-${PORTVERSION} @@ -14,7 +14,7 @@ LICENSE= PSFL -USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz shebangfix +USES= cpe ncurses pathfix pkgconfig readline:port ssl tar:xz shebangfix PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -117,6 +117,13 @@ .endif post-patch: +# readline shared library is present on base before FreeBSD 11 - r268461 +# force setup.py ignore base and use readline from ports +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 + ${REINPLACE_CMD} -e \ + "s|lib_dirs,\ \'readline\'|[\'${LOCALBASE}/lib\',\ \'.\'],\ \'readline\'|" \ + ${WRKSRC}/setup.py +.endif ${REINPLACE_CMD} -e 's|/usr/local/bin/python|${python_CMD}|' \ ${WRKSRC}/Lib/cgi.py Index: lang/python35/Makefile =================================================================== --- lang/python35/Makefile +++ lang/python35/Makefile @@ -3,7 +3,7 @@ PORTNAME= python PORTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PYTHON_PORTVERSION} PKGNAMESUFFIX= ${PYTHON_SUFFIX} @@ -17,7 +17,7 @@ BROKEN_SSL= openssl-devel -USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz shebangfix +USES= cpe ncurses pathfix pkgconfig readline:port ssl tar:xz shebangfix PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -127,6 +127,13 @@ .endif post-patch: +# readline shared library is present on base before FreeBSD 11 - r268461 +# force setup.py ignore base and use readline from ports +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 + ${REINPLACE_CMD} -e \ + "s|lib_dirs,\ \'readline\'|[\'${LOCALBASE}/lib\',\ \'.\'],\ \'readline\'|" \ + ${WRKSRC}/setup.py +.endif ${REINPLACE_CMD} -e 's|/usr/local/bin/python|${python_CMD}|' \ ${WRKSRC}/Lib/cgi.py Index: lang/python36/Makefile =================================================================== --- lang/python36/Makefile +++ lang/python36/Makefile @@ -3,7 +3,7 @@ PORTNAME= python PORTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PYTHON_PORTVERSION} PKGNAMESUFFIX= ${PYTHON_SUFFIX} @@ -15,7 +15,7 @@ LICENSE= PSFL -USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz shebangfix +USES= cpe ncurses pathfix pkgconfig readline:port ssl tar:xz shebangfix PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -124,6 +124,13 @@ .endif post-patch: +# readline shared library is present on base before FreeBSD 11 - r268461 +# force setup.py ignore base and use readline from ports +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 + ${REINPLACE_CMD} -e \ + "s|lib_dirs,\ \'readline\'|[\'${LOCALBASE}/lib\',\ \'.\'],\ \'readline\'|" \ + ${WRKSRC}/setup.py +.endif ${REINPLACE_CMD} -e 's|/usr/local/bin/python|${python_CMD}|' \ ${WRKSRC}/Lib/cgi.py