20 files changed, 86 insertions, 3678 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 844add380cf3..fb76524ce3ec 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -31,7 +31,7 @@ DISTFILES+=	${CWSARCHIVE}:cws
 .endif
 CWSARCHIVE=	${WITH_CWS}.tar.gz
 
-OOOVERSION=	3.0.1
+OOOVERSION=	3.1.0
 NO_LATEST_LINK=	yes
 USE_GNOME=	desktopfileutils gtk20
 MOZILLA_VERSION=	1.7.5
@@ -72,8 +72,8 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		15
-OOOTAG?=		OOO300_m${MILESTONE}
+MILESTONE?=		11
+OOOTAG?=		OOO310_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
@@ -132,7 +132,6 @@ LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 USE_BISON=	build
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
-CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 MAXPROCESSES?=	1
@@ -176,7 +175,13 @@ pre-everything::
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
+#issue XXXXXX not raised yet...
+CRLFFILES=curl/curl*patch neon/neon*patch
+
 post-extract:
+	for i in ${CRLFFILES};  do \
+		cd ${WRKSRC} ; ${REINPLACE_CMD} -e 's#
##g' $$i ; \
+	done
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
 .if defined(WITH_CWS)
 	cd ${WRKSRC} ; ${TAR} xvfz ${DISTDIR}/${DIST_SUBDIR}/${CWSARCHIVE}
@@ -189,6 +194,7 @@ post-extract:
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
+
 pre-configure:
 #Workaround for gperf. #i85469#
 	@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 834c7a7ca68d..d1276562a517 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_OOO300_m15_source.tar.bz2) = 97923bc2f9d98ffec7863f1170ef4291
-SHA256 (openoffice.org3/OOo_OOO300_m15_source.tar.bz2) = dcd6ca79fe264608a4d3089a7de06eaa57bd897f7071a546e40ac2b5ab951dce
-SIZE (openoffice.org3/OOo_OOO300_m15_source.tar.bz2) = 335188535
+MD5 (openoffice.org3/OOo_OOO310_m11_source.tar.bz2) = 7f8a9dd05f2bb8449447cca02a54891b
+SHA256 (openoffice.org3/OOo_OOO310_m11_source.tar.bz2) = 77a5c868b3dcfdfd4439727b491f6724d86fee318ae706e287bfb4159203dd55
+SIZE (openoffice.org3/OOo_OOO310_m11_source.tar.bz2) = 407464693
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index c1a56b9ed2a3..e1053db6682d 100644
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/files/Makefile.knobs
@@ -23,10 +23,10 @@ CONFIGURE_ARGS+=	--disable-mozilla
 CONFIGURE_ARGS+=	--enable-build-mozilla
 .endif
 
-.if defined(WITHOUT_GNOMEVFS)
-CONFIGURE_ARGS+=	--disable-gnome-vfs
+.if defined(WITHOUT_GNOME)
+CONFIGURE_ARGS+=	--disable-gconf --disable-gnome-vfs
 .else
-USE_GNOME+=		gnomevfs2
+USE_GNOME+=		gconf2 gnomevfs2
 .endif
 
 .if defined(WITH_EVOLUTION2)
@@ -69,10 +69,10 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without Mozilla connectivity with"
 	@${ECHO} "make -DWITHOUT_MOZILLA"
 .endif
-.if !defined(WITHOUT_GNOMEVFS)
+.if !defined(WITHOUT_GNOME)
 	@${ECHO}
 	@${ECHO} "You can compile OOo without gnome VFS support with"
-	@${ECHO} "make -DWITHOUT_GNOMEVFS"
+	@${ECHO} "make -DWITHOUT_GNOME"
 .endif
 .if !defined(WITH_SYSTEM_ICU)
 	@${ECHO}
