diff options
| author | sumikawa <sumikawa@FreeBSD.org> | 2000-01-27 23:54:26 +0800 |
|---|---|---|
| committer | sumikawa <sumikawa@FreeBSD.org> | 2000-01-27 23:54:26 +0800 |
| commit | 75e2171b0157523588e53163d4790383127289a1 (patch) | |
| tree | 8cc6c880ee483709d5ccc40a854110013f04f642 /lang | |
| parent | ff674c6466cfc34599b6e2a4e7eb78365a80c5a9 (diff) | |
| download | freebsd-ports-gnome-75e2171b0157523588e53163d4790383127289a1.tar.gz freebsd-ports-gnome-75e2171b0157523588e53163d4790383127289a1.tar.zst freebsd-ports-gnome-75e2171b0157523588e53163d4790383127289a1.zip | |
move IPv6-enable python to python+ipv6 and revert origial python
to before IPv6.
Since IPv6-enable python make bigger the size of sockaddr, some of scripts
are affected. I maintain python+ipv6 separately to minimize impact for users.
It will be removed when IPv6 patches are merged into original distribution,
such as ruby.
Repositry copied by: asami
Diffstat (limited to 'lang')
44 files changed, 54 insertions, 307 deletions
diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile index 7013b8601e4d..28c2c6639c9c 100644 --- a/lang/python+ipv6/Makefile +++ b/lang/python+ipv6/Makefile @@ -7,17 +7,17 @@ # DISTNAME= py152 -PKGNAME= python-1.5.2 +PKGNAME= python+ipv6-1.5.2 CATEGORIES= lang python tk82 ipv6 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 +PATCHFILES= python-152-v6-20000120.diff.gz PATCH_DIST_STRIP= -p1 -MAINTAINER= tg@FreeBSD.org +MAINTAINER= sumikawa@FreeBSD.org LIB_DEPENDS= ${TK_DEPENDS} @@ -25,11 +25,6 @@ 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 @@ -85,9 +80,6 @@ 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 @@ -100,6 +92,13 @@ post-configure: .include <bsd.port.pre.mk> +.if ${OSVERSION} >= 400014 +PLIST_V6= ${PKGDIR}/PLIST.v6 +CONFIGURE_ARGS+=--enable-ipv6 +.else +CONFIGURE_ARGS+=--disable-ipv6 +.endif + .if ${OSVERSION} >= 400000 PLATFORMS=plat-freebsd2 plat-freebsd3 .elif ${OSVERSION} >= 300000 @@ -127,7 +126,7 @@ post-install: @cd ${WRKSRC}; tar cf - Tools | \ (cd ${PREFIX}/lib/python1.5; tar xf -) .endif -.if defined(USE_INET6) +.if ${OSVERSION} >= 400014 ${INSTALL_DATA} ${WRKSRC}/README.v6 ${PREFIX}/share/doc/python .endif diff --git a/lang/python+ipv6/distinfo b/lang/python+ipv6/distinfo index e1b1bece3998..dbc3ba6b23af 100644 --- a/lang/python+ipv6/distinfo +++ b/lang/python+ipv6/distinfo @@ -1,2 +1,2 @@ MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 -MD5 (python/python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f +MD5 (python/python-152-v6-20000120.diff.gz) = bbbd8296a8f651a76ea60a9ff0a5feb1 diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile index 7013b8601e4d..d8f497196ca8 100644 --- a/lang/python-devel/Makefile +++ b/lang/python-devel/Makefile @@ -8,28 +8,19 @@ DISTNAME= py152 PKGNAME= python-1.5.2 -CATEGORIES= lang python tk82 ipv6 +CATEGORIES= lang python tk82 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 +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 @@ -63,7 +54,6 @@ 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 @@ -85,9 +75,6 @@ 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 @@ -114,7 +101,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -127,8 +114,5 @@ 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 e1b1bece3998..72ca6a75cf6c 100644 --- a/lang/python-devel/distinfo +++ b/lang/python-devel/distinfo @@ -1,2 +1 @@ MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 -MD5 (python/python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist index 22ee7513f4ab..58ef1c97477d 100644 --- a/lang/python-devel/pkg-plist +++ b/lang/python-devel/pkg-plist @@ -4,7 +4,6 @@ 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 7013b8601e4d..d8f497196ca8 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -8,28 +8,19 @@ DISTNAME= py152 PKGNAME= python-1.5.2 -CATEGORIES= lang python tk82 ipv6 +CATEGORIES= lang python tk82 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 +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 @@ -63,7 +54,6 @@ 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 @@ -85,9 +75,6 @@ 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 @@ -114,7 +101,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -127,8 +114,5 @@ 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 e1b1bece3998..72ca6a75cf6c 100644 --- a/lang/python/distinfo +++ b/lang/python/distinfo @@ -1,2 +1 @@ MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 -MD5 (python/python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist index 22ee7513f4ab..58ef1c97477d 100644 --- a/lang/python/pkg-plist +++ b/lang/python/pkg-plist @@ -4,7 +4,6 @@ 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 7013b8601e4d..d8f497196ca8 100644 --- a/lang/python15/Makefile +++ b/lang/python15/Makefile @@ -8,28 +8,19 @@ DISTNAME= py152 PKGNAME= python-1.5.2 -CATEGORIES= lang python tk82 ipv6 +CATEGORIES= lang python tk82 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 +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 @@ -63,7 +54,6 @@ 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 @@ -85,9 +75,6 @@ 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 @@ -114,7 +101,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -127,8 +114,5 @@ 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 e1b1bece3998..72ca6a75cf6c 100644 --- a/lang/python15/distinfo +++ b/lang/python15/distinfo @@ -1,2 +1 @@ MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 -MD5 (python/python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python15/pkg-plist b/lang/python15/pkg-plist index 22ee7513f4ab..58ef1c97477d 100644 --- a/lang/python15/pkg-plist +++ b/lang/python15/pkg-plist @@ -4,7 +4,6 @@ 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 7013b8601e4d..d8f497196ca8 100644 --- a/lang/python20/Makefile +++ b/lang/python20/Makefile @@ -8,28 +8,19 @@ DISTNAME= py152 PKGNAME= python-1.5.2 -CATEGORIES= lang python tk82 ipv6 +CATEGORIES= lang python tk82 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 +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 @@ -63,7 +54,6 @@ 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 @@ -85,9 +75,6 @@ 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 @@ -114,7 +101,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -127,8 +114,5 @@ 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 e1b1bece3998..72ca6a75cf6c 100644 --- a/lang/python20/distinfo +++ b/lang/python20/distinfo @@ -1,2 +1 @@ MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 -MD5 (python/python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python20/pkg-plist b/lang/python20/pkg-plist index 22ee7513f4ab..58ef1c97477d 100644 --- a/lang/python20/pkg-plist +++ b/lang/python20/pkg-plist @@ -4,7 +4,6 @@ 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 7013b8601e4d..d8f497196ca8 100644 --- a/lang/python21/Makefile +++ b/lang/python21/Makefile @@ -8,28 +8,19 @@ DISTNAME= py152 PKGNAME= python-1.5.2 -CATEGORIES= lang python tk82 ipv6 +CATEGORIES= lang python tk82 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 +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 @@ -63,7 +54,6 @@ 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 @@ -85,9 +75,6 @@ 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 @@ -114,7 +101,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -127,8 +114,5 @@ 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 e1b1bece3998..72ca6a75cf6c 100644 --- a/lang/python21/distinfo +++ b/lang/python21/distinfo @@ -1,2 +1 @@ MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 -MD5 (python/python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python21/pkg-plist b/lang/python21/pkg-plist index 22ee7513f4ab..58ef1c97477d 100644 --- a/lang/python21/pkg-plist +++ b/lang/python21/pkg-plist @@ -4,7 +4,6 @@ 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 7013b8601e4d..d8f497196ca8 100644 --- a/lang/python22/Makefile +++ b/lang/python22/Makefile @@ -8,28 +8,19 @@ DISTNAME= py152 PKGNAME= python-1.5.2 -CATEGORIES= lang python tk82 ipv6 +CATEGORIES= lang python tk82 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 +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 @@ -63,7 +54,6 @@ 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 @@ -85,9 +75,6 @@ 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 @@ -114,7 +101,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -127,8 +114,5 @@ 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 e1b1bece3998..72ca6a75cf6c 100644 --- a/lang/python22/distinfo +++ b/lang/python22/distinfo @@ -1,2 +1 @@ MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 -MD5 (python/python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python22/pkg-plist b/lang/python22/pkg-plist index 22ee7513f4ab..58ef1c97477d 100644 --- a/lang/python22/pkg-plist +++ b/lang/python22/pkg-plist @@ -4,7 +4,6 @@ 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 7013b8601e4d..d8f497196ca8 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -8,28 +8,19 @@ DISTNAME= py152 PKGNAME= python-1.5.2 -CATEGORIES= lang python tk82 ipv6 +CATEGORIES= lang python tk82 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 +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 @@ -63,7 +54,6 @@ 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 @@ -85,9 +75,6 @@ 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 @@ -114,7 +101,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -127,8 +114,5 @@ 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 e1b1bece3998..72ca6a75cf6c 100644 --- a/lang/python23/distinfo +++ b/lang/python23/distinfo @@ -1,2 +1 @@ MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 -MD5 (python/python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist index 22ee7513f4ab..58ef1c97477d 100644 --- a/lang/python23/pkg-plist +++ b/lang/python23/pkg-plist @@ -4,7 +4,6 @@ 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 7013b8601e4d..d8f497196ca8 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -8,28 +8,19 @@ DISTNAME= py152 PKGNAME= python-1.5.2 -CATEGORIES= lang python tk82 ipv6 +CATEGORIES= lang python tk82 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 +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 @@ -63,7 +54,6 @@ 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 @@ -85,9 +75,6 @@ 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 @@ -114,7 +101,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -127,8 +114,5 @@ 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 e1b1bece3998..72ca6a75cf6c 100644 --- a/lang/python24/distinfo +++ b/lang/python24/distinfo @@ -1,2 +1 @@ MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 -MD5 (python/python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist index 22ee7513f4ab..58ef1c97477d 100644 --- a/lang/python24/pkg-plist +++ b/lang/python24/pkg-plist @@ -4,7 +4,6 @@ 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 7013b8601e4d..d8f497196ca8 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -8,28 +8,19 @@ DISTNAME= py152 PKGNAME= python-1.5.2 -CATEGORIES= lang python tk82 ipv6 +CATEGORIES= lang python tk82 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 +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 @@ -63,7 +54,6 @@ 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 @@ -85,9 +75,6 @@ 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 @@ -114,7 +101,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -127,8 +114,5 @@ 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 e1b1bece3998..72ca6a75cf6c 100644 --- a/lang/python25/distinfo +++ b/lang/python25/distinfo @@ -1,2 +1 @@ MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 -MD5 (python/python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist index 22ee7513f4ab..58ef1c97477d 100644 --- a/lang/python25/pkg-plist +++ b/lang/python25/pkg-plist @@ -4,7 +4,6 @@ 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 7013b8601e4d..d8f497196ca8 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -8,28 +8,19 @@ DISTNAME= py152 PKGNAME= python-1.5.2 -CATEGORIES= lang python tk82 ipv6 +CATEGORIES= lang python tk82 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 +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 @@ -63,7 +54,6 @@ 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 @@ -85,9 +75,6 @@ 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 @@ -114,7 +101,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -127,8 +114,5 @@ 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 e1b1bece3998..72ca6a75cf6c 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1,2 +1 @@ MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 -MD5 (python/python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist index 22ee7513f4ab..58ef1c97477d 100644 --- a/lang/python26/pkg-plist +++ b/lang/python26/pkg-plist @@ -4,7 +4,6 @@ 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 7013b8601e4d..d8f497196ca8 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -8,28 +8,19 @@ DISTNAME= py152 PKGNAME= python-1.5.2 -CATEGORIES= lang python tk82 ipv6 +CATEGORIES= lang python tk82 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 +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 @@ -63,7 +54,6 @@ 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 @@ -85,9 +75,6 @@ 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 @@ -114,7 +101,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -127,8 +114,5 @@ 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 e1b1bece3998..72ca6a75cf6c 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -1,2 +1 @@ MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 -MD5 (python/python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist index 22ee7513f4ab..58ef1c97477d 100644 --- a/lang/python27/pkg-plist +++ b/lang/python27/pkg-plist @@ -4,7 +4,6 @@ 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 7013b8601e4d..d8f497196ca8 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -8,28 +8,19 @@ DISTNAME= py152 PKGNAME= python-1.5.2 -CATEGORIES= lang python tk82 ipv6 +CATEGORIES= lang python tk82 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 +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 @@ -63,7 +54,6 @@ 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 @@ -85,9 +75,6 @@ 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 @@ -114,7 +101,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -127,8 +114,5 @@ 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 e1b1bece3998..72ca6a75cf6c 100644 --- a/lang/python30/distinfo +++ b/lang/python30/distinfo @@ -1,2 +1 @@ MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 -MD5 (python/python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist index 22ee7513f4ab..58ef1c97477d 100644 --- a/lang/python30/pkg-plist +++ b/lang/python30/pkg-plist @@ -4,7 +4,6 @@ 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 7013b8601e4d..d8f497196ca8 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -8,28 +8,19 @@ DISTNAME= py152 PKGNAME= python-1.5.2 -CATEGORIES= lang python tk82 ipv6 +CATEGORIES= lang python tk82 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 +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 @@ -63,7 +54,6 @@ 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 @@ -85,9 +75,6 @@ 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 @@ -114,7 +101,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -127,8 +114,5 @@ 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 e1b1bece3998..72ca6a75cf6c 100644 --- a/lang/python31/distinfo +++ b/lang/python31/distinfo @@ -1,2 +1 @@ MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 -MD5 (python/python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist index 22ee7513f4ab..58ef1c97477d 100644 --- a/lang/python31/pkg-plist +++ b/lang/python31/pkg-plist @@ -4,7 +4,6 @@ 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 7013b8601e4d..d8f497196ca8 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -8,28 +8,19 @@ DISTNAME= py152 PKGNAME= python-1.5.2 -CATEGORIES= lang python tk82 ipv6 +CATEGORIES= lang python tk82 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 +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 @@ -63,7 +54,6 @@ 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 @@ -85,9 +75,6 @@ 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 @@ -114,7 +101,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PREFIX}/lib/python1.5/${platform}/ .endfor - @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_V6} ${PKGDIR}/PLIST + @sort -r -o ${PLIST} ${PLIST_TK} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/PLIST post-install: strip ${PREFIX}/bin/python @@ -127,8 +114,5 @@ 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 e1b1bece3998..72ca6a75cf6c 100644 --- a/lang/python32/distinfo +++ b/lang/python32/distinfo @@ -1,2 +1 @@ MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 -MD5 (python/python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist index 22ee7513f4ab..58ef1c97477d 100644 --- a/lang/python32/pkg-plist +++ b/lang/python32/pkg-plist @@ -4,7 +4,6 @@ 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 |