diff options
| author | Munechika SUMIKAWA <sumikawa@FreeBSD.org> | 2000-01-13 13:28:10 +0000 |
|---|---|---|
| committer | Munechika SUMIKAWA <sumikawa@FreeBSD.org> | 2000-01-13 13:28:10 +0000 |
| commit | 66082ac2d09bc60c078da3d0477b4787838c329d (patch) | |
| tree | 38449f09961e6ff06a43b3bda907d1cc139ac468 | |
| parent | 38b1a6fd25e50622548241d8a1349d6e5416b321 (diff) | |
| download | ports-66082ac2d09bc60c078da3d0477b4787838c329d.tar.gz ports-66082ac2d09bc60c078da3d0477b4787838c329d.zip | |
- Support IPv6.
- remove DIST_SUBDIR since there are 2 distfiles on this port anymore.
Reviewed by: tg(maintainer)
Notes
Notes:
svn path=/head/; revision=24697
46 files changed, 301 insertions, 45 deletions
diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile index d8f497196ca8..108a8abb6224 100644 --- a/lang/python+ipv6/Makefile +++ b/lang/python+ipv6/Makefile @@ -13,14 +13,22 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ EXTRACT_SUFX= .tgz +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ +PATCHFILES= python-152-v6-20000113.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= tg@FreeBSD.org LIB_DEPENDS= ${TK_DEPENDS} -DIST_SUBDIR= python WRKSRC= ${WRKDIR}/Python-1.5.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl --with-libs='-lxpg4' +.if defined(USE_INET6) +CONFIGURE_ARGS+=--enable-ipv6 +.else +CONFIGURE_ARGS+=--disable-ipv6 +.endif CONFIGURE_ENV= OPT="${CFLAGS}" INSTALL_TARGET= install PLIST= ${WRKDIR}/PLIST @@ -54,6 +62,7 @@ WITH_THREADS?= yes LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread + CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" .endif @@ -75,6 +84,9 @@ WITH_TOOLS?= yes .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes PLIST_TOOLS= ${PKGDIR}/PLIST.Tools .endif +.if defined(USE_INET6) +PLIST_V6= ${PKGDIR}/PLIST.v6 +.endif post-extract: cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh @@ -101,7 +113,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -114,5 +126,8 @@ post-install: @cd ${WRKSRC}; tar cf - Tools | \ (cd ${PREFIX}/lib/python1.5; tar xf -) .endif +.if defined(USE_INET6) + ${INSTALL_DATA} ${WRKSRC}/README.v6 ${PREFIX}/share/doc/python +.endif .include <bsd.port.post.mk> diff --git a/lang/python+ipv6/distinfo b/lang/python+ipv6/distinfo index 72ca6a75cf6c..f3530a2ebfa8 100644 --- a/lang/python+ipv6/distinfo +++ b/lang/python+ipv6/distinfo @@ -1 +1,2 @@ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python+ipv6/pkg-plist b/lang/python+ipv6/pkg-plist index 58ef1c97477d..22ee7513f4ab 100644 --- a/lang/python+ipv6/pkg-plist +++ b/lang/python+ipv6/pkg-plist @@ -4,6 +4,7 @@ share/doc/python/COPYRIGHT share/emacs/site-lisp/python-mode.el include/python1.5/Python.h include/python1.5/abstract.h +include/python1.5/addrinfo.h include/python1.5/bitset.h include/python1.5/bufferobject.h include/python1.5/cStringIO.h diff --git a/lang/python+ipv6/pkg-plist.v6 b/lang/python+ipv6/pkg-plist.v6 new file mode 100644 index 000000000000..9cd0804d32ec --- /dev/null +++ b/lang/python+ipv6/pkg-plist.v6 @@ -0,0 +1 @@ +share/doc/python/README.v6 diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile index d8f497196ca8..108a8abb6224 100644 --- a/lang/python-devel/Makefile +++ b/lang/python-devel/Makefile @@ -13,14 +13,22 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ EXTRACT_SUFX= .tgz +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ +PATCHFILES= python-152-v6-20000113.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= tg@FreeBSD.org LIB_DEPENDS= ${TK_DEPENDS} -DIST_SUBDIR= python WRKSRC= ${WRKDIR}/Python-1.5.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl --with-libs='-lxpg4' +.if defined(USE_INET6) +CONFIGURE_ARGS+=--enable-ipv6 +.else +CONFIGURE_ARGS+=--disable-ipv6 +.endif CONFIGURE_ENV= OPT="${CFLAGS}" INSTALL_TARGET= install PLIST= ${WRKDIR}/PLIST @@ -54,6 +62,7 @@ WITH_THREADS?= yes LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread + CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" .endif @@ -75,6 +84,9 @@ WITH_TOOLS?= yes .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes PLIST_TOOLS= ${PKGDIR}/PLIST.Tools .endif +.if defined(USE_INET6) +PLIST_V6= ${PKGDIR}/PLIST.v6 +.endif post-extract: cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh @@ -101,7 +113,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -114,5 +126,8 @@ post-install: @cd ${WRKSRC}; tar cf - Tools | \ (cd ${PREFIX}/lib/python1.5; tar xf -) .endif +.if defined(USE_INET6) + ${INSTALL_DATA} ${WRKSRC}/README.v6 ${PREFIX}/share/doc/python +.endif .include <bsd.port.post.mk> diff --git a/lang/python-devel/distinfo b/lang/python-devel/distinfo index 72ca6a75cf6c..f3530a2ebfa8 100644 --- a/lang/python-devel/distinfo +++ b/lang/python-devel/distinfo @@ -1 +1,2 @@ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist index 58ef1c97477d..22ee7513f4ab 100644 --- a/lang/python-devel/pkg-plist +++ b/lang/python-devel/pkg-plist @@ -4,6 +4,7 @@ share/doc/python/COPYRIGHT share/emacs/site-lisp/python-mode.el include/python1.5/Python.h include/python1.5/abstract.h +include/python1.5/addrinfo.h include/python1.5/bitset.h include/python1.5/bufferobject.h include/python1.5/cStringIO.h diff --git a/lang/python/Makefile b/lang/python/Makefile index d8f497196ca8..108a8abb6224 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -13,14 +13,22 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ EXTRACT_SUFX= .tgz +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ +PATCHFILES= python-152-v6-20000113.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= tg@FreeBSD.org LIB_DEPENDS= ${TK_DEPENDS} -DIST_SUBDIR= python WRKSRC= ${WRKDIR}/Python-1.5.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl --with-libs='-lxpg4' +.if defined(USE_INET6) +CONFIGURE_ARGS+=--enable-ipv6 +.else +CONFIGURE_ARGS+=--disable-ipv6 +.endif CONFIGURE_ENV= OPT="${CFLAGS}" INSTALL_TARGET= install PLIST= ${WRKDIR}/PLIST @@ -54,6 +62,7 @@ WITH_THREADS?= yes LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread + CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" .endif @@ -75,6 +84,9 @@ WITH_TOOLS?= yes .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes PLIST_TOOLS= ${PKGDIR}/PLIST.Tools .endif +.if defined(USE_INET6) +PLIST_V6= ${PKGDIR}/PLIST.v6 +.endif post-extract: cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh @@ -101,7 +113,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -114,5 +126,8 @@ post-install: @cd ${WRKSRC}; tar cf - Tools | \ (cd ${PREFIX}/lib/python1.5; tar xf -) .endif +.if defined(USE_INET6) + ${INSTALL_DATA} ${WRKSRC}/README.v6 ${PREFIX}/share/doc/python +.endif .include <bsd.port.post.mk> diff --git a/lang/python/distinfo b/lang/python/distinfo index 72ca6a75cf6c..f3530a2ebfa8 100644 --- a/lang/python/distinfo +++ b/lang/python/distinfo @@ -1 +1,2 @@ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist index 58ef1c97477d..22ee7513f4ab 100644 --- a/lang/python/pkg-plist +++ b/lang/python/pkg-plist @@ -4,6 +4,7 @@ share/doc/python/COPYRIGHT share/emacs/site-lisp/python-mode.el include/python1.5/Python.h include/python1.5/abstract.h +include/python1.5/addrinfo.h include/python1.5/bitset.h include/python1.5/bufferobject.h include/python1.5/cStringIO.h diff --git a/lang/python15/Makefile b/lang/python15/Makefile index d8f497196ca8..108a8abb6224 100644 --- a/lang/python15/Makefile +++ b/lang/python15/Makefile @@ -13,14 +13,22 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ EXTRACT_SUFX= .tgz +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ +PATCHFILES= python-152-v6-20000113.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= tg@FreeBSD.org LIB_DEPENDS= ${TK_DEPENDS} -DIST_SUBDIR= python WRKSRC= ${WRKDIR}/Python-1.5.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl --with-libs='-lxpg4' +.if defined(USE_INET6) +CONFIGURE_ARGS+=--enable-ipv6 +.else +CONFIGURE_ARGS+=--disable-ipv6 +.endif CONFIGURE_ENV= OPT="${CFLAGS}" INSTALL_TARGET= install PLIST= ${WRKDIR}/PLIST @@ -54,6 +62,7 @@ WITH_THREADS?= yes LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread + CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" .endif @@ -75,6 +84,9 @@ WITH_TOOLS?= yes .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes PLIST_TOOLS= ${PKGDIR}/PLIST.Tools .endif +.if defined(USE_INET6) +PLIST_V6= ${PKGDIR}/PLIST.v6 +.endif post-extract: cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh @@ -101,7 +113,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -114,5 +126,8 @@ post-install: @cd ${WRKSRC}; tar cf - Tools | \ (cd ${PREFIX}/lib/python1.5; tar xf -) .endif +.if defined(USE_INET6) + ${INSTALL_DATA} ${WRKSRC}/README.v6 ${PREFIX}/share/doc/python +.endif .include <bsd.port.post.mk> diff --git a/lang/python15/distinfo b/lang/python15/distinfo index 72ca6a75cf6c..f3530a2ebfa8 100644 --- a/lang/python15/distinfo +++ b/lang/python15/distinfo @@ -1 +1,2 @@ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python15/pkg-plist b/lang/python15/pkg-plist index 58ef1c97477d..22ee7513f4ab 100644 --- a/lang/python15/pkg-plist +++ b/lang/python15/pkg-plist @@ -4,6 +4,7 @@ share/doc/python/COPYRIGHT share/emacs/site-lisp/python-mode.el include/python1.5/Python.h include/python1.5/abstract.h +include/python1.5/addrinfo.h include/python1.5/bitset.h include/python1.5/bufferobject.h include/python1.5/cStringIO.h diff --git a/lang/python20/Makefile b/lang/python20/Makefile index d8f497196ca8..108a8abb6224 100644 --- a/lang/python20/Makefile +++ b/lang/python20/Makefile @@ -13,14 +13,22 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ EXTRACT_SUFX= .tgz +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ +PATCHFILES= python-152-v6-20000113.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= tg@FreeBSD.org LIB_DEPENDS= ${TK_DEPENDS} -DIST_SUBDIR= python WRKSRC= ${WRKDIR}/Python-1.5.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl --with-libs='-lxpg4' +.if defined(USE_INET6) +CONFIGURE_ARGS+=--enable-ipv6 +.else +CONFIGURE_ARGS+=--disable-ipv6 +.endif CONFIGURE_ENV= OPT="${CFLAGS}" INSTALL_TARGET= install PLIST= ${WRKDIR}/PLIST @@ -54,6 +62,7 @@ WITH_THREADS?= yes LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread + CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" .endif @@ -75,6 +84,9 @@ WITH_TOOLS?= yes .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes PLIST_TOOLS= ${PKGDIR}/PLIST.Tools .endif +.if defined(USE_INET6) +PLIST_V6= ${PKGDIR}/PLIST.v6 +.endif post-extract: cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh @@ -101,7 +113,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -114,5 +126,8 @@ post-install: @cd ${WRKSRC}; tar cf - Tools | \ (cd ${PREFIX}/lib/python1.5; tar xf -) .endif +.if defined(USE_INET6) + ${INSTALL_DATA} ${WRKSRC}/README.v6 ${PREFIX}/share/doc/python +.endif .include <bsd.port.post.mk> diff --git a/lang/python20/distinfo b/lang/python20/distinfo index 72ca6a75cf6c..f3530a2ebfa8 100644 --- a/lang/python20/distinfo +++ b/lang/python20/distinfo @@ -1 +1,2 @@ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python20/pkg-plist b/lang/python20/pkg-plist index 58ef1c97477d..22ee7513f4ab 100644 --- a/lang/python20/pkg-plist +++ b/lang/python20/pkg-plist @@ -4,6 +4,7 @@ share/doc/python/COPYRIGHT share/emacs/site-lisp/python-mode.el include/python1.5/Python.h include/python1.5/abstract.h +include/python1.5/addrinfo.h include/python1.5/bitset.h include/python1.5/bufferobject.h include/python1.5/cStringIO.h diff --git a/lang/python21/Makefile b/lang/python21/Makefile index d8f497196ca8..108a8abb6224 100644 --- a/lang/python21/Makefile +++ b/lang/python21/Makefile @@ -13,14 +13,22 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ EXTRACT_SUFX= .tgz +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ +PATCHFILES= python-152-v6-20000113.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= tg@FreeBSD.org LIB_DEPENDS= ${TK_DEPENDS} -DIST_SUBDIR= python WRKSRC= ${WRKDIR}/Python-1.5.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl --with-libs='-lxpg4' +.if defined(USE_INET6) +CONFIGURE_ARGS+=--enable-ipv6 +.else +CONFIGURE_ARGS+=--disable-ipv6 +.endif CONFIGURE_ENV= OPT="${CFLAGS}" INSTALL_TARGET= install PLIST= ${WRKDIR}/PLIST @@ -54,6 +62,7 @@ WITH_THREADS?= yes LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread + CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" .endif @@ -75,6 +84,9 @@ WITH_TOOLS?= yes .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes PLIST_TOOLS= ${PKGDIR}/PLIST.Tools .endif +.if defined(USE_INET6) +PLIST_V6= ${PKGDIR}/PLIST.v6 +.endif post-extract: cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh @@ -101,7 +113,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -114,5 +126,8 @@ post-install: @cd ${WRKSRC}; tar cf - Tools | \ (cd ${PREFIX}/lib/python1.5; tar xf -) .endif +.if defined(USE_INET6) + ${INSTALL_DATA} ${WRKSRC}/README.v6 ${PREFIX}/share/doc/python +.endif .include <bsd.port.post.mk> diff --git a/lang/python21/distinfo b/lang/python21/distinfo index 72ca6a75cf6c..f3530a2ebfa8 100644 --- a/lang/python21/distinfo +++ b/lang/python21/distinfo @@ -1 +1,2 @@ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python21/pkg-plist b/lang/python21/pkg-plist index 58ef1c97477d..22ee7513f4ab 100644 --- a/lang/python21/pkg-plist +++ b/lang/python21/pkg-plist @@ -4,6 +4,7 @@ share/doc/python/COPYRIGHT share/emacs/site-lisp/python-mode.el include/python1.5/Python.h include/python1.5/abstract.h +include/python1.5/addrinfo.h include/python1.5/bitset.h include/python1.5/bufferobject.h include/python1.5/cStringIO.h diff --git a/lang/python22/Makefile b/lang/python22/Makefile index d8f497196ca8..108a8abb6224 100644 --- a/lang/python22/Makefile +++ b/lang/python22/Makefile @@ -13,14 +13,22 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ EXTRACT_SUFX= .tgz +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ +PATCHFILES= python-152-v6-20000113.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= tg@FreeBSD.org LIB_DEPENDS= ${TK_DEPENDS} -DIST_SUBDIR= python WRKSRC= ${WRKDIR}/Python-1.5.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl --with-libs='-lxpg4' +.if defined(USE_INET6) +CONFIGURE_ARGS+=--enable-ipv6 +.else +CONFIGURE_ARGS+=--disable-ipv6 +.endif CONFIGURE_ENV= OPT="${CFLAGS}" INSTALL_TARGET= install PLIST= ${WRKDIR}/PLIST @@ -54,6 +62,7 @@ WITH_THREADS?= yes LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread + CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" .endif @@ -75,6 +84,9 @@ WITH_TOOLS?= yes .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes PLIST_TOOLS= ${PKGDIR}/PLIST.Tools .endif +.if defined(USE_INET6) +PLIST_V6= ${PKGDIR}/PLIST.v6 +.endif post-extract: cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh @@ -101,7 +113,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -114,5 +126,8 @@ post-install: @cd ${WRKSRC}; tar cf - Tools | \ (cd ${PREFIX}/lib/python1.5; tar xf -) .endif +.if defined(USE_INET6) + ${INSTALL_DATA} ${WRKSRC}/README.v6 ${PREFIX}/share/doc/python +.endif .include <bsd.port.post.mk> diff --git a/lang/python22/distinfo b/lang/python22/distinfo index 72ca6a75cf6c..f3530a2ebfa8 100644 --- a/lang/python22/distinfo +++ b/lang/python22/distinfo @@ -1 +1,2 @@ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python22/pkg-plist b/lang/python22/pkg-plist index 58ef1c97477d..22ee7513f4ab 100644 --- a/lang/python22/pkg-plist +++ b/lang/python22/pkg-plist @@ -4,6 +4,7 @@ share/doc/python/COPYRIGHT share/emacs/site-lisp/python-mode.el include/python1.5/Python.h include/python1.5/abstract.h +include/python1.5/addrinfo.h include/python1.5/bitset.h include/python1.5/bufferobject.h include/python1.5/cStringIO.h diff --git a/lang/python23/Makefile b/lang/python23/Makefile index d8f497196ca8..108a8abb6224 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -13,14 +13,22 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ EXTRACT_SUFX= .tgz +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ +PATCHFILES= python-152-v6-20000113.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= tg@FreeBSD.org LIB_DEPENDS= ${TK_DEPENDS} -DIST_SUBDIR= python WRKSRC= ${WRKDIR}/Python-1.5.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl --with-libs='-lxpg4' +.if defined(USE_INET6) +CONFIGURE_ARGS+=--enable-ipv6 +.else +CONFIGURE_ARGS+=--disable-ipv6 +.endif CONFIGURE_ENV= OPT="${CFLAGS}" INSTALL_TARGET= install PLIST= ${WRKDIR}/PLIST @@ -54,6 +62,7 @@ WITH_THREADS?= yes LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread + CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" .endif @@ -75,6 +84,9 @@ WITH_TOOLS?= yes .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes PLIST_TOOLS= ${PKGDIR}/PLIST.Tools .endif +.if defined(USE_INET6) +PLIST_V6= ${PKGDIR}/PLIST.v6 +.endif post-extract: cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh @@ -101,7 +113,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -114,5 +126,8 @@ post-install: @cd ${WRKSRC}; tar cf - Tools | \ (cd ${PREFIX}/lib/python1.5; tar xf -) .endif +.if defined(USE_INET6) + ${INSTALL_DATA} ${WRKSRC}/README.v6 ${PREFIX}/share/doc/python +.endif .include <bsd.port.post.mk> diff --git a/lang/python23/distinfo b/lang/python23/distinfo index 72ca6a75cf6c..f3530a2ebfa8 100644 --- a/lang/python23/distinfo +++ b/lang/python23/distinfo @@ -1 +1,2 @@ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist index 58ef1c97477d..22ee7513f4ab 100644 --- a/lang/python23/pkg-plist +++ b/lang/python23/pkg-plist @@ -4,6 +4,7 @@ share/doc/python/COPYRIGHT share/emacs/site-lisp/python-mode.el include/python1.5/Python.h include/python1.5/abstract.h +include/python1.5/addrinfo.h include/python1.5/bitset.h include/python1.5/bufferobject.h include/python1.5/cStringIO.h diff --git a/lang/python24/Makefile b/lang/python24/Makefile index d8f497196ca8..108a8abb6224 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -13,14 +13,22 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ EXTRACT_SUFX= .tgz +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ +PATCHFILES= python-152-v6-20000113.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= tg@FreeBSD.org LIB_DEPENDS= ${TK_DEPENDS} -DIST_SUBDIR= python WRKSRC= ${WRKDIR}/Python-1.5.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl --with-libs='-lxpg4' +.if defined(USE_INET6) +CONFIGURE_ARGS+=--enable-ipv6 +.else +CONFIGURE_ARGS+=--disable-ipv6 +.endif CONFIGURE_ENV= OPT="${CFLAGS}" INSTALL_TARGET= install PLIST= ${WRKDIR}/PLIST @@ -54,6 +62,7 @@ WITH_THREADS?= yes LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread + CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" .endif @@ -75,6 +84,9 @@ WITH_TOOLS?= yes .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes PLIST_TOOLS= ${PKGDIR}/PLIST.Tools .endif +.if defined(USE_INET6) +PLIST_V6= ${PKGDIR}/PLIST.v6 +.endif post-extract: cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh @@ -101,7 +113,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -114,5 +126,8 @@ post-install: @cd ${WRKSRC}; tar cf - Tools | \ (cd ${PREFIX}/lib/python1.5; tar xf -) .endif +.if defined(USE_INET6) + ${INSTALL_DATA} ${WRKSRC}/README.v6 ${PREFIX}/share/doc/python +.endif .include <bsd.port.post.mk> diff --git a/lang/python24/distinfo b/lang/python24/distinfo index 72ca6a75cf6c..f3530a2ebfa8 100644 --- a/lang/python24/distinfo +++ b/lang/python24/distinfo @@ -1 +1,2 @@ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist index 58ef1c97477d..22ee7513f4ab 100644 --- a/lang/python24/pkg-plist +++ b/lang/python24/pkg-plist @@ -4,6 +4,7 @@ share/doc/python/COPYRIGHT share/emacs/site-lisp/python-mode.el include/python1.5/Python.h include/python1.5/abstract.h +include/python1.5/addrinfo.h include/python1.5/bitset.h include/python1.5/bufferobject.h include/python1.5/cStringIO.h diff --git a/lang/python25/Makefile b/lang/python25/Makefile index d8f497196ca8..108a8abb6224 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -13,14 +13,22 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ EXTRACT_SUFX= .tgz +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ +PATCHFILES= python-152-v6-20000113.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= tg@FreeBSD.org LIB_DEPENDS= ${TK_DEPENDS} -DIST_SUBDIR= python WRKSRC= ${WRKDIR}/Python-1.5.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl --with-libs='-lxpg4' +.if defined(USE_INET6) +CONFIGURE_ARGS+=--enable-ipv6 +.else +CONFIGURE_ARGS+=--disable-ipv6 +.endif CONFIGURE_ENV= OPT="${CFLAGS}" INSTALL_TARGET= install PLIST= ${WRKDIR}/PLIST @@ -54,6 +62,7 @@ WITH_THREADS?= yes LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread + CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" .endif @@ -75,6 +84,9 @@ WITH_TOOLS?= yes .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes PLIST_TOOLS= ${PKGDIR}/PLIST.Tools .endif +.if defined(USE_INET6) +PLIST_V6= ${PKGDIR}/PLIST.v6 +.endif post-extract: cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh @@ -101,7 +113,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -114,5 +126,8 @@ post-install: @cd ${WRKSRC}; tar cf - Tools | \ (cd ${PREFIX}/lib/python1.5; tar xf -) .endif +.if defined(USE_INET6) + ${INSTALL_DATA} ${WRKSRC}/README.v6 ${PREFIX}/share/doc/python +.endif .include <bsd.port.post.mk> diff --git a/lang/python25/distinfo b/lang/python25/distinfo index 72ca6a75cf6c..f3530a2ebfa8 100644 --- a/lang/python25/distinfo +++ b/lang/python25/distinfo @@ -1 +1,2 @@ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist index 58ef1c97477d..22ee7513f4ab 100644 --- a/lang/python25/pkg-plist +++ b/lang/python25/pkg-plist @@ -4,6 +4,7 @@ share/doc/python/COPYRIGHT share/emacs/site-lisp/python-mode.el include/python1.5/Python.h include/python1.5/abstract.h +include/python1.5/addrinfo.h include/python1.5/bitset.h include/python1.5/bufferobject.h include/python1.5/cStringIO.h diff --git a/lang/python26/Makefile b/lang/python26/Makefile index d8f497196ca8..108a8abb6224 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -13,14 +13,22 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ EXTRACT_SUFX= .tgz +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ +PATCHFILES= python-152-v6-20000113.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= tg@FreeBSD.org LIB_DEPENDS= ${TK_DEPENDS} -DIST_SUBDIR= python WRKSRC= ${WRKDIR}/Python-1.5.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl --with-libs='-lxpg4' +.if defined(USE_INET6) +CONFIGURE_ARGS+=--enable-ipv6 +.else +CONFIGURE_ARGS+=--disable-ipv6 +.endif CONFIGURE_ENV= OPT="${CFLAGS}" INSTALL_TARGET= install PLIST= ${WRKDIR}/PLIST @@ -54,6 +62,7 @@ WITH_THREADS?= yes LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread + CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" .endif @@ -75,6 +84,9 @@ WITH_TOOLS?= yes .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes PLIST_TOOLS= ${PKGDIR}/PLIST.Tools .endif +.if defined(USE_INET6) +PLIST_V6= ${PKGDIR}/PLIST.v6 +.endif post-extract: cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh @@ -101,7 +113,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -114,5 +126,8 @@ post-install: @cd ${WRKSRC}; tar cf - Tools | \ (cd ${PREFIX}/lib/python1.5; tar xf -) .endif +.if defined(USE_INET6) + ${INSTALL_DATA} ${WRKSRC}/README.v6 ${PREFIX}/share/doc/python +.endif .include <bsd.port.post.mk> diff --git a/lang/python26/distinfo b/lang/python26/distinfo index 72ca6a75cf6c..f3530a2ebfa8 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1 +1,2 @@ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist index 58ef1c97477d..22ee7513f4ab 100644 --- a/lang/python26/pkg-plist +++ b/lang/python26/pkg-plist @@ -4,6 +4,7 @@ share/doc/python/COPYRIGHT share/emacs/site-lisp/python-mode.el include/python1.5/Python.h include/python1.5/abstract.h +include/python1.5/addrinfo.h include/python1.5/bitset.h include/python1.5/bufferobject.h include/python1.5/cStringIO.h diff --git a/lang/python27/Makefile b/lang/python27/Makefile index d8f497196ca8..108a8abb6224 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -13,14 +13,22 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ EXTRACT_SUFX= .tgz +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ +PATCHFILES= python-152-v6-20000113.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= tg@FreeBSD.org LIB_DEPENDS= ${TK_DEPENDS} -DIST_SUBDIR= python WRKSRC= ${WRKDIR}/Python-1.5.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl --with-libs='-lxpg4' +.if defined(USE_INET6) +CONFIGURE_ARGS+=--enable-ipv6 +.else +CONFIGURE_ARGS+=--disable-ipv6 +.endif CONFIGURE_ENV= OPT="${CFLAGS}" INSTALL_TARGET= install PLIST= ${WRKDIR}/PLIST @@ -54,6 +62,7 @@ WITH_THREADS?= yes LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread + CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" .endif @@ -75,6 +84,9 @@ WITH_TOOLS?= yes .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes PLIST_TOOLS= ${PKGDIR}/PLIST.Tools .endif +.if defined(USE_INET6) +PLIST_V6= ${PKGDIR}/PLIST.v6 +.endif post-extract: cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh @@ -101,7 +113,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -114,5 +126,8 @@ post-install: @cd ${WRKSRC}; tar cf - Tools | \ (cd ${PREFIX}/lib/python1.5; tar xf -) .endif +.if defined(USE_INET6) + ${INSTALL_DATA} ${WRKSRC}/README.v6 ${PREFIX}/share/doc/python +.endif .include <bsd.port.post.mk> diff --git a/lang/python27/distinfo b/lang/python27/distinfo index 72ca6a75cf6c..f3530a2ebfa8 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -1 +1,2 @@ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist index 58ef1c97477d..22ee7513f4ab 100644 --- a/lang/python27/pkg-plist +++ b/lang/python27/pkg-plist @@ -4,6 +4,7 @@ share/doc/python/COPYRIGHT share/emacs/site-lisp/python-mode.el include/python1.5/Python.h include/python1.5/abstract.h +include/python1.5/addrinfo.h include/python1.5/bitset.h include/python1.5/bufferobject.h include/python1.5/cStringIO.h diff --git a/lang/python30/Makefile b/lang/python30/Makefile index d8f497196ca8..108a8abb6224 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -13,14 +13,22 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ EXTRACT_SUFX= .tgz +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ +PATCHFILES= python-152-v6-20000113.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= tg@FreeBSD.org LIB_DEPENDS= ${TK_DEPENDS} -DIST_SUBDIR= python WRKSRC= ${WRKDIR}/Python-1.5.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl --with-libs='-lxpg4' +.if defined(USE_INET6) +CONFIGURE_ARGS+=--enable-ipv6 +.else +CONFIGURE_ARGS+=--disable-ipv6 +.endif CONFIGURE_ENV= OPT="${CFLAGS}" INSTALL_TARGET= install PLIST= ${WRKDIR}/PLIST @@ -54,6 +62,7 @@ WITH_THREADS?= yes LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread + CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" .endif @@ -75,6 +84,9 @@ WITH_TOOLS?= yes .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes PLIST_TOOLS= ${PKGDIR}/PLIST.Tools .endif +.if defined(USE_INET6) +PLIST_V6= ${PKGDIR}/PLIST.v6 +.endif post-extract: cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh @@ -101,7 +113,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -114,5 +126,8 @@ post-install: @cd ${WRKSRC}; tar cf - Tools | \ (cd ${PREFIX}/lib/python1.5; tar xf -) .endif +.if defined(USE_INET6) + ${INSTALL_DATA} ${WRKSRC}/README.v6 ${PREFIX}/share/doc/python +.endif .include <bsd.port.post.mk> diff --git a/lang/python30/distinfo b/lang/python30/distinfo index 72ca6a75cf6c..f3530a2ebfa8 100644 --- a/lang/python30/distinfo +++ b/lang/python30/distinfo @@ -1 +1,2 @@ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist index 58ef1c97477d..22ee7513f4ab 100644 --- a/lang/python30/pkg-plist +++ b/lang/python30/pkg-plist @@ -4,6 +4,7 @@ share/doc/python/COPYRIGHT share/emacs/site-lisp/python-mode.el include/python1.5/Python.h include/python1.5/abstract.h +include/python1.5/addrinfo.h include/python1.5/bitset.h include/python1.5/bufferobject.h include/python1.5/cStringIO.h diff --git a/lang/python31/Makefile b/lang/python31/Makefile index d8f497196ca8..108a8abb6224 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -13,14 +13,22 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ EXTRACT_SUFX= .tgz +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ +PATCHFILES= python-152-v6-20000113.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= tg@FreeBSD.org LIB_DEPENDS= ${TK_DEPENDS} -DIST_SUBDIR= python WRKSRC= ${WRKDIR}/Python-1.5.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl --with-libs='-lxpg4' +.if defined(USE_INET6) +CONFIGURE_ARGS+=--enable-ipv6 +.else +CONFIGURE_ARGS+=--disable-ipv6 +.endif CONFIGURE_ENV= OPT="${CFLAGS}" INSTALL_TARGET= install PLIST= ${WRKDIR}/PLIST @@ -54,6 +62,7 @@ WITH_THREADS?= yes LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread + CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" .endif @@ -75,6 +84,9 @@ WITH_TOOLS?= yes .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes PLIST_TOOLS= ${PKGDIR}/PLIST.Tools .endif +.if defined(USE_INET6) +PLIST_V6= ${PKGDIR}/PLIST.v6 +.endif post-extract: cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh @@ -101,7 +113,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -114,5 +126,8 @@ post-install: @cd ${WRKSRC}; tar cf - Tools | \ (cd ${PREFIX}/lib/python1.5; tar xf -) .endif +.if defined(USE_INET6) + ${INSTALL_DATA} ${WRKSRC}/README.v6 ${PREFIX}/share/doc/python +.endif .include <bsd.port.post.mk> diff --git a/lang/python31/distinfo b/lang/python31/distinfo index 72ca6a75cf6c..f3530a2ebfa8 100644 --- a/lang/python31/distinfo +++ b/lang/python31/distinfo @@ -1 +1,2 @@ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist index 58ef1c97477d..22ee7513f4ab 100644 --- a/lang/python31/pkg-plist +++ b/lang/python31/pkg-plist @@ -4,6 +4,7 @@ share/doc/python/COPYRIGHT share/emacs/site-lisp/python-mode.el include/python1.5/Python.h include/python1.5/abstract.h +include/python1.5/addrinfo.h include/python1.5/bitset.h include/python1.5/bufferobject.h include/python1.5/cStringIO.h diff --git a/lang/python32/Makefile b/lang/python32/Makefile index d8f497196ca8..108a8abb6224 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -13,14 +13,22 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ EXTRACT_SUFX= .tgz +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ +PATCHFILES= python-152-v6-20000113.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= tg@FreeBSD.org LIB_DEPENDS= ${TK_DEPENDS} -DIST_SUBDIR= python WRKSRC= ${WRKDIR}/Python-1.5.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl --with-libs='-lxpg4' +.if defined(USE_INET6) +CONFIGURE_ARGS+=--enable-ipv6 +.else +CONFIGURE_ARGS+=--disable-ipv6 +.endif CONFIGURE_ENV= OPT="${CFLAGS}" INSTALL_TARGET= install PLIST= ${WRKDIR}/PLIST @@ -54,6 +62,7 @@ WITH_THREADS?= yes LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread + CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" .endif @@ -75,6 +84,9 @@ WITH_TOOLS?= yes .if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes PLIST_TOOLS= ${PKGDIR}/PLIST.Tools .endif +.if defined(USE_INET6) +PLIST_V6= ${PKGDIR}/PLIST.v6 +.endif post-extract: cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh @@ -101,7 +113,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -114,5 +126,8 @@ post-install: @cd ${WRKSRC}; tar cf - Tools | \ (cd ${PREFIX}/lib/python1.5; tar xf -) .endif +.if defined(USE_INET6) + ${INSTALL_DATA} ${WRKSRC}/README.v6 ${PREFIX}/share/doc/python +.endif .include <bsd.port.post.mk> diff --git a/lang/python32/distinfo b/lang/python32/distinfo index 72ca6a75cf6c..f3530a2ebfa8 100644 --- a/lang/python32/distinfo +++ b/lang/python32/distinfo @@ -1 +1,2 @@ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist index 58ef1c97477d..22ee7513f4ab 100644 --- a/lang/python32/pkg-plist +++ b/lang/python32/pkg-plist @@ -4,6 +4,7 @@ share/doc/python/COPYRIGHT share/emacs/site-lisp/python-mode.el include/python1.5/Python.h include/python1.5/abstract.h +include/python1.5/addrinfo.h include/python1.5/bitset.h include/python1.5/bufferobject.h include/python1.5/cStringIO.h |