diff --git a/editors/openoffice-3/files/patch-i101333 b/editors/openoffice-3/files/patch-i101333
new file mode 100644
index 000000000000..1e65c0ed1843
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i101333
@@ -0,0 +1,11 @@
+--- openssl/makefile.mk~	2009-04-25 09:42:18.000000000 +0900
++++ openssl/makefile.mk	2009-04-25 13:00:45.000000000 +0900
+@@ -65,7 +65,7 @@
+ OUT2LIB += libcrypto.*
+ OUT2INC += include/openssl/*
+ 
+-.IF "$(OS)" == "LINUX"
++.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
+ 	PATCH_FILE_NAME=openssllnx.patch
+ 	ADDITIONAL_FILES:= \
+ 		libcrypto_OOo_0_9_8k.map \
diff --git a/editors/openoffice-3/files/patch-i84586 b/editors/openoffice-3/files/patch-i84586
deleted file mode 100644
index 7b624c3f77f1..000000000000
--- a/editors/openoffice-3/files/patch-i84586
+++ /dev/null
@@ -1,43 +0,0 @@
-? sc/unxfbsdi.pro
-Index: sc/source/ui/vba/vbaaxis.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/vba/vbaaxis.cxx,v
-retrieving revision 1.2
-diff -u -r1.2 vbaaxis.cxx
---- sc/source/ui/vba/vbaaxis.cxx	7 Dec 2007 10:43:48 -0000	1.2
-+++ sc/source/ui/vba/vbaaxis.cxx	14 Dec 2007 23:40:31 -0000
-@@ -47,8 +47,8 @@
- 
- const rtl::OUString ORIGIN( RTL_CONSTASCII_USTRINGPARAM("Origin") );
- const rtl::OUString AUTOORIGIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
--const rtl::OUString MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
--const rtl::OUString MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
-+const rtl::OUString VBA_MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
-+const rtl::OUString VBA_MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
- ScVbaChart* 
- ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
- {
-@@ -142,12 +142,12 @@
- 				bCrossesAreCustomized = sal_False;
- 				return;
- 			case xlAxisCrossesMinimum:                     // The axis crosses at the minimum value. 
--				mxPropertySet->getPropertyValue(MIN) >>= fNum;
-+				mxPropertySet->getPropertyValue(VBA_MIN) >>= fNum;
- 				setCrossesAt( fNum );
- 				bCrossesAreCustomized = sal_False;
- 				break;
- 			case xlAxisCrossesMaximum:                     // The axis crosses at the maximum value. 
--				mxPropertySet->getPropertyValue(MAX) >>= fNum;
-+				mxPropertySet->getPropertyValue(VBA_MAX) >>= fNum;
- 				setCrossesAt(fNum);
- 				bCrossesAreCustomized = sal_False;
- 				break;
-@@ -182,7 +182,7 @@
- 				mxPropertySet->getPropertyValue(ORIGIN) >>= forigin;
- //obsolete      double fmax = AnyConverter.toDouble(mxPropertySet.getPropertyValue("Max"));
- 				double fmin = 0.0;
--				mxPropertySet->getPropertyValue(MIN) >>= fmin;
-+				mxPropertySet->getPropertyValue(VBA_MIN) >>= fmin;
- 				if (forigin == fmin)
- 					nCrosses = xlAxisCrossesMinimum;
- 				else
diff --git a/editors/openoffice-3/files/patch-i85127 b/editors/openoffice-3/files/patch-i85127
deleted file mode 100644
index 75f41e93f555..000000000000
--- a/editors/openoffice-3/files/patch-i85127
+++ /dev/null
@@ -1,1659 +0,0 @@
-- Add support for FreeBSD 8.x.
-- Add patches for setup.py and Lib/posixfile.py.
-
-Index: Python-2.3.4.patch
-===================================================================
-RCS file: /cvs/external/python/Python-2.3.4.patch,v
-retrieving revision 1.22
-diff -u -r1.22 Python-2.3.4.patch
---- python/Python-2.3.4.patch	9 Jun 2008 13:04:49 -0000	1.22
-+++ python/Python-2.3.4.patch	14 Jun 2008 01:41:01 -0000
-@@ -14661,3 +14661,1648 @@
-  
-  /* Define the macros needed if on a UnixWare 7.x system. */
-  #if defined(__USLC__) && defined(__SCO_VERSION__)
-+*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py	Wed Dec 31 19:00:00 1969
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py	Tue Jan  8 14:12:12 2008
-+***************
-+*** 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
-+*** misc/Python-2.3.4/Lib/plat-freebsd7/IN.py	Wed Dec 31 19:00:00 1969
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/IN.py	Tue Jan  8 14:13:03 2008
-+***************
-+*** 0 ****
-+--- 1,535 ----
-++ # Generated by h2py from /usr/include/netinet/in.h
-++ 
-++ # Included from sys/cdefs.h
-++ __GNUCLIKE_ASM = 3
-++ __GNUCLIKE_ASM = 2
-++ __GNUCLIKE___TYPEOF = 1
-++ __GNUCLIKE___OFFSETOF = 1
-++ __GNUCLIKE___SECTION = 1
-++ __GNUCLIKE_ATTRIBUTE_MODE_DI = 1
-++ __GNUCLIKE_CTOR_SECTION_HANDLING = 1
-++ __GNUCLIKE_BUILTIN_CONSTANT_P = 1
-++ __GNUCLIKE_BUILTIN_VARARGS = 1
-++ __GNUCLIKE_BUILTIN_VAALIST = 1
-++ __GNUC_VA_LIST_COMPATIBILITY = 1
-++ __GNUCLIKE_BUILTIN_STDARG = 1
-++ __GNUCLIKE_BUILTIN_NEXT_ARG = 1
-++ __GNUCLIKE_BUILTIN_MEMCPY = 1
-++ __CC_SUPPORTS_INLINE = 1
-++ __CC_SUPPORTS___INLINE = 1
-++ __CC_SUPPORTS___INLINE__ = 1
-++ __CC_SUPPORTS___FUNC__ = 1
-++ __CC_SUPPORTS_WARNING = 1
-++ __CC_SUPPORTS_VARADIC_XXX = 1
-++ __CC_SUPPORTS_DYNAMIC_ARRAY_INIT = 1
-++ __CC_INT_IS_32BIT = 1
-++ 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
-++ 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_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_CARP = 112
-++ IPPROTO_PGM = 113
-++ IPPROTO_PFSYNC = 240
-++ IPPROTO_OLD_DIVERT = 254
-++ IPPROTO_MAX = 256
-++ IPPROTO_DONE = 257
-++ IPPROTO_DIVERT = 258
-++ IPPROTO_SPACER = 32767
-++ 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
-+*** misc/Python-2.3.4/Lib/plat-freebsd8/IN.py	Wed Dec 31 19:00:00 1969
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd8/IN.py	Tue Jan  8 14:13:22 2008
-+***************
-+*** 0 ****
-+--- 1,535 ----
-++ # Generated by h2py from /usr/include/netinet/in.h
-++ 
-++ # Included from sys/cdefs.h
-++ __GNUCLIKE_ASM = 3
-++ __GNUCLIKE_ASM = 2
-++ __GNUCLIKE___TYPEOF = 1
-++ __GNUCLIKE___OFFSETOF = 1
-++ __GNUCLIKE___SECTION = 1
-++ __GNUCLIKE_ATTRIBUTE_MODE_DI = 1
-++ __GNUCLIKE_CTOR_SECTION_HANDLING = 1
-++ __GNUCLIKE_BUILTIN_CONSTANT_P = 1
-++ __GNUCLIKE_BUILTIN_VARARGS = 1
-++ __GNUCLIKE_BUILTIN_VAALIST = 1
-++ __GNUC_VA_LIST_COMPATIBILITY = 1
-++ __GNUCLIKE_BUILTIN_STDARG = 1
-++ __GNUCLIKE_BUILTIN_NEXT_ARG = 1
-++ __GNUCLIKE_BUILTIN_MEMCPY = 1
-++ __CC_SUPPORTS_INLINE = 1
-++ __CC_SUPPORTS___INLINE = 1
-++ __CC_SUPPORTS___INLINE__ = 1
-++ __CC_SUPPORTS___FUNC__ = 1
-++ __CC_SUPPORTS_WARNING = 1
-++ __CC_SUPPORTS_VARADIC_XXX = 1
-++ __CC_SUPPORTS_DYNAMIC_ARRAY_INIT = 1
-++ __CC_INT_IS_32BIT = 1
-++ 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
-++ 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_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_CARP = 112
-++ IPPROTO_PGM = 113
-++ IPPROTO_PFSYNC = 240
-++ IPPROTO_OLD_DIVERT = 254
-++ IPPROTO_MAX = 256
-++ IPPROTO_DONE = 257
-++ IPPROTO_DIVERT = 258
-++ IPPROTO_SPACER = 32767
-++ 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
-+*** misc/Python-2.3.4/Lib/posixfile.py	Wed Oct 24 18:03:35 2001
-+--- misc/build/Python-2.3.4/Lib/posixfile.py	Tue Jan  8 14:16:12 2008
-+***************
-+*** 185,191 ****
-+          if sys.platform in ('netbsd1',
-+                              'openbsd2',
-+                              'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
-+!                             'bsdos2', 'bsdos3', 'bsdos4'):
-+              flock = struct.pack('lxxxxlxxxxlhh', \
-+                    l_start, l_len, os.getpid(), l_type, l_whence)
-+          elif sys.platform in ['aix3', 'aix4']:
-+--- 185,191 ----
-+          if sys.platform in ('netbsd1',
-+                              'openbsd2',
-+                              'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
-+!                             'freebsd6', 'freebsd7', 'freebsd8', 'bsdos2', 'bsdos3', 'bsdos4'):
-+              flock = struct.pack('lxxxxlxxxxlhh', \
-+                    l_start, l_len, os.getpid(), l_type, l_whence)
-+          elif sys.platform in ['aix3', 'aix4']:
-+*** misc/Python-2.3.4/Mac/OSX/Makefile	Tue Nov  4 23:45:16 2003
-+--- misc/build/Python-2.3.4/Mac/OSX/Makefile	Tue Jan 15 12:11:51 2008
-+***************
-+@ -15547,3 +17166,22 @@
-+  
-+  /* Define the macros needed if on a UnixWare 7.x system. */
-+  #if defined(__USLC__) && defined(__SCO_VERSION__)
-+*** misc/Python-2.3.4/setup.py	Tue Oct 21 16:01:21 2003
-+--- misc/build/Python-2.3.4/setup.py	Tue Jan  8 14:17:55 2008
-+***************
-+*** 770,776 ****
-+              # Linux-specific modules
-+              exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
-+  
-+!         if platform in ('linux2', 'freebsd4'):
-+              exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
-+  
-+          if platform == 'sunos5':
-+--- 770,776 ----
-+              # Linux-specific modules
-+              exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
-+  
-+!         if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-+              exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
-+  
-+          if platform == 'sunos5':
diff --git a/editors/openoffice-3/files/patch-i85972 b/editors/openoffice-3/files/patch-i85972
index 931cbb8c535d..9a87976fcbb1 100644
--- a/editors/openoffice-3/files/patch-i85972
+++ b/editors/openoffice-3/files/patch-i85972
@@ -31,23 +31,19 @@ diff -u -r1.4 lp_solve_5.5.patch
 ++fi
 ++
 ++rm *.o 2>/dev/null
