diff options
| author | Hye-Shik Chang <perky@FreeBSD.org> | 2005-01-29 05:01:02 +0000 |
|---|---|---|
| committer | Hye-Shik Chang <perky@FreeBSD.org> | 2005-01-29 05:01:02 +0000 |
| commit | 35c8a898d416e25fa1dc4acf3b460f7a3850210a (patch) | |
| tree | 463f1e08a3f868a2d3dc6ad7a1b04594ded7504c | |
| parent | c5810eb8aadb7ee239570f4ce3995dcd54ac617a (diff) | |
| download | ports-35c8a898d416e25fa1dc4acf3b460f7a3850210a.tar.gz ports-35c8a898d416e25fa1dc4acf3b460f7a3850210a.zip | |
Notes
38 files changed, 428 insertions, 3955 deletions
diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk index 8d4b73abc63e..a535cd25c89a 100644 --- a/Mk/bsd.python.mk +++ b/Mk/bsd.python.mk @@ -117,7 +117,7 @@ Python_Include_MAINTAINER= perky@FreeBSD.org # default: setup.py _PYTHON_PORTBRANCH= 2.4 -_PYTHON_ALLBRANCHES= 2.4 2.3 2.2 2.1 # preferred first +_PYTHON_ALLBRANCHES= 2.4 2.3 2.2 2.1 2.5 # preferred first .if defined(USE_ZOPE) PYTHON_VERSION= python2.3 @@ -207,8 +207,15 @@ PYTHON_PORTVERSION= ${_PYTHON_PORTVERSION} # Propagate the chosen python version to submakes. .MAKEFLAGS: PYTHON_VERSION=python${_PYTHON_VERSION} +# Python-2.5 +.if ${PYTHON_VERSION} == "python2.5" +PYTHON_PORTVERSION?=2.5.a0.20050129 +PYTHON_PORTSDIR= ${PORTSDIR}/lang/python-devel +PYTHON_REL= 250 +PYTHON_SUFFIX= 25 + # Python-2.4 -.if ${PYTHON_VERSION} == "python2.4" +.elif ${PYTHON_VERSION} == "python2.4" PYTHON_PORTVERSION?=2.4 PYTHON_PORTSDIR= ${PORTSDIR}/lang/python PYTHON_REL= 240 @@ -250,21 +257,22 @@ check-makevars:: @${ECHO} "Legal values are:" @${ECHO} " python2.1" @${ECHO} " python2.2" - @${ECHO} " python2.3 (default)" - @${ECHO} " python2.4" + @${ECHO} " python2.3" + @${ECHO} " python2.4 (default)" + @${ECHO} " python2.5" @${FALSE} .endif -PYTHON_MASTER_SITES= ${MASTER_SITE_PYTHON} -.if defined(PYTHON_REL) && ${PYTHON_REL} == 240 -PYTHON_MASTER_SITE_SUBDIR= ftp/python/2.4 -PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION:S/2.4./2.4/}.tgz -PYTHON_WRKSRC= ${WRKDIR}/Python-${PYTHON_PORTVERSION:S/2.4./2.4/} +.if defined(PYTHON_REL) && ${PYTHON_REL} == 250 +PYTHON_MASTER_SITES= ${MASTER_SITE_LOCAL} +PYTHON_MASTER_SITE_SUBDIR= perky +PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION}.tgz .else +PYTHON_MASTER_SITES= ${MASTER_SITE_PYTHON} PYTHON_MASTER_SITE_SUBDIR= ftp/python/${PYTHON_PORTVERSION} PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION}.tgz +.endif # defined(PYTHON_REL) && ${PYTHON_REL} == 250 PYTHON_WRKSRC= ${WRKDIR}/Python-${PYTHON_PORTVERSION} -.endif # defined(PYTHON_REL) && ${PYTHON_REL} == 240 PYTHON_INCLUDEDIR= ${PYTHONBASE}/include/${PYTHON_VERSION} PYTHON_LIBDIR= ${PYTHONBASE}/lib/${PYTHON_VERSION} diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile index 0daa10b33ea6..ec0f468b3ab4 100644 --- a/lang/python-devel/Makefile +++ b/lang/python-devel/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.5.a0.000000 +PORTVERSION= 2.5.a0.20050129 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -14,8 +14,6 @@ DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language -IGNORE= is not available yet - DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes @@ -29,7 +27,7 @@ MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes USE_REINPLACE= yes -PYTHON_VERSION= python2.4 +PYTHON_VERSION= python2.5 PYTHON_NO_DEPENDS= yes LATEST_LINK= ${PYTHON_VERSION:S/.//} @@ -108,11 +106,11 @@ PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.4 + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 + ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py + ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py pre-patch: ${REINPLACE_CMD} -e \ @@ -172,8 +170,8 @@ post-install: ${PREFIX}/bin @# additional files installing by ports - ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \ - ${WRKDIR}/smtpd2.4.py ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.5 ${WRKDIR}/idle2.5 \ + ${WRKDIR}/smtpd2.5.py ${PREFIX}/bin @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 diff --git a/lang/python-devel/distinfo b/lang/python-devel/distinfo index 24141b21691f..0072eec35a72 100644 --- a/lang/python-devel/distinfo +++ b/lang/python-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4c1.tgz) = deea93a91518314ffe9a7c5cd8144eac -SIZE (python/Python-2.4c1.tgz) = 9198160 +MD5 (python/Python-2.5.a0.20050129.tgz) = bdf571f3e28c4793bedbd180611c28e6 +SIZE (python/Python-2.5.a0.20050129.tgz) = 9227299 diff --git a/lang/python-devel/files/patch-Lib::plat-freebsd6::IN.py b/lang/python-devel/files/patch-Lib::plat-freebsd6::IN.py deleted file mode 100644 index 8316a9ef20a0..000000000000 --- a/lang/python-devel/files/patch-Lib::plat-freebsd6::IN.py +++ /dev/null @@ -1,518 +0,0 @@ ---- Lib/plat-freebsd6/IN.py Thu Jan 1 09:00:00 1970 -+++ Lib/plat-freebsd6/IN.py Sat Aug 21 08:09:15 2004 -@@ -0,0 +1,515 @@ -+# Generated by h2py from /usr/include/netinet/in.h -+ -+# Included from sys/cdefs.h -+def __P(protos): return protos -+ -+def __STRING(x): return #x -+ -+def __XSTRING(x): return __STRING(x) -+ -+def __P(protos): return () -+ -+def __STRING(x): return "x" -+ -+def __aligned(x): return __attribute__((__aligned__(x))) -+ -+def __section(x): return __attribute__((__section__(x))) -+ -+def __aligned(x): return __attribute__((__aligned__(x))) -+ -+def __section(x): return __attribute__((__section__(x))) -+ -+def __nonnull(x): return __attribute__((__nonnull__(x))) -+ -+def __predict_true(exp): return __builtin_expect((exp), 1) -+ -+def __predict_false(exp): return __builtin_expect((exp), 0) -+ -+def __predict_true(exp): return (exp) -+ -+def __predict_false(exp): return (exp) -+ -+def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -+ -+def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -+ -+def __RCSID_SOURCE(s): return __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s) -+ -+def __SCCSID(s): return __IDSTRING(__CONCAT(__sccsid_,__LINE__),s) -+ -+def __COPYRIGHT(s): return __IDSTRING(__CONCAT(__copyright_,__LINE__),s) -+ -+_POSIX_C_SOURCE = 199009 -+_POSIX_C_SOURCE = 199209 -+__XSI_VISIBLE = 600 -+_POSIX_C_SOURCE = 200112 -+__XSI_VISIBLE = 500 -+_POSIX_C_SOURCE = 199506 -+_POSIX_C_SOURCE = 198808 -+__POSIX_VISIBLE = 200112 -+__ISO_C_VISIBLE = 1999 -+__POSIX_VISIBLE = 199506 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199309 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199209 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199009 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 198808 -+__ISO_C_VISIBLE = 0 -+__POSIX_VISIBLE = 0 -+__XSI_VISIBLE = 0 -+__BSD_VISIBLE = 0 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 0 -+__XSI_VISIBLE = 0 -+__BSD_VISIBLE = 0 -+__ISO_C_VISIBLE = 1999 -+__POSIX_VISIBLE = 200112 -+__XSI_VISIBLE = 600 -+__BSD_VISIBLE = 1 -+__ISO_C_VISIBLE = 1999 -+ -+# Included from sys/_types.h -+ -+# Included from machine/_types.h -+ -+# Included from machine/endian.h -+_QUAD_HIGHWORD = 1 -+_QUAD_LOWWORD = 0 -+_LITTLE_ENDIAN = 1234 -+_BIG_ENDIAN = 4321 -+_PDP_ENDIAN = 3412 -+_BYTE_ORDER = _LITTLE_ENDIAN -+LITTLE_ENDIAN = _LITTLE_ENDIAN -+BIG_ENDIAN = _BIG_ENDIAN -+PDP_ENDIAN = _PDP_ENDIAN -+BYTE_ORDER = _BYTE_ORDER -+__INTEL_COMPILER_with_FreeBSD_endian = 1 -+__INTEL_COMPILER_with_FreeBSD_endian = 1 -+def __word_swap_int_var(x): return \ -+ -+def __word_swap_int_const(x): return \ -+ -+def __word_swap_int(x): return __word_swap_int_var(x) -+ -+def __byte_swap_int_var(x): return \ -+ -+def __byte_swap_int_var(x): return \ -+ -+def __byte_swap_int_const(x): return \ -+ -+def __byte_swap_int(x): return __byte_swap_int_var(x) -+ -+def __byte_swap_word_var(x): return \ -+ -+def __byte_swap_word_const(x): return \ -+ -+def __byte_swap_word(x): return __byte_swap_word_var(x) -+ -+def __htonl(x): return __bswap32(x) -+ -+def __htons(x): return __bswap16(x) -+ -+def __ntohl(x): return __bswap32(x) -+ -+def __ntohs(x): return __bswap16(x) -+ -+IPPROTO_IP = 0 -+IPPROTO_ICMP = 1 -+IPPROTO_TCP = 6 -+IPPROTO_UDP = 17 -+def htonl(x): return __htonl(x) -+ -+def htons(x): return __htons(x) -+ -+def ntohl(x): return __ntohl(x) -+ -+def ntohs(x): return __ntohs(x) -+ -+IPPROTO_RAW = 255 -+INET_ADDRSTRLEN = 16 -+IPPROTO_HOPOPTS = 0 -+IPPROTO_IGMP = 2 -+IPPROTO_GGP = 3 -+IPPROTO_IPV4 = 4 -+IPPROTO_IPIP = IPPROTO_IPV4 -+IPPROTO_ST = 7 -+IPPROTO_EGP = 8 -+IPPROTO_PIGP = 9 -+IPPROTO_RCCMON = 10 -+IPPROTO_NVPII = 11 -+IPPROTO_PUP = 12 -+IPPROTO_ARGUS = 13 -+IPPROTO_EMCON = 14 -+IPPROTO_XNET = 15 -+IPPROTO_CHAOS = 16 -+IPPROTO_MUX = 18 -+IPPROTO_MEAS = 19 -+IPPROTO_HMP = 20 -+IPPROTO_PRM = 21 -+IPPROTO_IDP = 22 -+IPPROTO_TRUNK1 = 23 -+IPPROTO_TRUNK2 = 24 -+IPPROTO_LEAF1 = 25 -+IPPROTO_LEAF2 = 26 -+IPPROTO_RDP = 27 -+IPPROTO_IRTP = 28 -+IPPROTO_TP = 29 -+IPPROTO_BLT = 30 -+IPPROTO_NSP = 31 -+IPPROTO_INP = 32 -+IPPROTO_SEP = 33 -+IPPROTO_3PC = 34 -+IPPROTO_IDPR = 35 -+IPPROTO_XTP = 36 -+IPPROTO_DDP = 37 -+IPPROTO_CMTP = 38 -+IPPROTO_TPXX = 39 -+IPPROTO_IL = 40 -+IPPROTO_IPV6 = 41 -+IPPROTO_SDRP = 42 -+IPPROTO_ROUTING = 43 -+IPPROTO_FRAGMENT = 44 -+IPPROTO_IDRP = 45 -+IPPROTO_RSVP = 46 -+IPPROTO_GRE = 47 -+IPPROTO_MHRP = 48 -+IPPROTO_BHA = 49 -+IPPROTO_ESP = 50 -+IPPROTO_AH = 51 -+IPPROTO_INLSP = 52 -+IPPROTO_SWIPE = 53 -+IPPROTO_NHRP = 54 -+IPPROTO_MOBILE = 55 -+IPPROTO_TLSP = 56 -+IPPROTO_SKIP = 57 -+IPPROTO_ICMPV6 = 58 -+IPPROTO_NONE = 59 -+IPPROTO_DSTOPTS = 60 -+IPPROTO_AHIP = 61 -+IPPROTO_CFTP = 62 -+IPPROTO_HELLO = 63 -+IPPROTO_SATEXPAK = 64 -+IPPROTO_KRYPTOLAN = 65 -+IPPROTO_RVD = 66 -+IPPROTO_IPPC = 67 -+IPPROTO_ADFS = 68 -+IPPROTO_SATMON = 69 -+IPPROTO_VISA = 70 -+IPPROTO_IPCV = 71 -+IPPROTO_CPNX = 72 -+IPPROTO_CPHB = 73 -+IPPROTO_WSN = 74 -+IPPROTO_PVP = 75 -+IPPROTO_BRSATMON = 76 -+IPPROTO_ND = 77 -+IPPROTO_WBMON = 78 -+IPPROTO_WBEXPAK = 79 -+IPPROTO_EON = 80 -+IPPROTO_VMTP = 81 -+IPPROTO_SVMTP = 82 -+IPPROTO_VINES = 83 -+IPPROTO_TTP = 84 -+IPPROTO_IGP = 85 -+IPPROTO_DGP = 86 -+IPPROTO_TCF = 87 -+IPPROTO_IGRP = 88 -+IPPROTO_OSPFIGP = 89 -+IPPROTO_SRPC = 90 -+IPPROTO_LARP = 91 -+IPPROTO_MTP = 92 -+IPPROTO_AX25 = 93 -+IPPROTO_IPEIP = 94 -+IPPROTO_MICP = 95 -+IPPROTO_SCCSP = 96 -+IPPROTO_ETHERIP = 97 -+IPPROTO_ENCAP = 98 -+IPPROTO_APES = 99 -+IPPROTO_GMTP = 100 -+IPPROTO_IPCOMP = 108 -+IPPROTO_PIM = 103 -+IPPROTO_PGM = 113 -+IPPROTO_PFSYNC = 240 -+IPPROTO_OLD_DIVERT = 254 -+IPPROTO_MAX = 256 -+IPPROTO_DONE = 257 -+IPPROTO_DIVERT = 258 -+IPPORT_RESERVED = 1024 -+IPPORT_HIFIRSTAUTO = 49152 -+IPPORT_HILASTAUTO = 65535 -+IPPORT_RESERVEDSTART = 600 -+IPPORT_MAX = 65535 -+def IN_CLASSA(i): return (((u_int32_t)(i) & (-2147483648)) == 0) -+ -+IN_CLASSA_NET = (-16777216) -+IN_CLASSA_NSHIFT = 24 -+IN_CLASSA_HOST = 0x00ffffff -+IN_CLASSA_MAX = 128 -+def IN_CLASSB(i): return (((u_int32_t)(i) & (-1073741824)) == (-2147483648)) -+ -+IN_CLASSB_NET = (-65536) -+IN_CLASSB_NSHIFT = 16 -+IN_CLASSB_HOST = 0x0000ffff -+IN_CLASSB_MAX = 65536 -+def IN_CLASSC(i): return (((u_int32_t)(i) & (-536870912)) == (-1073741824)) -+ -+IN_CLASSC_NET = (-256) -+IN_CLASSC_NSHIFT = 8 -+IN_CLASSC_HOST = 0x000000ff -+def IN_CLASSD(i): return (((u_int32_t)(i) & (-268435456)) == (-536870912)) -+ -+IN_CLASSD_NET = (-268435456) -+IN_CLASSD_NSHIFT = 28 -+IN_CLASSD_HOST = 0x0fffffff -+def IN_MULTICAST(i): return IN_CLASSD(i) -+ -+def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -+ -+def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -+ -+INADDR_NONE = (-1) -+IN_LOOPBACKNET = 127 -+IP_OPTIONS = 1 -+IP_HDRINCL = 2 -+IP_TOS = 3 -+IP_TTL = 4 -+IP_RECVOPTS = 5 -+IP_RECVRETOPTS = 6 -+IP_RECVDSTADDR = 7 -+IP_SENDSRCADDR = IP_RECVDSTADDR -+IP_RETOPTS = 8 -+IP_MULTICAST_IF = 9 -+IP_MULTICAST_TTL = 10 -+IP_MULTICAST_LOOP = 11 -+IP_ADD_MEMBERSHIP = 12 -+IP_DROP_MEMBERSHIP = 13 -+IP_MULTICAST_VIF = 14 -+IP_RSVP_ON = 15 -+IP_RSVP_OFF = 16 -+IP_RSVP_VIF_ON = 17 -+IP_RSVP_VIF_OFF = 18 -+IP_PORTRANGE = 19 -+IP_RECVIF = 20 -+IP_IPSEC_POLICY = 21 -+IP_FAITH = 22 -+IP_ONESBCAST = 23 -+IP_FW_TABLE_ADD = 40 -+IP_FW_TABLE_DEL = 41 -+IP_FW_TABLE_FLUSH = 42 -+IP_FW_TABLE_GETSIZE = 43 -+IP_FW_TABLE_LIST = 44 -+IP_FW_ADD = 50 -+IP_FW_DEL = 51 -+IP_FW_FLUSH = 52 -+IP_FW_ZERO = 53 -+IP_FW_GET = 54 -+IP_FW_RESETLOG = 55 -+IP_DUMMYNET_CONFIGURE = 60 -+IP_DUMMYNET_DEL = 61 -+IP_DUMMYNET_FLUSH = 62 -+IP_DUMMYNET_GET = 64 -+IP_RECVTTL = 65 -+IP_DEFAULT_MULTICAST_TTL = 1 -+IP_DEFAULT_MULTICAST_LOOP = 1 -+IP_MAX_MEMBERSHIPS = 20 -+IP_PORTRANGE_DEFAULT = 0 -+IP_PORTRANGE_HIGH = 1 -+IP_PORTRANGE_LOW = 2 -+IPPROTO_MAXID = (IPPROTO_AH + 1) -+IPCTL_FORWARDING = 1 -+IPCTL_SENDREDIRECTS = 2 -+IPCTL_DEFTTL = 3 -+IPCTL_DEFMTU = 4 -+IPCTL_RTEXPIRE = 5 -+IPCTL_RTMINEXPIRE = 6 -+IPCTL_RTMAXCACHE = 7 -+IPCTL_SOURCEROUTE = 8 -+IPCTL_DIRECTEDBROADCAST = 9 -+IPCTL_INTRQMAXLEN = 10 -+IPCTL_INTRQDROPS = 11 -+IPCTL_STATS = 12 -+IPCTL_ACCEPTSOURCEROUTE = 13 -+IPCTL_FASTFORWARDING = 14 -+IPCTL_KEEPFAITH = 15 -+IPCTL_GIF_TTL = 16 -+IPCTL_MAXID = 17 -+def in_nullhost(x): return ((x).s_addr == INADDR_ANY) -+ -+ -+# Included from netinet6/in6.h -+__KAME_VERSION = "20010528/FreeBSD" -+IPV6PORT_RESERVED = 1024 -+IPV6PORT_ANONMIN = 49152 -+IPV6PORT_ANONMAX = 65535 -+IPV6PORT_RESERVEDMIN = 600 -+IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -+INET6_ADDRSTRLEN = 46 -+IPV6_ADDR_INT32_ONE = 1 -+IPV6_ADDR_INT32_TWO = 2 -+IPV6_ADDR_INT32_MNL = (-16711680) -+IPV6_ADDR_INT32_MLL = (-16646144) -+IPV6_ADDR_INT32_SMP = 0x0000ffff -+IPV6_ADDR_INT16_ULL = 0xfe80 -+IPV6_ADDR_INT16_USL = 0xfec0 -+IPV6_ADDR_INT16_MLL = 0xff02 -+IPV6_ADDR_INT32_ONE = 0x01000000 -+IPV6_ADDR_INT32_TWO = 0x02000000 -+IPV6_ADDR_INT32_MNL = 0x000001ff -+IPV6_ADDR_INT32_MLL = 0x000002ff -+IPV6_ADDR_INT32_SMP = (-65536) -+IPV6_ADDR_INT16_ULL = 0x80fe -+IPV6_ADDR_INT16_USL = 0xc0fe -+IPV6_ADDR_INT16_MLL = 0x02ff -+def IN6_IS_ADDR_UNSPECIFIED(a): return \ -+ -+def IN6_IS_ADDR_LOOPBACK(a): return \ -+ -+def IN6_IS_ADDR_V4COMPAT(a): return \ -+ -+def IN6_IS_ADDR_V4MAPPED(a): return \ -+ -+IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -+IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -+IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -+IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -+IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -+IPV6_ADDR_SCOPE_GLOBAL = 0x0e -+__IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -+__IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -+__IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -+__IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -+__IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -+__IPV6_ADDR_SCOPE_GLOBAL = 0x0e -+def IN6_IS_ADDR_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_INTFACELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_GLOBAL(a): return \ -+ -+def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_GLOBAL(a): return \ -+ -+def IN6_IS_SCOPE_LINKLOCAL(a): return \ -+ -+def IFA6_IS_DEPRECATED(a): return \ -+ -+def IFA6_IS_INVALID(a): return \ -+ -+IPV6_OPTIONS = 1 -+IPV6_RECVOPTS = 5 -+IPV6_RECVRETOPTS = 6 -+IPV6_RECVDSTADDR = 7 -+IPV6_RETOPTS = 8 -+IPV6_SOCKOPT_RESERVED1 = 3 -+IPV6_UNICAST_HOPS = 4 -+IPV6_MULTICAST_IF = 9 -+IPV6_MULTICAST_HOPS = 10 -+IPV6_MULTICAST_LOOP = 11 -+IPV6_JOIN_GROUP = 12 -+IPV6_LEAVE_GROUP = 13 -+IPV6_PORTRANGE = 14 -+ICMP6_FILTER = 18 -+IPV6_2292PKTINFO = 19 -+IPV6_2292HOPLIMIT = 20 -+IPV6_2292NEXTHOP = 21 -+IPV6_2292HOPOPTS = 22 -+IPV6_2292DSTOPTS = 23 -+IPV6_2292RTHDR = 24 -+IPV6_2292PKTOPTIONS = 25 -+IPV6_CHECKSUM = 26 -+IPV6_V6ONLY = 27 -+IPV6_BINDV6ONLY = IPV6_V6ONLY -+IPV6_IPSEC_POLICY = 28 -+IPV6_FAITH = 29 -+IPV6_FW_ADD = 30 -+IPV6_FW_DEL = 31 -+IPV6_FW_FLUSH = 32 -+IPV6_FW_ZERO = 33 -+IPV6_FW_GET = 34 -+IPV6_RTHDRDSTOPTS = 35 -+IPV6_RECVPKTINFO = 36 -+IPV6_RECVHOPLIMIT = 37 -+IPV6_RECVRTHDR = 38 -+IPV6_RECVHOPOPTS = 39 -+IPV6_RECVDSTOPTS = 40 -+IPV6_RECVRTHDRDSTOPTS = 41 -+IPV6_USE_MIN_MTU = 42 -+IPV6_RECVPATHMTU = 43 -+IPV6_PATHMTU = 44 -+IPV6_REACHCONF = 45 -+IPV6_PKTINFO = 46 -+IPV6_HOPLIMIT = 47 -+IPV6_NEXTHOP = 48 -+IPV6_HOPOPTS = 49 -+IPV6_DSTOPTS = 50 -+IPV6_RTHDR = 51 -+IPV6_PKTOPTIONS = 52 -+IPV6_RECVTCLASS = 57 -+IPV6_AUTOFLOWLABEL = 59 -+IPV6_TCLASS = 61 -+IPV6_DONTFRAG = 62 -+IPV6_PREFER_TEMPADDR = 63 -+IPV6_RTHDR_LOOSE = 0 -+IPV6_RTHDR_STRICT = 1 -+IPV6_RTHDR_TYPE_0 = 0 -+IPV6_DEFAULT_MULTICAST_HOPS = 1 -+IPV6_DEFAULT_MULTICAST_LOOP = 1 -+IPV6_PORTRANGE_DEFAULT = 0 -+IPV6_PORTRANGE_HIGH = 1 -+IPV6_PORTRANGE_LOW = 2 -+IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -+IPV6CTL_FORWARDING = 1 -+IPV6CTL_SENDREDIRECTS = 2 -+IPV6CTL_DEFHLIM = 3 -+IPV6CTL_DEFMTU = 4 -+IPV6CTL_FORWSRCRT = 5 -+IPV6CTL_STATS = 6 -+IPV6CTL_MRTSTATS = 7 -+IPV6CTL_MRTPROTO = 8 -+IPV6CTL_MAXFRAGPACKETS = 9 -+IPV6CTL_SOURCECHECK = 10 -+IPV6CTL_SOURCECHECK_LOGINT = 11 -+IPV6CTL_ACCEPT_RTADV = 12 -+IPV6CTL_KEEPFAITH = 13 -+IPV6CTL_LOG_INTERVAL = 14 -+IPV6CTL_HDRNESTLIMIT = 15 -+IPV6CTL_DAD_COUNT = 16 -+IPV6CTL_AUTO_FLOWLABEL = 17 -+IPV6CTL_DEFMCASTHLIM = 18 -+IPV6CTL_GIF_HLIM = 19 -+IPV6CTL_KAME_VERSION = 20 -+IPV6CTL_USE_DEPRECATED = 21 -+IPV6CTL_RR_PRUNE = 22 -+IPV6CTL_MAPPED_ADDR = 23 -+IPV6CTL_V6ONLY = 24 -+IPV6CTL_RTEXPIRE = 25 -+IPV6CTL_RTMINEXPIRE = 26 -+IPV6CTL_RTMAXCACHE = 27 -+IPV6CTL_USETEMPADDR = 32 -+IPV6CTL_TEMPPLTIME = 33 -+IPV6CTL_TEMPVLTIME = 34 -+IPV6CTL_AUTO_LINKLOCAL = 35 -+IPV6CTL_RIP6STATS = 36 -+IPV6CTL_PREFER_TEMPADDR = 37 -+IPV6CTL_ADDRCTLPOLICY = 38 -+IPV6CTL_MAXFRAGS = 41 -+IPV6CTL_MAXID = 42 diff --git a/lang/python-devel/files/patch-configure b/lang/python-devel/files/patch-configure deleted file mode 100644 index 9ed971ab4be7..000000000000 --- a/lang/python-devel/files/patch-configure +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.orig Sat Oct 4 13:27:50 2003 -+++ configure Sat Oct 4 13:29:05 2003 -@@ -1321,7 +1321,7 @@ - VERSION=2.4 - - --SOVERSION=1.0 -+SOVERSION=1 - - # The later defininition of _XOPEN_SOURCE disables certain features - # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). -@@ -3396,6 +3396,12 @@ - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -+ INSTSONAME="$LDLIBRARY".$SOVERSION -+ ;; -+ FreeBSD*) -+ LDLIBRARY='libpython$(VERSION).so' -+ BLDLIBRARY='-L. -lpython$(VERSION)' -+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; - hp*|HP*) diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist index 0c4ef402b2a4..2da321c50218 100644 --- a/lang/python-devel/pkg-plist +++ b/lang/python-devel/pkg-plist @@ -495,6 +495,27 @@ lib/%%PYTHON_VERSION%%/distutils/spawn.pyo lib/%%PYTHON_VERSION%%/distutils/sysconfig.py lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyc lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.py +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/support.py +lib/%%PYTHON_VERSION%%/distutils/tests/support.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/support.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyo lib/%%PYTHON_VERSION%%/distutils/text_file.py lib/%%PYTHON_VERSION%%/distutils/text_file.pyc lib/%%PYTHON_VERSION%%/distutils/text_file.pyo @@ -630,6 +651,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_39.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_41.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_42.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_43.txt lib/%%PYTHON_VERSION%%/email/test/test_email.py lib/%%PYTHON_VERSION%%/email/test/test_email.pyc lib/%%PYTHON_VERSION%%/email/test/test_email.pyo @@ -1337,15 +1359,24 @@ lib/%%PYTHON_VERSION%%/lib-old/poly.pyo lib/%%PYTHON_VERSION%%/lib-old/rand.py lib/%%PYTHON_VERSION%%/lib-old/rand.pyc lib/%%PYTHON_VERSION%%/lib-old/rand.pyo +lib/%%PYTHON_VERSION%%/lib-old/statcache.py +lib/%%PYTHON_VERSION%%/lib-old/statcache.pyc +lib/%%PYTHON_VERSION%%/lib-old/statcache.pyo lib/%%PYTHON_VERSION%%/lib-old/tb.py lib/%%PYTHON_VERSION%%/lib-old/tb.pyc lib/%%PYTHON_VERSION%%/lib-old/tb.pyo +lib/%%PYTHON_VERSION%%/lib-old/tzparse.py +lib/%%PYTHON_VERSION%%/lib-old/tzparse.pyc +lib/%%PYTHON_VERSION%%/lib-old/tzparse.pyo lib/%%PYTHON_VERSION%%/lib-old/util.py lib/%%PYTHON_VERSION%%/lib-old/util.pyc lib/%%PYTHON_VERSION%%/lib-old/util.pyo lib/%%PYTHON_VERSION%%/lib-old/whatsound.py lib/%%PYTHON_VERSION%%/lib-old/whatsound.pyc lib/%%PYTHON_VERSION%%/lib-old/whatsound.pyo +lib/%%PYTHON_VERSION%%/lib-old/whrandom.py +lib/%%PYTHON_VERSION%%/lib-old/whrandom.pyc +lib/%%PYTHON_VERSION%%/lib-old/whrandom.pyo lib/%%PYTHON_VERSION%%/lib-old/zmod.py lib/%%PYTHON_VERSION%%/lib-old/zmod.pyc lib/%%PYTHON_VERSION%%/lib-old/zmod.pyo @@ -1528,7 +1559,6 @@ lib/%%PYTHON_VERSION%%/posixpath.pyo lib/%%PYTHON_VERSION%%/pprint.py lib/%%PYTHON_VERSION%%/pprint.pyc lib/%%PYTHON_VERSION%%/pprint.pyo -lib/%%PYTHON_VERSION%%/profile.doc lib/%%PYTHON_VERSION%%/profile.py lib/%%PYTHON_VERSION%%/profile.pyc lib/%%PYTHON_VERSION%%/profile.pyo @@ -1629,9 +1659,6 @@ lib/%%PYTHON_VERSION%%/sre_parse.pyo lib/%%PYTHON_VERSION%%/stat.py lib/%%PYTHON_VERSION%%/stat.pyc lib/%%PYTHON_VERSION%%/stat.pyo -lib/%%PYTHON_VERSION%%/statcache.py -lib/%%PYTHON_VERSION%%/statcache.pyc -lib/%%PYTHON_VERSION%%/statcache.pyo lib/%%PYTHON_VERSION%%/statvfs.py lib/%%PYTHON_VERSION%%/statvfs.pyc lib/%%PYTHON_VERSION%%/statvfs.pyo @@ -1729,6 +1756,12 @@ lib/%%PYTHON_VERSION%%/test/double_const.py lib/%%PYTHON_VERSION%%/test/double_const.pyc lib/%%PYTHON_VERSION%%/test/double_const.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue +lib/%%PYTHON_VERSION%%/test/inspect_fodder.py +lib/%%PYTHON_VERSION%%/test/inspect_fodder.pyc +lib/%%PYTHON_VERSION%%/test/inspect_fodder.pyo +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.py +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.pyc +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.pyo lib/%%PYTHON_VERSION%%/test/list_tests.py lib/%%PYTHON_VERSION%%/test/list_tests.pyc lib/%%PYTHON_VERSION%%/test/list_tests.pyo @@ -2062,6 +2095,7 @@ lib/%%PYTHON_VERSION%%/test/test_doctest2.py lib/%%PYTHON_VERSION%%/test/test_doctest2.pyc lib/%%PYTHON_VERSION%%/test/test_doctest2.pyo lib/%%PYTHON_VERSION%%/test/test_doctest2.txt +lib/%%PYTHON_VERSION%%/test/test_doctest3.txt lib/%%PYTHON_VERSION%%/test/test_dumbdbm.py lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyc lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo @@ -2751,9 +2785,6 @@ lib/%%PYTHON_VERSION%%/tty.pyo lib/%%PYTHON_VERSION%%/types.py lib/%%PYTHON_VERSION%%/types.pyc lib/%%PYTHON_VERSION%%/types.pyo -lib/%%PYTHON_VERSION%%/tzparse.py -lib/%%PYTHON_VERSION%%/tzparse.pyc -lib/%%PYTHON_VERSION%%/tzparse.pyo lib/%%PYTHON_VERSION%%/unittest.py lib/%%PYTHON_VERSION%%/unittest.pyc lib/%%PYTHON_VERSION%%/unittest.pyo @@ -2787,9 +2818,6 @@ lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo -lib/%%PYTHON_VERSION%%/whrandom.py -lib/%%PYTHON_VERSION%%/whrandom.pyc -lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo @@ -3157,6 +3185,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/win32.html %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/makelocalealias.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.py @@ -3188,6 +3217,14 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/modulator.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/README.txt +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msi.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msilib.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.c +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.mak +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/schema.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/sequence.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/uisample.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py @@ -3292,6 +3329,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/scripts %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche/X %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche +%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/msi %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator/Templates %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/i18n @@ -3354,6 +3392,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo @dirrm lib/%%PYTHON_VERSION%%/email/test/data @dirrm lib/%%PYTHON_VERSION%%/email/test @dirrm lib/%%PYTHON_VERSION%%/email +@dirrm lib/%%PYTHON_VERSION%%/distutils/tests @dirrm lib/%%PYTHON_VERSION%%/distutils/command @dirrm lib/%%PYTHON_VERSION%%/distutils @dirrm lib/%%PYTHON_VERSION%%/curses diff --git a/lang/python/distinfo b/lang/python/distinfo index ea1578781569..6c9336f3e7c9 100644 --- a/lang/python/distinfo +++ b/lang/python/distinfo @@ -13,7 +13,7 @@ MD5 (python/Python-2.3.3.tgz) = 4d16732b1cfccc0ed250956d41463c61 SIZE (python/Python-2.3.3.tgz) = 8491380 MD5 (python/Python-2.3.4.tgz) = b6cf0b19226861a38689d2fabd0931b3 SIZE (python/Python-2.3.4.tgz) = 8502738 -MD5 (python/Python-2.4c1.tgz) = deea93a91518314ffe9a7c5cd8144eac -SIZE (python/Python-2.4c1.tgz) = 9198160 MD5 (python/Python-2.4.tgz) = 149ad508f936eccf669d52682cf8e606 SIZE (python/Python-2.4.tgz) = 9198035 +MD5 (python/Python-2.5.a0.20050129.tgz) = bdf571f3e28c4793bedbd180611c28e6 +SIZE (python/Python-2.5.a0.20050129.tgz) = 9227299 diff --git a/lang/python24/distinfo b/lang/python24/distinfo index ea1578781569..6c9336f3e7c9 100644 --- a/lang/python24/distinfo +++ b/lang/python24/distinfo @@ -13,7 +13,7 @@ MD5 (python/Python-2.3.3.tgz) = 4d16732b1cfccc0ed250956d41463c61 SIZE (python/Python-2.3.3.tgz) = 8491380 MD5 (python/Python-2.3.4.tgz) = b6cf0b19226861a38689d2fabd0931b3 SIZE (python/Python-2.3.4.tgz) = 8502738 -MD5 (python/Python-2.4c1.tgz) = deea93a91518314ffe9a7c5cd8144eac -SIZE (python/Python-2.4c1.tgz) = 9198160 MD5 (python/Python-2.4.tgz) = 149ad508f936eccf669d52682cf8e606 SIZE (python/Python-2.4.tgz) = 9198035 +MD5 (python/Python-2.5.a0.20050129.tgz) = bdf571f3e28c4793bedbd180611c28e6 +SIZE (python/Python-2.5.a0.20050129.tgz) = 9227299 diff --git a/lang/python25/Makefile b/lang/python25/Makefile index 0daa10b33ea6..ec0f468b3ab4 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.5.a0.000000 +PORTVERSION= 2.5.a0.20050129 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -14,8 +14,6 @@ DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language -IGNORE= is not available yet - DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes @@ -29,7 +27,7 @@ MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes USE_REINPLACE= yes -PYTHON_VERSION= python2.4 +PYTHON_VERSION= python2.5 PYTHON_NO_DEPENDS= yes LATEST_LINK= ${PYTHON_VERSION:S/.//} @@ -108,11 +106,11 @@ PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.4 + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 + ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py + ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py pre-patch: ${REINPLACE_CMD} -e \ @@ -172,8 +170,8 @@ post-install: ${PREFIX}/bin @# additional files installing by ports - ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \ - ${WRKDIR}/smtpd2.4.py ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.5 ${WRKDIR}/idle2.5 \ + ${WRKDIR}/smtpd2.5.py ${PREFIX}/bin @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 diff --git a/lang/python25/distinfo b/lang/python25/distinfo index 24141b21691f..0072eec35a72 100644 --- a/lang/python25/distinfo +++ b/lang/python25/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4c1.tgz) = deea93a91518314ffe9a7c5cd8144eac -SIZE (python/Python-2.4c1.tgz) = 9198160 +MD5 (python/Python-2.5.a0.20050129.tgz) = bdf571f3e28c4793bedbd180611c28e6 +SIZE (python/Python-2.5.a0.20050129.tgz) = 9227299 diff --git a/lang/python25/files/patch-Lib::plat-freebsd6::IN.py b/lang/python25/files/patch-Lib::plat-freebsd6::IN.py deleted file mode 100644 index 8316a9ef20a0..000000000000 --- a/lang/python25/files/patch-Lib::plat-freebsd6::IN.py +++ /dev/null @@ -1,518 +0,0 @@ ---- Lib/plat-freebsd6/IN.py Thu Jan 1 09:00:00 1970 -+++ Lib/plat-freebsd6/IN.py Sat Aug 21 08:09:15 2004 -@@ -0,0 +1,515 @@ -+# Generated by h2py from /usr/include/netinet/in.h -+ -+# Included from sys/cdefs.h -+def __P(protos): return protos -+ -+def __STRING(x): return #x -+ -+def __XSTRING(x): return __STRING(x) -+ -+def __P(protos): return () -+ -+def __STRING(x): return "x" -+ -+def __aligned(x): return __attribute__((__aligned__(x))) -+ -+def __section(x): return __attribute__((__section__(x))) -+ -+def __aligned(x): return __attribute__((__aligned__(x))) -+ -+def __section(x): return __attribute__((__section__(x))) -+ -+def __nonnull(x): return __attribute__((__nonnull__(x))) -+ -+def __predict_true(exp): return __builtin_expect((exp), 1) -+ -+def __predict_false(exp): return __builtin_expect((exp), 0) -+ -+def __predict_true(exp): return (exp) -+ -+def __predict_false(exp): return (exp) -+ -+def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -+ -+def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -+ -+def __RCSID_SOURCE(s): return __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s) -+ -+def __SCCSID(s): return __IDSTRING(__CONCAT(__sccsid_,__LINE__),s) -+ -+def __COPYRIGHT(s): return __IDSTRING(__CONCAT(__copyright_,__LINE__),s) -+ -+_POSIX_C_SOURCE = 199009 -+_POSIX_C_SOURCE = 199209 -+__XSI_VISIBLE = 600 -+_POSIX_C_SOURCE = 200112 -+__XSI_VISIBLE = 500 -+_POSIX_C_SOURCE = 199506 -+_POSIX_C_SOURCE = 198808 -+__POSIX_VISIBLE = 200112 -+__ISO_C_VISIBLE = 1999 -+__POSIX_VISIBLE = 199506 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199309 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199209 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199009 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 198808 -+__ISO_C_VISIBLE = 0 -+__POSIX_VISIBLE = 0 -+__XSI_VISIBLE = 0 -+__BSD_VISIBLE = 0 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 0 -+__XSI_VISIBLE = 0 -+__BSD_VISIBLE = 0 -+__ISO_C_VISIBLE = 1999 -+__POSIX_VISIBLE = 200112 -+__XSI_VISIBLE = 600 -+__BSD_VISIBLE = 1 -+__ISO_C_VISIBLE = 1999 -+ -+# Included from sys/_types.h -+ -+# Included from machine/_types.h -+ -+# Included from machine/endian.h -+_QUAD_HIGHWORD = 1 -+_QUAD_LOWWORD = 0 -+_LITTLE_ENDIAN = 1234 -+_BIG_ENDIAN = 4321 -+_PDP_ENDIAN = 3412 -+_BYTE_ORDER = _LITTLE_ENDIAN -+LITTLE_ENDIAN = _LITTLE_ENDIAN -+BIG_ENDIAN = _BIG_ENDIAN -+PDP_ENDIAN = _PDP_ENDIAN -+BYTE_ORDER = _BYTE_ORDER -+__INTEL_COMPILER_with_FreeBSD_endian = 1 -+__INTEL_COMPILER_with_FreeBSD_endian = 1 -+def __word_swap_int_var(x): return \ -+ -+def __word_swap_int_const(x): return \ -+ -+def __word_swap_int(x): return __word_swap_int_var(x) -+ -+def __byte_swap_int_var(x): return \ -+ -+def __byte_swap_int_var(x): return \ -+ -+def __byte_swap_int_const(x): return \ -+ -+def __byte_swap_int(x): return __byte_swap_int_var(x) -+ -+def __byte_swap_word_var(x): return \ -+ -+def __byte_swap_word_const(x): return \ -+ -+def __byte_swap_word(x): return __byte_swap_word_var(x) -+ -+def __htonl(x): return __bswap32(x) -+ -+def __htons(x): return __bswap16(x) -+ -+def __ntohl(x): return __bswap32(x) -+ -+def __ntohs(x): return __bswap16(x) -+ -+IPPROTO_IP = 0 -+IPPROTO_ICMP = 1 -+IPPROTO_TCP = 6 -+IPPROTO_UDP = 17 -+def htonl(x): return __htonl(x) -+ -+def htons(x): return __htons(x) -+ -+def ntohl(x): return __ntohl(x) -+ -+def ntohs(x): return __ntohs(x) -+ -+IPPROTO_RAW = 255 -+INET_ADDRSTRLEN = 16 -+IPPROTO_HOPOPTS = 0 -+IPPROTO_IGMP = 2 -+IPPROTO_GGP = 3 -+IPPROTO_IPV4 = 4 -+IPPROTO_IPIP = IPPROTO_IPV4 -+IPPROTO_ST = 7 -+IPPROTO_EGP = 8 -+IPPROTO_PIGP = 9 -+IPPROTO_RCCMON = 10 -+IPPROTO_NVPII = 11 -+IPPROTO_PUP = 12 -+IPPROTO_ARGUS = 13 -+IPPROTO_EMCON = 14 -+IPPROTO_XNET = 15 -+IPPROTO_CHAOS = 16 -+IPPROTO_MUX = 18 -+IPPROTO_MEAS = 19 -+IPPROTO_HMP = 20 -+IPPROTO_PRM = 21 -+IPPROTO_IDP = 22 -+IPPROTO_TRUNK1 = 23 -+IPPROTO_TRUNK2 = 24 -+IPPROTO_LEAF1 = 25 -+IPPROTO_LEAF2 = 26 -+IPPROTO_RDP = 27 -+IPPROTO_IRTP = 28 -+IPPROTO_TP = 29 -+IPPROTO_BLT = 30 -+IPPROTO_NSP = 31 -+IPPROTO_INP = 32 -+IPPROTO_SEP = 33 -+IPPROTO_3PC = 34 -+IPPROTO_IDPR = 35 -+IPPROTO_XTP = 36 -+IPPROTO_DDP = 37 -+IPPROTO_CMTP = 38 -+IPPROTO_TPXX = 39 -+IPPROTO_IL = 40 -+IPPROTO_IPV6 = 41 -+IPPROTO_SDRP = 42 -+IPPROTO_ROUTING = 43 -+IPPROTO_FRAGMENT = 44 -+IPPROTO_IDRP = 45 -+IPPROTO_RSVP = 46 -+IPPROTO_GRE = 47 -+IPPROTO_MHRP = 48 -+IPPROTO_BHA = 49 -+IPPROTO_ESP = 50 -+IPPROTO_AH = 51 -+IPPROTO_INLSP = 52 -+IPPROTO_SWIPE = 53 -+IPPROTO_NHRP = 54 -+IPPROTO_MOBILE = 55 -+IPPROTO_TLSP = 56 -+IPPROTO_SKIP = 57 -+IPPROTO_ICMPV6 = 58 -+IPPROTO_NONE = 59 -+IPPROTO_DSTOPTS = 60 -+IPPROTO_AHIP = 61 -+IPPROTO_CFTP = 62 -+IPPROTO_HELLO = 63 -+IPPROTO_SATEXPAK = 64 -+IPPROTO_KRYPTOLAN = 65 -+IPPROTO_RVD = 66 -+IPPROTO_IPPC = 67 -+IPPROTO_ADFS = 68 -+IPPROTO_SATMON = 69 -+IPPROTO_VISA = 70 -+IPPROTO_IPCV = 71 -+IPPROTO_CPNX = 72 -+IPPROTO_CPHB = 73 -+IPPROTO_WSN = 74 -+IPPROTO_PVP = 75 -+IPPROTO_BRSATMON = 76 -+IPPROTO_ND = 77 -+IPPROTO_WBMON = 78 -+IPPROTO_WBEXPAK = 79 -+IPPROTO_EON = 80 -+IPPROTO_VMTP = 81 -+IPPROTO_SVMTP = 82 -+IPPROTO_VINES = 83 -+IPPROTO_TTP = 84 -+IPPROTO_IGP = 85 -+IPPROTO_DGP = 86 -+IPPROTO_TCF = 87 -+IPPROTO_IGRP = 88 -+IPPROTO_OSPFIGP = 89 -+IPPROTO_SRPC = 90 -+IPPROTO_LARP = 91 -+IPPROTO_MTP = 92 -+IPPROTO_AX25 = 93 -+IPPROTO_IPEIP = 94 -+IPPROTO_MICP = 95 -+IPPROTO_SCCSP = 96 -+IPPROTO_ETHERIP = 97 -+IPPROTO_ENCAP = 98 -+IPPROTO_APES = 99 -+IPPROTO_GMTP = 100 -+IPPROTO_IPCOMP = 108 -+IPPROTO_PIM = 103 -+IPPROTO_PGM = 113 -+IPPROTO_PFSYNC = 240 -+IPPROTO_OLD_DIVERT = 254 -+IPPROTO_MAX = 256 -+IPPROTO_DONE = 257 -+IPPROTO_DIVERT = 258 -+IPPORT_RESERVED = 1024 -+IPPORT_HIFIRSTAUTO = 49152 -+IPPORT_HILASTAUTO = 65535 -+IPPORT_RESERVEDSTART = 600 -+IPPORT_MAX = 65535 -+def IN_CLASSA(i): return (((u_int32_t)(i) & (-2147483648)) == 0) -+ -+IN_CLASSA_NET = (-16777216) -+IN_CLASSA_NSHIFT = 24 -+IN_CLASSA_HOST = 0x00ffffff -+IN_CLASSA_MAX = 128 -+def IN_CLASSB(i): return (((u_int32_t)(i) & (-1073741824)) == (-2147483648)) -+ -+IN_CLASSB_NET = (-65536) -+IN_CLASSB_NSHIFT = 16 -+IN_CLASSB_HOST = 0x0000ffff -+IN_CLASSB_MAX = 65536 -+def IN_CLASSC(i): return (((u_int32_t)(i) & (-536870912)) == (-1073741824)) -+ -+IN_CLASSC_NET = (-256) -+IN_CLASSC_NSHIFT = 8 -+IN_CLASSC_HOST = 0x000000ff -+def IN_CLASSD(i): return (((u_int32_t)(i) & (-268435456)) == (-536870912)) -+ -+IN_CLASSD_NET = (-268435456) -+IN_CLASSD_NSHIFT = 28 -+IN_CLASSD_HOST = 0x0fffffff -+def IN_MULTICAST(i): return IN_CLASSD(i) -+ -+def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -+ -+def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -+ -+INADDR_NONE = (-1) -+IN_LOOPBACKNET = 127 -+IP_OPTIONS = 1 -+IP_HDRINCL = 2 -+IP_TOS = 3 -+IP_TTL = 4 -+IP_RECVOPTS = 5 -+IP_RECVRETOPTS = 6 -+IP_RECVDSTADDR = 7 -+IP_SENDSRCADDR = IP_RECVDSTADDR -+IP_RETOPTS = 8 -+IP_MULTICAST_IF = 9 -+IP_MULTICAST_TTL = 10 -+IP_MULTICAST_LOOP = 11 -+IP_ADD_MEMBERSHIP = 12 -+IP_DROP_MEMBERSHIP = 13 -+IP_MULTICAST_VIF = 14 -+IP_RSVP_ON = 15 -+IP_RSVP_OFF = 16 -+IP_RSVP_VIF_ON = 17 -+IP_RSVP_VIF_OFF = 18 -+IP_PORTRANGE = 19 -+IP_RECVIF = 20 -+IP_IPSEC_POLICY = 21 -+IP_FAITH = 22 -+IP_ONESBCAST = 23 -+IP_FW_TABLE_ADD = 40 -+IP_FW_TABLE_DEL = 41 -+IP_FW_TABLE_FLUSH = 42 -+IP_FW_TABLE_GETSIZE = 43 -+IP_FW_TABLE_LIST = 44 -+IP_FW_ADD = 50 -+IP_FW_DEL = 51 -+IP_FW_FLUSH = 52 -+IP_FW_ZERO = 53 -+IP_FW_GET = 54 -+IP_FW_RESETLOG = 55 -+IP_DUMMYNET_CONFIGURE = 60 -+IP_DUMMYNET_DEL = 61 -+IP_DUMMYNET_FLUSH = 62 -+IP_DUMMYNET_GET = 64 -+IP_RECVTTL = 65 -+IP_DEFAULT_MULTICAST_TTL = 1 -+IP_DEFAULT_MULTICAST_LOOP = 1 -+IP_MAX_MEMBERSHIPS = 20 -+IP_PORTRANGE_DEFAULT = 0 -+IP_PORTRANGE_HIGH = 1 -+IP_PORTRANGE_LOW = 2 -+IPPROTO_MAXID = (IPPROTO_AH + 1) -+IPCTL_FORWARDING = 1 -+IPCTL_SENDREDIRECTS = 2 -+IPCTL_DEFTTL = 3 -+IPCTL_DEFMTU = 4 -+IPCTL_RTEXPIRE = 5 -+IPCTL_RTMINEXPIRE = 6 -+IPCTL_RTMAXCACHE = 7 -+IPCTL_SOURCEROUTE = 8 -+IPCTL_DIRECTEDBROADCAST = 9 -+IPCTL_INTRQMAXLEN = 10 -+IPCTL_INTRQDROPS = 11 -+IPCTL_STATS = 12 -+IPCTL_ACCEPTSOURCEROUTE = 13 -+IPCTL_FASTFORWARDING = 14 -+IPCTL_KEEPFAITH = 15 -+IPCTL_GIF_TTL = 16 -+IPCTL_MAXID = 17 -+def in_nullhost(x): return ((x).s_addr == INADDR_ANY) -+ -+ -+# Included from netinet6/in6.h -+__KAME_VERSION = "20010528/FreeBSD" -+IPV6PORT_RESERVED = 1024 -+IPV6PORT_ANONMIN = 49152 -+IPV6PORT_ANONMAX = 65535 -+IPV6PORT_RESERVEDMIN = 600 -+IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -+INET6_ADDRSTRLEN = 46 -+IPV6_ADDR_INT32_ONE = 1 -+IPV6_ADDR_INT32_TWO = 2 -+IPV6_ADDR_INT32_MNL = (-16711680) -+IPV6_ADDR_INT32_MLL = (-16646144) -+IPV6_ADDR_INT32_SMP = 0x0000ffff -+IPV6_ADDR_INT16_ULL = 0xfe80 -+IPV6_ADDR_INT16_USL = 0xfec0 -+IPV6_ADDR_INT16_MLL = 0xff02 -+IPV6_ADDR_INT32_ONE = 0x01000000 -+IPV6_ADDR_INT32_TWO = 0x02000000 -+IPV6_ADDR_INT32_MNL = 0x000001ff -+IPV6_ADDR_INT32_MLL = 0x000002ff -+IPV6_ADDR_INT32_SMP = (-65536) -+IPV6_ADDR_INT16_ULL = 0x80fe -+IPV6_ADDR_INT16_USL = 0xc0fe -+IPV6_ADDR_INT16_MLL = 0x02ff -+def IN6_IS_ADDR_UNSPECIFIED(a): return \ -+ -+def IN6_IS_ADDR_LOOPBACK(a): return \ -+ -+def IN6_IS_ADDR_V4COMPAT(a): return \ -+ -+def IN6_IS_ADDR_V4MAPPED(a): return \ -+ -+IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -+IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -+IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -+IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -+IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -+IPV6_ADDR_SCOPE_GLOBAL = 0x0e -+__IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -+__IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -+__IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -+__IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -+__IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -+__IPV6_ADDR_SCOPE_GLOBAL = 0x0e -+def IN6_IS_ADDR_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_INTFACELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_GLOBAL(a): return \ -+ -+def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_GLOBAL(a): return \ -+ -+def IN6_IS_SCOPE_LINKLOCAL(a): return \ -+ -+def IFA6_IS_DEPRECATED(a): return \ -+ -+def IFA6_IS_INVALID(a): return \ -+ -+IPV6_OPTIONS = 1 -+IPV6_RECVOPTS = 5 -+IPV6_RECVRETOPTS = 6 -+IPV6_RECVDSTADDR = 7 -+IPV6_RETOPTS = 8 -+IPV6_SOCKOPT_RESERVED1 = 3 -+IPV6_UNICAST_HOPS = 4 -+IPV6_MULTICAST_IF = 9 -+IPV6_MULTICAST_HOPS = 10 -+IPV6_MULTICAST_LOOP = 11 -+IPV6_JOIN_GROUP = 12 -+IPV6_LEAVE_GROUP = 13 -+IPV6_PORTRANGE = 14 -+ICMP6_FILTER = 18 -+IPV6_2292PKTINFO = 19 -+IPV6_2292HOPLIMIT = 20 -+IPV6_2292NEXTHOP = 21 -+IPV6_2292HOPOPTS = 22 -+IPV6_2292DSTOPTS = 23 -+IPV6_2292RTHDR = 24 -+IPV6_2292PKTOPTIONS = 25 -+IPV6_CHECKSUM = 26 -+IPV6_V6ONLY = 27 -+IPV6_BINDV6ONLY = IPV6_V6ONLY -+IPV6_IPSEC_POLICY = 28 -+IPV6_FAITH = 29 -+IPV6_FW_ADD = 30 -+IPV6_FW_DEL = 31 -+IPV6_FW_FLUSH = 32 -+IPV6_FW_ZERO = 33 -+IPV6_FW_GET = 34 -+IPV6_RTHDRDSTOPTS = 35 -+IPV6_RECVPKTINFO = 36 -+IPV6_RECVHOPLIMIT = 37 -+IPV6_RECVRTHDR = 38 -+IPV6_RECVHOPOPTS = 39 -+IPV6_RECVDSTOPTS = 40 -+IPV6_RECVRTHDRDSTOPTS = 41 -+IPV6_USE_MIN_MTU = 42 -+IPV6_RECVPATHMTU = 43 -+IPV6_PATHMTU = 44 -+IPV6_REACHCONF = 45 -+IPV6_PKTINFO = 46 -+IPV6_HOPLIMIT = 47 -+IPV6_NEXTHOP = 48 -+IPV6_HOPOPTS = 49 -+IPV6_DSTOPTS = 50 -+IPV6_RTHDR = 51 -+IPV6_PKTOPTIONS = 52 -+IPV6_RECVTCLASS = 57 -+IPV6_AUTOFLOWLABEL = 59 -+IPV6_TCLASS = 61 -+IPV6_DONTFRAG = 62 -+IPV6_PREFER_TEMPADDR = 63 -+IPV6_RTHDR_LOOSE = 0 -+IPV6_RTHDR_STRICT = 1 -+IPV6_RTHDR_TYPE_0 = 0 -+IPV6_DEFAULT_MULTICAST_HOPS = 1 -+IPV6_DEFAULT_MULTICAST_LOOP = 1 -+IPV6_PORTRANGE_DEFAULT = 0 -+IPV6_PORTRANGE_HIGH = 1 -+IPV6_PORTRANGE_LOW = 2 -+IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -+IPV6CTL_FORWARDING = 1 -+IPV6CTL_SENDREDIRECTS = 2 -+IPV6CTL_DEFHLIM = 3 -+IPV6CTL_DEFMTU = 4 -+IPV6CTL_FORWSRCRT = 5 -+IPV6CTL_STATS = 6 -+IPV6CTL_MRTSTATS = 7 -+IPV6CTL_MRTPROTO = 8 -+IPV6CTL_MAXFRAGPACKETS = 9 -+IPV6CTL_SOURCECHECK = 10 -+IPV6CTL_SOURCECHECK_LOGINT = 11 -+IPV6CTL_ACCEPT_RTADV = 12 -+IPV6CTL_KEEPFAITH = 13 -+IPV6CTL_LOG_INTERVAL = 14 -+IPV6CTL_HDRNESTLIMIT = 15 -+IPV6CTL_DAD_COUNT = 16 -+IPV6CTL_AUTO_FLOWLABEL = 17 -+IPV6CTL_DEFMCASTHLIM = 18 -+IPV6CTL_GIF_HLIM = 19 -+IPV6CTL_KAME_VERSION = 20 -+IPV6CTL_USE_DEPRECATED = 21 -+IPV6CTL_RR_PRUNE = 22 -+IPV6CTL_MAPPED_ADDR = 23 -+IPV6CTL_V6ONLY = 24 -+IPV6CTL_RTEXPIRE = 25 -+IPV6CTL_RTMINEXPIRE = 26 -+IPV6CTL_RTMAXCACHE = 27 -+IPV6CTL_USETEMPADDR = 32 -+IPV6CTL_TEMPPLTIME = 33 -+IPV6CTL_TEMPVLTIME = 34 -+IPV6CTL_AUTO_LINKLOCAL = 35 -+IPV6CTL_RIP6STATS = 36 -+IPV6CTL_PREFER_TEMPADDR = 37 -+IPV6CTL_ADDRCTLPOLICY = 38 -+IPV6CTL_MAXFRAGS = 41 -+IPV6CTL_MAXID = 42 diff --git a/lang/python25/files/patch-configure b/lang/python25/files/patch-configure deleted file mode 100644 index 9ed971ab4be7..000000000000 --- a/lang/python25/files/patch-configure +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.orig Sat Oct 4 13:27:50 2003 -+++ configure Sat Oct 4 13:29:05 2003 -@@ -1321,7 +1321,7 @@ - VERSION=2.4 - - --SOVERSION=1.0 -+SOVERSION=1 - - # The later defininition of _XOPEN_SOURCE disables certain features - # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). -@@ -3396,6 +3396,12 @@ - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -+ INSTSONAME="$LDLIBRARY".$SOVERSION -+ ;; -+ FreeBSD*) -+ LDLIBRARY='libpython$(VERSION).so' -+ BLDLIBRARY='-L. -lpython$(VERSION)' -+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; - hp*|HP*) diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist index 0c4ef402b2a4..2da321c50218 100644 --- a/lang/python25/pkg-plist +++ b/lang/python25/pkg-plist @@ -495,6 +495,27 @@ lib/%%PYTHON_VERSION%%/distutils/spawn.pyo lib/%%PYTHON_VERSION%%/distutils/sysconfig.py lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyc lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.py +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/support.py +lib/%%PYTHON_VERSION%%/distutils/tests/support.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/support.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyo lib/%%PYTHON_VERSION%%/distutils/text_file.py lib/%%PYTHON_VERSION%%/distutils/text_file.pyc lib/%%PYTHON_VERSION%%/distutils/text_file.pyo @@ -630,6 +651,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_39.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_41.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_42.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_43.txt lib/%%PYTHON_VERSION%%/email/test/test_email.py lib/%%PYTHON_VERSION%%/email/test/test_email.pyc lib/%%PYTHON_VERSION%%/email/test/test_email.pyo @@ -1337,15 +1359,24 @@ lib/%%PYTHON_VERSION%%/lib-old/poly.pyo lib/%%PYTHON_VERSION%%/lib-old/rand.py lib/%%PYTHON_VERSION%%/lib-old/rand.pyc lib/%%PYTHON_VERSION%%/lib-old/rand.pyo +lib/%%PYTHON_VERSION%%/lib-old/statcache.py +lib/%%PYTHON_VERSION%%/lib-old/statcache.pyc +lib/%%PYTHON_VERSION%%/lib-old/statcache.pyo lib/%%PYTHON_VERSION%%/lib-old/tb.py lib/%%PYTHON_VERSION%%/lib-old/tb.pyc lib/%%PYTHON_VERSION%%/lib-old/tb.pyo +lib/%%PYTHON_VERSION%%/lib-old/tzparse.py +lib/%%PYTHON_VERSION%%/lib-old/tzparse.pyc +lib/%%PYTHON_VERSION%%/lib-old/tzparse.pyo lib/%%PYTHON_VERSION%%/lib-old/util.py lib/%%PYTHON_VERSION%%/lib-old/util.pyc lib/%%PYTHON_VERSION%%/lib-old/util.pyo lib/%%PYTHON_VERSION%%/lib-old/whatsound.py lib/%%PYTHON_VERSION%%/lib-old/whatsound.pyc lib/%%PYTHON_VERSION%%/lib-old/whatsound.pyo +lib/%%PYTHON_VERSION%%/lib-old/whrandom.py +lib/%%PYTHON_VERSION%%/lib-old/whrandom.pyc +lib/%%PYTHON_VERSION%%/lib-old/whrandom.pyo lib/%%PYTHON_VERSION%%/lib-old/zmod.py lib/%%PYTHON_VERSION%%/lib-old/zmod.pyc lib/%%PYTHON_VERSION%%/lib-old/zmod.pyo @@ -1528,7 +1559,6 @@ lib/%%PYTHON_VERSION%%/posixpath.pyo lib/%%PYTHON_VERSION%%/pprint.py lib/%%PYTHON_VERSION%%/pprint.pyc lib/%%PYTHON_VERSION%%/pprint.pyo -lib/%%PYTHON_VERSION%%/profile.doc lib/%%PYTHON_VERSION%%/profile.py lib/%%PYTHON_VERSION%%/profile.pyc lib/%%PYTHON_VERSION%%/profile.pyo @@ -1629,9 +1659,6 @@ lib/%%PYTHON_VERSION%%/sre_parse.pyo lib/%%PYTHON_VERSION%%/stat.py lib/%%PYTHON_VERSION%%/stat.pyc lib/%%PYTHON_VERSION%%/stat.pyo -lib/%%PYTHON_VERSION%%/statcache.py -lib/%%PYTHON_VERSION%%/statcache.pyc -lib/%%PYTHON_VERSION%%/statcache.pyo lib/%%PYTHON_VERSION%%/statvfs.py lib/%%PYTHON_VERSION%%/statvfs.pyc lib/%%PYTHON_VERSION%%/statvfs.pyo @@ -1729,6 +1756,12 @@ lib/%%PYTHON_VERSION%%/test/double_const.py lib/%%PYTHON_VERSION%%/test/double_const.pyc lib/%%PYTHON_VERSION%%/test/double_const.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue +lib/%%PYTHON_VERSION%%/test/inspect_fodder.py +lib/%%PYTHON_VERSION%%/test/inspect_fodder.pyc +lib/%%PYTHON_VERSION%%/test/inspect_fodder.pyo +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.py +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.pyc +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.pyo lib/%%PYTHON_VERSION%%/test/list_tests.py lib/%%PYTHON_VERSION%%/test/list_tests.pyc lib/%%PYTHON_VERSION%%/test/list_tests.pyo @@ -2062,6 +2095,7 @@ lib/%%PYTHON_VERSION%%/test/test_doctest2.py lib/%%PYTHON_VERSION%%/test/test_doctest2.pyc lib/%%PYTHON_VERSION%%/test/test_doctest2.pyo lib/%%PYTHON_VERSION%%/test/test_doctest2.txt +lib/%%PYTHON_VERSION%%/test/test_doctest3.txt lib/%%PYTHON_VERSION%%/test/test_dumbdbm.py lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyc lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo @@ -2751,9 +2785,6 @@ lib/%%PYTHON_VERSION%%/tty.pyo lib/%%PYTHON_VERSION%%/types.py lib/%%PYTHON_VERSION%%/types.pyc lib/%%PYTHON_VERSION%%/types.pyo -lib/%%PYTHON_VERSION%%/tzparse.py -lib/%%PYTHON_VERSION%%/tzparse.pyc -lib/%%PYTHON_VERSION%%/tzparse.pyo lib/%%PYTHON_VERSION%%/unittest.py lib/%%PYTHON_VERSION%%/unittest.pyc lib/%%PYTHON_VERSION%%/unittest.pyo @@ -2787,9 +2818,6 @@ lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo -lib/%%PYTHON_VERSION%%/whrandom.py -lib/%%PYTHON_VERSION%%/whrandom.pyc -lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo @@ -3157,6 +3185,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/win32.html %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/makelocalealias.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.py @@ -3188,6 +3217,14 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/modulator.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/README.txt +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msi.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msilib.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.c +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.mak +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/schema.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/sequence.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/uisample.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py @@ -3292,6 +3329,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/scripts %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche/X %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche +%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/msi %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator/Templates %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/i18n @@ -3354,6 +3392,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo @dirrm lib/%%PYTHON_VERSION%%/email/test/data @dirrm lib/%%PYTHON_VERSION%%/email/test @dirrm lib/%%PYTHON_VERSION%%/email +@dirrm lib/%%PYTHON_VERSION%%/distutils/tests @dirrm lib/%%PYTHON_VERSION%%/distutils/command @dirrm lib/%%PYTHON_VERSION%%/distutils @dirrm lib/%%PYTHON_VERSION%%/curses diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 0daa10b33ea6..ec0f468b3ab4 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.5.a0.000000 +PORTVERSION= 2.5.a0.20050129 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -14,8 +14,6 @@ DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language -IGNORE= is not available yet - DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes @@ -29,7 +27,7 @@ MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes USE_REINPLACE= yes -PYTHON_VERSION= python2.4 +PYTHON_VERSION= python2.5 PYTHON_NO_DEPENDS= yes LATEST_LINK= ${PYTHON_VERSION:S/.//} @@ -108,11 +106,11 @@ PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.4 + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 + ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py + ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py pre-patch: ${REINPLACE_CMD} -e \ @@ -172,8 +170,8 @@ post-install: ${PREFIX}/bin @# additional files installing by ports - ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \ - ${WRKDIR}/smtpd2.4.py ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.5 ${WRKDIR}/idle2.5 \ + ${WRKDIR}/smtpd2.5.py ${PREFIX}/bin @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 diff --git a/lang/python26/distinfo b/lang/python26/distinfo index 24141b21691f..0072eec35a72 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4c1.tgz) = deea93a91518314ffe9a7c5cd8144eac -SIZE (python/Python-2.4c1.tgz) = 9198160 +MD5 (python/Python-2.5.a0.20050129.tgz) = bdf571f3e28c4793bedbd180611c28e6 +SIZE (python/Python-2.5.a0.20050129.tgz) = 9227299 diff --git a/lang/python26/files/patch-Lib::plat-freebsd6::IN.py b/lang/python26/files/patch-Lib::plat-freebsd6::IN.py deleted file mode 100644 index 8316a9ef20a0..000000000000 --- a/lang/python26/files/patch-Lib::plat-freebsd6::IN.py +++ /dev/null @@ -1,518 +0,0 @@ ---- Lib/plat-freebsd6/IN.py Thu Jan 1 09:00:00 1970 -+++ Lib/plat-freebsd6/IN.py Sat Aug 21 08:09:15 2004 -@@ -0,0 +1,515 @@ -+# Generated by h2py from /usr/include/netinet/in.h -+ -+# Included from sys/cdefs.h -+def __P(protos): return protos -+ -+def __STRING(x): return #x -+ -+def __XSTRING(x): return __STRING(x) -+ -+def __P(protos): return () -+ -+def __STRING(x): return "x" -+ -+def __aligned(x): return __attribute__((__aligned__(x))) -+ -+def __section(x): return __attribute__((__section__(x))) -+ -+def __aligned(x): return __attribute__((__aligned__(x))) -+ -+def __section(x): return __attribute__((__section__(x))) -+ -+def __nonnull(x): return __attribute__((__nonnull__(x))) -+ -+def __predict_true(exp): return __builtin_expect((exp), 1) -+ -+def __predict_false(exp): return __builtin_expect((exp), 0) -+ -+def __predict_true(exp): return (exp) -+ -+def __predict_false(exp): return (exp) -+ -+def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -+ -+def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -+ -+def __RCSID_SOURCE(s): return __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s) -+ -+def __SCCSID(s): return __IDSTRING(__CONCAT(__sccsid_,__LINE__),s) -+ -+def __COPYRIGHT(s): return __IDSTRING(__CONCAT(__copyright_,__LINE__),s) -+ -+_POSIX_C_SOURCE = 199009 -+_POSIX_C_SOURCE = 199209 -+__XSI_VISIBLE = 600 -+_POSIX_C_SOURCE = 200112 -+__XSI_VISIBLE = 500 -+_POSIX_C_SOURCE = 199506 -+_POSIX_C_SOURCE = 198808 -+__POSIX_VISIBLE = 200112 -+__ISO_C_VISIBLE = 1999 -+__POSIX_VISIBLE = 199506 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199309 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199209 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199009 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 198808 -+__ISO_C_VISIBLE = 0 -+__POSIX_VISIBLE = 0 -+__XSI_VISIBLE = 0 -+__BSD_VISIBLE = 0 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 0 -+__XSI_VISIBLE = 0 -+__BSD_VISIBLE = 0 -+__ISO_C_VISIBLE = 1999 -+__POSIX_VISIBLE = 200112 -+__XSI_VISIBLE = 600 -+__BSD_VISIBLE = 1 -+__ISO_C_VISIBLE = 1999 -+ -+# Included from sys/_types.h -+ -+# Included from machine/_types.h -+ -+# Included from machine/endian.h -+_QUAD_HIGHWORD = 1 -+_QUAD_LOWWORD = 0 -+_LITTLE_ENDIAN = 1234 -+_BIG_ENDIAN = 4321 -+_PDP_ENDIAN = 3412 -+_BYTE_ORDER = _LITTLE_ENDIAN -+LITTLE_ENDIAN = _LITTLE_ENDIAN -+BIG_ENDIAN = _BIG_ENDIAN -+PDP_ENDIAN = _PDP_ENDIAN -+BYTE_ORDER = _BYTE_ORDER -+__INTEL_COMPILER_with_FreeBSD_endian = 1 -+__INTEL_COMPILER_with_FreeBSD_endian = 1 -+def __word_swap_int_var(x): return \ -+ -+def __word_swap_int_const(x): return \ -+ -+def __word_swap_int(x): return __word_swap_int_var(x) -+ -+def __byte_swap_int_var(x): return \ -+ -+def __byte_swap_int_var(x): return \ -+ -+def __byte_swap_int_const(x): return \ -+ -+def __byte_swap_int(x): return __byte_swap_int_var(x) -+ -+def __byte_swap_word_var(x): return \ -+ -+def __byte_swap_word_const(x): return \ -+ -+def __byte_swap_word(x): return __byte_swap_word_var(x) -+ -+def __htonl(x): return __bswap32(x) -+ -+def __htons(x): return __bswap16(x) -+ -+def __ntohl(x): return __bswap32(x) -+ -+def __ntohs(x): return __bswap16(x) -+ -+IPPROTO_IP = 0 -+IPPROTO_ICMP = 1 -+IPPROTO_TCP = 6 -+IPPROTO_UDP = 17 -+def htonl(x): return __htonl(x) -+ -+def htons(x): return __htons(x) -+ -+def ntohl(x): return __ntohl(x) -+ -+def ntohs(x): return __ntohs(x) -+ -+IPPROTO_RAW = 255 -+INET_ADDRSTRLEN = 16 -+IPPROTO_HOPOPTS = 0 -+IPPROTO_IGMP = 2 -+IPPROTO_GGP = 3 -+IPPROTO_IPV4 = 4 -+IPPROTO_IPIP = IPPROTO_IPV4 -+IPPROTO_ST = 7 -+IPPROTO_EGP = 8 -+IPPROTO_PIGP = 9 -+IPPROTO_RCCMON = 10 -+IPPROTO_NVPII = 11 -+IPPROTO_PUP = 12 -+IPPROTO_ARGUS = 13 -+IPPROTO_EMCON = 14 -+IPPROTO_XNET = 15 -+IPPROTO_CHAOS = 16 -+IPPROTO_MUX = 18 -+IPPROTO_MEAS = 19 -+IPPROTO_HMP = 20 -+IPPROTO_PRM = 21 -+IPPROTO_IDP = 22 -+IPPROTO_TRUNK1 = 23 -+IPPROTO_TRUNK2 = 24 -+IPPROTO_LEAF1 = 25 -+IPPROTO_LEAF2 = 26 -+IPPROTO_RDP = 27 -+IPPROTO_IRTP = 28 -+IPPROTO_TP = 29 -+IPPROTO_BLT = 30 -+IPPROTO_NSP = 31 -+IPPROTO_INP = 32 -+IPPROTO_SEP = 33 -+IPPROTO_3PC = 34 -+IPPROTO_IDPR = 35 -+IPPROTO_XTP = 36 -+IPPROTO_DDP = 37 -+IPPROTO_CMTP = 38 -+IPPROTO_TPXX = 39 -+IPPROTO_IL = 40 -+IPPROTO_IPV6 = 41 -+IPPROTO_SDRP = 42 -+IPPROTO_ROUTING = 43 -+IPPROTO_FRAGMENT = 44 -+IPPROTO_IDRP = 45 -+IPPROTO_RSVP = 46 -+IPPROTO_GRE = 47 -+IPPROTO_MHRP = 48 -+IPPROTO_BHA = 49 -+IPPROTO_ESP = 50 -+IPPROTO_AH = 51 -+IPPROTO_INLSP = 52 -+IPPROTO_SWIPE = 53 -+IPPROTO_NHRP = 54 -+IPPROTO_MOBILE = 55 -+IPPROTO_TLSP = 56 -+IPPROTO_SKIP = 57 -+IPPROTO_ICMPV6 = 58 -+IPPROTO_NONE = 59 -+IPPROTO_DSTOPTS = 60 -+IPPROTO_AHIP = 61 -+IPPROTO_CFTP = 62 -+IPPROTO_HELLO = 63 -+IPPROTO_SATEXPAK = 64 -+IPPROTO_KRYPTOLAN = 65 -+IPPROTO_RVD = 66 -+IPPROTO_IPPC = 67 -+IPPROTO_ADFS = 68 -+IPPROTO_SATMON = 69 -+IPPROTO_VISA = 70 -+IPPROTO_IPCV = 71 -+IPPROTO_CPNX = 72 -+IPPROTO_CPHB = 73 -+IPPROTO_WSN = 74 -+IPPROTO_PVP = 75 -+IPPROTO_BRSATMON = 76 -+IPPROTO_ND = 77 -+IPPROTO_WBMON = 78 -+IPPROTO_WBEXPAK = 79 -+IPPROTO_EON = 80 -+IPPROTO_VMTP = 81 -+IPPROTO_SVMTP = 82 -+IPPROTO_VINES = 83 -+IPPROTO_TTP = 84 -+IPPROTO_IGP = 85 -+IPPROTO_DGP = 86 -+IPPROTO_TCF = 87 -+IPPROTO_IGRP = 88 -+IPPROTO_OSPFIGP = 89 -+IPPROTO_SRPC = 90 -+IPPROTO_LARP = 91 -+IPPROTO_MTP = 92 -+IPPROTO_AX25 = 93 -+IPPROTO_IPEIP = 94 -+IPPROTO_MICP = 95 -+IPPROTO_SCCSP = 96 -+IPPROTO_ETHERIP = 97 -+IPPROTO_ENCAP = 98 -+IPPROTO_APES = 99 -+IPPROTO_GMTP = 100 -+IPPROTO_IPCOMP = 108 -+IPPROTO_PIM = 103 -+IPPROTO_PGM = 113 -+IPPROTO_PFSYNC = 240 -+IPPROTO_OLD_DIVERT = 254 -+IPPROTO_MAX = 256 -+IPPROTO_DONE = 257 -+IPPROTO_DIVERT = 258 -+IPPORT_RESERVED = 1024 -+IPPORT_HIFIRSTAUTO = 49152 -+IPPORT_HILASTAUTO = 65535 -+IPPORT_RESERVEDSTART = 600 -+IPPORT_MAX = 65535 -+def IN_CLASSA(i): return (((u_int32_t)(i) & (-2147483648)) == 0) -+ -+IN_CLASSA_NET = (-16777216) -+IN_CLASSA_NSHIFT = 24 -+IN_CLASSA_HOST = 0x00ffffff -+IN_CLASSA_MAX = 128 -+def IN_CLASSB(i): return (((u_int32_t)(i) & (-1073741824)) == (-2147483648)) -+ -+IN_CLASSB_NET = (-65536) -+IN_CLASSB_NSHIFT = 16 -+IN_CLASSB_HOST = 0x0000ffff -+IN_CLASSB_MAX = 65536 -+def IN_CLASSC(i): return (((u_int32_t)(i) & (-536870912)) == (-1073741824)) -+ -+IN_CLASSC_NET = (-256) -+IN_CLASSC_NSHIFT = 8 -+IN_CLASSC_HOST = 0x000000ff -+def IN_CLASSD(i): return (((u_int32_t)(i) & (-268435456)) == (-536870912)) -+ -+IN_CLASSD_NET = (-268435456) -+IN_CLASSD_NSHIFT = 28 -+IN_CLASSD_HOST = 0x0fffffff -+def IN_MULTICAST(i): return IN_CLASSD(i) -+ -+def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -+ -+def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -+ -+INADDR_NONE = (-1) -+IN_LOOPBACKNET = 127 -+IP_OPTIONS = 1 -+IP_HDRINCL = 2 -+IP_TOS = 3 -+IP_TTL = 4 -+IP_RECVOPTS = 5 -+IP_RECVRETOPTS = 6 -+IP_RECVDSTADDR = 7 -+IP_SENDSRCADDR = IP_RECVDSTADDR -+IP_RETOPTS = 8 -+IP_MULTICAST_IF = 9 -+IP_MULTICAST_TTL = 10 -+IP_MULTICAST_LOOP = 11 -+IP_ADD_MEMBERSHIP = 12 -+IP_DROP_MEMBERSHIP = 13 -+IP_MULTICAST_VIF = 14 -+IP_RSVP_ON = 15 -+IP_RSVP_OFF = 16 -+IP_RSVP_VIF_ON = 17 -+IP_RSVP_VIF_OFF = 18 -+IP_PORTRANGE = 19 -+IP_RECVIF = 20 -+IP_IPSEC_POLICY = 21 -+IP_FAITH = 22 -+IP_ONESBCAST = 23 -+IP_FW_TABLE_ADD = 40 -+IP_FW_TABLE_DEL = 41 -+IP_FW_TABLE_FLUSH = 42 -+IP_FW_TABLE_GETSIZE = 43 -+IP_FW_TABLE_LIST = 44 -+IP_FW_ADD = 50 -+IP_FW_DEL = 51 -+IP_FW_FLUSH = 52 -+IP_FW_ZERO = 53 -+IP_FW_GET = 54 -+IP_FW_RESETLOG = 55 -+IP_DUMMYNET_CONFIGURE = 60 -+IP_DUMMYNET_DEL = 61 -+IP_DUMMYNET_FLUSH = 62 -+IP_DUMMYNET_GET = 64 -+IP_RECVTTL = 65 -+IP_DEFAULT_MULTICAST_TTL = 1 -+IP_DEFAULT_MULTICAST_LOOP = 1 -+IP_MAX_MEMBERSHIPS = 20 -+IP_PORTRANGE_DEFAULT = 0 -+IP_PORTRANGE_HIGH = 1 -+IP_PORTRANGE_LOW = 2 -+IPPROTO_MAXID = (IPPROTO_AH + 1) -+IPCTL_FORWARDING = 1 -+IPCTL_SENDREDIRECTS = 2 -+IPCTL_DEFTTL = 3 -+IPCTL_DEFMTU = 4 -+IPCTL_RTEXPIRE = 5 -+IPCTL_RTMINEXPIRE = 6 -+IPCTL_RTMAXCACHE = 7 -+IPCTL_SOURCEROUTE = 8 -+IPCTL_DIRECTEDBROADCAST = 9 -+IPCTL_INTRQMAXLEN = 10 -+IPCTL_INTRQDROPS = 11 -+IPCTL_STATS = 12 -+IPCTL_ACCEPTSOURCEROUTE = 13 -+IPCTL_FASTFORWARDING = 14 -+IPCTL_KEEPFAITH = 15 -+IPCTL_GIF_TTL = 16 -+IPCTL_MAXID = 17 -+def in_nullhost(x): return ((x).s_addr == INADDR_ANY) -+ -+ -+# Included from netinet6/in6.h -+__KAME_VERSION = "20010528/FreeBSD" -+IPV6PORT_RESERVED = 1024 -+IPV6PORT_ANONMIN = 49152 -+IPV6PORT_ANONMAX = 65535 -+IPV6PORT_RESERVEDMIN = 600 -+IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -+INET6_ADDRSTRLEN = 46 -+IPV6_ADDR_INT32_ONE = 1 -+IPV6_ADDR_INT32_TWO = 2 -+IPV6_ADDR_INT32_MNL = (-16711680) -+IPV6_ADDR_INT32_MLL = (-16646144) -+IPV6_ADDR_INT32_SMP = 0x0000ffff -+IPV6_ADDR_INT16_ULL = 0xfe80 -+IPV6_ADDR_INT16_USL = 0xfec0 -+IPV6_ADDR_INT16_MLL = 0xff02 -+IPV6_ADDR_INT32_ONE = 0x01000000 -+IPV6_ADDR_INT32_TWO = 0x02000000 -+IPV6_ADDR_INT32_MNL = 0x000001ff -+IPV6_ADDR_INT32_MLL = 0x000002ff -+IPV6_ADDR_INT32_SMP = (-65536) -+IPV6_ADDR_INT16_ULL = 0x80fe -+IPV6_ADDR_INT16_USL = 0xc0fe -+IPV6_ADDR_INT16_MLL = 0x02ff -+def IN6_IS_ADDR_UNSPECIFIED(a): return \ -+ -+def IN6_IS_ADDR_LOOPBACK(a): return \ -+ -+def IN6_IS_ADDR_V4COMPAT(a): return \ -+ -+def IN6_IS_ADDR_V4MAPPED(a): return \ -+ -+IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -+IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -+IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -+IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -+IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -+IPV6_ADDR_SCOPE_GLOBAL = 0x0e -+__IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -+__IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -+__IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -+__IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -+__IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -+__IPV6_ADDR_SCOPE_GLOBAL = 0x0e -+def IN6_IS_ADDR_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_INTFACELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_GLOBAL(a): return \ -+ -+def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_GLOBAL(a): return \ -+ -+def IN6_IS_SCOPE_LINKLOCAL(a): return \ -+ -+def IFA6_IS_DEPRECATED(a): return \ -+ -+def IFA6_IS_INVALID(a): return \ -+ -+IPV6_OPTIONS = 1 -+IPV6_RECVOPTS = 5 -+IPV6_RECVRETOPTS = 6 -+IPV6_RECVDSTADDR = 7 -+IPV6_RETOPTS = 8 -+IPV6_SOCKOPT_RESERVED1 = 3 -+IPV6_UNICAST_HOPS = 4 -+IPV6_MULTICAST_IF = 9 -+IPV6_MULTICAST_HOPS = 10 -+IPV6_MULTICAST_LOOP = 11 -+IPV6_JOIN_GROUP = 12 -+IPV6_LEAVE_GROUP = 13 -+IPV6_PORTRANGE = 14 -+ICMP6_FILTER = 18 -+IPV6_2292PKTINFO = 19 -+IPV6_2292HOPLIMIT = 20 -+IPV6_2292NEXTHOP = 21 -+IPV6_2292HOPOPTS = 22 -+IPV6_2292DSTOPTS = 23 -+IPV6_2292RTHDR = 24 -+IPV6_2292PKTOPTIONS = 25 -+IPV6_CHECKSUM = 26 -+IPV6_V6ONLY = 27 -+IPV6_BINDV6ONLY = IPV6_V6ONLY -+IPV6_IPSEC_POLICY = 28 -+IPV6_FAITH = 29 -+IPV6_FW_ADD = 30 -+IPV6_FW_DEL = 31 -+IPV6_FW_FLUSH = 32 -+IPV6_FW_ZERO = 33 -+IPV6_FW_GET = 34 -+IPV6_RTHDRDSTOPTS = 35 -+IPV6_RECVPKTINFO = 36 -+IPV6_RECVHOPLIMIT = 37 -+IPV6_RECVRTHDR = 38 -+IPV6_RECVHOPOPTS = 39 -+IPV6_RECVDSTOPTS = 40 -+IPV6_RECVRTHDRDSTOPTS = 41 -+IPV6_USE_MIN_MTU = 42 -+IPV6_RECVPATHMTU = 43 -+IPV6_PATHMTU = 44 -+IPV6_REACHCONF = 45 -+IPV6_PKTINFO = 46 -+IPV6_HOPLIMIT = 47 -+IPV6_NEXTHOP = 48 -+IPV6_HOPOPTS = 49 -+IPV6_DSTOPTS = 50 -+IPV6_RTHDR = 51 -+IPV6_PKTOPTIONS = 52 -+IPV6_RECVTCLASS = 57 -+IPV6_AUTOFLOWLABEL = 59 -+IPV6_TCLASS = 61 -+IPV6_DONTFRAG = 62 -+IPV6_PREFER_TEMPADDR = 63 -+IPV6_RTHDR_LOOSE = 0 -+IPV6_RTHDR_STRICT = 1 -+IPV6_RTHDR_TYPE_0 = 0 -+IPV6_DEFAULT_MULTICAST_HOPS = 1 -+IPV6_DEFAULT_MULTICAST_LOOP = 1 -+IPV6_PORTRANGE_DEFAULT = 0 -+IPV6_PORTRANGE_HIGH = 1 -+IPV6_PORTRANGE_LOW = 2 -+IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -+IPV6CTL_FORWARDING = 1 -+IPV6CTL_SENDREDIRECTS = 2 -+IPV6CTL_DEFHLIM = 3 -+IPV6CTL_DEFMTU = 4 -+IPV6CTL_FORWSRCRT = 5 -+IPV6CTL_STATS = 6 -+IPV6CTL_MRTSTATS = 7 -+IPV6CTL_MRTPROTO = 8 -+IPV6CTL_MAXFRAGPACKETS = 9 -+IPV6CTL_SOURCECHECK = 10 -+IPV6CTL_SOURCECHECK_LOGINT = 11 -+IPV6CTL_ACCEPT_RTADV = 12 -+IPV6CTL_KEEPFAITH = 13 -+IPV6CTL_LOG_INTERVAL = 14 -+IPV6CTL_HDRNESTLIMIT = 15 -+IPV6CTL_DAD_COUNT = 16 -+IPV6CTL_AUTO_FLOWLABEL = 17 -+IPV6CTL_DEFMCASTHLIM = 18 -+IPV6CTL_GIF_HLIM = 19 -+IPV6CTL_KAME_VERSION = 20 -+IPV6CTL_USE_DEPRECATED = 21 -+IPV6CTL_RR_PRUNE = 22 -+IPV6CTL_MAPPED_ADDR = 23 -+IPV6CTL_V6ONLY = 24 -+IPV6CTL_RTEXPIRE = 25 -+IPV6CTL_RTMINEXPIRE = 26 -+IPV6CTL_RTMAXCACHE = 27 -+IPV6CTL_USETEMPADDR = 32 -+IPV6CTL_TEMPPLTIME = 33 -+IPV6CTL_TEMPVLTIME = 34 -+IPV6CTL_AUTO_LINKLOCAL = 35 -+IPV6CTL_RIP6STATS = 36 -+IPV6CTL_PREFER_TEMPADDR = 37 -+IPV6CTL_ADDRCTLPOLICY = 38 -+IPV6CTL_MAXFRAGS = 41 -+IPV6CTL_MAXID = 42 diff --git a/lang/python26/files/patch-configure b/lang/python26/files/patch-configure deleted file mode 100644 index 9ed971ab4be7..000000000000 --- a/lang/python26/files/patch-configure +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.orig Sat Oct 4 13:27:50 2003 -+++ configure Sat Oct 4 13:29:05 2003 -@@ -1321,7 +1321,7 @@ - VERSION=2.4 - - --SOVERSION=1.0 -+SOVERSION=1 - - # The later defininition of _XOPEN_SOURCE disables certain features - # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). -@@ -3396,6 +3396,12 @@ - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -+ INSTSONAME="$LDLIBRARY".$SOVERSION -+ ;; -+ FreeBSD*) -+ LDLIBRARY='libpython$(VERSION).so' -+ BLDLIBRARY='-L. -lpython$(VERSION)' -+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; - hp*|HP*) diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist index 0c4ef402b2a4..2da321c50218 100644 --- a/lang/python26/pkg-plist +++ b/lang/python26/pkg-plist @@ -495,6 +495,27 @@ lib/%%PYTHON_VERSION%%/distutils/spawn.pyo lib/%%PYTHON_VERSION%%/distutils/sysconfig.py lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyc lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.py +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/support.py +lib/%%PYTHON_VERSION%%/distutils/tests/support.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/support.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyo lib/%%PYTHON_VERSION%%/distutils/text_file.py lib/%%PYTHON_VERSION%%/distutils/text_file.pyc lib/%%PYTHON_VERSION%%/distutils/text_file.pyo @@ -630,6 +651,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_39.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_41.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_42.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_43.txt lib/%%PYTHON_VERSION%%/email/test/test_email.py lib/%%PYTHON_VERSION%%/email/test/test_email.pyc lib/%%PYTHON_VERSION%%/email/test/test_email.pyo @@ -1337,15 +1359,24 @@ lib/%%PYTHON_VERSION%%/lib-old/poly.pyo lib/%%PYTHON_VERSION%%/lib-old/rand.py lib/%%PYTHON_VERSION%%/lib-old/rand.pyc lib/%%PYTHON_VERSION%%/lib-old/rand.pyo +lib/%%PYTHON_VERSION%%/lib-old/statcache.py +lib/%%PYTHON_VERSION%%/lib-old/statcache.pyc +lib/%%PYTHON_VERSION%%/lib-old/statcache.pyo lib/%%PYTHON_VERSION%%/lib-old/tb.py lib/%%PYTHON_VERSION%%/lib-old/tb.pyc lib/%%PYTHON_VERSION%%/lib-old/tb.pyo +lib/%%PYTHON_VERSION%%/lib-old/tzparse.py +lib/%%PYTHON_VERSION%%/lib-old/tzparse.pyc +lib/%%PYTHON_VERSION%%/lib-old/tzparse.pyo lib/%%PYTHON_VERSION%%/lib-old/util.py lib/%%PYTHON_VERSION%%/lib-old/util.pyc lib/%%PYTHON_VERSION%%/lib-old/util.pyo lib/%%PYTHON_VERSION%%/lib-old/whatsound.py lib/%%PYTHON_VERSION%%/lib-old/whatsound.pyc lib/%%PYTHON_VERSION%%/lib-old/whatsound.pyo +lib/%%PYTHON_VERSION%%/lib-old/whrandom.py +lib/%%PYTHON_VERSION%%/lib-old/whrandom.pyc +lib/%%PYTHON_VERSION%%/lib-old/whrandom.pyo lib/%%PYTHON_VERSION%%/lib-old/zmod.py lib/%%PYTHON_VERSION%%/lib-old/zmod.pyc lib/%%PYTHON_VERSION%%/lib-old/zmod.pyo @@ -1528,7 +1559,6 @@ lib/%%PYTHON_VERSION%%/posixpath.pyo lib/%%PYTHON_VERSION%%/pprint.py lib/%%PYTHON_VERSION%%/pprint.pyc lib/%%PYTHON_VERSION%%/pprint.pyo -lib/%%PYTHON_VERSION%%/profile.doc lib/%%PYTHON_VERSION%%/profile.py lib/%%PYTHON_VERSION%%/profile.pyc lib/%%PYTHON_VERSION%%/profile.pyo @@ -1629,9 +1659,6 @@ lib/%%PYTHON_VERSION%%/sre_parse.pyo lib/%%PYTHON_VERSION%%/stat.py lib/%%PYTHON_VERSION%%/stat.pyc lib/%%PYTHON_VERSION%%/stat.pyo -lib/%%PYTHON_VERSION%%/statcache.py -lib/%%PYTHON_VERSION%%/statcache.pyc -lib/%%PYTHON_VERSION%%/statcache.pyo lib/%%PYTHON_VERSION%%/statvfs.py lib/%%PYTHON_VERSION%%/statvfs.pyc lib/%%PYTHON_VERSION%%/statvfs.pyo @@ -1729,6 +1756,12 @@ lib/%%PYTHON_VERSION%%/test/double_const.py lib/%%PYTHON_VERSION%%/test/double_const.pyc lib/%%PYTHON_VERSION%%/test/double_const.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue +lib/%%PYTHON_VERSION%%/test/inspect_fodder.py +lib/%%PYTHON_VERSION%%/test/inspect_fodder.pyc +lib/%%PYTHON_VERSION%%/test/inspect_fodder.pyo +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.py +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.pyc +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.pyo lib/%%PYTHON_VERSION%%/test/list_tests.py lib/%%PYTHON_VERSION%%/test/list_tests.pyc lib/%%PYTHON_VERSION%%/test/list_tests.pyo @@ -2062,6 +2095,7 @@ lib/%%PYTHON_VERSION%%/test/test_doctest2.py lib/%%PYTHON_VERSION%%/test/test_doctest2.pyc lib/%%PYTHON_VERSION%%/test/test_doctest2.pyo lib/%%PYTHON_VERSION%%/test/test_doctest2.txt +lib/%%PYTHON_VERSION%%/test/test_doctest3.txt lib/%%PYTHON_VERSION%%/test/test_dumbdbm.py lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyc lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo @@ -2751,9 +2785,6 @@ lib/%%PYTHON_VERSION%%/tty.pyo lib/%%PYTHON_VERSION%%/types.py lib/%%PYTHON_VERSION%%/types.pyc lib/%%PYTHON_VERSION%%/types.pyo -lib/%%PYTHON_VERSION%%/tzparse.py -lib/%%PYTHON_VERSION%%/tzparse.pyc -lib/%%PYTHON_VERSION%%/tzparse.pyo lib/%%PYTHON_VERSION%%/unittest.py lib/%%PYTHON_VERSION%%/unittest.pyc lib/%%PYTHON_VERSION%%/unittest.pyo @@ -2787,9 +2818,6 @@ lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo -lib/%%PYTHON_VERSION%%/whrandom.py -lib/%%PYTHON_VERSION%%/whrandom.pyc -lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo @@ -3157,6 +3185,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/win32.html %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/makelocalealias.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.py @@ -3188,6 +3217,14 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/modulator.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/README.txt +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msi.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msilib.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.c +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.mak +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/schema.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/sequence.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/uisample.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py @@ -3292,6 +3329,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/scripts %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche/X %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche +%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/msi %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator/Templates %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/i18n @@ -3354,6 +3392,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo @dirrm lib/%%PYTHON_VERSION%%/email/test/data @dirrm lib/%%PYTHON_VERSION%%/email/test @dirrm lib/%%PYTHON_VERSION%%/email +@dirrm lib/%%PYTHON_VERSION%%/distutils/tests @dirrm lib/%%PYTHON_VERSION%%/distutils/command @dirrm lib/%%PYTHON_VERSION%%/distutils @dirrm lib/%%PYTHON_VERSION%%/curses diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 0daa10b33ea6..ec0f468b3ab4 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.5.a0.000000 +PORTVERSION= 2.5.a0.20050129 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -14,8 +14,6 @@ DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language -IGNORE= is not available yet - DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes @@ -29,7 +27,7 @@ MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes USE_REINPLACE= yes -PYTHON_VERSION= python2.4 +PYTHON_VERSION= python2.5 PYTHON_NO_DEPENDS= yes LATEST_LINK= ${PYTHON_VERSION:S/.//} @@ -108,11 +106,11 @@ PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.4 + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 + ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py + ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py pre-patch: ${REINPLACE_CMD} -e \ @@ -172,8 +170,8 @@ post-install: ${PREFIX}/bin @# additional files installing by ports - ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \ - ${WRKDIR}/smtpd2.4.py ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.5 ${WRKDIR}/idle2.5 \ + ${WRKDIR}/smtpd2.5.py ${PREFIX}/bin @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 diff --git a/lang/python27/distinfo b/lang/python27/distinfo index 24141b21691f..0072eec35a72 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4c1.tgz) = deea93a91518314ffe9a7c5cd8144eac -SIZE (python/Python-2.4c1.tgz) = 9198160 +MD5 (python/Python-2.5.a0.20050129.tgz) = bdf571f3e28c4793bedbd180611c28e6 +SIZE (python/Python-2.5.a0.20050129.tgz) = 9227299 diff --git a/lang/python27/files/patch-Lib::plat-freebsd6::IN.py b/lang/python27/files/patch-Lib::plat-freebsd6::IN.py deleted file mode 100644 index 8316a9ef20a0..000000000000 --- a/lang/python27/files/patch-Lib::plat-freebsd6::IN.py +++ /dev/null @@ -1,518 +0,0 @@ ---- Lib/plat-freebsd6/IN.py Thu Jan 1 09:00:00 1970 -+++ Lib/plat-freebsd6/IN.py Sat Aug 21 08:09:15 2004 -@@ -0,0 +1,515 @@ -+# Generated by h2py from /usr/include/netinet/in.h -+ -+# Included from sys/cdefs.h -+def __P(protos): return protos -+ -+def __STRING(x): return #x -+ -+def __XSTRING(x): return __STRING(x) -+ -+def __P(protos): return () -+ -+def __STRING(x): return "x" -+ -+def __aligned(x): return __attribute__((__aligned__(x))) -+ -+def __section(x): return __attribute__((__section__(x))) -+ -+def __aligned(x): return __attribute__((__aligned__(x))) -+ -+def __section(x): return __attribute__((__section__(x))) -+ -+def __nonnull(x): return __attribute__((__nonnull__(x))) -+ -+def __predict_true(exp): return __builtin_expect((exp), 1) -+ -+def __predict_false(exp): return __builtin_expect((exp), 0) -+ -+def __predict_true(exp): return (exp) -+ -+def __predict_false(exp): return (exp) -+ -+def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -+ -+def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -+ -+def __RCSID_SOURCE(s): return __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s) -+ -+def __SCCSID(s): return __IDSTRING(__CONCAT(__sccsid_,__LINE__),s) -+ -+def __COPYRIGHT(s): return __IDSTRING(__CONCAT(__copyright_,__LINE__),s) -+ -+_POSIX_C_SOURCE = 199009 -+_POSIX_C_SOURCE = 199209 -+__XSI_VISIBLE = 600 -+_POSIX_C_SOURCE = 200112 -+__XSI_VISIBLE = 500 -+_POSIX_C_SOURCE = 199506 -+_POSIX_C_SOURCE = 198808 -+__POSIX_VISIBLE = 200112 -+__ISO_C_VISIBLE = 1999 -+__POSIX_VISIBLE = 199506 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199309 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199209 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199009 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 198808 -+__ISO_C_VISIBLE = 0 -+__POSIX_VISIBLE = 0 -+__XSI_VISIBLE = 0 -+__BSD_VISIBLE = 0 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 0 -+__XSI_VISIBLE = 0 -+__BSD_VISIBLE = 0 -+__ISO_C_VISIBLE = 1999 -+__POSIX_VISIBLE = 200112 -+__XSI_VISIBLE = 600 -+__BSD_VISIBLE = 1 -+__ISO_C_VISIBLE = 1999 -+ -+# Included from sys/_types.h -+ -+# Included from machine/_types.h -+ -+# Included from machine/endian.h -+_QUAD_HIGHWORD = 1 -+_QUAD_LOWWORD = 0 -+_LITTLE_ENDIAN = 1234 -+_BIG_ENDIAN = 4321 -+_PDP_ENDIAN = 3412 -+_BYTE_ORDER = _LITTLE_ENDIAN -+LITTLE_ENDIAN = _LITTLE_ENDIAN -+BIG_ENDIAN = _BIG_ENDIAN -+PDP_ENDIAN = _PDP_ENDIAN -+BYTE_ORDER = _BYTE_ORDER -+__INTEL_COMPILER_with_FreeBSD_endian = 1 -+__INTEL_COMPILER_with_FreeBSD_endian = 1 -+def __word_swap_int_var(x): return \ -+ -+def __word_swap_int_const(x): return \ -+ -+def __word_swap_int(x): return __word_swap_int_var(x) -+ -+def __byte_swap_int_var(x): return \ -+ -+def __byte_swap_int_var(x): return \ -+ -+def __byte_swap_int_const(x): return \ -+ -+def __byte_swap_int(x): return __byte_swap_int_var(x) -+ -+def __byte_swap_word_var(x): return \ -+ -+def __byte_swap_word_const(x): return \ -+ -+def __byte_swap_word(x): return __byte_swap_word_var(x) -+ -+def __htonl(x): return __bswap32(x) -+ -+def __htons(x): return __bswap16(x) -+ -+def __ntohl(x): return __bswap32(x) -+ -+def __ntohs(x): return __bswap16(x) -+ -+IPPROTO_IP = 0 -+IPPROTO_ICMP = 1 -+IPPROTO_TCP = 6 -+IPPROTO_UDP = 17 -+def htonl(x): return __htonl(x) -+ -+def htons(x): return __htons(x) -+ -+def ntohl(x): return __ntohl(x) -+ -+def ntohs(x): return __ntohs(x) -+ -+IPPROTO_RAW = 255 -+INET_ADDRSTRLEN = 16 -+IPPROTO_HOPOPTS = 0 -+IPPROTO_IGMP = 2 -+IPPROTO_GGP = 3 -+IPPROTO_IPV4 = 4 -+IPPROTO_IPIP = IPPROTO_IPV4 -+IPPROTO_ST = 7 -+IPPROTO_EGP = 8 -+IPPROTO_PIGP = 9 -+IPPROTO_RCCMON = 10 -+IPPROTO_NVPII = 11 -+IPPROTO_PUP = 12 -+IPPROTO_ARGUS = 13 -+IPPROTO_EMCON = 14 -+IPPROTO_XNET = 15 -+IPPROTO_CHAOS = 16 -+IPPROTO_MUX = 18 -+IPPROTO_MEAS = 19 -+IPPROTO_HMP = 20 -+IPPROTO_PRM = 21 -+IPPROTO_IDP = 22 -+IPPROTO_TRUNK1 = 23 -+IPPROTO_TRUNK2 = 24 -+IPPROTO_LEAF1 = 25 -+IPPROTO_LEAF2 = 26 -+IPPROTO_RDP = 27 -+IPPROTO_IRTP = 28 -+IPPROTO_TP = 29 -+IPPROTO_BLT = 30 -+IPPROTO_NSP = 31 -+IPPROTO_INP = 32 -+IPPROTO_SEP = 33 -+IPPROTO_3PC = 34 -+IPPROTO_IDPR = 35 -+IPPROTO_XTP = 36 -+IPPROTO_DDP = 37 -+IPPROTO_CMTP = 38 -+IPPROTO_TPXX = 39 -+IPPROTO_IL = 40 -+IPPROTO_IPV6 = 41 -+IPPROTO_SDRP = 42 -+IPPROTO_ROUTING = 43 -+IPPROTO_FRAGMENT = 44 -+IPPROTO_IDRP = 45 -+IPPROTO_RSVP = 46 -+IPPROTO_GRE = 47 -+IPPROTO_MHRP = 48 -+IPPROTO_BHA = 49 -+IPPROTO_ESP = 50 -+IPPROTO_AH = 51 -+IPPROTO_INLSP = 52 -+IPPROTO_SWIPE = 53 -+IPPROTO_NHRP = 54 -+IPPROTO_MOBILE = 55 -+IPPROTO_TLSP = 56 -+IPPROTO_SKIP = 57 -+IPPROTO_ICMPV6 = 58 -+IPPROTO_NONE = 59 -+IPPROTO_DSTOPTS = 60 -+IPPROTO_AHIP = 61 -+IPPROTO_CFTP = 62 -+IPPROTO_HELLO = 63 -+IPPROTO_SATEXPAK = 64 -+IPPROTO_KRYPTOLAN = 65 -+IPPROTO_RVD = 66 -+IPPROTO_IPPC = 67 -+IPPROTO_ADFS = 68 -+IPPROTO_SATMON = 69 -+IPPROTO_VISA = 70 -+IPPROTO_IPCV = 71 -+IPPROTO_CPNX = 72 -+IPPROTO_CPHB = 73 -+IPPROTO_WSN = 74 -+IPPROTO_PVP = 75 -+IPPROTO_BRSATMON = 76 -+IPPROTO_ND = 77 -+IPPROTO_WBMON = 78 -+IPPROTO_WBEXPAK = 79 -+IPPROTO_EON = 80 -+IPPROTO_VMTP = 81 -+IPPROTO_SVMTP = 82 -+IPPROTO_VINES = 83 -+IPPROTO_TTP = 84 -+IPPROTO_IGP = 85 -+IPPROTO_DGP = 86 -+IPPROTO_TCF = 87 -+IPPROTO_IGRP = 88 -+IPPROTO_OSPFIGP = 89 -+IPPROTO_SRPC = 90 -+IPPROTO_LARP = 91 -+IPPROTO_MTP = 92 -+IPPROTO_AX25 = 93 -+IPPROTO_IPEIP = 94 -+IPPROTO_MICP = 95 -+IPPROTO_SCCSP = 96 -+IPPROTO_ETHERIP = 97 -+IPPROTO_ENCAP = 98 -+IPPROTO_APES = 99 -+IPPROTO_GMTP = 100 -+IPPROTO_IPCOMP = 108 -+IPPROTO_PIM = 103 -+IPPROTO_PGM = 113 -+IPPROTO_PFSYNC = 240 -+IPPROTO_OLD_DIVERT = 254 -+IPPROTO_MAX = 256 -+IPPROTO_DONE = 257 -+IPPROTO_DIVERT = 258 -+IPPORT_RESERVED = 1024 -+IPPORT_HIFIRSTAUTO = 49152 -+IPPORT_HILASTAUTO = 65535 -+IPPORT_RESERVEDSTART = 600 -+IPPORT_MAX = 65535 -+def IN_CLASSA(i): return (((u_int32_t)(i) & (-2147483648)) == 0) -+ -+IN_CLASSA_NET = (-16777216) -+IN_CLASSA_NSHIFT = 24 -+IN_CLASSA_HOST = 0x00ffffff -+IN_CLASSA_MAX = 128 -+def IN_CLASSB(i): return (((u_int32_t)(i) & (-1073741824)) == (-2147483648)) -+ -+IN_CLASSB_NET = (-65536) -+IN_CLASSB_NSHIFT = 16 -+IN_CLASSB_HOST = 0x0000ffff -+IN_CLASSB_MAX = 65536 -+def IN_CLASSC(i): return (((u_int32_t)(i) & (-536870912)) == (-1073741824)) -+ -+IN_CLASSC_NET = (-256) -+IN_CLASSC_NSHIFT = 8 -+IN_CLASSC_HOST = 0x000000ff -+def IN_CLASSD(i): return (((u_int32_t)(i) & (-268435456)) == (-536870912)) -+ -+IN_CLASSD_NET = (-268435456) -+IN_CLASSD_NSHIFT = 28 -+IN_CLASSD_HOST = 0x0fffffff -+def IN_MULTICAST(i): return IN_CLASSD(i) -+ -+def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -+ -+def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -+ -+INADDR_NONE = (-1) -+IN_LOOPBACKNET = 127 -+IP_OPTIONS = 1 -+IP_HDRINCL = 2 -+IP_TOS = 3 -+IP_TTL = 4 -+IP_RECVOPTS = 5 -+IP_RECVRETOPTS = 6 -+IP_RECVDSTADDR = 7 -+IP_SENDSRCADDR = IP_RECVDSTADDR -+IP_RETOPTS = 8 -+IP_MULTICAST_IF = 9 -+IP_MULTICAST_TTL = 10 -+IP_MULTICAST_LOOP = 11 -+IP_ADD_MEMBERSHIP = 12 -+IP_DROP_MEMBERSHIP = 13 -+IP_MULTICAST_VIF = 14 -+IP_RSVP_ON = 15 -+IP_RSVP_OFF = 16 -+IP_RSVP_VIF_ON = 17 -+IP_RSVP_VIF_OFF = 18 -+IP_PORTRANGE = 19 -+IP_RECVIF = 20 -+IP_IPSEC_POLICY = 21 -+IP_FAITH = 22 -+IP_ONESBCAST = 23 -+IP_FW_TABLE_ADD = 40 -+IP_FW_TABLE_DEL = 41 -+IP_FW_TABLE_FLUSH = 42 -+IP_FW_TABLE_GETSIZE = 43 -+IP_FW_TABLE_LIST = 44 -+IP_FW_ADD = 50 -+IP_FW_DEL = 51 -+IP_FW_FLUSH = 52 -+IP_FW_ZERO = 53 -+IP_FW_GET = 54 -+IP_FW_RESETLOG = 55 -+IP_DUMMYNET_CONFIGURE = 60 -+IP_DUMMYNET_DEL = 61 -+IP_DUMMYNET_FLUSH = 62 -+IP_DUMMYNET_GET = 64 -+IP_RECVTTL = 65 -+IP_DEFAULT_MULTICAST_TTL = 1 -+IP_DEFAULT_MULTICAST_LOOP = 1 -+IP_MAX_MEMBERSHIPS = 20 -+IP_PORTRANGE_DEFAULT = 0 -+IP_PORTRANGE_HIGH = 1 -+IP_PORTRANGE_LOW = 2 -+IPPROTO_MAXID = (IPPROTO_AH + 1) -+IPCTL_FORWARDING = 1 -+IPCTL_SENDREDIRECTS = 2 -+IPCTL_DEFTTL = 3 -+IPCTL_DEFMTU = 4 -+IPCTL_RTEXPIRE = 5 -+IPCTL_RTMINEXPIRE = 6 -+IPCTL_RTMAXCACHE = 7 -+IPCTL_SOURCEROUTE = 8 -+IPCTL_DIRECTEDBROADCAST = 9 -+IPCTL_INTRQMAXLEN = 10 -+IPCTL_INTRQDROPS = 11 -+IPCTL_STATS = 12 -+IPCTL_ACCEPTSOURCEROUTE = 13 -+IPCTL_FASTFORWARDING = 14 -+IPCTL_KEEPFAITH = 15 -+IPCTL_GIF_TTL = 16 -+IPCTL_MAXID = 17 -+def in_nullhost(x): return ((x).s_addr == INADDR_ANY) -+ -+ -+# Included from netinet6/in6.h -+__KAME_VERSION = "20010528/FreeBSD" -+IPV6PORT_RESERVED = 1024 -+IPV6PORT_ANONMIN = 49152 -+IPV6PORT_ANONMAX = 65535 -+IPV6PORT_RESERVEDMIN = 600 -+IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -+INET6_ADDRSTRLEN = 46 -+IPV6_ADDR_INT32_ONE = 1 -+IPV6_ADDR_INT32_TWO = 2 -+IPV6_ADDR_INT32_MNL = (-16711680) -+IPV6_ADDR_INT32_MLL = (-16646144) -+IPV6_ADDR_INT32_SMP = 0x0000ffff -+IPV6_ADDR_INT16_ULL = 0xfe80 -+IPV6_ADDR_INT16_USL = 0xfec0 -+IPV6_ADDR_INT16_MLL = 0xff02 -+IPV6_ADDR_INT32_ONE = 0x01000000 -+IPV6_ADDR_INT32_TWO = 0x02000000 -+IPV6_ADDR_INT32_MNL = 0x000001ff -+IPV6_ADDR_INT32_MLL = 0x000002ff -+IPV6_ADDR_INT32_SMP = (-65536) -+IPV6_ADDR_INT16_ULL = 0x80fe -+IPV6_ADDR_INT16_USL = 0xc0fe -+IPV6_ADDR_INT16_MLL = 0x02ff -+def IN6_IS_ADDR_UNSPECIFIED(a): return \ -+ -+def IN6_IS_ADDR_LOOPBACK(a): return \ -+ -+def IN6_IS_ADDR_V4COMPAT(a): return \ -+ -+def IN6_IS_ADDR_V4MAPPED(a): return \ -+ -+IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -+IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -+IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -+IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -+IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -+IPV6_ADDR_SCOPE_GLOBAL = 0x0e -+__IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -+__IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -+__IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -+__IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -+__IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -+__IPV6_ADDR_SCOPE_GLOBAL = 0x0e -+def IN6_IS_ADDR_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_INTFACELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_GLOBAL(a): return \ -+ -+def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_GLOBAL(a): return \ -+ -+def IN6_IS_SCOPE_LINKLOCAL(a): return \ -+ -+def IFA6_IS_DEPRECATED(a): return \ -+ -+def IFA6_IS_INVALID(a): return \ -+ -+IPV6_OPTIONS = 1 -+IPV6_RECVOPTS = 5 -+IPV6_RECVRETOPTS = 6 -+IPV6_RECVDSTADDR = 7 -+IPV6_RETOPTS = 8 -+IPV6_SOCKOPT_RESERVED1 = 3 -+IPV6_UNICAST_HOPS = 4 -+IPV6_MULTICAST_IF = 9 -+IPV6_MULTICAST_HOPS = 10 -+IPV6_MULTICAST_LOOP = 11 -+IPV6_JOIN_GROUP = 12 -+IPV6_LEAVE_GROUP = 13 -+IPV6_PORTRANGE = 14 -+ICMP6_FILTER = 18 -+IPV6_2292PKTINFO = 19 -+IPV6_2292HOPLIMIT = 20 -+IPV6_2292NEXTHOP = 21 -+IPV6_2292HOPOPTS = 22 -+IPV6_2292DSTOPTS = 23 -+IPV6_2292RTHDR = 24 -+IPV6_2292PKTOPTIONS = 25 -+IPV6_CHECKSUM = 26 -+IPV6_V6ONLY = 27 -+IPV6_BINDV6ONLY = IPV6_V6ONLY -+IPV6_IPSEC_POLICY = 28 -+IPV6_FAITH = 29 -+IPV6_FW_ADD = 30 -+IPV6_FW_DEL = 31 -+IPV6_FW_FLUSH = 32 -+IPV6_FW_ZERO = 33 -+IPV6_FW_GET = 34 -+IPV6_RTHDRDSTOPTS = 35 -+IPV6_RECVPKTINFO = 36 -+IPV6_RECVHOPLIMIT = 37 -+IPV6_RECVRTHDR = 38 -+IPV6_RECVHOPOPTS = 39 -+IPV6_RECVDSTOPTS = 40 -+IPV6_RECVRTHDRDSTOPTS = 41 -+IPV6_USE_MIN_MTU = 42 -+IPV6_RECVPATHMTU = 43 -+IPV6_PATHMTU = 44 -+IPV6_REACHCONF = 45 -+IPV6_PKTINFO = 46 -+IPV6_HOPLIMIT = 47 -+IPV6_NEXTHOP = 48 -+IPV6_HOPOPTS = 49 -+IPV6_DSTOPTS = 50 -+IPV6_RTHDR = 51 -+IPV6_PKTOPTIONS = 52 -+IPV6_RECVTCLASS = 57 -+IPV6_AUTOFLOWLABEL = 59 -+IPV6_TCLASS = 61 -+IPV6_DONTFRAG = 62 -+IPV6_PREFER_TEMPADDR = 63 -+IPV6_RTHDR_LOOSE = 0 -+IPV6_RTHDR_STRICT = 1 -+IPV6_RTHDR_TYPE_0 = 0 -+IPV6_DEFAULT_MULTICAST_HOPS = 1 -+IPV6_DEFAULT_MULTICAST_LOOP = 1 -+IPV6_PORTRANGE_DEFAULT = 0 -+IPV6_PORTRANGE_HIGH = 1 -+IPV6_PORTRANGE_LOW = 2 -+IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -+IPV6CTL_FORWARDING = 1 -+IPV6CTL_SENDREDIRECTS = 2 -+IPV6CTL_DEFHLIM = 3 -+IPV6CTL_DEFMTU = 4 -+IPV6CTL_FORWSRCRT = 5 -+IPV6CTL_STATS = 6 -+IPV6CTL_MRTSTATS = 7 -+IPV6CTL_MRTPROTO = 8 -+IPV6CTL_MAXFRAGPACKETS = 9 -+IPV6CTL_SOURCECHECK = 10 -+IPV6CTL_SOURCECHECK_LOGINT = 11 -+IPV6CTL_ACCEPT_RTADV = 12 -+IPV6CTL_KEEPFAITH = 13 -+IPV6CTL_LOG_INTERVAL = 14 -+IPV6CTL_HDRNESTLIMIT = 15 -+IPV6CTL_DAD_COUNT = 16 -+IPV6CTL_AUTO_FLOWLABEL = 17 -+IPV6CTL_DEFMCASTHLIM = 18 -+IPV6CTL_GIF_HLIM = 19 -+IPV6CTL_KAME_VERSION = 20 -+IPV6CTL_USE_DEPRECATED = 21 -+IPV6CTL_RR_PRUNE = 22 -+IPV6CTL_MAPPED_ADDR = 23 -+IPV6CTL_V6ONLY = 24 -+IPV6CTL_RTEXPIRE = 25 -+IPV6CTL_RTMINEXPIRE = 26 -+IPV6CTL_RTMAXCACHE = 27 -+IPV6CTL_USETEMPADDR = 32 -+IPV6CTL_TEMPPLTIME = 33 -+IPV6CTL_TEMPVLTIME = 34 -+IPV6CTL_AUTO_LINKLOCAL = 35 -+IPV6CTL_RIP6STATS = 36 -+IPV6CTL_PREFER_TEMPADDR = 37 -+IPV6CTL_ADDRCTLPOLICY = 38 -+IPV6CTL_MAXFRAGS = 41 -+IPV6CTL_MAXID = 42 diff --git a/lang/python27/files/patch-configure b/lang/python27/files/patch-configure deleted file mode 100644 index 9ed971ab4be7..000000000000 --- a/lang/python27/files/patch-configure +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.orig Sat Oct 4 13:27:50 2003 -+++ configure Sat Oct 4 13:29:05 2003 -@@ -1321,7 +1321,7 @@ - VERSION=2.4 - - --SOVERSION=1.0 -+SOVERSION=1 - - # The later defininition of _XOPEN_SOURCE disables certain features - # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). -@@ -3396,6 +3396,12 @@ - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -+ INSTSONAME="$LDLIBRARY".$SOVERSION -+ ;; -+ FreeBSD*) -+ LDLIBRARY='libpython$(VERSION).so' -+ BLDLIBRARY='-L. -lpython$(VERSION)' -+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; - hp*|HP*) diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist index 0c4ef402b2a4..2da321c50218 100644 --- a/lang/python27/pkg-plist +++ b/lang/python27/pkg-plist @@ -495,6 +495,27 @@ lib/%%PYTHON_VERSION%%/distutils/spawn.pyo lib/%%PYTHON_VERSION%%/distutils/sysconfig.py lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyc lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.py +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/support.py +lib/%%PYTHON_VERSION%%/distutils/tests/support.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/support.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyo lib/%%PYTHON_VERSION%%/distutils/text_file.py lib/%%PYTHON_VERSION%%/distutils/text_file.pyc lib/%%PYTHON_VERSION%%/distutils/text_file.pyo @@ -630,6 +651,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_39.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_41.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_42.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_43.txt lib/%%PYTHON_VERSION%%/email/test/test_email.py lib/%%PYTHON_VERSION%%/email/test/test_email.pyc lib/%%PYTHON_VERSION%%/email/test/test_email.pyo @@ -1337,15 +1359,24 @@ lib/%%PYTHON_VERSION%%/lib-old/poly.pyo lib/%%PYTHON_VERSION%%/lib-old/rand.py lib/%%PYTHON_VERSION%%/lib-old/rand.pyc lib/%%PYTHON_VERSION%%/lib-old/rand.pyo +lib/%%PYTHON_VERSION%%/lib-old/statcache.py +lib/%%PYTHON_VERSION%%/lib-old/statcache.pyc +lib/%%PYTHON_VERSION%%/lib-old/statcache.pyo lib/%%PYTHON_VERSION%%/lib-old/tb.py lib/%%PYTHON_VERSION%%/lib-old/tb.pyc lib/%%PYTHON_VERSION%%/lib-old/tb.pyo +lib/%%PYTHON_VERSION%%/lib-old/tzparse.py +lib/%%PYTHON_VERSION%%/lib-old/tzparse.pyc +lib/%%PYTHON_VERSION%%/lib-old/tzparse.pyo lib/%%PYTHON_VERSION%%/lib-old/util.py lib/%%PYTHON_VERSION%%/lib-old/util.pyc lib/%%PYTHON_VERSION%%/lib-old/util.pyo lib/%%PYTHON_VERSION%%/lib-old/whatsound.py lib/%%PYTHON_VERSION%%/lib-old/whatsound.pyc lib/%%PYTHON_VERSION%%/lib-old/whatsound.pyo +lib/%%PYTHON_VERSION%%/lib-old/whrandom.py +lib/%%PYTHON_VERSION%%/lib-old/whrandom.pyc +lib/%%PYTHON_VERSION%%/lib-old/whrandom.pyo lib/%%PYTHON_VERSION%%/lib-old/zmod.py lib/%%PYTHON_VERSION%%/lib-old/zmod.pyc lib/%%PYTHON_VERSION%%/lib-old/zmod.pyo @@ -1528,7 +1559,6 @@ lib/%%PYTHON_VERSION%%/posixpath.pyo lib/%%PYTHON_VERSION%%/pprint.py lib/%%PYTHON_VERSION%%/pprint.pyc lib/%%PYTHON_VERSION%%/pprint.pyo -lib/%%PYTHON_VERSION%%/profile.doc lib/%%PYTHON_VERSION%%/profile.py lib/%%PYTHON_VERSION%%/profile.pyc lib/%%PYTHON_VERSION%%/profile.pyo @@ -1629,9 +1659,6 @@ lib/%%PYTHON_VERSION%%/sre_parse.pyo lib/%%PYTHON_VERSION%%/stat.py lib/%%PYTHON_VERSION%%/stat.pyc lib/%%PYTHON_VERSION%%/stat.pyo -lib/%%PYTHON_VERSION%%/statcache.py -lib/%%PYTHON_VERSION%%/statcache.pyc -lib/%%PYTHON_VERSION%%/statcache.pyo lib/%%PYTHON_VERSION%%/statvfs.py lib/%%PYTHON_VERSION%%/statvfs.pyc lib/%%PYTHON_VERSION%%/statvfs.pyo @@ -1729,6 +1756,12 @@ lib/%%PYTHON_VERSION%%/test/double_const.py lib/%%PYTHON_VERSION%%/test/double_const.pyc lib/%%PYTHON_VERSION%%/test/double_const.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue +lib/%%PYTHON_VERSION%%/test/inspect_fodder.py +lib/%%PYTHON_VERSION%%/test/inspect_fodder.pyc +lib/%%PYTHON_VERSION%%/test/inspect_fodder.pyo +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.py +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.pyc +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.pyo lib/%%PYTHON_VERSION%%/test/list_tests.py lib/%%PYTHON_VERSION%%/test/list_tests.pyc lib/%%PYTHON_VERSION%%/test/list_tests.pyo @@ -2062,6 +2095,7 @@ lib/%%PYTHON_VERSION%%/test/test_doctest2.py lib/%%PYTHON_VERSION%%/test/test_doctest2.pyc lib/%%PYTHON_VERSION%%/test/test_doctest2.pyo lib/%%PYTHON_VERSION%%/test/test_doctest2.txt +lib/%%PYTHON_VERSION%%/test/test_doctest3.txt lib/%%PYTHON_VERSION%%/test/test_dumbdbm.py lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyc lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo @@ -2751,9 +2785,6 @@ lib/%%PYTHON_VERSION%%/tty.pyo lib/%%PYTHON_VERSION%%/types.py lib/%%PYTHON_VERSION%%/types.pyc lib/%%PYTHON_VERSION%%/types.pyo -lib/%%PYTHON_VERSION%%/tzparse.py -lib/%%PYTHON_VERSION%%/tzparse.pyc -lib/%%PYTHON_VERSION%%/tzparse.pyo lib/%%PYTHON_VERSION%%/unittest.py lib/%%PYTHON_VERSION%%/unittest.pyc lib/%%PYTHON_VERSION%%/unittest.pyo @@ -2787,9 +2818,6 @@ lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo -lib/%%PYTHON_VERSION%%/whrandom.py -lib/%%PYTHON_VERSION%%/whrandom.pyc -lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo @@ -3157,6 +3185,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/win32.html %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/makelocalealias.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.py @@ -3188,6 +3217,14 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/modulator.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/README.txt +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msi.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msilib.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.c +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.mak +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/schema.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/sequence.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/uisample.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py @@ -3292,6 +3329,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/scripts %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche/X %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche +%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/msi %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator/Templates %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/i18n @@ -3354,6 +3392,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo @dirrm lib/%%PYTHON_VERSION%%/email/test/data @dirrm lib/%%PYTHON_VERSION%%/email/test @dirrm lib/%%PYTHON_VERSION%%/email +@dirrm lib/%%PYTHON_VERSION%%/distutils/tests @dirrm lib/%%PYTHON_VERSION%%/distutils/command @dirrm lib/%%PYTHON_VERSION%%/distutils @dirrm lib/%%PYTHON_VERSION%%/curses diff --git a/lang/python30/Makefile b/lang/python30/Makefile index 0daa10b33ea6..ec0f468b3ab4 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.5.a0.000000 +PORTVERSION= 2.5.a0.20050129 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -14,8 +14,6 @@ DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language -IGNORE= is not available yet - DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes @@ -29,7 +27,7 @@ MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes USE_REINPLACE= yes -PYTHON_VERSION= python2.4 +PYTHON_VERSION= python2.5 PYTHON_NO_DEPENDS= yes LATEST_LINK= ${PYTHON_VERSION:S/.//} @@ -108,11 +106,11 @@ PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.4 + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 + ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py + ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py pre-patch: ${REINPLACE_CMD} -e \ @@ -172,8 +170,8 @@ post-install: ${PREFIX}/bin @# additional files installing by ports - ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \ - ${WRKDIR}/smtpd2.4.py ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.5 ${WRKDIR}/idle2.5 \ + ${WRKDIR}/smtpd2.5.py ${PREFIX}/bin @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 diff --git a/lang/python30/distinfo b/lang/python30/distinfo index 24141b21691f..0072eec35a72 100644 --- a/lang/python30/distinfo +++ b/lang/python30/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4c1.tgz) = deea93a91518314ffe9a7c5cd8144eac -SIZE (python/Python-2.4c1.tgz) = 9198160 +MD5 (python/Python-2.5.a0.20050129.tgz) = bdf571f3e28c4793bedbd180611c28e6 +SIZE (python/Python-2.5.a0.20050129.tgz) = 9227299 diff --git a/lang/python30/files/patch-Lib::plat-freebsd6::IN.py b/lang/python30/files/patch-Lib::plat-freebsd6::IN.py deleted file mode 100644 index 8316a9ef20a0..000000000000 --- a/lang/python30/files/patch-Lib::plat-freebsd6::IN.py +++ /dev/null @@ -1,518 +0,0 @@ ---- Lib/plat-freebsd6/IN.py Thu Jan 1 09:00:00 1970 -+++ Lib/plat-freebsd6/IN.py Sat Aug 21 08:09:15 2004 -@@ -0,0 +1,515 @@ -+# Generated by h2py from /usr/include/netinet/in.h -+ -+# Included from sys/cdefs.h -+def __P(protos): return protos -+ -+def __STRING(x): return #x -+ -+def __XSTRING(x): return __STRING(x) -+ -+def __P(protos): return () -+ -+def __STRING(x): return "x" -+ -+def __aligned(x): return __attribute__((__aligned__(x))) -+ -+def __section(x): return __attribute__((__section__(x))) -+ -+def __aligned(x): return __attribute__((__aligned__(x))) -+ -+def __section(x): return __attribute__((__section__(x))) -+ -+def __nonnull(x): return __attribute__((__nonnull__(x))) -+ -+def __predict_true(exp): return __builtin_expect((exp), 1) -+ -+def __predict_false(exp): return __builtin_expect((exp), 0) -+ -+def __predict_true(exp): return (exp) -+ -+def __predict_false(exp): return (exp) -+ -+def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -+ -+def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -+ -+def __RCSID_SOURCE(s): return __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s) -+ -+def __SCCSID(s): return __IDSTRING(__CONCAT(__sccsid_,__LINE__),s) -+ -+def __COPYRIGHT(s): return __IDSTRING(__CONCAT(__copyright_,__LINE__),s) -+ -+_POSIX_C_SOURCE = 199009 -+_POSIX_C_SOURCE = 199209 -+__XSI_VISIBLE = 600 -+_POSIX_C_SOURCE = 200112 -+__XSI_VISIBLE = 500 -+_POSIX_C_SOURCE = 199506 -+_POSIX_C_SOURCE = 198808 -+__POSIX_VISIBLE = 200112 -+__ISO_C_VISIBLE = 1999 -+__POSIX_VISIBLE = 199506 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199309 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199209 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199009 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 198808 -+__ISO_C_VISIBLE = 0 -+__POSIX_VISIBLE = 0 -+__XSI_VISIBLE = 0 -+__BSD_VISIBLE = 0 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 0 -+__XSI_VISIBLE = 0 -+__BSD_VISIBLE = 0 -+__ISO_C_VISIBLE = 1999 -+__POSIX_VISIBLE = 200112 -+__XSI_VISIBLE = 600 -+__BSD_VISIBLE = 1 -+__ISO_C_VISIBLE = 1999 -+ -+# Included from sys/_types.h -+ -+# Included from machine/_types.h -+ -+# Included from machine/endian.h -+_QUAD_HIGHWORD = 1 -+_QUAD_LOWWORD = 0 -+_LITTLE_ENDIAN = 1234 -+_BIG_ENDIAN = 4321 -+_PDP_ENDIAN = 3412 -+_BYTE_ORDER = _LITTLE_ENDIAN -+LITTLE_ENDIAN = _LITTLE_ENDIAN -+BIG_ENDIAN = _BIG_ENDIAN -+PDP_ENDIAN = _PDP_ENDIAN -+BYTE_ORDER = _BYTE_ORDER -+__INTEL_COMPILER_with_FreeBSD_endian = 1 -+__INTEL_COMPILER_with_FreeBSD_endian = 1 -+def __word_swap_int_var(x): return \ -+ -+def __word_swap_int_const(x): return \ -+ -+def __word_swap_int(x): return __word_swap_int_var(x) -+ -+def __byte_swap_int_var(x): return \ -+ -+def __byte_swap_int_var(x): return \ -+ -+def __byte_swap_int_const(x): return \ -+ -+def __byte_swap_int(x): return __byte_swap_int_var(x) -+ -+def __byte_swap_word_var(x): return \ -+ -+def __byte_swap_word_const(x): return \ -+ -+def __byte_swap_word(x): return __byte_swap_word_var(x) -+ -+def __htonl(x): return __bswap32(x) -+ -+def __htons(x): return __bswap16(x) -+ -+def __ntohl(x): return __bswap32(x) -+ -+def __ntohs(x): return __bswap16(x) -+ -+IPPROTO_IP = 0 -+IPPROTO_ICMP = 1 -+IPPROTO_TCP = 6 -+IPPROTO_UDP = 17 -+def htonl(x): return __htonl(x) -+ -+def htons(x): return __htons(x) -+ -+def ntohl(x): return __ntohl(x) -+ -+def ntohs(x): return __ntohs(x) -+ -+IPPROTO_RAW = 255 -+INET_ADDRSTRLEN = 16 -+IPPROTO_HOPOPTS = 0 -+IPPROTO_IGMP = 2 -+IPPROTO_GGP = 3 -+IPPROTO_IPV4 = 4 -+IPPROTO_IPIP = IPPROTO_IPV4 -+IPPROTO_ST = 7 -+IPPROTO_EGP = 8 -+IPPROTO_PIGP = 9 -+IPPROTO_RCCMON = 10 -+IPPROTO_NVPII = 11 -+IPPROTO_PUP = 12 -+IPPROTO_ARGUS = 13 -+IPPROTO_EMCON = 14 -+IPPROTO_XNET = 15 -+IPPROTO_CHAOS = 16 -+IPPROTO_MUX = 18 -+IPPROTO_MEAS = 19 -+IPPROTO_HMP = 20 -+IPPROTO_PRM = 21 -+IPPROTO_IDP = 22 -+IPPROTO_TRUNK1 = 23 -+IPPROTO_TRUNK2 = 24 -+IPPROTO_LEAF1 = 25 -+IPPROTO_LEAF2 = 26 -+IPPROTO_RDP = 27 -+IPPROTO_IRTP = 28 -+IPPROTO_TP = 29 -+IPPROTO_BLT = 30 -+IPPROTO_NSP = 31 -+IPPROTO_INP = 32 -+IPPROTO_SEP = 33 -+IPPROTO_3PC = 34 -+IPPROTO_IDPR = 35 -+IPPROTO_XTP = 36 -+IPPROTO_DDP = 37 -+IPPROTO_CMTP = 38 -+IPPROTO_TPXX = 39 -+IPPROTO_IL = 40 -+IPPROTO_IPV6 = 41 -+IPPROTO_SDRP = 42 -+IPPROTO_ROUTING = 43 -+IPPROTO_FRAGMENT = 44 -+IPPROTO_IDRP = 45 -+IPPROTO_RSVP = 46 -+IPPROTO_GRE = 47 -+IPPROTO_MHRP = 48 -+IPPROTO_BHA = 49 -+IPPROTO_ESP = 50 -+IPPROTO_AH = 51 -+IPPROTO_INLSP = 52 -+IPPROTO_SWIPE = 53 -+IPPROTO_NHRP = 54 -+IPPROTO_MOBILE = 55 -+IPPROTO_TLSP = 56 -+IPPROTO_SKIP = 57 -+IPPROTO_ICMPV6 = 58 -+IPPROTO_NONE = 59 -+IPPROTO_DSTOPTS = 60 -+IPPROTO_AHIP = 61 -+IPPROTO_CFTP = 62 -+IPPROTO_HELLO = 63 -+IPPROTO_SATEXPAK = 64 -+IPPROTO_KRYPTOLAN = 65 -+IPPROTO_RVD = 66 -+IPPROTO_IPPC = 67 -+IPPROTO_ADFS = 68 -+IPPROTO_SATMON = 69 -+IPPROTO_VISA = 70 -+IPPROTO_IPCV = 71 -+IPPROTO_CPNX = 72 -+IPPROTO_CPHB = 73 -+IPPROTO_WSN = 74 -+IPPROTO_PVP = 75 -+IPPROTO_BRSATMON = 76 -+IPPROTO_ND = 77 -+IPPROTO_WBMON = 78 -+IPPROTO_WBEXPAK = 79 -+IPPROTO_EON = 80 -+IPPROTO_VMTP = 81 -+IPPROTO_SVMTP = 82 -+IPPROTO_VINES = 83 -+IPPROTO_TTP = 84 -+IPPROTO_IGP = 85 -+IPPROTO_DGP = 86 -+IPPROTO_TCF = 87 -+IPPROTO_IGRP = 88 -+IPPROTO_OSPFIGP = 89 -+IPPROTO_SRPC = 90 -+IPPROTO_LARP = 91 -+IPPROTO_MTP = 92 -+IPPROTO_AX25 = 93 -+IPPROTO_IPEIP = 94 -+IPPROTO_MICP = 95 -+IPPROTO_SCCSP = 96 -+IPPROTO_ETHERIP = 97 -+IPPROTO_ENCAP = 98 -+IPPROTO_APES = 99 -+IPPROTO_GMTP = 100 -+IPPROTO_IPCOMP = 108 -+IPPROTO_PIM = 103 -+IPPROTO_PGM = 113 -+IPPROTO_PFSYNC = 240 -+IPPROTO_OLD_DIVERT = 254 -+IPPROTO_MAX = 256 -+IPPROTO_DONE = 257 -+IPPROTO_DIVERT = 258 -+IPPORT_RESERVED = 1024 -+IPPORT_HIFIRSTAUTO = 49152 -+IPPORT_HILASTAUTO = 65535 -+IPPORT_RESERVEDSTART = 600 -+IPPORT_MAX = 65535 -+def IN_CLASSA(i): return (((u_int32_t)(i) & (-2147483648)) == 0) -+ -+IN_CLASSA_NET = (-16777216) -+IN_CLASSA_NSHIFT = 24 -+IN_CLASSA_HOST = 0x00ffffff -+IN_CLASSA_MAX = 128 -+def IN_CLASSB(i): return (((u_int32_t)(i) & (-1073741824)) == (-2147483648)) -+ -+IN_CLASSB_NET = (-65536) -+IN_CLASSB_NSHIFT = 16 -+IN_CLASSB_HOST = 0x0000ffff -+IN_CLASSB_MAX = 65536 -+def IN_CLASSC(i): return (((u_int32_t)(i) & (-536870912)) == (-1073741824)) -+ -+IN_CLASSC_NET = (-256) -+IN_CLASSC_NSHIFT = 8 -+IN_CLASSC_HOST = 0x000000ff -+def IN_CLASSD(i): return (((u_int32_t)(i) & (-268435456)) == (-536870912)) -+ -+IN_CLASSD_NET = (-268435456) -+IN_CLASSD_NSHIFT = 28 -+IN_CLASSD_HOST = 0x0fffffff -+def IN_MULTICAST(i): return IN_CLASSD(i) -+ -+def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -+ -+def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -+ -+INADDR_NONE = (-1) -+IN_LOOPBACKNET = 127 -+IP_OPTIONS = 1 -+IP_HDRINCL = 2 -+IP_TOS = 3 -+IP_TTL = 4 -+IP_RECVOPTS = 5 -+IP_RECVRETOPTS = 6 -+IP_RECVDSTADDR = 7 -+IP_SENDSRCADDR = IP_RECVDSTADDR -+IP_RETOPTS = 8 -+IP_MULTICAST_IF = 9 -+IP_MULTICAST_TTL = 10 -+IP_MULTICAST_LOOP = 11 -+IP_ADD_MEMBERSHIP = 12 -+IP_DROP_MEMBERSHIP = 13 -+IP_MULTICAST_VIF = 14 -+IP_RSVP_ON = 15 -+IP_RSVP_OFF = 16 -+IP_RSVP_VIF_ON = 17 -+IP_RSVP_VIF_OFF = 18 -+IP_PORTRANGE = 19 -+IP_RECVIF = 20 -+IP_IPSEC_POLICY = 21 -+IP_FAITH = 22 -+IP_ONESBCAST = 23 -+IP_FW_TABLE_ADD = 40 -+IP_FW_TABLE_DEL = 41 -+IP_FW_TABLE_FLUSH = 42 -+IP_FW_TABLE_GETSIZE = 43 -+IP_FW_TABLE_LIST = 44 -+IP_FW_ADD = 50 -+IP_FW_DEL = 51 -+IP_FW_FLUSH = 52 -+IP_FW_ZERO = 53 -+IP_FW_GET = 54 -+IP_FW_RESETLOG = 55 -+IP_DUMMYNET_CONFIGURE = 60 -+IP_DUMMYNET_DEL = 61 -+IP_DUMMYNET_FLUSH = 62 -+IP_DUMMYNET_GET = 64 -+IP_RECVTTL = 65 -+IP_DEFAULT_MULTICAST_TTL = 1 -+IP_DEFAULT_MULTICAST_LOOP = 1 -+IP_MAX_MEMBERSHIPS = 20 -+IP_PORTRANGE_DEFAULT = 0 -+IP_PORTRANGE_HIGH = 1 -+IP_PORTRANGE_LOW = 2 -+IPPROTO_MAXID = (IPPROTO_AH + 1) -+IPCTL_FORWARDING = 1 -+IPCTL_SENDREDIRECTS = 2 -+IPCTL_DEFTTL = 3 -+IPCTL_DEFMTU = 4 -+IPCTL_RTEXPIRE = 5 -+IPCTL_RTMINEXPIRE = 6 -+IPCTL_RTMAXCACHE = 7 -+IPCTL_SOURCEROUTE = 8 -+IPCTL_DIRECTEDBROADCAST = 9 -+IPCTL_INTRQMAXLEN = 10 -+IPCTL_INTRQDROPS = 11 -+IPCTL_STATS = 12 -+IPCTL_ACCEPTSOURCEROUTE = 13 -+IPCTL_FASTFORWARDING = 14 -+IPCTL_KEEPFAITH = 15 -+IPCTL_GIF_TTL = 16 -+IPCTL_MAXID = 17 -+def in_nullhost(x): return ((x).s_addr == INADDR_ANY) -+ -+ -+# Included from netinet6/in6.h -+__KAME_VERSION = "20010528/FreeBSD" -+IPV6PORT_RESERVED = 1024 -+IPV6PORT_ANONMIN = 49152 -+IPV6PORT_ANONMAX = 65535 -+IPV6PORT_RESERVEDMIN = 600 -+IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -+INET6_ADDRSTRLEN = 46 -+IPV6_ADDR_INT32_ONE = 1 -+IPV6_ADDR_INT32_TWO = 2 -+IPV6_ADDR_INT32_MNL = (-16711680) -+IPV6_ADDR_INT32_MLL = (-16646144) -+IPV6_ADDR_INT32_SMP = 0x0000ffff -+IPV6_ADDR_INT16_ULL = 0xfe80 -+IPV6_ADDR_INT16_USL = 0xfec0 -+IPV6_ADDR_INT16_MLL = 0xff02 -+IPV6_ADDR_INT32_ONE = 0x01000000 -+IPV6_ADDR_INT32_TWO = 0x02000000 -+IPV6_ADDR_INT32_MNL = 0x000001ff -+IPV6_ADDR_INT32_MLL = 0x000002ff -+IPV6_ADDR_INT32_SMP = (-65536) -+IPV6_ADDR_INT16_ULL = 0x80fe -+IPV6_ADDR_INT16_USL = 0xc0fe -+IPV6_ADDR_INT16_MLL = 0x02ff -+def IN6_IS_ADDR_UNSPECIFIED(a): return \ -+ -+def IN6_IS_ADDR_LOOPBACK(a): return \ -+ -+def IN6_IS_ADDR_V4COMPAT(a): return \ -+ -+def IN6_IS_ADDR_V4MAPPED(a): return \ -+ -+IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -+IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -+IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -+IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -+IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -+IPV6_ADDR_SCOPE_GLOBAL = 0x0e -+__IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -+__IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -+__IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -+__IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -+__IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -+__IPV6_ADDR_SCOPE_GLOBAL = 0x0e -+def IN6_IS_ADDR_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_INTFACELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_GLOBAL(a): return \ -+ -+def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_GLOBAL(a): return \ -+ -+def IN6_IS_SCOPE_LINKLOCAL(a): return \ -+ -+def IFA6_IS_DEPRECATED(a): return \ -+ -+def IFA6_IS_INVALID(a): return \ -+ -+IPV6_OPTIONS = 1 -+IPV6_RECVOPTS = 5 -+IPV6_RECVRETOPTS = 6 -+IPV6_RECVDSTADDR = 7 -+IPV6_RETOPTS = 8 -+IPV6_SOCKOPT_RESERVED1 = 3 -+IPV6_UNICAST_HOPS = 4 -+IPV6_MULTICAST_IF = 9 -+IPV6_MULTICAST_HOPS = 10 -+IPV6_MULTICAST_LOOP = 11 -+IPV6_JOIN_GROUP = 12 -+IPV6_LEAVE_GROUP = 13 -+IPV6_PORTRANGE = 14 -+ICMP6_FILTER = 18 -+IPV6_2292PKTINFO = 19 -+IPV6_2292HOPLIMIT = 20 -+IPV6_2292NEXTHOP = 21 -+IPV6_2292HOPOPTS = 22 -+IPV6_2292DSTOPTS = 23 -+IPV6_2292RTHDR = 24 -+IPV6_2292PKTOPTIONS = 25 -+IPV6_CHECKSUM = 26 -+IPV6_V6ONLY = 27 -+IPV6_BINDV6ONLY = IPV6_V6ONLY -+IPV6_IPSEC_POLICY = 28 -+IPV6_FAITH = 29 -+IPV6_FW_ADD = 30 -+IPV6_FW_DEL = 31 -+IPV6_FW_FLUSH = 32 -+IPV6_FW_ZERO = 33 -+IPV6_FW_GET = 34 -+IPV6_RTHDRDSTOPTS = 35 -+IPV6_RECVPKTINFO = 36 -+IPV6_RECVHOPLIMIT = 37 -+IPV6_RECVRTHDR = 38 -+IPV6_RECVHOPOPTS = 39 -+IPV6_RECVDSTOPTS = 40 -+IPV6_RECVRTHDRDSTOPTS = 41 -+IPV6_USE_MIN_MTU = 42 -+IPV6_RECVPATHMTU = 43 -+IPV6_PATHMTU = 44 -+IPV6_REACHCONF = 45 -+IPV6_PKTINFO = 46 -+IPV6_HOPLIMIT = 47 -+IPV6_NEXTHOP = 48 -+IPV6_HOPOPTS = 49 -+IPV6_DSTOPTS = 50 -+IPV6_RTHDR = 51 -+IPV6_PKTOPTIONS = 52 -+IPV6_RECVTCLASS = 57 -+IPV6_AUTOFLOWLABEL = 59 -+IPV6_TCLASS = 61 -+IPV6_DONTFRAG = 62 -+IPV6_PREFER_TEMPADDR = 63 -+IPV6_RTHDR_LOOSE = 0 -+IPV6_RTHDR_STRICT = 1 -+IPV6_RTHDR_TYPE_0 = 0 -+IPV6_DEFAULT_MULTICAST_HOPS = 1 -+IPV6_DEFAULT_MULTICAST_LOOP = 1 -+IPV6_PORTRANGE_DEFAULT = 0 -+IPV6_PORTRANGE_HIGH = 1 -+IPV6_PORTRANGE_LOW = 2 -+IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -+IPV6CTL_FORWARDING = 1 -+IPV6CTL_SENDREDIRECTS = 2 -+IPV6CTL_DEFHLIM = 3 -+IPV6CTL_DEFMTU = 4 -+IPV6CTL_FORWSRCRT = 5 -+IPV6CTL_STATS = 6 -+IPV6CTL_MRTSTATS = 7 -+IPV6CTL_MRTPROTO = 8 -+IPV6CTL_MAXFRAGPACKETS = 9 -+IPV6CTL_SOURCECHECK = 10 -+IPV6CTL_SOURCECHECK_LOGINT = 11 -+IPV6CTL_ACCEPT_RTADV = 12 -+IPV6CTL_KEEPFAITH = 13 -+IPV6CTL_LOG_INTERVAL = 14 -+IPV6CTL_HDRNESTLIMIT = 15 -+IPV6CTL_DAD_COUNT = 16 -+IPV6CTL_AUTO_FLOWLABEL = 17 -+IPV6CTL_DEFMCASTHLIM = 18 -+IPV6CTL_GIF_HLIM = 19 -+IPV6CTL_KAME_VERSION = 20 -+IPV6CTL_USE_DEPRECATED = 21 -+IPV6CTL_RR_PRUNE = 22 -+IPV6CTL_MAPPED_ADDR = 23 -+IPV6CTL_V6ONLY = 24 -+IPV6CTL_RTEXPIRE = 25 -+IPV6CTL_RTMINEXPIRE = 26 -+IPV6CTL_RTMAXCACHE = 27 -+IPV6CTL_USETEMPADDR = 32 -+IPV6CTL_TEMPPLTIME = 33 -+IPV6CTL_TEMPVLTIME = 34 -+IPV6CTL_AUTO_LINKLOCAL = 35 -+IPV6CTL_RIP6STATS = 36 -+IPV6CTL_PREFER_TEMPADDR = 37 -+IPV6CTL_ADDRCTLPOLICY = 38 -+IPV6CTL_MAXFRAGS = 41 -+IPV6CTL_MAXID = 42 diff --git a/lang/python30/files/patch-configure b/lang/python30/files/patch-configure deleted file mode 100644 index 9ed971ab4be7..000000000000 --- a/lang/python30/files/patch-configure +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.orig Sat Oct 4 13:27:50 2003 -+++ configure Sat Oct 4 13:29:05 2003 -@@ -1321,7 +1321,7 @@ - VERSION=2.4 - - --SOVERSION=1.0 -+SOVERSION=1 - - # The later defininition of _XOPEN_SOURCE disables certain features - # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). -@@ -3396,6 +3396,12 @@ - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -+ INSTSONAME="$LDLIBRARY".$SOVERSION -+ ;; -+ FreeBSD*) -+ LDLIBRARY='libpython$(VERSION).so' -+ BLDLIBRARY='-L. -lpython$(VERSION)' -+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; - hp*|HP*) diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist index 0c4ef402b2a4..2da321c50218 100644 --- a/lang/python30/pkg-plist +++ b/lang/python30/pkg-plist @@ -495,6 +495,27 @@ lib/%%PYTHON_VERSION%%/distutils/spawn.pyo lib/%%PYTHON_VERSION%%/distutils/sysconfig.py lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyc lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.py +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/support.py +lib/%%PYTHON_VERSION%%/distutils/tests/support.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/support.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyo lib/%%PYTHON_VERSION%%/distutils/text_file.py lib/%%PYTHON_VERSION%%/distutils/text_file.pyc lib/%%PYTHON_VERSION%%/distutils/text_file.pyo @@ -630,6 +651,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_39.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_41.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_42.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_43.txt lib/%%PYTHON_VERSION%%/email/test/test_email.py lib/%%PYTHON_VERSION%%/email/test/test_email.pyc lib/%%PYTHON_VERSION%%/email/test/test_email.pyo @@ -1337,15 +1359,24 @@ lib/%%PYTHON_VERSION%%/lib-old/poly.pyo lib/%%PYTHON_VERSION%%/lib-old/rand.py lib/%%PYTHON_VERSION%%/lib-old/rand.pyc lib/%%PYTHON_VERSION%%/lib-old/rand.pyo +lib/%%PYTHON_VERSION%%/lib-old/statcache.py +lib/%%PYTHON_VERSION%%/lib-old/statcache.pyc +lib/%%PYTHON_VERSION%%/lib-old/statcache.pyo lib/%%PYTHON_VERSION%%/lib-old/tb.py lib/%%PYTHON_VERSION%%/lib-old/tb.pyc lib/%%PYTHON_VERSION%%/lib-old/tb.pyo +lib/%%PYTHON_VERSION%%/lib-old/tzparse.py +lib/%%PYTHON_VERSION%%/lib-old/tzparse.pyc +lib/%%PYTHON_VERSION%%/lib-old/tzparse.pyo lib/%%PYTHON_VERSION%%/lib-old/util.py lib/%%PYTHON_VERSION%%/lib-old/util.pyc lib/%%PYTHON_VERSION%%/lib-old/util.pyo lib/%%PYTHON_VERSION%%/lib-old/whatsound.py lib/%%PYTHON_VERSION%%/lib-old/whatsound.pyc lib/%%PYTHON_VERSION%%/lib-old/whatsound.pyo +lib/%%PYTHON_VERSION%%/lib-old/whrandom.py +lib/%%PYTHON_VERSION%%/lib-old/whrandom.pyc +lib/%%PYTHON_VERSION%%/lib-old/whrandom.pyo lib/%%PYTHON_VERSION%%/lib-old/zmod.py lib/%%PYTHON_VERSION%%/lib-old/zmod.pyc lib/%%PYTHON_VERSION%%/lib-old/zmod.pyo @@ -1528,7 +1559,6 @@ lib/%%PYTHON_VERSION%%/posixpath.pyo lib/%%PYTHON_VERSION%%/pprint.py lib/%%PYTHON_VERSION%%/pprint.pyc lib/%%PYTHON_VERSION%%/pprint.pyo -lib/%%PYTHON_VERSION%%/profile.doc lib/%%PYTHON_VERSION%%/profile.py lib/%%PYTHON_VERSION%%/profile.pyc lib/%%PYTHON_VERSION%%/profile.pyo @@ -1629,9 +1659,6 @@ lib/%%PYTHON_VERSION%%/sre_parse.pyo lib/%%PYTHON_VERSION%%/stat.py lib/%%PYTHON_VERSION%%/stat.pyc lib/%%PYTHON_VERSION%%/stat.pyo -lib/%%PYTHON_VERSION%%/statcache.py -lib/%%PYTHON_VERSION%%/statcache.pyc -lib/%%PYTHON_VERSION%%/statcache.pyo lib/%%PYTHON_VERSION%%/statvfs.py lib/%%PYTHON_VERSION%%/statvfs.pyc lib/%%PYTHON_VERSION%%/statvfs.pyo @@ -1729,6 +1756,12 @@ lib/%%PYTHON_VERSION%%/test/double_const.py lib/%%PYTHON_VERSION%%/test/double_const.pyc lib/%%PYTHON_VERSION%%/test/double_const.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue +lib/%%PYTHON_VERSION%%/test/inspect_fodder.py +lib/%%PYTHON_VERSION%%/test/inspect_fodder.pyc +lib/%%PYTHON_VERSION%%/test/inspect_fodder.pyo +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.py +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.pyc +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.pyo lib/%%PYTHON_VERSION%%/test/list_tests.py lib/%%PYTHON_VERSION%%/test/list_tests.pyc lib/%%PYTHON_VERSION%%/test/list_tests.pyo @@ -2062,6 +2095,7 @@ lib/%%PYTHON_VERSION%%/test/test_doctest2.py lib/%%PYTHON_VERSION%%/test/test_doctest2.pyc lib/%%PYTHON_VERSION%%/test/test_doctest2.pyo lib/%%PYTHON_VERSION%%/test/test_doctest2.txt +lib/%%PYTHON_VERSION%%/test/test_doctest3.txt lib/%%PYTHON_VERSION%%/test/test_dumbdbm.py lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyc lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo @@ -2751,9 +2785,6 @@ lib/%%PYTHON_VERSION%%/tty.pyo lib/%%PYTHON_VERSION%%/types.py lib/%%PYTHON_VERSION%%/types.pyc lib/%%PYTHON_VERSION%%/types.pyo -lib/%%PYTHON_VERSION%%/tzparse.py -lib/%%PYTHON_VERSION%%/tzparse.pyc -lib/%%PYTHON_VERSION%%/tzparse.pyo lib/%%PYTHON_VERSION%%/unittest.py lib/%%PYTHON_VERSION%%/unittest.pyc lib/%%PYTHON_VERSION%%/unittest.pyo @@ -2787,9 +2818,6 @@ lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo -lib/%%PYTHON_VERSION%%/whrandom.py -lib/%%PYTHON_VERSION%%/whrandom.pyc -lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo @@ -3157,6 +3185,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/win32.html %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/makelocalealias.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.py @@ -3188,6 +3217,14 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/modulator.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/README.txt +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msi.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msilib.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.c +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.mak +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/schema.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/sequence.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/uisample.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py @@ -3292,6 +3329,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/scripts %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche/X %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche +%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/msi %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator/Templates %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/i18n @@ -3354,6 +3392,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo @dirrm lib/%%PYTHON_VERSION%%/email/test/data @dirrm lib/%%PYTHON_VERSION%%/email/test @dirrm lib/%%PYTHON_VERSION%%/email +@dirrm lib/%%PYTHON_VERSION%%/distutils/tests @dirrm lib/%%PYTHON_VERSION%%/distutils/command @dirrm lib/%%PYTHON_VERSION%%/distutils @dirrm lib/%%PYTHON_VERSION%%/curses diff --git a/lang/python31/Makefile b/lang/python31/Makefile index 0daa10b33ea6..ec0f468b3ab4 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.5.a0.000000 +PORTVERSION= 2.5.a0.20050129 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -14,8 +14,6 @@ DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language -IGNORE= is not available yet - DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes @@ -29,7 +27,7 @@ MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes USE_REINPLACE= yes -PYTHON_VERSION= python2.4 +PYTHON_VERSION= python2.5 PYTHON_NO_DEPENDS= yes LATEST_LINK= ${PYTHON_VERSION:S/.//} @@ -108,11 +106,11 @@ PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.4 + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 + ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py + ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py pre-patch: ${REINPLACE_CMD} -e \ @@ -172,8 +170,8 @@ post-install: ${PREFIX}/bin @# additional files installing by ports - ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \ - ${WRKDIR}/smtpd2.4.py ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.5 ${WRKDIR}/idle2.5 \ + ${WRKDIR}/smtpd2.5.py ${PREFIX}/bin @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 diff --git a/lang/python31/distinfo b/lang/python31/distinfo index 24141b21691f..0072eec35a72 100644 --- a/lang/python31/distinfo +++ b/lang/python31/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4c1.tgz) = deea93a91518314ffe9a7c5cd8144eac -SIZE (python/Python-2.4c1.tgz) = 9198160 +MD5 (python/Python-2.5.a0.20050129.tgz) = bdf571f3e28c4793bedbd180611c28e6 +SIZE (python/Python-2.5.a0.20050129.tgz) = 9227299 diff --git a/lang/python31/files/patch-Lib::plat-freebsd6::IN.py b/lang/python31/files/patch-Lib::plat-freebsd6::IN.py deleted file mode 100644 index 8316a9ef20a0..000000000000 --- a/lang/python31/files/patch-Lib::plat-freebsd6::IN.py +++ /dev/null @@ -1,518 +0,0 @@ ---- Lib/plat-freebsd6/IN.py Thu Jan 1 09:00:00 1970 -+++ Lib/plat-freebsd6/IN.py Sat Aug 21 08:09:15 2004 -@@ -0,0 +1,515 @@ -+# Generated by h2py from /usr/include/netinet/in.h -+ -+# Included from sys/cdefs.h -+def __P(protos): return protos -+ -+def __STRING(x): return #x -+ -+def __XSTRING(x): return __STRING(x) -+ -+def __P(protos): return () -+ -+def __STRING(x): return "x" -+ -+def __aligned(x): return __attribute__((__aligned__(x))) -+ -+def __section(x): return __attribute__((__section__(x))) -+ -+def __aligned(x): return __attribute__((__aligned__(x))) -+ -+def __section(x): return __attribute__((__section__(x))) -+ -+def __nonnull(x): return __attribute__((__nonnull__(x))) -+ -+def __predict_true(exp): return __builtin_expect((exp), 1) -+ -+def __predict_false(exp): return __builtin_expect((exp), 0) -+ -+def __predict_true(exp): return (exp) -+ -+def __predict_false(exp): return (exp) -+ -+def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -+ -+def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -+ -+def __RCSID_SOURCE(s): return __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s) -+ -+def __SCCSID(s): return __IDSTRING(__CONCAT(__sccsid_,__LINE__),s) -+ -+def __COPYRIGHT(s): return __IDSTRING(__CONCAT(__copyright_,__LINE__),s) -+ -+_POSIX_C_SOURCE = 199009 -+_POSIX_C_SOURCE = 199209 -+__XSI_VISIBLE = 600 -+_POSIX_C_SOURCE = 200112 -+__XSI_VISIBLE = 500 -+_POSIX_C_SOURCE = 199506 -+_POSIX_C_SOURCE = 198808 -+__POSIX_VISIBLE = 200112 -+__ISO_C_VISIBLE = 1999 -+__POSIX_VISIBLE = 199506 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199309 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199209 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199009 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 198808 -+__ISO_C_VISIBLE = 0 -+__POSIX_VISIBLE = 0 -+__XSI_VISIBLE = 0 -+__BSD_VISIBLE = 0 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 0 -+__XSI_VISIBLE = 0 -+__BSD_VISIBLE = 0 -+__ISO_C_VISIBLE = 1999 -+__POSIX_VISIBLE = 200112 -+__XSI_VISIBLE = 600 -+__BSD_VISIBLE = 1 -+__ISO_C_VISIBLE = 1999 -+ -+# Included from sys/_types.h -+ -+# Included from machine/_types.h -+ -+# Included from machine/endian.h -+_QUAD_HIGHWORD = 1 -+_QUAD_LOWWORD = 0 -+_LITTLE_ENDIAN = 1234 -+_BIG_ENDIAN = 4321 -+_PDP_ENDIAN = 3412 -+_BYTE_ORDER = _LITTLE_ENDIAN -+LITTLE_ENDIAN = _LITTLE_ENDIAN -+BIG_ENDIAN = _BIG_ENDIAN -+PDP_ENDIAN = _PDP_ENDIAN -+BYTE_ORDER = _BYTE_ORDER -+__INTEL_COMPILER_with_FreeBSD_endian = 1 -+__INTEL_COMPILER_with_FreeBSD_endian = 1 -+def __word_swap_int_var(x): return \ -+ -+def __word_swap_int_const(x): return \ -+ -+def __word_swap_int(x): return __word_swap_int_var(x) -+ -+def __byte_swap_int_var(x): return \ -+ -+def __byte_swap_int_var(x): return \ -+ -+def __byte_swap_int_const(x): return \ -+ -+def __byte_swap_int(x): return __byte_swap_int_var(x) -+ -+def __byte_swap_word_var(x): return \ -+ -+def __byte_swap_word_const(x): return \ -+ -+def __byte_swap_word(x): return __byte_swap_word_var(x) -+ -+def __htonl(x): return __bswap32(x) -+ -+def __htons(x): return __bswap16(x) -+ -+def __ntohl(x): return __bswap32(x) -+ -+def __ntohs(x): return __bswap16(x) -+ -+IPPROTO_IP = 0 -+IPPROTO_ICMP = 1 -+IPPROTO_TCP = 6 -+IPPROTO_UDP = 17 -+def htonl(x): return __htonl(x) -+ -+def htons(x): return __htons(x) -+ -+def ntohl(x): return __ntohl(x) -+ -+def ntohs(x): return __ntohs(x) -+ -+IPPROTO_RAW = 255 -+INET_ADDRSTRLEN = 16 -+IPPROTO_HOPOPTS = 0 -+IPPROTO_IGMP = 2 -+IPPROTO_GGP = 3 -+IPPROTO_IPV4 = 4 -+IPPROTO_IPIP = IPPROTO_IPV4 -+IPPROTO_ST = 7 -+IPPROTO_EGP = 8 -+IPPROTO_PIGP = 9 -+IPPROTO_RCCMON = 10 -+IPPROTO_NVPII = 11 -+IPPROTO_PUP = 12 -+IPPROTO_ARGUS = 13 -+IPPROTO_EMCON = 14 -+IPPROTO_XNET = 15 -+IPPROTO_CHAOS = 16 -+IPPROTO_MUX = 18 -+IPPROTO_MEAS = 19 -+IPPROTO_HMP = 20 -+IPPROTO_PRM = 21 -+IPPROTO_IDP = 22 -+IPPROTO_TRUNK1 = 23 -+IPPROTO_TRUNK2 = 24 -+IPPROTO_LEAF1 = 25 -+IPPROTO_LEAF2 = 26 -+IPPROTO_RDP = 27 -+IPPROTO_IRTP = 28 -+IPPROTO_TP = 29 -+IPPROTO_BLT = 30 -+IPPROTO_NSP = 31 -+IPPROTO_INP = 32 -+IPPROTO_SEP = 33 -+IPPROTO_3PC = 34 -+IPPROTO_IDPR = 35 -+IPPROTO_XTP = 36 -+IPPROTO_DDP = 37 -+IPPROTO_CMTP = 38 -+IPPROTO_TPXX = 39 -+IPPROTO_IL = 40 -+IPPROTO_IPV6 = 41 -+IPPROTO_SDRP = 42 -+IPPROTO_ROUTING = 43 -+IPPROTO_FRAGMENT = 44 -+IPPROTO_IDRP = 45 -+IPPROTO_RSVP = 46 -+IPPROTO_GRE = 47 -+IPPROTO_MHRP = 48 -+IPPROTO_BHA = 49 -+IPPROTO_ESP = 50 -+IPPROTO_AH = 51 -+IPPROTO_INLSP = 52 -+IPPROTO_SWIPE = 53 -+IPPROTO_NHRP = 54 -+IPPROTO_MOBILE = 55 -+IPPROTO_TLSP = 56 -+IPPROTO_SKIP = 57 -+IPPROTO_ICMPV6 = 58 -+IPPROTO_NONE = 59 -+IPPROTO_DSTOPTS = 60 -+IPPROTO_AHIP = 61 -+IPPROTO_CFTP = 62 -+IPPROTO_HELLO = 63 -+IPPROTO_SATEXPAK = 64 -+IPPROTO_KRYPTOLAN = 65 -+IPPROTO_RVD = 66 -+IPPROTO_IPPC = 67 -+IPPROTO_ADFS = 68 -+IPPROTO_SATMON = 69 -+IPPROTO_VISA = 70 -+IPPROTO_IPCV = 71 -+IPPROTO_CPNX = 72 -+IPPROTO_CPHB = 73 -+IPPROTO_WSN = 74 -+IPPROTO_PVP = 75 -+IPPROTO_BRSATMON = 76 -+IPPROTO_ND = 77 -+IPPROTO_WBMON = 78 -+IPPROTO_WBEXPAK = 79 -+IPPROTO_EON = 80 -+IPPROTO_VMTP = 81 -+IPPROTO_SVMTP = 82 -+IPPROTO_VINES = 83 -+IPPROTO_TTP = 84 -+IPPROTO_IGP = 85 -+IPPROTO_DGP = 86 -+IPPROTO_TCF = 87 -+IPPROTO_IGRP = 88 -+IPPROTO_OSPFIGP = 89 -+IPPROTO_SRPC = 90 -+IPPROTO_LARP = 91 -+IPPROTO_MTP = 92 -+IPPROTO_AX25 = 93 -+IPPROTO_IPEIP = 94 -+IPPROTO_MICP = 95 -+IPPROTO_SCCSP = 96 -+IPPROTO_ETHERIP = 97 -+IPPROTO_ENCAP = 98 -+IPPROTO_APES = 99 -+IPPROTO_GMTP = 100 -+IPPROTO_IPCOMP = 108 -+IPPROTO_PIM = 103 -+IPPROTO_PGM = 113 -+IPPROTO_PFSYNC = 240 -+IPPROTO_OLD_DIVERT = 254 -+IPPROTO_MAX = 256 -+IPPROTO_DONE = 257 -+IPPROTO_DIVERT = 258 -+IPPORT_RESERVED = 1024 -+IPPORT_HIFIRSTAUTO = 49152 -+IPPORT_HILASTAUTO = 65535 -+IPPORT_RESERVEDSTART = 600 -+IPPORT_MAX = 65535 -+def IN_CLASSA(i): return (((u_int32_t)(i) & (-2147483648)) == 0) -+ -+IN_CLASSA_NET = (-16777216) -+IN_CLASSA_NSHIFT = 24 -+IN_CLASSA_HOST = 0x00ffffff -+IN_CLASSA_MAX = 128 -+def IN_CLASSB(i): return (((u_int32_t)(i) & (-1073741824)) == (-2147483648)) -+ -+IN_CLASSB_NET = (-65536) -+IN_CLASSB_NSHIFT = 16 -+IN_CLASSB_HOST = 0x0000ffff -+IN_CLASSB_MAX = 65536 -+def IN_CLASSC(i): return (((u_int32_t)(i) & (-536870912)) == (-1073741824)) -+ -+IN_CLASSC_NET = (-256) -+IN_CLASSC_NSHIFT = 8 -+IN_CLASSC_HOST = 0x000000ff -+def IN_CLASSD(i): return (((u_int32_t)(i) & (-268435456)) == (-536870912)) -+ -+IN_CLASSD_NET = (-268435456) -+IN_CLASSD_NSHIFT = 28 -+IN_CLASSD_HOST = 0x0fffffff -+def IN_MULTICAST(i): return IN_CLASSD(i) -+ -+def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -+ -+def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -+ -+INADDR_NONE = (-1) -+IN_LOOPBACKNET = 127 -+IP_OPTIONS = 1 -+IP_HDRINCL = 2 -+IP_TOS = 3 -+IP_TTL = 4 -+IP_RECVOPTS = 5 -+IP_RECVRETOPTS = 6 -+IP_RECVDSTADDR = 7 -+IP_SENDSRCADDR = IP_RECVDSTADDR -+IP_RETOPTS = 8 -+IP_MULTICAST_IF = 9 -+IP_MULTICAST_TTL = 10 -+IP_MULTICAST_LOOP = 11 -+IP_ADD_MEMBERSHIP = 12 -+IP_DROP_MEMBERSHIP = 13 -+IP_MULTICAST_VIF = 14 -+IP_RSVP_ON = 15 -+IP_RSVP_OFF = 16 -+IP_RSVP_VIF_ON = 17 -+IP_RSVP_VIF_OFF = 18 -+IP_PORTRANGE = 19 -+IP_RECVIF = 20 -+IP_IPSEC_POLICY = 21 -+IP_FAITH = 22 -+IP_ONESBCAST = 23 -+IP_FW_TABLE_ADD = 40 -+IP_FW_TABLE_DEL = 41 -+IP_FW_TABLE_FLUSH = 42 -+IP_FW_TABLE_GETSIZE = 43 -+IP_FW_TABLE_LIST = 44 -+IP_FW_ADD = 50 -+IP_FW_DEL = 51 -+IP_FW_FLUSH = 52 -+IP_FW_ZERO = 53 -+IP_FW_GET = 54 -+IP_FW_RESETLOG = 55 -+IP_DUMMYNET_CONFIGURE = 60 -+IP_DUMMYNET_DEL = 61 -+IP_DUMMYNET_FLUSH = 62 -+IP_DUMMYNET_GET = 64 -+IP_RECVTTL = 65 -+IP_DEFAULT_MULTICAST_TTL = 1 -+IP_DEFAULT_MULTICAST_LOOP = 1 -+IP_MAX_MEMBERSHIPS = 20 -+IP_PORTRANGE_DEFAULT = 0 -+IP_PORTRANGE_HIGH = 1 -+IP_PORTRANGE_LOW = 2 -+IPPROTO_MAXID = (IPPROTO_AH + 1) -+IPCTL_FORWARDING = 1 -+IPCTL_SENDREDIRECTS = 2 -+IPCTL_DEFTTL = 3 -+IPCTL_DEFMTU = 4 -+IPCTL_RTEXPIRE = 5 -+IPCTL_RTMINEXPIRE = 6 -+IPCTL_RTMAXCACHE = 7 -+IPCTL_SOURCEROUTE = 8 -+IPCTL_DIRECTEDBROADCAST = 9 -+IPCTL_INTRQMAXLEN = 10 -+IPCTL_INTRQDROPS = 11 -+IPCTL_STATS = 12 -+IPCTL_ACCEPTSOURCEROUTE = 13 -+IPCTL_FASTFORWARDING = 14 -+IPCTL_KEEPFAITH = 15 -+IPCTL_GIF_TTL = 16 -+IPCTL_MAXID = 17 -+def in_nullhost(x): return ((x).s_addr == INADDR_ANY) -+ -+ -+# Included from netinet6/in6.h -+__KAME_VERSION = "20010528/FreeBSD" -+IPV6PORT_RESERVED = 1024 -+IPV6PORT_ANONMIN = 49152 -+IPV6PORT_ANONMAX = 65535 -+IPV6PORT_RESERVEDMIN = 600 -+IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -+INET6_ADDRSTRLEN = 46 -+IPV6_ADDR_INT32_ONE = 1 -+IPV6_ADDR_INT32_TWO = 2 -+IPV6_ADDR_INT32_MNL = (-16711680) -+IPV6_ADDR_INT32_MLL = (-16646144) -+IPV6_ADDR_INT32_SMP = 0x0000ffff -+IPV6_ADDR_INT16_ULL = 0xfe80 -+IPV6_ADDR_INT16_USL = 0xfec0 -+IPV6_ADDR_INT16_MLL = 0xff02 -+IPV6_ADDR_INT32_ONE = 0x01000000 -+IPV6_ADDR_INT32_TWO = 0x02000000 -+IPV6_ADDR_INT32_MNL = 0x000001ff -+IPV6_ADDR_INT32_MLL = 0x000002ff -+IPV6_ADDR_INT32_SMP = (-65536) -+IPV6_ADDR_INT16_ULL = 0x80fe -+IPV6_ADDR_INT16_USL = 0xc0fe -+IPV6_ADDR_INT16_MLL = 0x02ff -+def IN6_IS_ADDR_UNSPECIFIED(a): return \ -+ -+def IN6_IS_ADDR_LOOPBACK(a): return \ -+ -+def IN6_IS_ADDR_V4COMPAT(a): return \ -+ -+def IN6_IS_ADDR_V4MAPPED(a): return \ -+ -+IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -+IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -+IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -+IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -+IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -+IPV6_ADDR_SCOPE_GLOBAL = 0x0e -+__IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -+__IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -+__IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -+__IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -+__IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -+__IPV6_ADDR_SCOPE_GLOBAL = 0x0e -+def IN6_IS_ADDR_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_INTFACELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_GLOBAL(a): return \ -+ -+def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_GLOBAL(a): return \ -+ -+def IN6_IS_SCOPE_LINKLOCAL(a): return \ -+ -+def IFA6_IS_DEPRECATED(a): return \ -+ -+def IFA6_IS_INVALID(a): return \ -+ -+IPV6_OPTIONS = 1 -+IPV6_RECVOPTS = 5 -+IPV6_RECVRETOPTS = 6 -+IPV6_RECVDSTADDR = 7 -+IPV6_RETOPTS = 8 -+IPV6_SOCKOPT_RESERVED1 = 3 -+IPV6_UNICAST_HOPS = 4 -+IPV6_MULTICAST_IF = 9 -+IPV6_MULTICAST_HOPS = 10 -+IPV6_MULTICAST_LOOP = 11 -+IPV6_JOIN_GROUP = 12 -+IPV6_LEAVE_GROUP = 13 -+IPV6_PORTRANGE = 14 -+ICMP6_FILTER = 18 -+IPV6_2292PKTINFO = 19 -+IPV6_2292HOPLIMIT = 20 -+IPV6_2292NEXTHOP = 21 -+IPV6_2292HOPOPTS = 22 -+IPV6_2292DSTOPTS = 23 -+IPV6_2292RTHDR = 24 -+IPV6_2292PKTOPTIONS = 25 -+IPV6_CHECKSUM = 26 -+IPV6_V6ONLY = 27 -+IPV6_BINDV6ONLY = IPV6_V6ONLY -+IPV6_IPSEC_POLICY = 28 -+IPV6_FAITH = 29 -+IPV6_FW_ADD = 30 -+IPV6_FW_DEL = 31 -+IPV6_FW_FLUSH = 32 -+IPV6_FW_ZERO = 33 -+IPV6_FW_GET = 34 -+IPV6_RTHDRDSTOPTS = 35 -+IPV6_RECVPKTINFO = 36 -+IPV6_RECVHOPLIMIT = 37 -+IPV6_RECVRTHDR = 38 -+IPV6_RECVHOPOPTS = 39 -+IPV6_RECVDSTOPTS = 40 -+IPV6_RECVRTHDRDSTOPTS = 41 -+IPV6_USE_MIN_MTU = 42 -+IPV6_RECVPATHMTU = 43 -+IPV6_PATHMTU = 44 -+IPV6_REACHCONF = 45 -+IPV6_PKTINFO = 46 -+IPV6_HOPLIMIT = 47 -+IPV6_NEXTHOP = 48 -+IPV6_HOPOPTS = 49 -+IPV6_DSTOPTS = 50 -+IPV6_RTHDR = 51 -+IPV6_PKTOPTIONS = 52 -+IPV6_RECVTCLASS = 57 -+IPV6_AUTOFLOWLABEL = 59 -+IPV6_TCLASS = 61 -+IPV6_DONTFRAG = 62 -+IPV6_PREFER_TEMPADDR = 63 -+IPV6_RTHDR_LOOSE = 0 -+IPV6_RTHDR_STRICT = 1 -+IPV6_RTHDR_TYPE_0 = 0 -+IPV6_DEFAULT_MULTICAST_HOPS = 1 -+IPV6_DEFAULT_MULTICAST_LOOP = 1 -+IPV6_PORTRANGE_DEFAULT = 0 -+IPV6_PORTRANGE_HIGH = 1 -+IPV6_PORTRANGE_LOW = 2 -+IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -+IPV6CTL_FORWARDING = 1 -+IPV6CTL_SENDREDIRECTS = 2 -+IPV6CTL_DEFHLIM = 3 -+IPV6CTL_DEFMTU = 4 -+IPV6CTL_FORWSRCRT = 5 -+IPV6CTL_STATS = 6 -+IPV6CTL_MRTSTATS = 7 -+IPV6CTL_MRTPROTO = 8 -+IPV6CTL_MAXFRAGPACKETS = 9 -+IPV6CTL_SOURCECHECK = 10 -+IPV6CTL_SOURCECHECK_LOGINT = 11 -+IPV6CTL_ACCEPT_RTADV = 12 -+IPV6CTL_KEEPFAITH = 13 -+IPV6CTL_LOG_INTERVAL = 14 -+IPV6CTL_HDRNESTLIMIT = 15 -+IPV6CTL_DAD_COUNT = 16 -+IPV6CTL_AUTO_FLOWLABEL = 17 -+IPV6CTL_DEFMCASTHLIM = 18 -+IPV6CTL_GIF_HLIM = 19 -+IPV6CTL_KAME_VERSION = 20 -+IPV6CTL_USE_DEPRECATED = 21 -+IPV6CTL_RR_PRUNE = 22 -+IPV6CTL_MAPPED_ADDR = 23 -+IPV6CTL_V6ONLY = 24 -+IPV6CTL_RTEXPIRE = 25 -+IPV6CTL_RTMINEXPIRE = 26 -+IPV6CTL_RTMAXCACHE = 27 -+IPV6CTL_USETEMPADDR = 32 -+IPV6CTL_TEMPPLTIME = 33 -+IPV6CTL_TEMPVLTIME = 34 -+IPV6CTL_AUTO_LINKLOCAL = 35 -+IPV6CTL_RIP6STATS = 36 -+IPV6CTL_PREFER_TEMPADDR = 37 -+IPV6CTL_ADDRCTLPOLICY = 38 -+IPV6CTL_MAXFRAGS = 41 -+IPV6CTL_MAXID = 42 diff --git a/lang/python31/files/patch-configure b/lang/python31/files/patch-configure deleted file mode 100644 index 9ed971ab4be7..000000000000 --- a/lang/python31/files/patch-configure +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.orig Sat Oct 4 13:27:50 2003 -+++ configure Sat Oct 4 13:29:05 2003 -@@ -1321,7 +1321,7 @@ - VERSION=2.4 - - --SOVERSION=1.0 -+SOVERSION=1 - - # The later defininition of _XOPEN_SOURCE disables certain features - # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). -@@ -3396,6 +3396,12 @@ - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -+ INSTSONAME="$LDLIBRARY".$SOVERSION -+ ;; -+ FreeBSD*) -+ LDLIBRARY='libpython$(VERSION).so' -+ BLDLIBRARY='-L. -lpython$(VERSION)' -+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; - hp*|HP*) diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist index 0c4ef402b2a4..2da321c50218 100644 --- a/lang/python31/pkg-plist +++ b/lang/python31/pkg-plist @@ -495,6 +495,27 @@ lib/%%PYTHON_VERSION%%/distutils/spawn.pyo lib/%%PYTHON_VERSION%%/distutils/sysconfig.py lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyc lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.py +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/support.py +lib/%%PYTHON_VERSION%%/distutils/tests/support.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/support.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyo lib/%%PYTHON_VERSION%%/distutils/text_file.py lib/%%PYTHON_VERSION%%/distutils/text_file.pyc lib/%%PYTHON_VERSION%%/distutils/text_file.pyo @@ -630,6 +651,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_39.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_41.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_42.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_43.txt lib/%%PYTHON_VERSION%%/email/test/test_email.py lib/%%PYTHON_VERSION%%/email/test/test_email.pyc lib/%%PYTHON_VERSION%%/email/test/test_email.pyo @@ -1337,15 +1359,24 @@ lib/%%PYTHON_VERSION%%/lib-old/poly.pyo lib/%%PYTHON_VERSION%%/lib-old/rand.py lib/%%PYTHON_VERSION%%/lib-old/rand.pyc lib/%%PYTHON_VERSION%%/lib-old/rand.pyo +lib/%%PYTHON_VERSION%%/lib-old/statcache.py +lib/%%PYTHON_VERSION%%/lib-old/statcache.pyc +lib/%%PYTHON_VERSION%%/lib-old/statcache.pyo lib/%%PYTHON_VERSION%%/lib-old/tb.py lib/%%PYTHON_VERSION%%/lib-old/tb.pyc lib/%%PYTHON_VERSION%%/lib-old/tb.pyo +lib/%%PYTHON_VERSION%%/lib-old/tzparse.py +lib/%%PYTHON_VERSION%%/lib-old/tzparse.pyc +lib/%%PYTHON_VERSION%%/lib-old/tzparse.pyo lib/%%PYTHON_VERSION%%/lib-old/util.py lib/%%PYTHON_VERSION%%/lib-old/util.pyc lib/%%PYTHON_VERSION%%/lib-old/util.pyo lib/%%PYTHON_VERSION%%/lib-old/whatsound.py lib/%%PYTHON_VERSION%%/lib-old/whatsound.pyc lib/%%PYTHON_VERSION%%/lib-old/whatsound.pyo +lib/%%PYTHON_VERSION%%/lib-old/whrandom.py +lib/%%PYTHON_VERSION%%/lib-old/whrandom.pyc +lib/%%PYTHON_VERSION%%/lib-old/whrandom.pyo lib/%%PYTHON_VERSION%%/lib-old/zmod.py lib/%%PYTHON_VERSION%%/lib-old/zmod.pyc lib/%%PYTHON_VERSION%%/lib-old/zmod.pyo @@ -1528,7 +1559,6 @@ lib/%%PYTHON_VERSION%%/posixpath.pyo lib/%%PYTHON_VERSION%%/pprint.py lib/%%PYTHON_VERSION%%/pprint.pyc lib/%%PYTHON_VERSION%%/pprint.pyo -lib/%%PYTHON_VERSION%%/profile.doc lib/%%PYTHON_VERSION%%/profile.py lib/%%PYTHON_VERSION%%/profile.pyc lib/%%PYTHON_VERSION%%/profile.pyo @@ -1629,9 +1659,6 @@ lib/%%PYTHON_VERSION%%/sre_parse.pyo lib/%%PYTHON_VERSION%%/stat.py lib/%%PYTHON_VERSION%%/stat.pyc lib/%%PYTHON_VERSION%%/stat.pyo -lib/%%PYTHON_VERSION%%/statcache.py -lib/%%PYTHON_VERSION%%/statcache.pyc -lib/%%PYTHON_VERSION%%/statcache.pyo lib/%%PYTHON_VERSION%%/statvfs.py lib/%%PYTHON_VERSION%%/statvfs.pyc lib/%%PYTHON_VERSION%%/statvfs.pyo @@ -1729,6 +1756,12 @@ lib/%%PYTHON_VERSION%%/test/double_const.py lib/%%PYTHON_VERSION%%/test/double_const.pyc lib/%%PYTHON_VERSION%%/test/double_const.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue +lib/%%PYTHON_VERSION%%/test/inspect_fodder.py +lib/%%PYTHON_VERSION%%/test/inspect_fodder.pyc +lib/%%PYTHON_VERSION%%/test/inspect_fodder.pyo +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.py +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.pyc +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.pyo lib/%%PYTHON_VERSION%%/test/list_tests.py lib/%%PYTHON_VERSION%%/test/list_tests.pyc lib/%%PYTHON_VERSION%%/test/list_tests.pyo @@ -2062,6 +2095,7 @@ lib/%%PYTHON_VERSION%%/test/test_doctest2.py lib/%%PYTHON_VERSION%%/test/test_doctest2.pyc lib/%%PYTHON_VERSION%%/test/test_doctest2.pyo lib/%%PYTHON_VERSION%%/test/test_doctest2.txt +lib/%%PYTHON_VERSION%%/test/test_doctest3.txt lib/%%PYTHON_VERSION%%/test/test_dumbdbm.py lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyc lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo @@ -2751,9 +2785,6 @@ lib/%%PYTHON_VERSION%%/tty.pyo lib/%%PYTHON_VERSION%%/types.py lib/%%PYTHON_VERSION%%/types.pyc lib/%%PYTHON_VERSION%%/types.pyo -lib/%%PYTHON_VERSION%%/tzparse.py -lib/%%PYTHON_VERSION%%/tzparse.pyc -lib/%%PYTHON_VERSION%%/tzparse.pyo lib/%%PYTHON_VERSION%%/unittest.py lib/%%PYTHON_VERSION%%/unittest.pyc lib/%%PYTHON_VERSION%%/unittest.pyo @@ -2787,9 +2818,6 @@ lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo -lib/%%PYTHON_VERSION%%/whrandom.py -lib/%%PYTHON_VERSION%%/whrandom.pyc -lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo @@ -3157,6 +3185,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/win32.html %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/makelocalealias.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.py @@ -3188,6 +3217,14 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/modulator.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/README.txt +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msi.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msilib.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.c +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.mak +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/schema.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/sequence.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/uisample.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py @@ -3292,6 +3329,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/scripts %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche/X %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche +%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/msi %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator/Templates %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/i18n @@ -3354,6 +3392,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo @dirrm lib/%%PYTHON_VERSION%%/email/test/data @dirrm lib/%%PYTHON_VERSION%%/email/test @dirrm lib/%%PYTHON_VERSION%%/email +@dirrm lib/%%PYTHON_VERSION%%/distutils/tests @dirrm lib/%%PYTHON_VERSION%%/distutils/command @dirrm lib/%%PYTHON_VERSION%%/distutils @dirrm lib/%%PYTHON_VERSION%%/curses diff --git a/lang/python32/Makefile b/lang/python32/Makefile index 0daa10b33ea6..ec0f468b3ab4 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.5.a0.000000 +PORTVERSION= 2.5.a0.20050129 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -14,8 +14,6 @@ DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language -IGNORE= is not available yet - DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes @@ -29,7 +27,7 @@ MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes USE_REINPLACE= yes -PYTHON_VERSION= python2.4 +PYTHON_VERSION= python2.5 PYTHON_NO_DEPENDS= yes LATEST_LINK= ${PYTHON_VERSION:S/.//} @@ -108,11 +106,11 @@ PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.4 + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4 + ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py + ${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py pre-patch: ${REINPLACE_CMD} -e \ @@ -172,8 +170,8 @@ post-install: ${PREFIX}/bin @# additional files installing by ports - ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \ - ${WRKDIR}/smtpd2.4.py ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.5 ${WRKDIR}/idle2.5 \ + ${WRKDIR}/smtpd2.5.py ${PREFIX}/bin @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 diff --git a/lang/python32/distinfo b/lang/python32/distinfo index 24141b21691f..0072eec35a72 100644 --- a/lang/python32/distinfo +++ b/lang/python32/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4c1.tgz) = deea93a91518314ffe9a7c5cd8144eac -SIZE (python/Python-2.4c1.tgz) = 9198160 +MD5 (python/Python-2.5.a0.20050129.tgz) = bdf571f3e28c4793bedbd180611c28e6 +SIZE (python/Python-2.5.a0.20050129.tgz) = 9227299 diff --git a/lang/python32/files/patch-Lib::plat-freebsd6::IN.py b/lang/python32/files/patch-Lib::plat-freebsd6::IN.py deleted file mode 100644 index 8316a9ef20a0..000000000000 --- a/lang/python32/files/patch-Lib::plat-freebsd6::IN.py +++ /dev/null @@ -1,518 +0,0 @@ ---- Lib/plat-freebsd6/IN.py Thu Jan 1 09:00:00 1970 -+++ Lib/plat-freebsd6/IN.py Sat Aug 21 08:09:15 2004 -@@ -0,0 +1,515 @@ -+# Generated by h2py from /usr/include/netinet/in.h -+ -+# Included from sys/cdefs.h -+def __P(protos): return protos -+ -+def __STRING(x): return #x -+ -+def __XSTRING(x): return __STRING(x) -+ -+def __P(protos): return () -+ -+def __STRING(x): return "x" -+ -+def __aligned(x): return __attribute__((__aligned__(x))) -+ -+def __section(x): return __attribute__((__section__(x))) -+ -+def __aligned(x): return __attribute__((__aligned__(x))) -+ -+def __section(x): return __attribute__((__section__(x))) -+ -+def __nonnull(x): return __attribute__((__nonnull__(x))) -+ -+def __predict_true(exp): return __builtin_expect((exp), 1) -+ -+def __predict_false(exp): return __builtin_expect((exp), 0) -+ -+def __predict_true(exp): return (exp) -+ -+def __predict_false(exp): return (exp) -+ -+def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -+ -+def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -+ -+def __RCSID_SOURCE(s): return __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s) -+ -+def __SCCSID(s): return __IDSTRING(__CONCAT(__sccsid_,__LINE__),s) -+ -+def __COPYRIGHT(s): return __IDSTRING(__CONCAT(__copyright_,__LINE__),s) -+ -+_POSIX_C_SOURCE = 199009 -+_POSIX_C_SOURCE = 199209 -+__XSI_VISIBLE = 600 -+_POSIX_C_SOURCE = 200112 -+__XSI_VISIBLE = 500 -+_POSIX_C_SOURCE = 199506 -+_POSIX_C_SOURCE = 198808 -+__POSIX_VISIBLE = 200112 -+__ISO_C_VISIBLE = 1999 -+__POSIX_VISIBLE = 199506 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199309 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199209 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 199009 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 198808 -+__ISO_C_VISIBLE = 0 -+__POSIX_VISIBLE = 0 -+__XSI_VISIBLE = 0 -+__BSD_VISIBLE = 0 -+__ISO_C_VISIBLE = 1990 -+__POSIX_VISIBLE = 0 -+__XSI_VISIBLE = 0 -+__BSD_VISIBLE = 0 -+__ISO_C_VISIBLE = 1999 -+__POSIX_VISIBLE = 200112 -+__XSI_VISIBLE = 600 -+__BSD_VISIBLE = 1 -+__ISO_C_VISIBLE = 1999 -+ -+# Included from sys/_types.h -+ -+# Included from machine/_types.h -+ -+# Included from machine/endian.h -+_QUAD_HIGHWORD = 1 -+_QUAD_LOWWORD = 0 -+_LITTLE_ENDIAN = 1234 -+_BIG_ENDIAN = 4321 -+_PDP_ENDIAN = 3412 -+_BYTE_ORDER = _LITTLE_ENDIAN -+LITTLE_ENDIAN = _LITTLE_ENDIAN -+BIG_ENDIAN = _BIG_ENDIAN -+PDP_ENDIAN = _PDP_ENDIAN -+BYTE_ORDER = _BYTE_ORDER -+__INTEL_COMPILER_with_FreeBSD_endian = 1 -+__INTEL_COMPILER_with_FreeBSD_endian = 1 -+def __word_swap_int_var(x): return \ -+ -+def __word_swap_int_const(x): return \ -+ -+def __word_swap_int(x): return __word_swap_int_var(x) -+ -+def __byte_swap_int_var(x): return \ -+ -+def __byte_swap_int_var(x): return \ -+ -+def __byte_swap_int_const(x): return \ -+ -+def __byte_swap_int(x): return __byte_swap_int_var(x) -+ -+def __byte_swap_word_var(x): return \ -+ -+def __byte_swap_word_const(x): return \ -+ -+def __byte_swap_word(x): return __byte_swap_word_var(x) -+ -+def __htonl(x): return __bswap32(x) -+ -+def __htons(x): return __bswap16(x) -+ -+def __ntohl(x): return __bswap32(x) -+ -+def __ntohs(x): return __bswap16(x) -+ -+IPPROTO_IP = 0 -+IPPROTO_ICMP = 1 -+IPPROTO_TCP = 6 -+IPPROTO_UDP = 17 -+def htonl(x): return __htonl(x) -+ -+def htons(x): return __htons(x) -+ -+def ntohl(x): return __ntohl(x) -+ -+def ntohs(x): return __ntohs(x) -+ -+IPPROTO_RAW = 255 -+INET_ADDRSTRLEN = 16 -+IPPROTO_HOPOPTS = 0 -+IPPROTO_IGMP = 2 -+IPPROTO_GGP = 3 -+IPPROTO_IPV4 = 4 -+IPPROTO_IPIP = IPPROTO_IPV4 -+IPPROTO_ST = 7 -+IPPROTO_EGP = 8 -+IPPROTO_PIGP = 9 -+IPPROTO_RCCMON = 10 -+IPPROTO_NVPII = 11 -+IPPROTO_PUP = 12 -+IPPROTO_ARGUS = 13 -+IPPROTO_EMCON = 14 -+IPPROTO_XNET = 15 -+IPPROTO_CHAOS = 16 -+IPPROTO_MUX = 18 -+IPPROTO_MEAS = 19 -+IPPROTO_HMP = 20 -+IPPROTO_PRM = 21 -+IPPROTO_IDP = 22 -+IPPROTO_TRUNK1 = 23 -+IPPROTO_TRUNK2 = 24 -+IPPROTO_LEAF1 = 25 -+IPPROTO_LEAF2 = 26 -+IPPROTO_RDP = 27 -+IPPROTO_IRTP = 28 -+IPPROTO_TP = 29 -+IPPROTO_BLT = 30 -+IPPROTO_NSP = 31 -+IPPROTO_INP = 32 -+IPPROTO_SEP = 33 -+IPPROTO_3PC = 34 -+IPPROTO_IDPR = 35 -+IPPROTO_XTP = 36 -+IPPROTO_DDP = 37 -+IPPROTO_CMTP = 38 -+IPPROTO_TPXX = 39 -+IPPROTO_IL = 40 -+IPPROTO_IPV6 = 41 -+IPPROTO_SDRP = 42 -+IPPROTO_ROUTING = 43 -+IPPROTO_FRAGMENT = 44 -+IPPROTO_IDRP = 45 -+IPPROTO_RSVP = 46 -+IPPROTO_GRE = 47 -+IPPROTO_MHRP = 48 -+IPPROTO_BHA = 49 -+IPPROTO_ESP = 50 -+IPPROTO_AH = 51 -+IPPROTO_INLSP = 52 -+IPPROTO_SWIPE = 53 -+IPPROTO_NHRP = 54 -+IPPROTO_MOBILE = 55 -+IPPROTO_TLSP = 56 -+IPPROTO_SKIP = 57 -+IPPROTO_ICMPV6 = 58 -+IPPROTO_NONE = 59 -+IPPROTO_DSTOPTS = 60 -+IPPROTO_AHIP = 61 -+IPPROTO_CFTP = 62 -+IPPROTO_HELLO = 63 -+IPPROTO_SATEXPAK = 64 -+IPPROTO_KRYPTOLAN = 65 -+IPPROTO_RVD = 66 -+IPPROTO_IPPC = 67 -+IPPROTO_ADFS = 68 -+IPPROTO_SATMON = 69 -+IPPROTO_VISA = 70 -+IPPROTO_IPCV = 71 -+IPPROTO_CPNX = 72 -+IPPROTO_CPHB = 73 -+IPPROTO_WSN = 74 -+IPPROTO_PVP = 75 -+IPPROTO_BRSATMON = 76 -+IPPROTO_ND = 77 -+IPPROTO_WBMON = 78 -+IPPROTO_WBEXPAK = 79 -+IPPROTO_EON = 80 -+IPPROTO_VMTP = 81 -+IPPROTO_SVMTP = 82 -+IPPROTO_VINES = 83 -+IPPROTO_TTP = 84 -+IPPROTO_IGP = 85 -+IPPROTO_DGP = 86 -+IPPROTO_TCF = 87 -+IPPROTO_IGRP = 88 -+IPPROTO_OSPFIGP = 89 -+IPPROTO_SRPC = 90 -+IPPROTO_LARP = 91 -+IPPROTO_MTP = 92 -+IPPROTO_AX25 = 93 -+IPPROTO_IPEIP = 94 -+IPPROTO_MICP = 95 -+IPPROTO_SCCSP = 96 -+IPPROTO_ETHERIP = 97 -+IPPROTO_ENCAP = 98 -+IPPROTO_APES = 99 -+IPPROTO_GMTP = 100 -+IPPROTO_IPCOMP = 108 -+IPPROTO_PIM = 103 -+IPPROTO_PGM = 113 -+IPPROTO_PFSYNC = 240 -+IPPROTO_OLD_DIVERT = 254 -+IPPROTO_MAX = 256 -+IPPROTO_DONE = 257 -+IPPROTO_DIVERT = 258 -+IPPORT_RESERVED = 1024 -+IPPORT_HIFIRSTAUTO = 49152 -+IPPORT_HILASTAUTO = 65535 -+IPPORT_RESERVEDSTART = 600 -+IPPORT_MAX = 65535 -+def IN_CLASSA(i): return (((u_int32_t)(i) & (-2147483648)) == 0) -+ -+IN_CLASSA_NET = (-16777216) -+IN_CLASSA_NSHIFT = 24 -+IN_CLASSA_HOST = 0x00ffffff -+IN_CLASSA_MAX = 128 -+def IN_CLASSB(i): return (((u_int32_t)(i) & (-1073741824)) == (-2147483648)) -+ -+IN_CLASSB_NET = (-65536) -+IN_CLASSB_NSHIFT = 16 -+IN_CLASSB_HOST = 0x0000ffff -+IN_CLASSB_MAX = 65536 -+def IN_CLASSC(i): return (((u_int32_t)(i) & (-536870912)) == (-1073741824)) -+ -+IN_CLASSC_NET = (-256) -+IN_CLASSC_NSHIFT = 8 -+IN_CLASSC_HOST = 0x000000ff -+def IN_CLASSD(i): return (((u_int32_t)(i) & (-268435456)) == (-536870912)) -+ -+IN_CLASSD_NET = (-268435456) -+IN_CLASSD_NSHIFT = 28 -+IN_CLASSD_HOST = 0x0fffffff -+def IN_MULTICAST(i): return IN_CLASSD(i) -+ -+def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -+ -+def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -+ -+INADDR_NONE = (-1) -+IN_LOOPBACKNET = 127 -+IP_OPTIONS = 1 -+IP_HDRINCL = 2 -+IP_TOS = 3 -+IP_TTL = 4 -+IP_RECVOPTS = 5 -+IP_RECVRETOPTS = 6 -+IP_RECVDSTADDR = 7 -+IP_SENDSRCADDR = IP_RECVDSTADDR -+IP_RETOPTS = 8 -+IP_MULTICAST_IF = 9 -+IP_MULTICAST_TTL = 10 -+IP_MULTICAST_LOOP = 11 -+IP_ADD_MEMBERSHIP = 12 -+IP_DROP_MEMBERSHIP = 13 -+IP_MULTICAST_VIF = 14 -+IP_RSVP_ON = 15 -+IP_RSVP_OFF = 16 -+IP_RSVP_VIF_ON = 17 -+IP_RSVP_VIF_OFF = 18 -+IP_PORTRANGE = 19 -+IP_RECVIF = 20 -+IP_IPSEC_POLICY = 21 -+IP_FAITH = 22 -+IP_ONESBCAST = 23 -+IP_FW_TABLE_ADD = 40 -+IP_FW_TABLE_DEL = 41 -+IP_FW_TABLE_FLUSH = 42 -+IP_FW_TABLE_GETSIZE = 43 -+IP_FW_TABLE_LIST = 44 -+IP_FW_ADD = 50 -+IP_FW_DEL = 51 -+IP_FW_FLUSH = 52 -+IP_FW_ZERO = 53 -+IP_FW_GET = 54 -+IP_FW_RESETLOG = 55 -+IP_DUMMYNET_CONFIGURE = 60 -+IP_DUMMYNET_DEL = 61 -+IP_DUMMYNET_FLUSH = 62 -+IP_DUMMYNET_GET = 64 -+IP_RECVTTL = 65 -+IP_DEFAULT_MULTICAST_TTL = 1 -+IP_DEFAULT_MULTICAST_LOOP = 1 -+IP_MAX_MEMBERSHIPS = 20 -+IP_PORTRANGE_DEFAULT = 0 -+IP_PORTRANGE_HIGH = 1 -+IP_PORTRANGE_LOW = 2 -+IPPROTO_MAXID = (IPPROTO_AH + 1) -+IPCTL_FORWARDING = 1 -+IPCTL_SENDREDIRECTS = 2 -+IPCTL_DEFTTL = 3 -+IPCTL_DEFMTU = 4 -+IPCTL_RTEXPIRE = 5 -+IPCTL_RTMINEXPIRE = 6 -+IPCTL_RTMAXCACHE = 7 -+IPCTL_SOURCEROUTE = 8 -+IPCTL_DIRECTEDBROADCAST = 9 -+IPCTL_INTRQMAXLEN = 10 -+IPCTL_INTRQDROPS = 11 -+IPCTL_STATS = 12 -+IPCTL_ACCEPTSOURCEROUTE = 13 -+IPCTL_FASTFORWARDING = 14 -+IPCTL_KEEPFAITH = 15 -+IPCTL_GIF_TTL = 16 -+IPCTL_MAXID = 17 -+def in_nullhost(x): return ((x).s_addr == INADDR_ANY) -+ -+ -+# Included from netinet6/in6.h -+__KAME_VERSION = "20010528/FreeBSD" -+IPV6PORT_RESERVED = 1024 -+IPV6PORT_ANONMIN = 49152 -+IPV6PORT_ANONMAX = 65535 -+IPV6PORT_RESERVEDMIN = 600 -+IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -+INET6_ADDRSTRLEN = 46 -+IPV6_ADDR_INT32_ONE = 1 -+IPV6_ADDR_INT32_TWO = 2 -+IPV6_ADDR_INT32_MNL = (-16711680) -+IPV6_ADDR_INT32_MLL = (-16646144) -+IPV6_ADDR_INT32_SMP = 0x0000ffff -+IPV6_ADDR_INT16_ULL = 0xfe80 -+IPV6_ADDR_INT16_USL = 0xfec0 -+IPV6_ADDR_INT16_MLL = 0xff02 -+IPV6_ADDR_INT32_ONE = 0x01000000 -+IPV6_ADDR_INT32_TWO = 0x02000000 -+IPV6_ADDR_INT32_MNL = 0x000001ff -+IPV6_ADDR_INT32_MLL = 0x000002ff -+IPV6_ADDR_INT32_SMP = (-65536) -+IPV6_ADDR_INT16_ULL = 0x80fe -+IPV6_ADDR_INT16_USL = 0xc0fe -+IPV6_ADDR_INT16_MLL = 0x02ff -+def IN6_IS_ADDR_UNSPECIFIED(a): return \ -+ -+def IN6_IS_ADDR_LOOPBACK(a): return \ -+ -+def IN6_IS_ADDR_V4COMPAT(a): return \ -+ -+def IN6_IS_ADDR_V4MAPPED(a): return \ -+ -+IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -+IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -+IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -+IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -+IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -+IPV6_ADDR_SCOPE_GLOBAL = 0x0e -+__IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -+__IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -+__IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -+__IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -+__IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -+__IPV6_ADDR_SCOPE_GLOBAL = 0x0e -+def IN6_IS_ADDR_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_INTFACELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_GLOBAL(a): return \ -+ -+def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -+ -+def IN6_IS_ADDR_MC_GLOBAL(a): return \ -+ -+def IN6_IS_SCOPE_LINKLOCAL(a): return \ -+ -+def IFA6_IS_DEPRECATED(a): return \ -+ -+def IFA6_IS_INVALID(a): return \ -+ -+IPV6_OPTIONS = 1 -+IPV6_RECVOPTS = 5 -+IPV6_RECVRETOPTS = 6 -+IPV6_RECVDSTADDR = 7 -+IPV6_RETOPTS = 8 -+IPV6_SOCKOPT_RESERVED1 = 3 -+IPV6_UNICAST_HOPS = 4 -+IPV6_MULTICAST_IF = 9 -+IPV6_MULTICAST_HOPS = 10 -+IPV6_MULTICAST_LOOP = 11 -+IPV6_JOIN_GROUP = 12 -+IPV6_LEAVE_GROUP = 13 -+IPV6_PORTRANGE = 14 -+ICMP6_FILTER = 18 -+IPV6_2292PKTINFO = 19 -+IPV6_2292HOPLIMIT = 20 -+IPV6_2292NEXTHOP = 21 -+IPV6_2292HOPOPTS = 22 -+IPV6_2292DSTOPTS = 23 -+IPV6_2292RTHDR = 24 -+IPV6_2292PKTOPTIONS = 25 -+IPV6_CHECKSUM = 26 -+IPV6_V6ONLY = 27 -+IPV6_BINDV6ONLY = IPV6_V6ONLY -+IPV6_IPSEC_POLICY = 28 -+IPV6_FAITH = 29 -+IPV6_FW_ADD = 30 -+IPV6_FW_DEL = 31 -+IPV6_FW_FLUSH = 32 -+IPV6_FW_ZERO = 33 -+IPV6_FW_GET = 34 -+IPV6_RTHDRDSTOPTS = 35 -+IPV6_RECVPKTINFO = 36 -+IPV6_RECVHOPLIMIT = 37 -+IPV6_RECVRTHDR = 38 -+IPV6_RECVHOPOPTS = 39 -+IPV6_RECVDSTOPTS = 40 -+IPV6_RECVRTHDRDSTOPTS = 41 -+IPV6_USE_MIN_MTU = 42 -+IPV6_RECVPATHMTU = 43 -+IPV6_PATHMTU = 44 -+IPV6_REACHCONF = 45 -+IPV6_PKTINFO = 46 -+IPV6_HOPLIMIT = 47 -+IPV6_NEXTHOP = 48 -+IPV6_HOPOPTS = 49 -+IPV6_DSTOPTS = 50 -+IPV6_RTHDR = 51 -+IPV6_PKTOPTIONS = 52 -+IPV6_RECVTCLASS = 57 -+IPV6_AUTOFLOWLABEL = 59 -+IPV6_TCLASS = 61 -+IPV6_DONTFRAG = 62 -+IPV6_PREFER_TEMPADDR = 63 -+IPV6_RTHDR_LOOSE = 0 -+IPV6_RTHDR_STRICT = 1 -+IPV6_RTHDR_TYPE_0 = 0 -+IPV6_DEFAULT_MULTICAST_HOPS = 1 -+IPV6_DEFAULT_MULTICAST_LOOP = 1 -+IPV6_PORTRANGE_DEFAULT = 0 -+IPV6_PORTRANGE_HIGH = 1 -+IPV6_PORTRANGE_LOW = 2 -+IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -+IPV6CTL_FORWARDING = 1 -+IPV6CTL_SENDREDIRECTS = 2 -+IPV6CTL_DEFHLIM = 3 -+IPV6CTL_DEFMTU = 4 -+IPV6CTL_FORWSRCRT = 5 -+IPV6CTL_STATS = 6 -+IPV6CTL_MRTSTATS = 7 -+IPV6CTL_MRTPROTO = 8 -+IPV6CTL_MAXFRAGPACKETS = 9 -+IPV6CTL_SOURCECHECK = 10 -+IPV6CTL_SOURCECHECK_LOGINT = 11 -+IPV6CTL_ACCEPT_RTADV = 12 -+IPV6CTL_KEEPFAITH = 13 -+IPV6CTL_LOG_INTERVAL = 14 -+IPV6CTL_HDRNESTLIMIT = 15 -+IPV6CTL_DAD_COUNT = 16 -+IPV6CTL_AUTO_FLOWLABEL = 17 -+IPV6CTL_DEFMCASTHLIM = 18 -+IPV6CTL_GIF_HLIM = 19 -+IPV6CTL_KAME_VERSION = 20 -+IPV6CTL_USE_DEPRECATED = 21 -+IPV6CTL_RR_PRUNE = 22 -+IPV6CTL_MAPPED_ADDR = 23 -+IPV6CTL_V6ONLY = 24 -+IPV6CTL_RTEXPIRE = 25 -+IPV6CTL_RTMINEXPIRE = 26 -+IPV6CTL_RTMAXCACHE = 27 -+IPV6CTL_USETEMPADDR = 32 -+IPV6CTL_TEMPPLTIME = 33 -+IPV6CTL_TEMPVLTIME = 34 -+IPV6CTL_AUTO_LINKLOCAL = 35 -+IPV6CTL_RIP6STATS = 36 -+IPV6CTL_PREFER_TEMPADDR = 37 -+IPV6CTL_ADDRCTLPOLICY = 38 -+IPV6CTL_MAXFRAGS = 41 -+IPV6CTL_MAXID = 42 diff --git a/lang/python32/files/patch-configure b/lang/python32/files/patch-configure deleted file mode 100644 index 9ed971ab4be7..000000000000 --- a/lang/python32/files/patch-configure +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.orig Sat Oct 4 13:27:50 2003 -+++ configure Sat Oct 4 13:29:05 2003 -@@ -1321,7 +1321,7 @@ - VERSION=2.4 - - --SOVERSION=1.0 -+SOVERSION=1 - - # The later defininition of _XOPEN_SOURCE disables certain features - # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). -@@ -3396,6 +3396,12 @@ - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -+ INSTSONAME="$LDLIBRARY".$SOVERSION -+ ;; -+ FreeBSD*) -+ LDLIBRARY='libpython$(VERSION).so' -+ BLDLIBRARY='-L. -lpython$(VERSION)' -+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; - hp*|HP*) diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist index 0c4ef402b2a4..2da321c50218 100644 --- a/lang/python32/pkg-plist +++ b/lang/python32/pkg-plist @@ -495,6 +495,27 @@ lib/%%PYTHON_VERSION%%/distutils/spawn.pyo lib/%%PYTHON_VERSION%%/distutils/sysconfig.py lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyc lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.py +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/support.py +lib/%%PYTHON_VERSION%%/distutils/tests/support.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/support.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyo lib/%%PYTHON_VERSION%%/distutils/text_file.py lib/%%PYTHON_VERSION%%/distutils/text_file.pyc lib/%%PYTHON_VERSION%%/distutils/text_file.pyo @@ -630,6 +651,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_39.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_41.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_42.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_43.txt lib/%%PYTHON_VERSION%%/email/test/test_email.py lib/%%PYTHON_VERSION%%/email/test/test_email.pyc lib/%%PYTHON_VERSION%%/email/test/test_email.pyo @@ -1337,15 +1359,24 @@ lib/%%PYTHON_VERSION%%/lib-old/poly.pyo lib/%%PYTHON_VERSION%%/lib-old/rand.py lib/%%PYTHON_VERSION%%/lib-old/rand.pyc lib/%%PYTHON_VERSION%%/lib-old/rand.pyo +lib/%%PYTHON_VERSION%%/lib-old/statcache.py +lib/%%PYTHON_VERSION%%/lib-old/statcache.pyc +lib/%%PYTHON_VERSION%%/lib-old/statcache.pyo lib/%%PYTHON_VERSION%%/lib-old/tb.py lib/%%PYTHON_VERSION%%/lib-old/tb.pyc lib/%%PYTHON_VERSION%%/lib-old/tb.pyo +lib/%%PYTHON_VERSION%%/lib-old/tzparse.py +lib/%%PYTHON_VERSION%%/lib-old/tzparse.pyc +lib/%%PYTHON_VERSION%%/lib-old/tzparse.pyo lib/%%PYTHON_VERSION%%/lib-old/util.py lib/%%PYTHON_VERSION%%/lib-old/util.pyc lib/%%PYTHON_VERSION%%/lib-old/util.pyo lib/%%PYTHON_VERSION%%/lib-old/whatsound.py lib/%%PYTHON_VERSION%%/lib-old/whatsound.pyc lib/%%PYTHON_VERSION%%/lib-old/whatsound.pyo +lib/%%PYTHON_VERSION%%/lib-old/whrandom.py +lib/%%PYTHON_VERSION%%/lib-old/whrandom.pyc +lib/%%PYTHON_VERSION%%/lib-old/whrandom.pyo lib/%%PYTHON_VERSION%%/lib-old/zmod.py lib/%%PYTHON_VERSION%%/lib-old/zmod.pyc lib/%%PYTHON_VERSION%%/lib-old/zmod.pyo @@ -1528,7 +1559,6 @@ lib/%%PYTHON_VERSION%%/posixpath.pyo lib/%%PYTHON_VERSION%%/pprint.py lib/%%PYTHON_VERSION%%/pprint.pyc lib/%%PYTHON_VERSION%%/pprint.pyo -lib/%%PYTHON_VERSION%%/profile.doc lib/%%PYTHON_VERSION%%/profile.py lib/%%PYTHON_VERSION%%/profile.pyc lib/%%PYTHON_VERSION%%/profile.pyo @@ -1629,9 +1659,6 @@ lib/%%PYTHON_VERSION%%/sre_parse.pyo lib/%%PYTHON_VERSION%%/stat.py lib/%%PYTHON_VERSION%%/stat.pyc lib/%%PYTHON_VERSION%%/stat.pyo -lib/%%PYTHON_VERSION%%/statcache.py -lib/%%PYTHON_VERSION%%/statcache.pyc -lib/%%PYTHON_VERSION%%/statcache.pyo lib/%%PYTHON_VERSION%%/statvfs.py lib/%%PYTHON_VERSION%%/statvfs.pyc lib/%%PYTHON_VERSION%%/statvfs.pyo @@ -1729,6 +1756,12 @@ lib/%%PYTHON_VERSION%%/test/double_const.py lib/%%PYTHON_VERSION%%/test/double_const.pyc lib/%%PYTHON_VERSION%%/test/double_const.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue +lib/%%PYTHON_VERSION%%/test/inspect_fodder.py +lib/%%PYTHON_VERSION%%/test/inspect_fodder.pyc +lib/%%PYTHON_VERSION%%/test/inspect_fodder.pyo +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.py +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.pyc +lib/%%PYTHON_VERSION%%/test/inspect_fodder2.pyo lib/%%PYTHON_VERSION%%/test/list_tests.py lib/%%PYTHON_VERSION%%/test/list_tests.pyc lib/%%PYTHON_VERSION%%/test/list_tests.pyo @@ -2062,6 +2095,7 @@ lib/%%PYTHON_VERSION%%/test/test_doctest2.py lib/%%PYTHON_VERSION%%/test/test_doctest2.pyc lib/%%PYTHON_VERSION%%/test/test_doctest2.pyo lib/%%PYTHON_VERSION%%/test/test_doctest2.txt +lib/%%PYTHON_VERSION%%/test/test_doctest3.txt lib/%%PYTHON_VERSION%%/test/test_dumbdbm.py lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyc lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo @@ -2751,9 +2785,6 @@ lib/%%PYTHON_VERSION%%/tty.pyo lib/%%PYTHON_VERSION%%/types.py lib/%%PYTHON_VERSION%%/types.pyc lib/%%PYTHON_VERSION%%/types.pyo -lib/%%PYTHON_VERSION%%/tzparse.py -lib/%%PYTHON_VERSION%%/tzparse.pyc -lib/%%PYTHON_VERSION%%/tzparse.pyo lib/%%PYTHON_VERSION%%/unittest.py lib/%%PYTHON_VERSION%%/unittest.pyc lib/%%PYTHON_VERSION%%/unittest.pyo @@ -2787,9 +2818,6 @@ lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo -lib/%%PYTHON_VERSION%%/whrandom.py -lib/%%PYTHON_VERSION%%/whrandom.pyc -lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo @@ -3157,6 +3185,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/win32.html %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/makelocalealias.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.py @@ -3188,6 +3217,14 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/modulator.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/README.txt +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msi.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msilib.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.c +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.mak +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/schema.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/sequence.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/uisample.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py @@ -3292,6 +3329,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/scripts %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche/X %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche +%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/msi %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator/Templates %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/i18n @@ -3354,6 +3392,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo @dirrm lib/%%PYTHON_VERSION%%/email/test/data @dirrm lib/%%PYTHON_VERSION%%/email/test @dirrm lib/%%PYTHON_VERSION%%/email +@dirrm lib/%%PYTHON_VERSION%%/distutils/tests @dirrm lib/%%PYTHON_VERSION%%/distutils/command @dirrm lib/%%PYTHON_VERSION%%/distutils @dirrm lib/%%PYTHON_VERSION%%/curses |