Date: Tue, 02 Sep 2008 17:08:25 -0400 From: Mikhail Teterin <mi+mill@aldan.algebra.com> To: maho@FreeBSD.org Cc: openoffice@FreeBSD.org Subject: externalizing OOo's components Message-ID: <48BDAB49.6070900@aldan.algebra.com>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------070208020908030908030705
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
Content-Type: text/plain; charset="ISO-8859-1"
Hello!
As you may remember (or know, if you follow OOo's "issues"), I'm
trying to produce an OOo build, that uses no (or as little as
possible) of the bundled third-party software in favor of that same
software installed by their own respected ports.
After years of bundling everything (at some point FreeBSD was even
building OOo-specific C-compiler!), the OOo project in general, and
its FreeBSD-port in particular are moving into the desirable direction
of modularity.
I was not, yet, able to achieve a full clean build -- the several
times, when everything seems to have been in order, the language-pack
building failed -- see [1]i93266.
However, my work may be of benefit to you anyway, so, please, take a
look at the attached patch (against the openoffice.org-3-devel).
It does the following:
1. Avoid extracting directories with 3rd-party packages. This not
only saves disk-space and extraction-time, but also helps ensure,
the application is not, accidentally, compiled against a set of
headers different from the libraries used at run-time. This
skip-list currently consists of:
1. agg
2. apache-commons
3. beanshell
4. berkeleydb
5. boost
6. cairo
7. curl
8. dmake
9. expat
10. freetype
11. hsqldb
12. hunspell
13. icu
14. jpeg
15. libwpd
16. libxml2
17. libxslt
18. lpsolve
19. lucene
20. moz
21. neon
22. python
23. saxon
24. tomcat
25. vigra
26. zlib
2. Use the already-installed Mozilla-browser (be it firefox, or
whatever -- through the bsd.mozilla.mk).
3. Remove patches for the 3rd-party packages, which no longer apply,
because the packages themselves are no longer extracted (see 1.)
4. Add patches to ensure, the externally-available pieces are
properly found and used.
5. Builds "--without-stlport". This breaks the mythical binary
compatibility -- so, making the switch before the 3.0 release
would be justified, even if there existed a binary-only OOo-module
for FreeBSD, which would've been affected by the breakage of the
said compatibility.
What's not complete yet:
1. [2]xmlsec, although available from a [3]port of its own, is still
built from the bundled version.
2. Same for [4]xpdf.
3. As I say, there is still something wrong with install -- but I
[5]could not build the unmodified openoffice.org-3 either
(./PentahoReportEngine.java:58: cannot find symbol ...
DefaultReportJobDefinition), so I can not say, whether the
breakage is due to my changes, or simply because my LOCALIZED_LANG
is set to "uk ru en-US"...
4. Bundled STLPort's headers are still used by the build and the
subdirectory can not be skipped during extraction. This should be
removed completely some day -- GNU C++ provides all of the used
functionality.
5. epm -- with a [6]port of its own -- is still built from the
bundled sources. Not sure why -- the external port is maintained
by you, guys...
Please, take a look... Thanks! Yours,
-mi
References
1. http://qa.openoffice.org/issues/show_bug.cgi?id=93266
2. http://qa.openoffice.org/issues/show_bug.cgi?id=93297
3. http://freshports.org/security/xmlsec1
4. http://qa.openoffice.org/issues/show_bug.cgi?id=93305
5. http://aldan.algebra.com/%7Emi/OOo-3-build-failure.txt
6. http://freshports.org/devel/epm
--------------070208020908030908030705
Content-Type: text/plain;
name="ooo.update"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="ooo.update"
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/openoffice.org-3-devel/Makefile,v
retrieving revision 1.397
diff -U2 -r1.397 Makefile
--- Makefile 23 Aug 2008 05:07:40 -0000 1.397
+++ Makefile 1 Sep 2008 00:26:11 -0000
@@ -14,7 +14,5 @@
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
- ${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
-MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= ${OOOSRC} unowinreg.dll:unowinreg
.if defined(WITH_GPC)
@@ -34,9 +32,6 @@
NO_LATEST_LINK= yes
USE_GNOME= desktopfileutils gtk20
-MOZILLA_VERSION= 1.7.5
-MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz
.if !defined(WITHOUT_MOZILLA)
-DISTFILES+= ${MOZILLA_SOURCE}:mozsrc
-USE_GNOME+= libidl
+USE_GECKO= firefox mozilla seamonkey
.endif
@@ -46,7 +41,10 @@
USE_XORG= x11 ice xaw xau xext xrender xrandr \
xi xt xcursor xdamage xcomposite xfixes
+USE_OPENSSL= yes
+USE_OPENLDAP= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_BZIP2= yes
+USE_BDB= 42+
WITHOUT_CPU_CFLAGS= true
@@ -61,5 +59,5 @@
.endif
.if (${OSVERSION} >= 700000)
-JAVA_VERSION= 1.5 1.6
+JAVA_VERSION= 1.5+
.else
JAVA_VERSION= 1.4 1.5 1.6
@@ -76,9 +74,15 @@
.endif
-MILESTONE?= 29
+# This list is likely incomplete:
+SKIP= agg apache-commons beanshell berkeleydb boost cairo curl \
+ dmake expat freetype hsqldb hunspell icu jpeg libwpd libxml2 \
+ libxslt lpsolve lucene moz neon python saxon \
+ tomcat vigra zlib
+EXTRACT_AFTER_ARGS=|${TAR} -xpf - ${SKIP:S|^|--exclude ${OOOTAG}/|}
+MILESTONE?= 30
OOOTAG?= DEV300_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
OOODIR= openoffice.org3
-SNAPDATE= 20080802
+SNAPDATE= 20080825
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
@@ -117,5 +121,17 @@
CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \
CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
+ DMAKE="${LOCALBASE}/bin/dmake" \
+ LDFLAGS="-L${BDB_LIB_DIR} -L${LOCALBASE}/lib" \
+ OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
+ OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lssl -lcrypto" \
+ LUCENE_CORE_JAR=${JAVAJARDIR}/lucene-core-2.3.2.jar \
+ LUCENE_ANALYZERS_JAR=${JAVAJARDIR}/lucene-analyzers-2.3.2.jar \
+ HSQLDB_JAR=${JAVAJARDIR}/hsqldb.jar \
+ BSH_JAR=${JAVAJARDIR}/bsh.jar \
+ SAXON_JAR=${JAVAJARDIR}/saxon8.jar \
+ XML_APIS_JAR=${JAVAJARDIR}/xml-apis.jar \
+ XERCES_JAR=${JAVAJARDIR}/xercesImpl.jar \
+ XALAN_JAR=${JAVAJARDIR}/xalan.jar \
+ PYTHON_LIBS="" \
PATH=${WRKSRC}/solenv/bin:$$PATH
@@ -126,7 +142,25 @@
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bash:${PORTSDIR}/shells/bash \
+ dmake:${PORTSDIR}/devel/dmake \
imake:${PORTSDIR}/devel/imake \
+ ${JAVAJARDIR}/lucene-analyzers-2.3.2.jar:${PORTSDIR}/textproc/lucene \
+ ${JAVAJARDIR}/hsqldb.jar:${PORTSDIR}/databases/hsqldb \
+ ${JAVAJARDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
+ ${JAVAJARDIR}/saxon8.jar:${PORTSDIR}/textproc/saxon-devel \
+ ${JAVAJARDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j \
+ ${JAVAJARDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
+ ${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
+ ${JAVAJARDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
+ ${JAVAJARDIR}/commons-codec.jar:${PORTSDIR}/java/jakarta-commons-codec \
${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf #i85469#
+LIB_DEPENDS+= wpd:${PORTSDIR}/textproc/libwpd \
+ lpsolve55:${PORTSDIR}/math/lp_solve \
+ agg:${PORTSDIR}/graphics/agg
+
+# xmlsec1:${PORTSDIR}/security/xmlsec1 \
+
+LIB_DEPENDS+= hunspell:${PORTSDIR}/hungarian/hunspell
+
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant
.if !defined(WITH_GPC)
@@ -146,13 +181,19 @@
--with-gnu-patch=${LOCALBASE}/bin/gpatch \
--enable-crashdump=yes \
+ --without-stlport \
--with-system-zlib \
--with-system-stdlibs \
+ --with-system-headers --with-system-libs \
+ --with-openldap \
+ --without-system-altlinuxhyph \
+ --with-commons-httpclient-jar=${JAVAJARDIR}/commons-httpclient.jar \
+ --with-commons-logging-jar=${JAVAJARDIR}/commons-logging.jar \
+ --with-commons-lang-jar=${JAVAJARDIR}/commons-lang.jar \
+ --with-commons-codec-jar=${JAVAJARDIR}/commons-codec.jar \
+ --with-system-apache-commons \
--with-epm=internal
-.if ${ARCH} == amd64
-WITHOUT_MOZILLA= yes
LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost
CONFIGURE_ARGS+= --with-system-boost=yes #i58343#
-.endif
.if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
@@ -194,7 +235,25 @@
@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
.endif
-.if !defined(WITHOUT_MOZILLA)
- @${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
-.endif
+#-e 's#Darwin#FreeBSD#g' \
+post-patch:
+ @${REINPLACE_CMD} -e 's#-ldb#-l${BDB_LIB_NAME}#g' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+ @${REINPLACE_CMD} -e 's#-ldb$$#-l${BDB_LIB_NAME}#' \
+ -e 's#-ldb_cxx$$#-l${BDB_LIB_CXX_NAME}#' \
+ ${WRKSRC}/solenv/inc/libs.mk
+ @${REINPLACE_CMD} -e 's#<db.h>#<db${BDB_VER}/db.h>#' \
+ ${WRKSRC}/xmlhelp/source/cxxhelp/provider/db.hxx \
+ ${WRKSRC}/desktop/source/deployment/inc/db.hxx \
+ ${WRKSRC}/xmlhelp/source/com/sun/star/help/HelpCompiler.hxx
+# ${ECHO} "CFLAGS+=-I${PREFIX}/include/xmlsec1" > \
+# ${WRKSRC}/xmlsecurity/source/xmlsec/settings.mk
+
+# @${REINPLACE_CMD} -e 's,<xmlsec/,<xmlsec1/xmlsec/,' \
+# ${WRKSRC}/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx \
+# ${WRKSRC}/xmlsecurity/source/xmlsec/baseencoding.cxx \
+# ${WRKSRC}/xmlsecurity/source/xmlsec/biginteger.cxx \
+# ${WRKSRC}/xmlsecurity/source/xmlsec/xmlstreamio.cxx \
+# ${WRKSRC}/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+
pre-configure:
#Workaround for gperf. #i85469#
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/editors/openoffice.org-3-devel/distinfo,v
retrieving revision 1.192
diff -U2 -r1.192 distinfo
--- distinfo 2 Aug 2008 00:23:38 -0000 1.192
+++ distinfo 1 Sep 2008 00:26:11 -0000
@@ -1,5 +1,5 @@
-MD5 (openoffice.org3/OOo_DEV300_m29_source.tar.bz2) = c1e4630bd54b079496a59f0ed6aaf518
-SHA256 (openoffice.org3/OOo_DEV300_m29_source.tar.bz2) = 21e7932a6ea7caa2e53b13d6907e1af33e05064c732760a1c2c9864849bfe076
-SIZE (openoffice.org3/OOo_DEV300_m29_source.tar.bz2) = 321848941
+MD5 (openoffice.org3/OOo_DEV300_m30_source.tar.bz2) = 4459af894984883c64da287d19408bbc
+SHA256 (openoffice.org3/OOo_DEV300_m30_source.tar.bz2) = b2059cdea795952fd9ad643ad9ea76f037bae6c1384e77ce99e23bd5d14038e9
+SIZE (openoffice.org3/OOo_DEV300_m30_source.tar.bz2) = 336176865
MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
@@ -8,5 +8,2 @@
SHA256 (openoffice.org3/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org3/gpc231.tar.Z) = 27917
-MD5 (openoffice.org3/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
-SHA256 (openoffice.org3/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
-SIZE (openoffice.org3/mozilla-source-1.7.5.tar.gz) = 38721366
Index: files/Makefile.knobs
===================================================================
RCS file: /home/pcvs/ports/editors/openoffice.org-3-devel/files/Makefile.knobs,v
retrieving revision 1.53
diff -U2 -r1.53 Makefile.knobs
--- files/Makefile.knobs 26 Apr 2008 08:01:13 -0000 1.53
+++ files/Makefile.knobs 1 Sep 2008 00:26:11 -0000
@@ -21,10 +21,4 @@
.endif
-.if defined(WITHOUT_MOZILLA)
-CONFIGURE_ARGS+= --disable-mozilla
-.else
-CONFIGURE_ARGS+= --enable-build-mozilla
-.endif
-
.if defined(WITHOUT_GNOMEVFS)
CONFIGURE_ARGS+= --disable-gnome-vfs
@@ -33,4 +27,10 @@
.endif
+.if defined(WITHOUT_MOZILLA)
+CONFIGURE_ARGS+=--without-mozilla
+.else
+CONFIGURE_ARGS+=--with-system-mozilla=${GECKO}
+.endif
+
.if defined(WITH_EVOLUTION2)
CONFIGURE_ARGS+= --enable-evolution2=yes
@@ -144,5 +144,5 @@
@${ECHO} "You can select the language for OOo by making it with:"
@${ECHO} "make LOCALIZED_LANG=xx"
- @${ECHO} "while xx can be one of the following"
+ @${ECHO} "while xx can be one or more (space-separated) of the following"
@${ECHO} "af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da"
@${ECHO} "de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl"
Index: files/patch-i65514
===================================================================
RCS file: files/patch-i65514
diff -N files/patch-i65514
--- files/patch-i65514 8 Jul 2008 05:19:45 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
---- berkeleydb/makefile.mk 25 May 2007 10:48:51 -0000 1.40
-+++ berkeleydb/makefile.mk 2 Jul 2007 20:15:24 -0000
-@@ -105,6 +105,10 @@
- ..$/dist$/configure
- CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
-
-+.IF "$(OS)"==FREEBSD && "$(COM)$(CPU)"=="GCCX"
-+CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
-+.ENDIF
-+
- # just pass ARCH_FLAGS to native build
- CFLAGS+:=$(ARCH_FLAGS)
- CXXFLAGS+:=$(ARCH_FLAGS)
Index: files/patch-i80129
===================================================================
RCS file: files/patch-i80129
diff -N files/patch-i80129
--- files/patch-i80129 8 Jul 2008 05:19:45 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-Index: libxml2/libxml2-2.6.31.patch
-===================================================================
-RCS file: /cvs/external/libxml2/libxml2-2.6.31.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libxml2-2.6.31.patch
---- libxml2/libxml2-2.6.31.patch 6 Jun 2008 11:48:45 -0000 1.2
-+++ libxml2/libxml2-2.6.31.patch 8 Jul 2008 02:54:59 -0000
-@@ -88,7 +88,7 @@
-
- freebsd-elf)
- ! major=.`expr $current - $age`
--! versuffix=".$major.$age.$revision";
-+! versuffix="$major";
- ;;
-
- irix | nonstopux)
Index: files/patch-i84549
===================================================================
RCS file: files/patch-i84549
diff -N files/patch-i84549
--- files/patch-i84549 25 Jul 2008 10:06:48 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-Index: neon/neon.patch
-===================================================================
-RCS file: /cvs/external/neon/neon.patch,v
-retrieving revision 1.25
-diff -u -r1.25 neon.patch
---- neon/neon.patch 22 Jul 2008 17:17:06 -0000 1.25
-+++ neon/neon.patch 24 Jul 2008 21:32:52 -0000
-@@ -266,7 +266,7 @@
- +#define HAVE_SYS_TYPES_H 1
- +
- +/* Define if the timezone global is available */
--+#ifndef MACOSX
-++#if !defined (MACOSX) && !defined (FREEBSD)
- +#define HAVE_TIMEZONE 1
- +#endif
- +
Index: files/patch-i85127
===================================================================
RCS file: files/patch-i85127
diff -N files/patch-i85127
--- files/patch-i85127 14 Jun 2008 05:45:57 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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':
Index: files/patch-i85972
===================================================================
RCS file: files/patch-i85972
diff -N files/patch-i85972
--- files/patch-i85972 3 Jul 2008 11:10:53 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,66 +0,0 @@
-Index: lpsolve/lp_solve_5.5.patch
-===================================================================
-RCS file: /cvs/external/lpsolve/lp_solve_5.5.patch,v
-retrieving revision 1.4
-diff -u -r1.4 lp_solve_5.5.patch
---- lpsolve/lp_solve_5.5.patch 16 Jun 2008 14:19:46 -0000 1.4
-+++ lpsolve/lp_solve_5.5.patch 3 Jul 2008 00:20:52 -0000
-@@ -72,3 +72,25 @@
- +fi
- +
- +rm *.o 2>/dev/null
-+--- misc/lp_solve_5.5/lpsolve55/ccc.freebsd Wed May 21 17:45:07 2008
-++++ misc/build/lp_solve_5.5/lpsolve55/ccc.freebsd Wed May 21 17:44:54 2008
-+@@ -1,1 +1,18 @@
-+-dummy
-++src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-++
-++c=$CC
-++def=
-++so=yes
-++
-++opts='-O3 -DINTEGERTIME'
-++$CC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-++ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
-++ranlib liblpsolve55.a
-++
-++if [ "$so" != "" ]
-++then
-++ $CC -fPIC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-++ $CC -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm
-++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
-@@ -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
- .ENDIF
-
- CONFIGURE_DIR=
-@@ -70,11 +70,16 @@
- .IF "$(COMNAME)"=="sunpro5"
- BUILD_ACTION=sh ccc.solaris
- .ELSE
-+.IF "$(OS)"=="FREEBSD"
-+BUILD_ACTION=sh -x ccc.freebsd
-+OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
-+.ELSE
- BUILD_ACTION=sh ccc
- .ENDIF
- OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
- .ENDIF
- .ENDIF
-+.ENDIF
-
- OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h
-
Index: files/patch-i91318
===================================================================
RCS file: files/patch-i91318
diff -N files/patch-i91318
--- files/patch-i91318 8 Jul 2008 05:19:45 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-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 6 Jul 2008 01:23:13 -0000
-@@ -487,3 +487,10 @@
- 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-07-01 06:18:31.000000000 +0900
-+@@ -1,4 +1,4 @@
-+-#!/bin/bash
-++#!/usr/local/bin/bash
-+ export LC_ALL="C"
-+
Index: files/patch-i91861
===================================================================
RCS file: files/patch-i91861
diff -N files/patch-i91861
--- files/patch-i91861 20 Jul 2008 06:31:25 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-? vcl/unxfbsdi.pro
-Index: vcl/source/glyphs/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- vcl/source/glyphs/makefile.mk 11 Apr 2008 08:59:18 -0000 1.13
-+++ vcl/source/glyphs/makefile.mk 20 Jul 2008 03:14:41 -0000
-@@ -42,9 +42,17 @@
- .INCLUDE : $(PRJ)$/util$/makefile2.pmk
-
- .IF "$(SYSTEM_FREETYPE)" == "YES"
-+.IF "$(OS)" != "FREEBSD"
- CFLAGS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS)
-+.ELSE
-+ADDCDEFS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS)
-+.ENDIF
- .IF "$(USE_FT_EMBOLDEN)" == "YES"
-+.IF "$(OS)" != "FREEBSD"
- CFLAGS+=-DUSE_FT_EMBOLDEN
-+.ELSE
-+ADDCDEFS+=-DUSE_FT_EMBOLDEN
-+.ENDIF
- .ENDIF
- .ENDIF
-
Index: files/patch-i92931
===================================================================
RCS file: files/patch-i92931
diff -N files/patch-i92931
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-i92931 1 Sep 2008 00:26:11 -0000
@@ -0,0 +1,80 @@
+This patch fixes the bashist use of `==' instead of `=' as an argument
+to test (a.k.a. `[').
+
+The equivalent patch for configure.in is filed under
+
+ http://www.openoffice.org/issues/show_bug.cgi?id=92931
+
+ -mi
+
+--- config_office/configure 2008-08-20 10:25:51.000000000 -0400
++++ config_office/configure 2008-08-30 09:54:00.000000000 -0400
+@@ -11439,5 +11439,5 @@
+
+ if test "$SOLAR_JAVA" != ""; then
+- if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
++ if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
+ if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then
+ cat > findhome.java <<_ACEOF
+@@ -11540,5 +11540,5 @@
+ echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
+ echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
+-# if test "$JDK" == "gcj"; then
++# if test "$JDK" = "gcj"; then
+ # echo "e.g. install java-1.4.2-gcj-compat-devel and use --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn
+ # fi
+@@ -14218,5 +14218,5 @@
+ test "$with_system_libxslt" != "no"; then
+ if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
+- test "$with_system_libxml" == "no"; then
++ test "$with_system_libxml" = "no"; then
+ # somehow AC_MSG_WARN won't work...
+ echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml"
+@@ -14228,5 +14228,5 @@
+ test "$with_system_libxml" != "no"; then
+ if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
+- test "$with_system_libxslt" == "no"; then
++ test "$with_system_libxslt" = "no"; then
+ # somehow AC_MSG_WARN won't work...
+ echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt"
+@@ -17388,5 +17388,5 @@
+ #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
+ #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
+- if test "$MOZ_FLAVOUR" == "libxul"; then
++ if test "$MOZ_FLAVOUR" = "libxul"; then
+ MOZ_FLAVOUR="mozilla"
+ fi
+@@ -25040,5 +25040,5 @@
+ { echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5
+ echo $ECHO_N "checking which Apache commons-* libs to use... $ECHO_C" >&6; }
+- if test "$with_system_apache_commons" == "yes"; then
++ if test "$with_system_apache_commons" = "yes"; then
+ SYSTEM_APACHE_COMMONS=YES
+ { echo "$as_me:$LINENO: result: external" >&5
+@@ -25183,5 +25183,5 @@
+
+
+-if test "$ENABLE_MEDIAWIKI" == "YES"; then
++if test "$ENABLE_MEDIAWIKI" = "YES"; then
+ { echo "$as_me:$LINENO: checking which Servlet API Jar to use" >&5
+ echo $ECHO_N "checking which Servlet API Jar to use... $ECHO_C" >&6; }
+@@ -25238,5 +25238,5 @@
+ { echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5
+ echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6; }
+- if test "$with_system_jfreereport" == "yes"; then
++ if test "$with_system_jfreereport" = "yes"; then
+ SYSTEM_JFREEREPORT=YES
+ { echo "$as_me:$LINENO: result: external" >&5
+@@ -27012,10 +27012,10 @@
+ echo $ECHO_N "checking build verbosity... $ECHO_C" >&6; }
+ if test -n "$enable_verbose"; then
+- if test "$enable_verbose" == "yes"; then
++ if test "$enable_verbose" = "yes"; then
+ VERBOSE="TRUE"
+ { echo "$as_me:$LINENO: result: high" >&5
+ echo "${ECHO_T}high" >&6; }
+ fi
+- if test "$enable_verbose" == "no"; then
++ if test "$enable_verbose" = "no"; then
+ VERBOSE="FALSE"
+ { echo "$as_me:$LINENO: result: low" >&5
Index: files/patch-i92932-system-openssl
===================================================================
RCS file: files/patch-i92932-system-openssl
diff -N files/patch-i92932-system-openssl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-i92932-system-openssl 1 Sep 2008 00:26:11 -0000
@@ -0,0 +1,19 @@
+This patch gets FreeBSD the same treatment as Darwin in regards to
+OpenSSL detection. Without this, OpenSSL.pc is being looked for and
+--with-system-openssl foolishly fails...
+
+Filed under:
+
+ http://www.openoffice.org/issues/show_bug.cgi?id=92932
+
+ -mi
+
+--- config_office/configure 2008-07-31 09:52:31.000000000 -0400
++++ config_office/configure 2008-08-19 21:24:41.000000000 -0400
+@@ -21349,5 +21349,5 @@
+ # Mac OS builds should get out without extra stuff is the Mac porters'
+ # wish. And pkg-config is although Xcode ships a .pc for openssl
+- if test "$_os" = "Darwin"; then
++ if test "$_os" = "Darwin" -o "$_os" = "FreeBSD" ; then
+ OPENSSL_CFLAGS=
+ OPENSSL_LIBS="-lssl -lcrypto"
Index: files/patch-i93294-external-lucene-analyzers
===================================================================
RCS file: files/patch-i93294-external-lucene-analyzers
diff -N files/patch-i93294-external-lucene-analyzers
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-i93294-external-lucene-analyzers 1 Sep 2008 00:26:11 -0000
@@ -0,0 +1,9 @@
+--- helpcontent2/settings.pmk 2008-07-07 12:02:53.000000000 -0400
++++ helpcontent2/settings.pmk 2008-08-31 00:09:20.000000000 -0400
+@@ -3,5 +3,5 @@
+ my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$
+ .IF "$(SYSTEM_LUCENE)" == "YES"
+-my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)
++my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
+ .ELSE
+ my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar
Index: files/patch-i93295-external-hsqldb
===================================================================
RCS file: files/patch-i93295-external-hsqldb
diff -N files/patch-i93295-external-hsqldb
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-i93295-external-hsqldb 1 Sep 2008 00:26:11 -0000
@@ -0,0 +1,8 @@
+--- connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk 2008-08-19 05:08:34.000000000 -0400
++++ connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk 2008-08-31 01:29:31.000000000 -0400
+@@ -44,4 +44,5 @@
+ .IF "$(SYSTEM_HSQLDB)" == "YES"
+ XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR)
++JARFILES+= $(HSQLDB_JAR)
+ .ELSE
+ JARFILES+= hsqldb.jar
Index: files/patch-i93304-dmake-version-detection
===================================================================
RCS file: files/patch-i93304-dmake-version-detection
diff -N files/patch-i93304-dmake-version-detection
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-i93304-dmake-version-detection 1 Sep 2008 00:26:11 -0000
@@ -0,0 +1,9 @@
+--- config_office/configure 2008-08-31 15:57:06.000000000 -0400
++++ config_office/configure 2008-08-31 16:05:20.000000000 -0400
+@@ -12191,5 +12191,5 @@
+ { echo "$as_me:$LINENO: checking the dmake version" >&5
+ echo $ECHO_N "checking the dmake version... $ECHO_C" >&6; }
+- DMAKE_VERSION=`$DMAKE -V | $SED -n 's/.*Version \([0-9.]\+\).*/\1/p'`
++ DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'`
+ if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
+ { echo "$as_me:$LINENO: result: OK, >= 4.11" >&5
Index: files/patch-system-agg
===================================================================
RCS file: files/patch-system-agg
diff -N files/patch-system-agg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-system-agg 1 Sep 2008 00:26:11 -0000
@@ -0,0 +1,17 @@
+--- config_office/configure 2008-07-30 01:27:48.000000000 -0400
++++ config_office/configure 2008-07-30 02:08:34.000000000 -0400
+@@ -21375,10 +21375,10 @@
+ fi
+ if $PKG_CONFIG --modversion libagg | grep -q 2.3 || \
+- $PKG_CONFIG --modversion libagg | grep -q 2.4; then
++ $PKG_CONFIG --modversion libagg | grep -q 2.5; then
+ # 2.4's libagg.pc.in still contains 2.3 :/
+- if $EGREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then
+- { echo "$as_me:$LINENO: result: 2.4" >&5
++ if $EGREP -q "Version 2.5" `echo $AGG_INCDIR`/agg_basics.h; then
++ { echo "$as_me:$LINENO: result: 2.5" >&5
+ echo "${ECHO_T}2.4" >&6; }
+- AGG_VERSION=2400
++ AGG_VERSION=2500
+ else
+ { echo "$as_me:$LINENO: result: 2.3" >&5
--------------070208020908030908030705--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?48BDAB49.6070900>