-Index: lpsolve/makefile.mk
-===================================================================
-RCS file: /cvs/external/lpsolve/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- lpsolve/makefile.mk	11 Apr 2008 07:18:41 -0000	1.5
-+++ lpsolve/makefile.mk	3 Jul 2008 00:20:53 -0000
+
+--- lpsolve/makefile.mk.orig	2008-12-24 09:40:11.000000000 +0900
++++ lpsolve/makefile.mk	2008-12-24 12:09:06.000000000 +0900
 @@ -46,7 +46,7 @@
  PATCH_FILE_NAME=lp_solve_5.5-windows.patch
  .ELSE
  PATCH_FILE_NAME=lp_solve_5.5.patch
--ADDITIONAL_FILES=lpsolve55$/ccc.solaris
-+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.freebsd
+-ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2
++ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 lpsolve55$/ccc.freebsd
  .ENDIF
  
  CONFIGURE_DIR=
-@@ -70,11 +70,16 @@
+@@ -73,11 +73,16 @@
  .IF "$(COMNAME)"=="sunpro5"
  BUILD_ACTION=sh ccc.solaris
  .ELSE
diff --git a/editors/openoffice-3/files/patch-i87583 b/editors/openoffice-3/files/patch-i87583
index e82f268d7ad0..750935a3030b 100644
--- a/editors/openoffice-3/files/patch-i87583
+++ b/editors/openoffice-3/files/patch-i87583
@@ -1,17 +1,3 @@
---- configmgr/source/cmdtools/setofficelang.sh.orig	2008-06-09 08:42:48.000000000 -0400
-+++ configmgr/source/cmdtools/setofficelang.sh	2008-06-27 15:47:37.000000000 -0400
-@@ -75,6 +75,11 @@
-     export DYLD_LIBRARY_PATH
-     ;;
- 
-+  FreeBSD)
-+    LD_LIBRARY_PATH=${sd_prog}:${sd_prog}/../ure-link/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
-+    export LD_LIBRARY_PATH
-+    ;;
-+
-   HP-UX)
-     SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH+:${SHLIB_PATH}}
-     export SHLIB_PATH
 --- desktop/scripts/soffice.sh.orig	2008-06-09 08:57:10.000000000 -0400
 +++ desktop/scripts/soffice.sh	2008-06-27 16:12:58.000000000 -0400
 @@ -75,6 +75,15 @@
