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

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>

lang/python30/distinfo

@@ -1,2 +1 @@
 MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752
-MD5 (python/python-152-v6-20000113.diff.gz) = 9f130f18402d4731287db54acdf7a01f

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