diff --git a/editors/openoffice-3/files/patch-i91318 b/editors/openoffice-3/files/patch-i91318
index d04fef781b9c..dd4b2f2ea7c3 100644
--- a/editors/openoffice-3/files/patch-i91318
+++ b/editors/openoffice-3/files/patch-i91318
@@ -1,16 +1,11 @@
-Index: hunspell/hunspell-1.1.12.patch
-===================================================================
-RCS file: /cvs/external/hunspell/hunspell-1.1.12.patch,v
-retrieving revision 1.12
-diff -u -r1.12 hunspell-1.1.12.patch
---- hunspell/hunspell-1.1.12.patch	2 Jul 2008 09:46:59 -0000	1.12
-+++ hunspell/hunspell-1.1.12.patch	10 Aug 2008 01:02:29 -0000
-@@ -487,3 +487,11 @@
-  i68568utf.test \
-  1706659.test \
-  digits_in_words.test \
-+--- misc/hunspell-1.1.12/tests/test.sh	2007-07-15 22:33:13.000000000 +0900
-++++ misc/build/hunspell-1.1.12/tests/test.sh	2008-08-10 10:00:33.000000000 +0900
+--- hunspell/hunspell-1.2.8.patch~	2009-02-21 08:52:35.000000000 +0900
++++ hunspell/hunspell-1.2.8.patch	2009-03-05 09:30:33.000000000 +0900
+@@ -619,3 +619,11 @@
+              p++;
+          }
+          if (i > 0 && buf[i - 1] == '\n') {
++--- misc/hunspell-1.2.8/tests/test.sh	2007-07-15 22:33:13.000000000 +0900
+++++ misc/build/hunspell-1.2.8/tests/test.sh	2008-08-10 10:00:33.000000000 +0900
 +@@ -1,4 +1,4 @@
 +-#!/bin/bash
 ++#!/usr/bin/env bash
diff --git a/editors/openoffice-3/files/patch-i93235 b/editors/openoffice-3/files/patch-i93235
deleted file mode 100644
index a581a2c34afd..000000000000
--- a/editors/openoffice-3/files/patch-i93235
+++ /dev/null
@@ -1,88 +0,0 @@
-Add support for Diablo JDK 1.6.0 and above.
-
---- /dev/null	2008-08-27 17:05:37.000000000 -0400
-+++ jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml	2008-08-27 17:20:55.000000000 -0400
-@@ -0,0 +1,38 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+
-+<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
-+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-+ 
-+ <updated>2008-08-27</updated>
-+ 
-+ <vendorInfos> 
-+  <vendor name="Sun Microsystems Inc.">
-+    <minVersion>1.3.1</minVersion>
-+  </vendor>
-+  <vendor name="The FreeBSD Foundation">
-+    <minVersion>1.6.0</minVersion>
-+  </vendor>
-+  <vendor name="IBM Corporation">
-+    <minVersion>1.3.1</minVersion>
-+    <maxVersion>1.4.2</maxVersion>
-+  </vendor>
-+  <vendor name="Blackdown Java-Linux Team">
-+    <minVersion>1.3.1</minVersion>
-+  </vendor>
-+  <vendor name="Free Software Foundation, Inc.">
-+    <minVersion>1.4.2</minVersion>
-+  </vendor>
-+  <vendor name="BEA Systems, Inc.">
-+    <minVersion>1.4.1</minVersion>
-+  </vendor>
-+ </vendorInfos>
-+
-+ <plugins>
-+  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+  <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+  <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+  <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+  <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+  <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+ </plugins>
-+</javaSelection>
---- jvmfwk/distributions/OpenOfficeorg/makefile.mk.orig	2008-04-11 06:16:59.000000000 -0400
-+++ jvmfwk/distributions/OpenOfficeorg/makefile.mk	2008-08-27 17:09:45.000000000 -0400
-@@ -43,9 +43,11 @@
- .IF "$(SOLAR_JAVA)"!=""
- $(BIN)$/javavendors.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_macosx.xml javavendors_linux.xml
- .IF "$(GUI)"=="UNX"
--.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="FREEBSD"
-+	-$(COPY) javavendors_freebsd.xml $(BIN)$/javavendors.xml
-+.ELIF "$(OS)"=="MACOSX"
- 	-$(COPY) javavendors_macosx.xml $(BIN)$/javavendors.xml
--.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
-+.ELIF "$(OS)"=="LINUX"
- 	-$(COPY) javavendors_linux.xml $(BIN)$/javavendors.xml
- .ELSE
- 	-$(COPY) javavendors_unx.xml $(BIN)$/javavendors.xml
---- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx.orig	2008-04-11 06:19:31.000000000 -0400
-+++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx	2008-08-27 17:19:35.000000000 -0400
-@@ -128,13 +128,15 @@
-     rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("Apple Computer, Inc."));
-     rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc."));
-     rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc."));
-+    rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation"));
-     if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True
-             || sVendor2.equals(pInfo->sVendor) == sal_True
-             || sVendor3.equals(pInfo->sVendor) == sal_True
-             || sVendor4.equals(pInfo->sVendor) == sal_True
-             || sVendor5.equals(pInfo->sVendor) == sal_True
-             || sVendor6.equals(pInfo->sVendor) == sal_True
--	    || sVendor7.equals(pInfo->sVendor) == sal_True))
-+            || sVendor7.equals(pInfo->sVendor) == sal_True
-+            || sVendor8.equals(pInfo->sVendor) == sal_True))
-         return 0;
-     
-     rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
---- jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx.orig	2008-04-11 06:24:39.000000000 -0400
-+++ jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx	2008-08-27 17:13:00.000000000 -0400
-@@ -56,6 +56,7 @@
-     VENDOR_MAP_ENTRY("Apple Computer, Inc.", OtherInfo)
-     VENDOR_MAP_ENTRY("BEA Systems, Inc.", OtherInfo)
-     VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo)
-+    VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo)
- END_VENDOR_MAP()    
- 
- 
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 844add380cf3..fb76524ce3ec 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -31,7 +31,7 @@ DISTFILES+=	${CWSARCHIVE}:cws
 .endif
 CWSARCHIVE=	${WITH_CWS}.tar.gz
 
-OOOVERSION=	3.0.1
+OOOVERSION=	3.1.0
 NO_LATEST_LINK=	yes
 USE_GNOME=	desktopfileutils gtk20
 MOZILLA_VERSION=	1.7.5
@@ -72,8 +72,8 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		15
-OOOTAG?=		OOO300_m${MILESTONE}
+MILESTONE?=		11
+OOOTAG?=		OOO310_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
@@ -132,7 +132,6 @@ LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 USE_BISON=	build
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
-CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 MAXPROCESSES?=	1
@@ -176,7 +175,13 @@ pre-everything::
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
+#issue XXXXXX not raised yet...
+CRLFFILES=curl/curl*patch neon/neon*patch
+
 post-extract:
+	for i in ${CRLFFILES};  do \
+		cd ${WRKSRC} ; ${REINPLACE_CMD} -e 's#
##g' $$i ; \
+	done
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
 .if defined(WITH_CWS)
 	cd ${WRKSRC} ; ${TAR} xvfz ${DISTDIR}/${DIST_SUBDIR}/${CWSARCHIVE}
@@ -189,6 +194,7 @@ post-extract:
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
+
 pre-configure:
 #Workaround for gperf. #i85469#
 	@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 834c7a7ca68d..d1276562a517 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_OOO300_m15_source.tar.bz2) = 97923bc2f9d98ffec7863f1170ef4291
-SHA256 (openoffice.org3/OOo_OOO300_m15_source.tar.bz2) = dcd6ca79fe264608a4d3089a7de06eaa57bd897f7071a546e40ac2b5ab951dce
-SIZE (openoffice.org3/OOo_OOO300_m15_source.tar.bz2) = 335188535
+MD5 (openoffice.org3/OOo_OOO310_m11_source.tar.bz2) = 7f8a9dd05f2bb8449447cca02a54891b
+SHA256 (openoffice.org3/OOo_OOO310_m11_source.tar.bz2) = 77a5c868b3dcfdfd4439727b491f6724d86fee318ae706e287bfb4159203dd55
+SIZE (openoffice.org3/OOo_OOO310_m11_source.tar.bz2) = 407464693
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3/files/Makefile.knobs b/editors/openoffice.org-3/files/Makefile.knobs
index c1a56b9ed2a3..e1053db6682d 100644
--- a/editors/openoffice.org-3/files/Makefile.knobs
+++ b/editors/openoffice.org-3/files/Makefile.knobs
@@ -23,10 +23,10 @@ CONFIGURE_ARGS+=	--disable-mozilla
 CONFIGURE_ARGS+=	--enable-build-mozilla
 .endif
 
-.if defined(WITHOUT_GNOMEVFS)
-CONFIGURE_ARGS+=	--disable-gnome-vfs
+.if defined(WITHOUT_GNOME)
+CONFIGURE_ARGS+=	--disable-gconf --disable-gnome-vfs
 .else
-USE_GNOME+=		gnomevfs2
+USE_GNOME+=		gconf2 gnomevfs2
 .endif
 
 .if defined(WITH_EVOLUTION2)
@@ -69,10 +69,10 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without Mozilla connectivity with"
 	@${ECHO} "make -DWITHOUT_MOZILLA"
 .endif
-.if !defined(WITHOUT_GNOMEVFS)
+.if !defined(WITHOUT_GNOME)
 	@${ECHO}
 	@${ECHO} "You can compile OOo without gnome VFS support with"
-	@${ECHO} "make -DWITHOUT_GNOMEVFS"
+	@${ECHO} "make -DWITHOUT_GNOME"
 .endif
 .if !defined(WITH_SYSTEM_ICU)
 	@${ECHO}
diff --git a/editors/openoffice.org-3/files/patch-i101333 b/editors/openoffice.org-3/files/patch-i101333
new file mode 100644
index 000000000000..1e65c0ed1843
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i101333
@@ -0,0 +1,11 @@
+--- openssl/makefile.mk~	2009-04-25 09:42:18.000000000 +0900
++++ openssl/makefile.mk	2009-04-25 13:00:45.000000000 +0900
+@@ -65,7 +65,7 @@
+ OUT2LIB += libcrypto.*
+ OUT2INC += include/openssl/*
+ 
+-.IF "$(OS)" == "LINUX"
++.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
+ 	PATCH_FILE_NAME=openssllnx.patch
+ 	ADDITIONAL_FILES:= \
+ 		libcrypto_OOo_0_9_8k.map \
diff --git a/editors/openoffice.org-3/files/patch-i84586 b/editors/openoffice.org-3/files/patch-i84586
deleted file mode 100644
index 7b624c3f77f1..000000000000
--- a/editors/openoffice.org-3/files/patch-i84586
+++ /dev/null
@@ -1,43 +0,0 @@
-? sc/unxfbsdi.pro
-Index: sc/source/ui/vba/vbaaxis.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/vba/vbaaxis.cxx,v
-retrieving revision 1.2
-diff -u -r1.2 vbaaxis.cxx
---- sc/source/ui/vba/vbaaxis.cxx	7 Dec 2007 10:43:48 -0000	1.2
-+++ sc/source/ui/vba/vbaaxis.cxx	14 Dec 2007 23:40:31 -0000
-@@ -47,8 +47,8 @@
- 
- const rtl::OUString ORIGIN( RTL_CONSTASCII_USTRINGPARAM("Origin") );
- const rtl::OUString AUTOORIGIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
--const rtl::OUString MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
--const rtl::OUString MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
-+const rtl::OUString VBA_MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
-+const rtl::OUString VBA_MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
- ScVbaChart* 
- ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
- {
-@@ -142,12 +142,12 @@
- 				bCrossesAreCustomized = sal_False;
- 				return;
- 			case xlAxisCrossesMinimum:                     // The axis crosses at the minimum value. 
--				mxPropertySet->getPropertyValue(MIN) >>= fNum;
-+				mxPropertySet->getPropertyValue(VBA_MIN) >>= fNum;
- 				setCrossesAt( fNum );
- 				bCrossesAreCustomized = sal_False;
- 				break;
- 			case xlAxisCrossesMaximum:                     // The axis crosses at the maximum value. 
--				mxPropertySet->getPropertyValue(MAX) >>= fNum;
-+				mxPropertySet->getPropertyValue(VBA_MAX) >>= fNum;
- 				setCrossesAt(fNum);
- 				bCrossesAreCustomized = sal_False;
- 				break;
-@@ -182,7 +182,7 @@
- 				mxPropertySet->getPropertyValue(ORIGIN) >>= forigin;
- //obsolete      double fmax = AnyConverter.toDouble(mxPropertySet.getPropertyValue("Max"));
- 				double fmin = 0.0;
--				mxPropertySet->getPropertyValue(MIN) >>= fmin;
-+				mxPropertySet->getPropertyValue(VBA_MIN) >>= fmin;
- 				if (forigin == fmin)
- 					nCrosses = xlAxisCrossesMinimum;
- 				else
diff --git a/editors/openoffice.org-3/files/patch-i85127 b/editors/openoffice.org-3/files/patch-i85127
deleted file mode 100644
index 75f41e93f555..000000000000
--- a/editors/openoffice.org-3/files/patch-i85127
+++ /dev/null
@@ -1,1659 +0,0 @@
-- Add support for FreeBSD 8.x.
-- Add patches for setup.py and Lib/posixfile.py.
-
-Index: Python-2.3.4.patch
-===================================================================
-RCS file: /cvs/external/python/Python-2.3.4.patch,v
-retrieving revision 1.22
-diff -u -r1.22 Python-2.3.4.patch
---- python/Python-2.3.4.patch	9 Jun 2008 13:04:49 -0000	1.22
-+++ python/Python-2.3.4.patch	14 Jun 2008 01:41:01 -0000
-@@ -14661,3 +14661,1648 @@
-  
-  /* Define the macros needed if on a UnixWare 7.x system. */
-  #if defined(__USLC__) && defined(__SCO_VERSION__)
-+*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py	Wed Dec 31 19:00:00 1969
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py	Tue Jan  8 14:12:12 2008
-+***************
-+*** 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
-+*** misc/Python-2.3.4/Lib/plat-freebsd7/IN.py	Wed Dec 31 19:00:00 1969
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/IN.py	Tue Jan  8 14:13:03 2008
-+***************
-+*** 0 ****
-+--- 1,535 ----
-++ # Generated by h2py from /usr/include/netinet/in.h
-++ 
-++ # Included from sys/cdefs.h
-++ __GNUCLIKE_ASM = 3
-++ __GNUCLIKE_ASM = 2
-++ __GNUCLIKE___TYPEOF = 1
-++ __GNUCLIKE___OFFSETOF = 1
-++ __GNUCLIKE___SECTION = 1
-++ __GNUCLIKE_ATTRIBUTE_MODE_DI = 1
-++ __GNUCLIKE_CTOR_SECTION_HANDLING = 1
-++ __GNUCLIKE_BUILTIN_CONSTANT_P = 1
-++ __GNUCLIKE_BUILTIN_VARARGS = 1
-++ __GNUCLIKE_BUILTIN_VAALIST = 1
-++ __GNUC_VA_LIST_COMPATIBILITY = 1
-++ __GNUCLIKE_BUILTIN_STDARG = 1
-++ __GNUCLIKE_BUILTIN_NEXT_ARG = 1
-++ __GNUCLIKE_BUILTIN_MEMCPY = 1
-++ __CC_SUPPORTS_INLINE = 1
-++ __CC_SUPPORTS___INLINE = 1
-++ __CC_SUPPORTS___INLINE__ = 1
-++ __CC_SUPPORTS___FUNC__ = 1
-++ __CC_SUPPORTS_WARNING = 1
-++ __CC_SUPPORTS_VARADIC_XXX = 1
-++ __CC_SUPPORTS_DYNAMIC_ARRAY_INIT = 1
-++ __CC_INT_IS_32BIT = 1
-++ 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
-++ 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_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_CARP = 112
-++ IPPROTO_PGM = 113
-++ IPPROTO_PFSYNC = 240
-++ IPPROTO_OLD_DIVERT = 254
-++ IPPROTO_MAX = 256
-++ IPPROTO_DONE = 257
-++ IPPROTO_DIVERT = 258
-++ IPPROTO_SPACER = 32767
-++ 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
-+*** misc/Python-2.3.4/Lib/plat-freebsd8/IN.py	Wed Dec 31 19:00:00 1969
-+--- misc/build/Python-2.3.4/Lib/plat-freebsd8/IN.py	Tue Jan  8 14:13:22 2008
-+***************
-+*** 0 ****
-+--- 1,535 ----
-++ # Generated by h2py from /usr/include/netinet/in.h
-++ 
-++ # Included from sys/cdefs.h
-++ __GNUCLIKE_ASM = 3
-++ __GNUCLIKE_ASM = 2
-++ __GNUCLIKE___TYPEOF = 1
-++ __GNUCLIKE___OFFSETOF = 1
-++ __GNUCLIKE___SECTION = 1
-++ __GNUCLIKE_ATTRIBUTE_MODE_DI = 1
-++ __GNUCLIKE_CTOR_SECTION_HANDLING = 1
-++ __GNUCLIKE_BUILTIN_CONSTANT_P = 1
-++ __GNUCLIKE_BUILTIN_VARARGS = 1
-++ __GNUCLIKE_BUILTIN_VAALIST = 1
-++ __GNUC_VA_LIST_COMPATIBILITY = 1
-++ __GNUCLIKE_BUILTIN_STDARG = 1
-++ __GNUCLIKE_BUILTIN_NEXT_ARG = 1
-++ __GNUCLIKE_BUILTIN_MEMCPY = 1
-++ __CC_SUPPORTS_INLINE = 1
-++ __CC_SUPPORTS___INLINE = 1
-++ __CC_SUPPORTS___INLINE__ = 1
-++ __CC_SUPPORTS___FUNC__ = 1
-++ __CC_SUPPORTS_WARNING = 1
-++ __CC_SUPPORTS_VARADIC_XXX = 1
-++ __CC_SUPPORTS_DYNAMIC_ARRAY_INIT = 1
-++ __CC_INT_IS_32BIT = 1
-++ 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
-++ 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_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_CARP = 112
-++ IPPROTO_PGM = 113
-++ IPPROTO_PFSYNC = 240
-++ IPPROTO_OLD_DIVERT = 254
-++ IPPROTO_MAX = 256
-++ IPPROTO_DONE = 257
-++ IPPROTO_DIVERT = 258
-++ IPPROTO_SPACER = 32767
-++ 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
-+*** misc/Python-2.3.4/Lib/posixfile.py	Wed Oct 24 18:03:35 2001
-+--- misc/build/Python-2.3.4/Lib/posixfile.py	Tue Jan  8 14:16:12 2008
-+***************
-+*** 185,191 ****
-+          if sys.platform in ('netbsd1',
-+                              'openbsd2',
-+                              'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
-+!                             'bsdos2', 'bsdos3', 'bsdos4'):
-+              flock = struct.pack('lxxxxlxxxxlhh', \
-+                    l_start, l_len, os.getpid(), l_type, l_whence)
-+          elif sys.platform in ['aix3', 'aix4']:
-+--- 185,191 ----
-+          if sys.platform in ('netbsd1',
-+                              'openbsd2',
-+                              'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
-+!                             'freebsd6', 'freebsd7', 'freebsd8', 'bsdos2', 'bsdos3', 'bsdos4'):
-+              flock = struct.pack('lxxxxlxxxxlhh', \
-+                    l_start, l_len, os.getpid(), l_type, l_whence)
-+          elif sys.platform in ['aix3', 'aix4']:
-+*** misc/Python-2.3.4/Mac/OSX/Makefile	Tue Nov  4 23:45:16 2003
-+--- misc/build/Python-2.3.4/Mac/OSX/Makefile	Tue Jan 15 12:11:51 2008
-+***************
-+@ -15547,3 +17166,22 @@
-+  
-+  /* Define the macros needed if on a UnixWare 7.x system. */
-+  #if defined(__USLC__) && defined(__SCO_VERSION__)
-+*** misc/Python-2.3.4/setup.py	Tue Oct 21 16:01:21 2003
-+--- misc/build/Python-2.3.4/setup.py	Tue Jan  8 14:17:55 2008
-+***************
-+*** 770,776 ****
-+              # Linux-specific modules
-+              exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
-+  
-+!         if platform in ('linux2', 'freebsd4'):
-+              exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
-+  
-+          if platform == 'sunos5':
-+--- 770,776 ----
-+              # Linux-specific modules
-+              exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
-+  
-+!         if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-+              exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
-+  
-+          if platform == 'sunos5':
diff --git a/editors/openoffice.org-3/files/patch-i85972 b/editors/openoffice.org-3/files/patch-i85972
index 931cbb8c535d..9a87976fcbb1 100644
--- a/editors/openoffice.org-3/files/patch-i85972
+++ b/editors/openoffice.org-3/files/patch-i85972
@@ -31,23 +31,19 @@ diff -u -r1.4 lp_solve_5.5.patch
 ++fi
 ++
 ++rm *.o 2>/dev/null
-Index: lpsolve/makefile.mk
-===================================================================
-RCS file: /cvs/external/lpsolve/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- lpsolve/makefile.mk	11 Apr 2008 07:18:41 -0000	1.5
-+++ lpsolve/makefile.mk	3 Jul 2008 00:20:53 -0000
+
+--- lpsolve/makefile.mk.orig	2008-12-24 09:40:11.000000000 +0900
++++ lpsolve/makefile.mk	2008-12-24 12:09:06.000000000 +0900
 @@ -46,7 +46,7 @@
  PATCH_FILE_NAME=lp_solve_5.5-windows.patch
  .ELSE
  PATCH_FILE_NAME=lp_solve_5.5.patch
--ADDITIONAL_FILES=lpsolve55$/ccc.solaris
-+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.freebsd
+-ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2
++ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 lpsolve55$/ccc.freebsd
  .ENDIF
  
  CONFIGURE_DIR=
-@@ -70,11 +70,16 @@
+@@ -73,11 +73,16 @@
  .IF "$(COMNAME)"=="sunpro5"
  BUILD_ACTION=sh ccc.solaris
  .ELSE
diff --git a/editors/openoffice.org-3/files/patch-i87583 b/editors/openoffice.org-3/files/patch-i87583
index e82f268d7ad0..750935a3030b 100644
--- a/editors/openoffice.org-3/files/patch-i87583
+++ b/editors/openoffice.org-3/files/patch-i87583
@@ -1,17 +1,3 @@
---- configmgr/source/cmdtools/setofficelang.sh.orig	2008-06-09 08:42:48.000000000 -0400
-+++ configmgr/source/cmdtools/setofficelang.sh	2008-06-27 15:47:37.000000000 -0400
-@@ -75,6 +75,11 @@
-     export DYLD_LIBRARY_PATH
-     ;;
- 
-+  FreeBSD)
-+    LD_LIBRARY_PATH=${sd_prog}:${sd_prog}/../ure-link/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
-+    export LD_LIBRARY_PATH
-+    ;;
-+
-   HP-UX)
-     SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH+:${SHLIB_PATH}}
-     export SHLIB_PATH
 --- desktop/scripts/soffice.sh.orig	2008-06-09 08:57:10.000000000 -0400
 +++ desktop/scripts/soffice.sh	2008-06-27 16:12:58.000000000 -0400
 @@ -75,6 +75,15 @@
diff --git a/editors/openoffice.org-3/files/patch-i91318 b/editors/openoffice.org-3/files/patch-i91318
index d04fef781b9c..dd4b2f2ea7c3 100644
--- a/editors/openoffice.org-3/files/patch-i91318
+++ b/editors/openoffice.org-3/files/patch-i91318
@@ -1,16 +1,11 @@
-Index: hunspell/hunspell-1.1.12.patch
-===================================================================
-RCS file: /cvs/external/hunspell/hunspell-1.1.12.patch,v
-retrieving revision 1.12
-diff -u -r1.12 hunspell-1.1.12.patch
---- hunspell/hunspell-1.1.12.patch	2 Jul 2008 09:46:59 -0000	1.12
-+++ hunspell/hunspell-1.1.12.patch	10 Aug 2008 01:02:29 -0000
-@@ -487,3 +487,11 @@
-  i68568utf.test \
-  1706659.test \
-  digits_in_words.test \
-+--- misc/hunspell-1.1.12/tests/test.sh	2007-07-15 22:33:13.000000000 +0900
-++++ misc/build/hunspell-1.1.12/tests/test.sh	2008-08-10 10:00:33.000000000 +0900
+--- hunspell/hunspell-1.2.8.patch~	2009-02-21 08:52:35.000000000 +0900
++++ hunspell/hunspell-1.2.8.patch	2009-03-05 09:30:33.000000000 +0900
+@@ -619,3 +619,11 @@
+              p++;
+          }
+          if (i > 0 && buf[i - 1] == '\n') {
++--- misc/hunspell-1.2.8/tests/test.sh	2007-07-15 22:33:13.000000000 +0900
+++++ misc/build/hunspell-1.2.8/tests/test.sh	2008-08-10 10:00:33.000000000 +0900
 +@@ -1,4 +1,4 @@
 +-#!/bin/bash
 ++#!/usr/bin/env bash
diff --git a/editors/openoffice.org-3/files/patch-i93235 b/editors/openoffice.org-3/files/patch-i93235
deleted file mode 100644
index a581a2c34afd..000000000000
--- a/editors/openoffice.org-3/files/patch-i93235
+++ /dev/null
@@ -1,88 +0,0 @@
-Add support for Diablo JDK 1.6.0 and above.
-
---- /dev/null	2008-08-27 17:05:37.000000000 -0400
-+++ jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml	2008-08-27 17:20:55.000000000 -0400
-@@ -0,0 +1,38 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+
-+<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
-+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-+ 
-+ <updated>2008-08-27</updated>
-+ 
-+ <vendorInfos> 
-+  <vendor name="Sun Microsystems Inc.">
-+    <minVersion>1.3.1</minVersion>
-+  </vendor>
-+  <vendor name="The FreeBSD Foundation">
-+    <minVersion>1.6.0</minVersion>
-+  </vendor>
-+  <vendor name="IBM Corporation">
-+    <minVersion>1.3.1</minVersion>
-+    <maxVersion>1.4.2</maxVersion>
-+  </vendor>
-+  <vendor name="Blackdown Java-Linux Team">
-+    <minVersion>1.3.1</minVersion>
-+  </vendor>
-+  <vendor name="Free Software Foundation, Inc.">
-+    <minVersion>1.4.2</minVersion>
-+  </vendor>
-+  <vendor name="BEA Systems, Inc.">
-+    <minVersion>1.4.1</minVersion>
-+  </vendor>
-+ </vendorInfos>
-+
-+ <plugins>
-+  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+  <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+  <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+  <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+  <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+  <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+ </plugins>
-+</javaSelection>
---- jvmfwk/distributions/OpenOfficeorg/makefile.mk.orig	2008-04-11 06:16:59.000000000 -0400
-+++ jvmfwk/distributions/OpenOfficeorg/makefile.mk	2008-08-27 17:09:45.000000000 -0400
-@@ -43,9 +43,11 @@
- .IF "$(SOLAR_JAVA)"!=""
- $(BIN)$/javavendors.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_macosx.xml javavendors_linux.xml
- .IF "$(GUI)"=="UNX"
--.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="FREEBSD"
-+	-$(COPY) javavendors_freebsd.xml $(BIN)$/javavendors.xml
-+.ELIF "$(OS)"=="MACOSX"
- 	-$(COPY) javavendors_macosx.xml $(BIN)$/javavendors.xml
--.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
-+.ELIF "$(OS)"=="LINUX"
- 	-$(COPY) javavendors_linux.xml $(BIN)$/javavendors.xml
- .ELSE
- 	-$(COPY) javavendors_unx.xml $(BIN)$/javavendors.xml
---- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx.orig	2008-04-11 06:19:31.000000000 -0400
-+++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx	2008-08-27 17:19:35.000000000 -0400
-@@ -128,13 +128,15 @@
-     rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("Apple Computer, Inc."));
-     rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc."));
-     rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc."));
-+    rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation"));
-     if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True
-             || sVendor2.equals(pInfo->sVendor) == sal_True
-             || sVendor3.equals(pInfo->sVendor) == sal_True
-             || sVendor4.equals(pInfo->sVendor) == sal_True
-             || sVendor5.equals(pInfo->sVendor) == sal_True
-             || sVendor6.equals(pInfo->sVendor) == sal_True
--	    || sVendor7.equals(pInfo->sVendor) == sal_True))
-+            || sVendor7.equals(pInfo->sVendor) == sal_True
-+            || sVendor8.equals(pInfo->sVendor) == sal_True))
-         return 0;
-     
-     rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
---- jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx.orig	2008-04-11 06:24:39.000000000 -0400
-+++ jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx	2008-08-27 17:13:00.000000000 -0400
-@@ -56,6 +56,7 @@
-     VENDOR_MAP_ENTRY("Apple Computer, Inc.", OtherInfo)
-     VENDOR_MAP_ENTRY("BEA Systems, Inc.", OtherInfo)
-     VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo)
-+    VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo)
- END_VENDOR_MAP()    
- 
-