mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-21 08:42:23 +00:00
Code Issues Releases Activity

Update to SRC680_m155.

Browse Source 
Add some preparation for gcj build.
This commit is contained in:
Maho Nakata 2006-02-05 08:57:52 +00:00
parent e8008c5840
commit 00316f3c4c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=155243
85 changed files with 7445 additions and 7280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
editors/openoffice-3-devel/Makefile
View File

@ -9,15 +9,19 @@ PORTNAME?= openoffice.org
PORTVERSION?= 2.0.${SNAPDATE}
CATEGORIES+= editors java
MASTER_SITES+= http://openoffice.lunarshells.com/sources/ \
ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= OOo_${OOOTAG}_source.tar.bz2
DISTFILES+= OOo_${OOOTAG}_source${EXTRACT_SUFX}
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
.endif
EXTRACT_ONLY= OOo_${OOOTAG}_source.tar.bz2
.if defined(WITH_GNUGCJ)
DISTFILES+= ${ANT_DISTFILE}:antbin
.endif
EXTRACT_ONLY= OOo_${OOOTAG}_source${EXTRACT_SUFX}
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@ -59,9 +63,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 151
MILESTONE?= 155
OOOTAG?= SRC680_m${MILESTONE}
SNAPDATE= 20060117
SNAPDATE= 20060203
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -78,7 +82,7 @@ PKGNAMESUFFIX?= -${LANG_SUFFIX}
.endif
.if defined(WITH_GNUGCJ)
BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41
#BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc41:${PORTSDIR}/lang/gcc41-wgcj
BROKEN= "still work in progress"
.else
BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo
@ -88,8 +92,8 @@ BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo
.if defined(WITH_CCACHE)
BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
.if defined(WITH_GNUGCJ)
CC= ccache gcc41
CXX= ccache g++41
CC= ccache ${LOCALBASE}/gcc41/bin/gcc
CXX= ccache ${LOCALBASE}/gcc41/bin/g++
.else
CC= ccache gcc-ooo
CXX= ccache g++-ooo
@ -97,8 +101,8 @@ CXX= ccache g++-ooo
.endif #WITH_CCACHE
.if !defined(WITH_CCACHE)
.if defined(WITH_GNUGCJ)
CC= gcc41
CXX= g++41
CC= ${LOCALBASE}/gcc41/bin/gcc
CXX= ${LOCALBASE}/gcc41/bin/g++
.else
CC= gcc-ooo
CXX= g++-ooo
@ -112,26 +116,40 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bison2:${PORTSDIR}/devel/bison2 \
imake:${X_IMAKE_PORT}
.if !defined(WITHOUT_JAVA)
BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant
.else
LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt
LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2
.endif
.if defined(WITH_GNUGCJ)
ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin.tar.bz2
ANT_VERSION= 1.6.5
.endif
.if !defined(WITH_GPC)
LIB_DEPENDS= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
.endif
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
ZIP?= ${PREFIX}/bin/zip
TCSH?= /bin/tcsh
PKGMESSAGE= ${WRKDIR}/pkg-message
NUMOFPROCESSES?= 1
USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
.if (${OSVERSION} <= 492000)
EXTRA_PATCHES+= ${FILESDIR}/fbsd4-workaroundpatch
.endif
.if defined(WITH_GNUGCJ)
EXTRA_PATCHES+= ${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches
.endif
#.if defined(WITH_TTF_BYTECODE_ENABLED)
#EXTRA_PATCHES+= ${FILESDIR}/optpatch-freetype
#.endif
.include <${FILESDIR}/Makefile.knobs>
pre-everything::
@ -152,11 +170,8 @@ pre-everything::
.endif
post-extract:
#.if defined(WITH_TTF_BYTECODE_ENABLED)
# @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
#.endif
.if (${OSVERSION} <= 492000)
@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/fbsd4-workaroundpatch
.if defined(WITH_GNUGCJ)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
.endif
.if defined(WITH_GPC)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -

9
editors/openoffice-3-devel/distinfo
View File

@ -1,9 +1,12 @@
MD5 (openoffice.org2.0/OOo_SRC680_m151_source.tar.bz2) = f652b703f21ade84d6ff814684df2327
SHA256 (openoffice.org2.0/OOo_SRC680_m151_source.tar.bz2) = 2c6a2e37ff5dd8b01c4d976239922e12b26bf948908f62d9e2df620c8ce4cf2d
SIZE (openoffice.org2.0/OOo_SRC680_m151_source.tar.bz2) = 236161920
MD5 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = b8a712737bb146baf1ebb00c88ed3dc3
SHA256 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 80b481f8815f7bc9263d9544f1a0326abeb61de7349e4947614a5e72e49c4b0b
SIZE (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 235716251
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024
MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
SHA256 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366

2
editors/openoffice-3-devel/files/Makefile.knobs
View File

@ -6,7 +6,7 @@
CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
.endif
.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
CONFIGURE_ARGS+= --with-java=gij --with-ant-home=${LOCALBASE}/ant
CONFIGURE_ARGS+= --with-jdk-home="${LOCALBASE}/gcc41" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}" --disable-qadevooo
.endif
.if defined(WITHOUT_JAVA)
CONFIGURE_ARGS+= --without-java

1308
editors/openoffice-3-devel/files/gcj-cws_jaxpapi Normal file
View File

File diff suppressed because it is too large Load Diff

137
editors/openoffice-3-devel/files/gcj-patches Normal file
View File

@ -0,0 +1,137 @@
Index: wizards/com/sun/star/wizards/ui/FilterComponent.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/ui/FilterComponent.java,v
retrieving revision 1.8
diff -u -r1.8 FilterComponent.java
--- wizards/com/sun/star/wizards/ui/FilterComponent.java 28 Dec 2005 17:25:36 -0000 1.8
+++ wizards/com/sun/star/wizards/ui/FilterComponent.java 27 Jan 2006 22:55:38 -0000
@@ -261,10 +261,7 @@
case DataType.BOOLEAN:
double dblvalue = ((Double) curValue).doubleValue();
curValue = new Boolean(dblvalue == 1.0);
- /**TODO: 1) Datei SingleSelectQueryComposer modifizieren:
- / Zeilen 1525ff in Methode auslagern und Aufruf in Zeile 1356 ändern TypeConverter is parameter
- * 2) setDisplayCondition ändern
- */
+ /* */
break;
default:
curValue = String.valueOf(curValue);
Index: solenv/inc/settings.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/settings.mk,v
retrieving revision 1.185
diff -u -r1.185 settings.mk
--- solenv/inc/settings.mk 20 Jan 2006 12:09:20 -0000 1.185
+++ solenv/inc/settings.mk 27 Jan 2006 23:11:31 -0000
@@ -187,7 +187,8 @@
#required arguments
.IF "$(JAVACACHE)" != ""
-JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
+#JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
+JAVAC=$(JAVACOMPILER) --encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
.ELSE
JAVAC=$(JAVACOMPILER)
Index: source/ui/slidesorter/cache/SlsQueueProcessor.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx,v
retrieving revision 1.10
diff -u -p -u -r1.10 SlsQueueProcessor.hxx
--- sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx 19 Jan 2006 12:52:20 -0000 1.10
+++ sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx 26 Jan 2006 08:29:38 -0000
@@ -164,7 +164,7 @@ template <class Queue, class RequestData
while ( ! mrQueue.IsEmpty())
{
// Determine whether the system is idle.
- sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mrView.GetWindow()));
+ sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(static_cast< ::Window* >(mrView.GetWindow())));
if (nIdleState != tools::IdleDetection::IDET_IDLE)
{
if ((nIdleState&tools::IdleDetection::IDET_FULL_SCREEN_SHOW_ACTIVE) != 0)
Index: config_office/configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.150
diff -u -r1.150 configure.in
--- config_office/configure.in 20 Jan 2006 13:28:25 -0000 1.150
+++ config_office/configure.in 2 Feb 2006 05:13:30 -0000
@@ -1975,6 +1975,7 @@
dnl Checks for javadoc
dnl ===================================================================
if test "$SOLAR_JAVA" != ""; then
+ if test "$JDK" != "gcj"; then
if test -z "$with_jdk_home"; then
AC_PATH_PROG(JAVADOC, javadoc)
else
@@ -1996,6 +1997,9 @@
JAVADOC=`cygpath -d "$JAVADOC"`
JAVADOC=`cygpath -u "$JAVADOC"`
fi
+ else
+ AC_PATH_PROG(JAVADOC, gjdoc)
+ fi
fi
if test "$SOLAR_JAVA" != ""; then
@@ -2032,8 +2036,14 @@
if test "$JDK" = "gcj"; then
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
- CFLAGS="$CFLAGS -I$JAVA_HOME/include"
- LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
+ CFLAGS="$CFLAGS -I$JAVA_HOME/include -pthread"
+ LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj -pthread"
+ JAR="$JAVA_HOME/bin/fastjar"
+ JAVACMD="$JAVA_HOME/bin/gij"
+ JAVA="$JAVA_HOME/bin/gij"
+ AC_SUBST(JAVA)
+ AC_SUBST(JAVACMD)
+ AC_SUBST(JAR)
AC_CHECK_HEADER(jni.h, [],
[AC_MSG_ERROR([jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?])], [])
@@ -4214,7 +4224,7 @@
EOF
oldJAVA_HOME=$JAVA_HOME
if test "$JDK" = "gcj"; then
- JAVA_HOME=; export JAVA_HOME
+ JAVACMD="$JAVA_HOME/bin/gij"; export JAVACMD
ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
else
ant_cmd="$ANT -buildfile conftest.xml 1>&2"
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.86
diff -u -r1.86 set_soenv.in
--- config_office/set_soenv.in 13 Jan 2006 16:37:16 -0000 1.86
+++ config_office/set_soenv.in 2 Feb 2006 05:13:31 -0000
@@ -68,7 +68,7 @@
#
# Help variables.
my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG,
- $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
+ $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE, $JAVACMD, $JAVA, $JAR,
$SOLARENVINC, $USR_DT, $USR_OPENWIN, $TCSH_PATH, $XLIB, $XINC,
$CYGWIN_PATH, $language, $dict, $ASM_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
$STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH );
@@ -1679,6 +1679,9 @@
ToFile( "JAVAINTERPRETER", "@JAVAINTERPRETER@","e" );
ToFile( "JAVACOMPILER", "@JAVACOMPILER@", "e" );
ToFile( "JAVADOC", "@JAVADOC@", "e" );
+ ToFile( "JAVA", "@JAVA@", "e" );
+ ToFile( "JAVACMD", "@JAVACMD@", "e" );
+ ToFile( "JAR", "@JAR@", "e" );
}
if ( $platform =~ m/darwin/ )
{ ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH, "e" );
Javadoc@xmerge http://qa.openoffice.org/issues/show_bug.cgi?id=57286
JAVA@berkeleydb http://qa.openoffice.org/issues/show_bug.cgi?id=54657
JAVACMD@ant
JAR@berkeleydb

752
editors/openoffice-3-devel/files/patch-Python-2.3.4.patch
View File

@ -1,752 +0,0 @@
Issuetracker : #i53287#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : Support for FreeBSD 6 and 7
Index: python/Python-2.3.4.patch
===================================================================
RCS file: /cvs/external/python/Python-2.3.4.patch,v
retrieving revision 1.6
diff -u -r1.6 Python-2.3.4.patch
--- python/Python-2.3.4.patch 3 Mar 2005 17:33:54 -0000 1.6
+++ python/Python-2.3.4.patch 8 Aug 2005 21:50:08 -0000
@@ -13776,3 +13776,739 @@
atheos*) DYNLOADFILE="dynload_atheos.o";;
*)
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
+*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py Tue Aug 9 06:26:23 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py Tue Aug 9 06:20:25 2005
+***************
+*** 0 ****
+--- 1,355 ----
++ # Generated by h2py from /usr/include/netinet/in.h
++ IPPROTO_IP = 0
++ IPPROTO_HOPOPTS = 0
++ IPPROTO_ICMP = 1
++ IPPROTO_IGMP = 2
++ IPPROTO_GGP = 3
++ IPPROTO_IPV4 = 4
++ IPPROTO_IPIP = IPPROTO_IPV4
++ IPPROTO_TCP = 6
++ 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_UDP = 17
++ 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_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_DIVERT = 254
++ IPPROTO_RAW = 255
++ IPPROTO_MAX = 256
++ IPPROTO_DONE = 257
++ IPPORT_RESERVED = 1024
++ IPPORT_USERRESERVED = 5000
++ IPPORT_HIFIRSTAUTO = 49152
++ IPPORT_HILASTAUTO = 65535
++ IPPORT_RESERVEDSTART = 600
++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
++
++ IN_CLASSA_NET = 0xff000000
++ IN_CLASSA_NSHIFT = 24
++ IN_CLASSA_HOST = 0x00ffffff
++ IN_CLASSA_MAX = 128
++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
++
++ IN_CLASSB_NET = 0xffff0000
++ IN_CLASSB_NSHIFT = 16
++ IN_CLASSB_HOST = 0x0000ffff
++ IN_CLASSB_MAX = 65536
++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
++
++ IN_CLASSC_NET = 0xffffff00
++ IN_CLASSC_NSHIFT = 8
++ IN_CLASSC_HOST = 0x000000ff
++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
++
++ IN_CLASSD_NET = 0xf0000000
++ 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) & 0xf0000000) == 0xf0000000)
++
++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
++
++ INADDR_NONE = 0xffffffff
++ IN_LOOPBACKNET = 127
++ INET_ADDRSTRLEN = 16
++ IP_OPTIONS = 1
++ IP_HDRINCL = 2
++ IP_TOS = 3
++ IP_TTL = 4
++ IP_RECVOPTS = 5
++ IP_RECVRETOPTS = 6
++ IP_RECVDSTADDR = 7
++ 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_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_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
++
++ # Included from netinet6/in6.h
++
++ # Included from sys/queue.h
++ def SLIST_HEAD_INITIALIZER(head): return \
++
++ def SLIST_ENTRY(type): return \
++
++ def STAILQ_HEAD_INITIALIZER(head): return \
++
++ def STAILQ_ENTRY(type): return \
++
++ def LIST_HEAD_INITIALIZER(head): return \
++
++ def LIST_ENTRY(type): return \
++
++ def TAILQ_HEAD_INITIALIZER(head): return \
++
++ def TAILQ_ENTRY(type): return \
++
++ def CIRCLEQ_ENTRY(type): return \
++
++ __KAME_VERSION = "20000701/FreeBSD-current"
++ 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 = 0xff010000
++ IPV6_ADDR_INT32_MLL = 0xff020000
++ 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 = 0xffff0000
++ 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_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_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_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 \
++
++ 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_PKTINFO = 19
++ IPV6_HOPLIMIT = 20
++ IPV6_NEXTHOP = 21
++ IPV6_HOPOPTS = 22
++ IPV6_DSTOPTS = 23
++ IPV6_RTHDR = 24
++ IPV6_PKTOPTIONS = 25
++ IPV6_CHECKSUM = 26
++ IPV6_BINDV6ONLY = 27
++ 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_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_BINDV6ONLY = 24
++ IPV6CTL_RTEXPIRE = 25
++ IPV6CTL_RTMINEXPIRE = 26
++ IPV6CTL_RTMAXCACHE = 27
++ IPV6CTL_MAXID = 28
+*** misc/Python-2.3.4/Lib/plat-freebsd6/regen Tue Aug 9 06:26:27 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/regen Tue Aug 9 06:19:02 2005
+***************
+*** 0 ****
+--- 1,3 ----
++ #! /bin/sh
++ set -v
++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
+*** misc/Python-2.3.4/Lib/plat-freebsd7/IN.py Tue Aug 9 06:26:23 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/IN.py Tue Aug 9 06:20:25 2005
+***************
+*** 0 ****
+--- 1,355 ----
++ # Generated by h2py from /usr/include/netinet/in.h
++ IPPROTO_IP = 0
++ IPPROTO_HOPOPTS = 0
++ IPPROTO_ICMP = 1
++ IPPROTO_IGMP = 2
++ IPPROTO_GGP = 3
++ IPPROTO_IPV4 = 4
++ IPPROTO_IPIP = IPPROTO_IPV4
++ IPPROTO_TCP = 6
++ 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_UDP = 17
++ 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_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_DIVERT = 254
++ IPPROTO_RAW = 255
++ IPPROTO_MAX = 256
++ IPPROTO_DONE = 257
++ IPPORT_RESERVED = 1024
++ IPPORT_USERRESERVED = 5000
++ IPPORT_HIFIRSTAUTO = 49152
++ IPPORT_HILASTAUTO = 65535
++ IPPORT_RESERVEDSTART = 600
++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
++
++ IN_CLASSA_NET = 0xff000000
++ IN_CLASSA_NSHIFT = 24
++ IN_CLASSA_HOST = 0x00ffffff
++ IN_CLASSA_MAX = 128
++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
++
++ IN_CLASSB_NET = 0xffff0000
++ IN_CLASSB_NSHIFT = 16
++ IN_CLASSB_HOST = 0x0000ffff
++ IN_CLASSB_MAX = 65536
++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
++
++ IN_CLASSC_NET = 0xffffff00
++ IN_CLASSC_NSHIFT = 8
++ IN_CLASSC_HOST = 0x000000ff
++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
++
++ IN_CLASSD_NET = 0xf0000000
++ 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) & 0xf0000000) == 0xf0000000)
++
++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
++
++ INADDR_NONE = 0xffffffff
++ IN_LOOPBACKNET = 127
++ INET_ADDRSTRLEN = 16
++ IP_OPTIONS = 1
++ IP_HDRINCL = 2
++ IP_TOS = 3
++ IP_TTL = 4
++ IP_RECVOPTS = 5
++ IP_RECVRETOPTS = 6
++ IP_RECVDSTADDR = 7
++ 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_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_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
++
++ # Included from netinet6/in6.h
++
++ # Included from sys/queue.h
++ def SLIST_HEAD_INITIALIZER(head): return \
++
++ def SLIST_ENTRY(type): return \
++
++ def STAILQ_HEAD_INITIALIZER(head): return \
++
++ def STAILQ_ENTRY(type): return \
++
++ def LIST_HEAD_INITIALIZER(head): return \
++
++ def LIST_ENTRY(type): return \
++
++ def TAILQ_HEAD_INITIALIZER(head): return \
++
++ def TAILQ_ENTRY(type): return \
++
++ def CIRCLEQ_ENTRY(type): return \
++
++ __KAME_VERSION = "20000701/FreeBSD-current"
++ 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 = 0xff010000
++ IPV6_ADDR_INT32_MLL = 0xff020000
++ 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 = 0xffff0000
++ 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_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_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_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 \
++
++ 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_PKTINFO = 19
++ IPV6_HOPLIMIT = 20
++ IPV6_NEXTHOP = 21
++ IPV6_HOPOPTS = 22
++ IPV6_DSTOPTS = 23
++ IPV6_RTHDR = 24
++ IPV6_PKTOPTIONS = 25
++ IPV6_CHECKSUM = 26
++ IPV6_BINDV6ONLY = 27
++ 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_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_BINDV6ONLY = 24
++ IPV6CTL_RTEXPIRE = 25
++ IPV6CTL_RTMINEXPIRE = 26
++ IPV6CTL_RTMAXCACHE = 27
++ IPV6CTL_MAXID = 28
+*** misc/Python-2.3.4/Lib/plat-freebsd7/regen Tue Aug 9 06:26:27 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/regen Tue Aug 9 06:19:02 2005
+***************
+*** 0 ****
+--- 1,3 ----
++ #! /bin/sh
++ set -v
++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h

173
editors/openoffice-3-devel/files/patch-bridges
View File

@ -1,173 +0,0 @@
Issuetracker : #i56947#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : update files at bridges project
catch up version up of bridge project of GNU/Linux
--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Thu Sep 8 07:20:08 2005
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed Oct 26 15:10:05 2005
@@ -57,7 +57,7 @@
typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
sal_Int32 nParams, typelib_MethodParameter * pParams,
void ** pCallStack,
- sal_Int64 * pRegisterReturn /* space for register return */ )
+ void * pReturnValue )
{
// pCallStack: ret, [return ptr], this, params
char * pCppStack = (char *)(pCallStack +1);
@@ -74,7 +74,7 @@
{
if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
{
- pUnoReturn = pRegisterReturn; // direct way for simple types
+ pUnoReturn = pReturnValue; // direct way for simple types
}
else // complex return via ptr (pCppReturn)
{
@@ -215,7 +215,7 @@
uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
}
// complex return ptr is set to eax
- *(void **)pRegisterReturn = pCppReturn;
+ *static_cast< void ** >(pReturnValue) = pCppReturn;
}
if (pReturnTypeDescr)
{
@@ -228,7 +228,7 @@
//==================================================================================================
extern "C" void cpp_vtable_call(
int nFunctionIndex, int nVtableOffset, void** pCallStack,
- sal_Int64 nRegReturn )
+ void * pReturnValue )
{
OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
@@ -275,7 +275,7 @@
pCppI, aMemberDescr.get(),
((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
0, 0, // no params
- pCallStack, &nRegReturn );
+ pCallStack, pReturnValue );
}
else
{
@@ -290,7 +290,7 @@
pCppI, aMemberDescr.get(),
0, // indicates void return
1, &aParam,
- pCallStack, &nRegReturn );
+ pCallStack, pReturnValue );
}
break;
}
@@ -324,7 +324,7 @@
&pInterface, pTD, cpp_acquire );
pInterface->release();
TYPELIB_DANGER_RELEASE( pTD );
- *(void **)&nRegReturn = pCallStack[1];
+ *static_cast< void ** >(pReturnValue) = pCallStack[1];
break;
}
TYPELIB_DANGER_RELEASE( pTD );
@@ -336,7 +336,7 @@
((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
- pCallStack, &nRegReturn );
+ pCallStack, pReturnValue );
}
break;
}
--- bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Wed Jun 1 01:32:41 2005
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Wed Oct 26 15:10:04 2005
@@ -9,12 +9,13 @@
.LCFIg0:
movl %esp,%ebp
.LCFIg1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x4,%esp # 32bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- movl 12(%esp),%eax # 64 bit nRegReturn, lower half
+ movl 16(%esp),%eax # 32bit returnValue
leave
ret
.LFEg:
@@ -29,7 +30,7 @@
.LCFIv0:
movl %esp,%ebp
.LCFIv1:
- subl $0x8,%esp # 64bit nRegReturn
+ pushl $0 # 32bit null pointer (returnValue not used)
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
@@ -48,13 +49,14 @@
.LCFIh0:
movl %esp,%ebp
.LCFIh1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x8,%esp # 64bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- movl 12(%esp),%eax # 64 bit nRegReturn, lower half
- movl 16(%esp),%edx # 64 bit nRegReturn, upper half
+ movl 16(%esp),%eax # 64bit returnValue, lower half
+ movl 20(%esp),%edx # 64bit returnValue, upper half
leave
ret
.LFEh:
@@ -69,12 +71,13 @@
.LCFIf0:
movl %esp,%ebp
.LCFIf1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x4,%esp # 32bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- flds 12(%esp) # 64 bit nRegReturn, lower half
+ flds 16(%esp) # 32bit returnValue
leave
ret
.LFEf:
@@ -89,12 +92,13 @@
.LCFId0:
movl %esp,%ebp
.LCFId1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x8,%esp # 64bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- fldl 12(%esp) # 64 bit nRegReturn
+ fldl 16(%esp) # 64bit returnValue
leave
ret
.LFEd:
@@ -109,12 +113,13 @@
.LCFIc0:
movl %esp,%ebp
.LCFIc1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x4,%esp # 32bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- movl 12(%esp),%eax # 64 bit nRegReturn, lower half
+ movl 16(%esp),%eax # 32bit returnValue
leave
ret $4
.LFEc:

18
editors/openoffice-3-devel/files/patch-config_office+set_soenv.in
View File

@ -1,18 +0,0 @@
Issuetracker : #i56949#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : Add conditional the case of @GCCVER@ >= 30401.
Like GNU/Linux's case, we also need the case for $CVER if @GCCVER@ is equal to or larger than 3.4.1
--- config_office/set_soenv.in Thu Sep 22 23:30:56 2005
+++ config_office/set_soenv.in Sat Oct 1 12:59:30 2005
@@ -347,6 +347,9 @@
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ if( @GCCVER@ >= 30401 ) {
+ $CVER = "C341";
+ }
}
elsif ( $platform =~ m/linux-gnu/ )
{

87
editors/openoffice-3-devel/files/patch-epm+epm-3.7.patch
View File

@ -1,87 +0,0 @@
Issuetracker : #iXXXXX#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : epm porting for FreeBSD
o FreeBSD's package manager doesn't allow multiple lines for
@exec and @unexec
o chown is at /usr/sbin/
o the way to recording package dependency is incorrect
Index: epm/epm-3.7.patch
===================================================================
RCS file: /cvs/external/epm/epm-3.7.patch,v
retrieving revision 1.2
diff -u -r1.2 epm-3.7.patch
--- epm/epm-3.7.patch 10 Mar 2005 11:52:43 -0000 1.2
+++ epm/epm-3.7.patch 3 Jun 2005 22:05:23 -0000
@@ -1,3 +1,69 @@
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005
+***************
+*** 26,31 ****
+--- 26,38 ----
+
+ #include "epm.h"
+
++ void cr2semicolon(char *command)
++ {
++ int len, i;
++ len=strlen(command);
++ for (i=0;i<len;i++)
++ if(*(command+i)=='\n') *(command+i)=';';
++ }
+
+ /*
+ * 'make_bsd()' - Make a FreeBSD software distribution package.
+***************
+*** 150,156 ****
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+ if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s", d->product);
+ else
+ #ifdef __FreeBSD__
+ /*
+--- 157,163 ----
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+ if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
+ else
+ #ifdef __FreeBSD__
+ /*
+***************
+*** 179,187 ****
+--- 186,196 ----
+ " by the BSD packager.\n", stderr);
+ break;
+ case COMMAND_POST_INSTALL :
++ cr2semicolon(c->command);
+ fprintf(fp, "@exec %s\n", c->command);
+ break;
+ case COMMAND_PRE_REMOVE :
++ cr2semicolon(c->command);
+ fprintf(fp, "@unexec %s\n", c->command);
+ break;
+ case COMMAND_POST_REMOVE :
+***************
+*** 199,205 ****
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
+--- 208,214 ----
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
*** misc/epm-3.7/epm.c 2003-10-28 15:48:30.000000000 +0100
--- misc/build/epm-3.7/epm.c 2004-11-24 10:38:40.000000000 +0100
***************

45
editors/openoffice-3-devel/files/patch-icu+icu-2.6.patch
View File

@ -1,45 +0,0 @@
Issuetracker : #i56952#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : Passing $ORIGIN to linker at icu project
We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case.
Index: icu/icu-2.6.patch
===================================================================
RCS file: /cvs/external/icu/icu-2.6.patch,v
retrieving revision 1.15
diff -u -r1.15 icu-2.6.patch
--- icu/icu-2.6.patch 28 Dec 2005 16:54:16 -0000 1.15
+++ icu/icu-2.6.patch 5 Jan 2006 12:58:57 -0000
@@ -2775,3 +2775,31 @@
commands = pkg_appendToList(commands, NULL, uprv_strdup(stanza));
sprintf(stanza, "@$(RMV) $(TEMP_DIR)/%s", cfile+genFileOffset);
+*** misc/icu/source/config/mh-bsd-gcc Thu May 2 08:48:10 2002
+--- misc/build/icu/source/config/mh-bsd-gcc Mon Oct 24 18:16:57 2005
+***************
+*** 10,21 ****
+--- 10,30 ----
+ GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
+
+ ## Flags for position independent code
++ STATICCFLAGS = -fPIC
++ STATICCXXFLAGS = -fPIC
++ STATICCPPFLAGS = -DPIC
+ SHAREDLIBCFLAGS = -fPIC
+ SHAREDLIBCXXFLAGS = -fPIC
+ SHAREDLIBCPPFLAGS = -DPIC
+
+ ## Compiler switch to embed a runtime search path
+ LD_RPATH=
++ ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
++ ENABLE_RPATH=YES
++ RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN'
++
++ #SH# ENABLE_RPATH=YES
++ #SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN'"
+ LD_RPATH_PRE= -Wl,-rpath,
+
+ ## Compiler switch to embed a library name
+
+

154
editors/openoffice-3-devel/files/patch-instsetoo
View File

@ -1,154 +0,0 @@
Issuetracker : #i53288#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : remove circular dependency
in this case,
core01 is depend on core02-core08, and core0[2-9] and core10
depends on core01. for FreeBSD this is regarded as circular dependency
and pkg_add command is forked infinite times and eats up systems' resource.
namely when core01 tries to install core02, core02 also tries to
install core01.
Index: instsetoo_native/inc_openoffice/unix/packagelist.txt
===================================================================
RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v
retrieving revision 1.21
diff -u -r1.21 packagelist.txt
--- instsetoo_native/inc_openoffice/unix/packagelist.txt 30 Nov 2005 13:21:44 -0000 1.21
+++ instsetoo_native/inc_openoffice/unix/packagelist.txt 3 Dec 2005 22:26:12 -0000
@@ -37,6 +37,7 @@
packagename = "%UNIXPRODUCTNAME-core01"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-mailcap,%WITHOUTDOTUNIXPRODUCTNAME-core,%WITHOUTDOTUNIXPRODUCTNAME-core01"
requires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
+freebsdrequires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08,%UNIXPRODUCTNAME-core09,%UNIXPRODUCTNAME-core10"
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -278,6 +279,7 @@
packagename = "%UNIXPRODUCTNAME-core02"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core02"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -291,6 +293,7 @@
packagename = "%UNIXPRODUCTNAME-core03"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core03"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -304,6 +307,7 @@
packagename = "%UNIXPRODUCTNAME-core04"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core04"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -317,6 +321,7 @@
packagename = "%UNIXPRODUCTNAME-core05"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core05"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -330,6 +335,7 @@
packagename = "%UNIXPRODUCTNAME-core06"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core06"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -343,6 +349,7 @@
packagename = "%UNIXPRODUCTNAME-core07"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core07"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -356,6 +363,7 @@
packagename = "%UNIXPRODUCTNAME-core08"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core08"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -369,6 +377,7 @@
packagename = "%UNIXPRODUCTNAME-core09"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core09"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -383,6 +392,7 @@
packagename = "%UNIXPRODUCTNAME-core10"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core10"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
Index: solenv/bin/modules/installer/epmfile.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v
retrieving revision 1.42
diff -u -r1.42 epmfile.pm
--- solenv/bin/modules/installer/epmfile.pm 9 Nov 2005 09:09:49 -0000 1.42
+++ solenv/bin/modules/installer/epmfile.pm 3 Dec 2005 22:26:52 -0000
@@ -395,6 +395,11 @@
$provides = "solarisprovides"; # the name in the packagelist
$requires = "solarisrequires"; # the name in the packagelist
}
+ elsif ( $installer::globals::isfreebsdpkgbuild )
+ {
+ $provides = "freebsdprovides"; # the name in the packagelist
+ $requires = "freebsdrequires"; # the name in the packagelist
+ }
else
{
$provides = "provides"; # the name in the packagelist
Index: solenv/bin/modules/installer/globals.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
retrieving revision 1.47
diff -u -r1.47 globals.pm
--- solenv/bin/modules/installer/globals.pm 9 Nov 2005 09:10:01 -0000 1.47
+++ solenv/bin/modules/installer/globals.pm 3 Dec 2005 22:26:52 -0000
@@ -80,6 +80,7 @@
$issolarispkgbuild = 0;
$issolarissparcbuild = 0;
$issolarisx86build = 0;
+ $isfreebsdpkgbuild = 0;
$unpackpath = "";
$idttemplatepath = "";
$idtlanguagepath = "";
Index: solenv/bin/modules/installer/parameter.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
retrieving revision 1.29
diff -u -r1.29 parameter.pm
--- solenv/bin/modules/installer/parameter.pm 9 Nov 2005 09:10:12 -0000 1.29
+++ solenv/bin/modules/installer/parameter.pm 10 Dec 2005 13:11:30 -0000
@@ -304,6 +304,13 @@
$installer::globals::epmoutpath = "packages";
}
}
+ if ( $installer::globals::compiler =~ /unxfbsdi/ )
+ {
+ if ( $installer::globals::packageformat eq "bsd" )
+ {
+ $installer::globals::isfreebsdpkgbuild = 1;
+ }
+ }
if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; }

17
editors/openoffice-3-devel/files/patch-jvmfwk+distributions+OpenOfficeorg+makefile.mk
View File

@ -1,17 +0,0 @@
Issuetracker : #i56951#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : javavendors_linux.xml can be used for FreeBSD as well.
javavendors_linux.xml can be used for FreeBSD as well.
--- jvmfwk/distributions/OpenOfficeorg/makefile.mk Thu Sep 8 04:26:17 2005
+++ jvmfwk/distributions/OpenOfficeorg/makefile.mk Sat Oct 22 18:31:16 2005
@@ -49,7 +49,7 @@
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
+-$(COPY) javavendors_macosx.xml $(BIN)$/javavendors_ooo.xml
-.ELIF "$(OS)"=="LINUX"
+.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
+-$(COPY) javavendors_linux.xml $(BIN)$/javavendors_ooo.xml
.ELSE
+-$(COPY) javavendors_unx.xml $(BIN)$/javavendors_ooo.xml

7
editors/openoffice-3-devel/files/patch-jvmfwk+plugins+sunmajor+pluginlib+sunversion.cxx
View File

@ -12,18 +12,17 @@ java 1.4.1-p10 for example to 1.4.1_110.
--- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Thu Sep 8 04:31:40 2005
+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Sat Oct 22 18:25:49 2005
@@ -208,7 +208,16 @@
@@ -208,7 +208,15 @@
return false;
#if defined(FREEBSD)
if (m_preRelease == Rel_FreeBSD) {
- m_nUpdateSpecial = *pCur;
+ pCur++; //elemnate `p'
+ if (pCur < pEnd && isdigit(*pCur))
+ if (pCur < pEnd)
+ pCur ++;
+ pCur ++;
+ int len = pCur - pLast -1; //elemenate `p'
+ if (len >= 127)
+ return false;
+ return false;
+ strncpy(buf, (pLast+1), len); //elemenate `p'
+ buf[len] = 0;
+ m_nUpdateSpecial = atoi(buf)+100; //hack for FBSD

23
editors/openoffice-3-devel/files/patch-libxmlsec+makefile.mk
View File

@ -1,23 +0,0 @@
Issuetracker : #i56954#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : Passing $ORIGIN to linker at libxmlsec project
We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case.
Index: libxmlsec/makefile.mk
===================================================================
RCS file: /cvs/external/libxmlsec/makefile.mk,v
retrieving revision 1.7
diff -u -r1.7 makefile.mk
--- libxmlsec/makefile.mk 28 Dec 2005 16:58:06 -0000 1.7
+++ libxmlsec/makefile.mk 5 Jan 2006 12:34:24 -0000
@@ -98,6 +98,9 @@
.IF "$(OS)$(COM)"=="SOLARISC52"
xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN'
.ENDIF # "$(OS)$(COM)"=="SOLARISC52"
+.IF "$(OS)$(COM)"=="FREEBSDGCC"
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN'
+.ENDIF # "$(OS)$(COM)"=="FREEBSDGCC"
LDFLAGS:=$(xmlsec_LDFLAGS)
.EXPORT: LDFLAGS

65
editors/openoffice-3-devel/files/patch-psprint+source+fontmanager+parseAFM.cxx
View File

@ -1,65 +0,0 @@
Issuetracker : #i60097#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : getc and ungetc are defined at stdio.h
Index: psprint/source/fontmanager/parseAFM.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/parseAFM.cxx,v
retrieving revision 1.6
diff -u -r1.6 parseAFM.cxx
--- psprint/source/fontmanager/parseAFM.cxx 28 Dec 2005 17:08:38 -0000 1.6
+++ psprint/source/fontmanager/parseAFM.cxx 5 Jan 2006 22:05:26 -0000
@@ -113,8 +113,8 @@
FileInputStream( const char* pFilename );
~FileInputStream();
- int getc() { return (m_nPos < m_nLen) ? int(m_pMemory[m_nPos++]) : -1; }
- void ungetc()
+ int getChar() { return (m_nPos < m_nLen) ? int(m_pMemory[m_nPos++]) : -1; }
+ void ungetChar()
{
if( m_nPos > 0 )
m_nPos--;
@@ -278,18 +278,18 @@
/* skip over white space */
// relies on EOF = -1
- while( is_white_Array[ (ch = stream->getc()) & 255 ] )
+ while( is_white_Array[ (ch = stream->getChar()) & 255 ] )
;
idx = 0;
while( ch != -1 && ! is_delimiter_Array[ ch & 255 ] )
{
ident[idx++] = ch;
- ch = stream->getc();
+ ch = stream->getChar();
}
if (ch == -1 && idx < 1) return ((char *)NULL);
- if (idx >= 1 && ch != ':' ) stream->ungetc();
+ if (idx >= 1 && ch != ':' ) stream->ungetChar();
if (idx < 1 ) ident[idx++] = ch; /* single-character token */
ident[idx] = 0;
rLen = idx;
@@ -311,16 +311,16 @@
static char ident[MAX_NAME]; /* storage buffer for keywords */
int ch, idx;
- while ((ch = stream->getc()) == ' ' || ch == '\t' );
+ while ((ch = stream->getChar()) == ' ' || ch == '\t' );
idx = 0;
while (ch != -1 && ch != lineterm && ch != '\r')
{
ident[idx++] = ch;
- ch = stream->getc();
+ ch = stream->getChar();
} /* while */
- stream->ungetc();
+ stream->ungetChar();
ident[idx] = 0;
return(ident); /* returns pointer to the token */

64
editors/openoffice-3-devel/files/patch-sdkoo
View File

@ -1,64 +0,0 @@
Issuetracker : #iXXXXX#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : building sdk fails for FreeBSD
1. Build error
dmake sdkoo fails like:
##############################################################################
... starting unpatched epm ...
... epm -f bsd openoffice.org-sdk /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/listfile/en-US/epm_OpenOffice_SDK_gid_Module_Root_unxfbsd_SRC680__en-US.lst -v 2>&1 | ...
**************************************************
ERROR: ERROR: "epm -f bsd openoffice.org-sdk /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/listfile/en-US/epm_OpenOffice_SDK_gid_Module_Root_unxfbsd_SRC680__en-US.lst -v 2>&1 |"!
in function: call_epm
**************************************************
**************************************************
ERROR: Saved logfile: /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/logging/en-US/log_SRC680__en-US.log
**************************************************
... cleaning the output tree ...
... removing directory /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/zip/en-US ...
Fri Nov 18 22:49:33 2005 (08:05 min.)
dmake: Error code 255, while making 'sdkoo_en-US.bsd'
'---* tg_merge.mk *---'
##############################################################################
2. Reason why it fails:
since quoting for filename containing `$' produces an error
tar: opt/openoffice.org2.0_sdk/classes/com/sun/star/lib/loader/InstallationFinder\$StreamGobbler.class: Could not stat: No such file or directory
tar: opt/openoffice.org2.0_sdk/classes/com/sun/star/lib/loader/Loader\$CustomURLClassLoader.class: Could not stat: No such file or directory
3. Solution
For FreeBSD, we don't need quoting. We use printf for files names
instead of using qprintf, a function that treats quoting string.
--- epm/epm-3.7.patch Sat Nov 19 10:21:34 2005
+++ epm/epm-3.7.patch Sat Nov 19 10:22:23 2005
@@ -586,3 +586,23 @@
}
--- 457,462 ----
+
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005
+***************
+*** 234,240 ****
+ case 'c' :
+ case 'f' :
+ case 'l' :
+! qprintf(fp, "%s\n", file->dst + 1);
+ break;
+ }
+ }
+--- 243,249 ----
+ case 'c' :
+ case 'f' :
+ case 'l' :
+! fprintf(fp, "%s\n", file->dst + 1);
+ break;
+ }
+ }

31
editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,31 +0,0 @@
Issuetracker : #i56956#
CWS : N/A
Author: : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : catch up recent version of solenv/inc/unxlngi6.mk
catch up recent version of solenv/inc/unxlngi6.mk and STLPORT_VERSION is 450 in FreeBSD
--- solenv/inc/unxfbsdi.mk Wed Oct 5 20:33:12 2005
+++ solenv/inc/unxfbsdi.mk Mon Oct 24 11:13:39 2005
@@ -45,7 +45,7 @@
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
# _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -190,8 +190,13 @@
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+.IF "$(USE_STLP_DEBUG)" != ""
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
+.ELSE # "$(USE_STLP_DEBUG)" != ""
LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)

53
editors/openoffice.org-2-devel/Makefile
View File

@ -9,15 +9,19 @@ PORTNAME?= openoffice.org
PORTVERSION?= 2.0.${SNAPDATE}
CATEGORIES+= editors java
MASTER_SITES+= http://openoffice.lunarshells.com/sources/ \
ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= OOo_${OOOTAG}_source.tar.bz2
DISTFILES+= OOo_${OOOTAG}_source${EXTRACT_SUFX}
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
.endif
EXTRACT_ONLY= OOo_${OOOTAG}_source.tar.bz2
.if defined(WITH_GNUGCJ)
DISTFILES+= ${ANT_DISTFILE}:antbin
.endif
EXTRACT_ONLY= OOo_${OOOTAG}_source${EXTRACT_SUFX}
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@ -59,9 +63,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 151
MILESTONE?= 155
OOOTAG?= SRC680_m${MILESTONE}
SNAPDATE= 20060117
SNAPDATE= 20060203
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -78,7 +82,7 @@ PKGNAMESUFFIX?= -${LANG_SUFFIX}
.endif
.if defined(WITH_GNUGCJ)
BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41
#BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc41:${PORTSDIR}/lang/gcc41-wgcj
BROKEN= "still work in progress"
.else
BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo
@ -88,8 +92,8 @@ BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo
.if defined(WITH_CCACHE)
BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
.if defined(WITH_GNUGCJ)
CC= ccache gcc41
CXX= ccache g++41
CC= ccache ${LOCALBASE}/gcc41/bin/gcc
CXX= ccache ${LOCALBASE}/gcc41/bin/g++
.else
CC= ccache gcc-ooo
CXX= ccache g++-ooo
@ -97,8 +101,8 @@ CXX= ccache g++-ooo
.endif #WITH_CCACHE
.if !defined(WITH_CCACHE)
.if defined(WITH_GNUGCJ)
CC= gcc41
CXX= g++41
CC= ${LOCALBASE}/gcc41/bin/gcc
CXX= ${LOCALBASE}/gcc41/bin/g++
.else
CC= gcc-ooo
CXX= g++-ooo
@ -112,26 +116,40 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bison2:${PORTSDIR}/devel/bison2 \
imake:${X_IMAKE_PORT}
.if !defined(WITHOUT_JAVA)
BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant
.else
LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt
LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2
.endif
.if defined(WITH_GNUGCJ)
ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin.tar.bz2
ANT_VERSION= 1.6.5
.endif
.if !defined(WITH_GPC)
LIB_DEPENDS= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
.endif
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
ZIP?= ${PREFIX}/bin/zip
TCSH?= /bin/tcsh
PKGMESSAGE= ${WRKDIR}/pkg-message
NUMOFPROCESSES?= 1
USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
.if (${OSVERSION} <= 492000)
EXTRA_PATCHES+= ${FILESDIR}/fbsd4-workaroundpatch
.endif
.if defined(WITH_GNUGCJ)
EXTRA_PATCHES+= ${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches
.endif
#.if defined(WITH_TTF_BYTECODE_ENABLED)
#EXTRA_PATCHES+= ${FILESDIR}/optpatch-freetype
#.endif
.include <${FILESDIR}/Makefile.knobs>
pre-everything::
@ -152,11 +170,8 @@ pre-everything::
.endif
post-extract:
#.if defined(WITH_TTF_BYTECODE_ENABLED)
# @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
#.endif
.if (${OSVERSION} <= 492000)
@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/fbsd4-workaroundpatch
.if defined(WITH_GNUGCJ)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
.endif
.if defined(WITH_GPC)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -

9
editors/openoffice.org-2-devel/distinfo
View File

@ -1,9 +1,12 @@
MD5 (openoffice.org2.0/OOo_SRC680_m151_source.tar.bz2) = f652b703f21ade84d6ff814684df2327
SHA256 (openoffice.org2.0/OOo_SRC680_m151_source.tar.bz2) = 2c6a2e37ff5dd8b01c4d976239922e12b26bf948908f62d9e2df620c8ce4cf2d
SIZE (openoffice.org2.0/OOo_SRC680_m151_source.tar.bz2) = 236161920
MD5 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = b8a712737bb146baf1ebb00c88ed3dc3
SHA256 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 80b481f8815f7bc9263d9544f1a0326abeb61de7349e4947614a5e72e49c4b0b
SIZE (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 235716251
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024
MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
SHA256 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366

2
editors/openoffice.org-2-devel/files/Makefile.knobs
View File

@ -6,7 +6,7 @@
CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
.endif
.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
CONFIGURE_ARGS+= --with-java=gij --with-ant-home=${LOCALBASE}/ant
CONFIGURE_ARGS+= --with-jdk-home="${LOCALBASE}/gcc41" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}" --disable-qadevooo
.endif
.if defined(WITHOUT_JAVA)
CONFIGURE_ARGS+= --without-java

1308
editors/openoffice.org-2-devel/files/gcj-cws_jaxpapi Normal file
View File

File diff suppressed because it is too large Load Diff

137
editors/openoffice.org-2-devel/files/gcj-patches Normal file
View File

@ -0,0 +1,137 @@
Index: wizards/com/sun/star/wizards/ui/FilterComponent.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/ui/FilterComponent.java,v
retrieving revision 1.8
diff -u -r1.8 FilterComponent.java
--- wizards/com/sun/star/wizards/ui/FilterComponent.java 28 Dec 2005 17:25:36 -0000 1.8
+++ wizards/com/sun/star/wizards/ui/FilterComponent.java 27 Jan 2006 22:55:38 -0000
@@ -261,10 +261,7 @@
case DataType.BOOLEAN:
double dblvalue = ((Double) curValue).doubleValue();
curValue = new Boolean(dblvalue == 1.0);
- /**TODO: 1) Datei SingleSelectQueryComposer modifizieren:
- / Zeilen 1525ff in Methode auslagern und Aufruf in Zeile 1356 ändern TypeConverter is parameter
- * 2) setDisplayCondition ändern
- */
+ /* */
break;
default:
curValue = String.valueOf(curValue);
Index: solenv/inc/settings.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/settings.mk,v
retrieving revision 1.185
diff -u -r1.185 settings.mk
--- solenv/inc/settings.mk 20 Jan 2006 12:09:20 -0000 1.185
+++ solenv/inc/settings.mk 27 Jan 2006 23:11:31 -0000
@@ -187,7 +187,8 @@
#required arguments
.IF "$(JAVACACHE)" != ""
-JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
+#JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
+JAVAC=$(JAVACOMPILER) --encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
.ELSE
JAVAC=$(JAVACOMPILER)
Index: source/ui/slidesorter/cache/SlsQueueProcessor.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx,v
retrieving revision 1.10
diff -u -p -u -r1.10 SlsQueueProcessor.hxx
--- sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx 19 Jan 2006 12:52:20 -0000 1.10
+++ sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx 26 Jan 2006 08:29:38 -0000
@@ -164,7 +164,7 @@ template <class Queue, class RequestData
while ( ! mrQueue.IsEmpty())
{
// Determine whether the system is idle.
- sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mrView.GetWindow()));
+ sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(static_cast< ::Window* >(mrView.GetWindow())));
if (nIdleState != tools::IdleDetection::IDET_IDLE)
{
if ((nIdleState&tools::IdleDetection::IDET_FULL_SCREEN_SHOW_ACTIVE) != 0)
Index: config_office/configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.150
diff -u -r1.150 configure.in
--- config_office/configure.in 20 Jan 2006 13:28:25 -0000 1.150
+++ config_office/configure.in 2 Feb 2006 05:13:30 -0000
@@ -1975,6 +1975,7 @@
dnl Checks for javadoc
dnl ===================================================================
if test "$SOLAR_JAVA" != ""; then
+ if test "$JDK" != "gcj"; then
if test -z "$with_jdk_home"; then
AC_PATH_PROG(JAVADOC, javadoc)
else
@@ -1996,6 +1997,9 @@
JAVADOC=`cygpath -d "$JAVADOC"`
JAVADOC=`cygpath -u "$JAVADOC"`
fi
+ else
+ AC_PATH_PROG(JAVADOC, gjdoc)
+ fi
fi
if test "$SOLAR_JAVA" != ""; then
@@ -2032,8 +2036,14 @@
if test "$JDK" = "gcj"; then
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
- CFLAGS="$CFLAGS -I$JAVA_HOME/include"
- LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
+ CFLAGS="$CFLAGS -I$JAVA_HOME/include -pthread"
+ LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj -pthread"
+ JAR="$JAVA_HOME/bin/fastjar"
+ JAVACMD="$JAVA_HOME/bin/gij"
+ JAVA="$JAVA_HOME/bin/gij"
+ AC_SUBST(JAVA)
+ AC_SUBST(JAVACMD)
+ AC_SUBST(JAR)
AC_CHECK_HEADER(jni.h, [],
[AC_MSG_ERROR([jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?])], [])
@@ -4214,7 +4224,7 @@
EOF
oldJAVA_HOME=$JAVA_HOME
if test "$JDK" = "gcj"; then
- JAVA_HOME=; export JAVA_HOME
+ JAVACMD="$JAVA_HOME/bin/gij"; export JAVACMD
ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
else
ant_cmd="$ANT -buildfile conftest.xml 1>&2"
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.86
diff -u -r1.86 set_soenv.in
--- config_office/set_soenv.in 13 Jan 2006 16:37:16 -0000 1.86
+++ config_office/set_soenv.in 2 Feb 2006 05:13:31 -0000
@@ -68,7 +68,7 @@
#
# Help variables.
my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG,
- $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
+ $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE, $JAVACMD, $JAVA, $JAR,
$SOLARENVINC, $USR_DT, $USR_OPENWIN, $TCSH_PATH, $XLIB, $XINC,
$CYGWIN_PATH, $language, $dict, $ASM_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
$STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH );
@@ -1679,6 +1679,9 @@
ToFile( "JAVAINTERPRETER", "@JAVAINTERPRETER@","e" );
ToFile( "JAVACOMPILER", "@JAVACOMPILER@", "e" );
ToFile( "JAVADOC", "@JAVADOC@", "e" );
+ ToFile( "JAVA", "@JAVA@", "e" );
+ ToFile( "JAVACMD", "@JAVACMD@", "e" );
+ ToFile( "JAR", "@JAR@", "e" );
}
if ( $platform =~ m/darwin/ )
{ ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH, "e" );
Javadoc@xmerge http://qa.openoffice.org/issues/show_bug.cgi?id=57286
JAVA@berkeleydb http://qa.openoffice.org/issues/show_bug.cgi?id=54657
JAVACMD@ant
JAR@berkeleydb

752
editors/openoffice.org-2-devel/files/patch-Python-2.3.4.patch
View File

@ -1,752 +0,0 @@
Issuetracker : #i53287#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : Support for FreeBSD 6 and 7
Index: python/Python-2.3.4.patch
===================================================================
RCS file: /cvs/external/python/Python-2.3.4.patch,v
retrieving revision 1.6
diff -u -r1.6 Python-2.3.4.patch
--- python/Python-2.3.4.patch 3 Mar 2005 17:33:54 -0000 1.6
+++ python/Python-2.3.4.patch 8 Aug 2005 21:50:08 -0000
@@ -13776,3 +13776,739 @@
atheos*) DYNLOADFILE="dynload_atheos.o";;
*)
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
+*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py Tue Aug 9 06:26:23 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py Tue Aug 9 06:20:25 2005
+***************
+*** 0 ****
+--- 1,355 ----
++ # Generated by h2py from /usr/include/netinet/in.h
++ IPPROTO_IP = 0
++ IPPROTO_HOPOPTS = 0
++ IPPROTO_ICMP = 1
++ IPPROTO_IGMP = 2
++ IPPROTO_GGP = 3
++ IPPROTO_IPV4 = 4
++ IPPROTO_IPIP = IPPROTO_IPV4
++ IPPROTO_TCP = 6
++ 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_UDP = 17
++ 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_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_DIVERT = 254
++ IPPROTO_RAW = 255
++ IPPROTO_MAX = 256
++ IPPROTO_DONE = 257
++ IPPORT_RESERVED = 1024
++ IPPORT_USERRESERVED = 5000
++ IPPORT_HIFIRSTAUTO = 49152
++ IPPORT_HILASTAUTO = 65535
++ IPPORT_RESERVEDSTART = 600
++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
++
++ IN_CLASSA_NET = 0xff000000
++ IN_CLASSA_NSHIFT = 24
++ IN_CLASSA_HOST = 0x00ffffff
++ IN_CLASSA_MAX = 128
++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
++
++ IN_CLASSB_NET = 0xffff0000
++ IN_CLASSB_NSHIFT = 16
++ IN_CLASSB_HOST = 0x0000ffff
++ IN_CLASSB_MAX = 65536
++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
++
++ IN_CLASSC_NET = 0xffffff00
++ IN_CLASSC_NSHIFT = 8
++ IN_CLASSC_HOST = 0x000000ff
++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
++
++ IN_CLASSD_NET = 0xf0000000
++ 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) & 0xf0000000) == 0xf0000000)
++
++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
++
++ INADDR_NONE = 0xffffffff
++ IN_LOOPBACKNET = 127
++ INET_ADDRSTRLEN = 16
++ IP_OPTIONS = 1
++ IP_HDRINCL = 2
++ IP_TOS = 3
++ IP_TTL = 4
++ IP_RECVOPTS = 5
++ IP_RECVRETOPTS = 6
++ IP_RECVDSTADDR = 7
++ 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_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_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
++
++ # Included from netinet6/in6.h
++
++ # Included from sys/queue.h
++ def SLIST_HEAD_INITIALIZER(head): return \
++
++ def SLIST_ENTRY(type): return \
++
++ def STAILQ_HEAD_INITIALIZER(head): return \
++
++ def STAILQ_ENTRY(type): return \
++
++ def LIST_HEAD_INITIALIZER(head): return \
++
++ def LIST_ENTRY(type): return \
++
++ def TAILQ_HEAD_INITIALIZER(head): return \
++
++ def TAILQ_ENTRY(type): return \
++
++ def CIRCLEQ_ENTRY(type): return \
++
++ __KAME_VERSION = "20000701/FreeBSD-current"
++ 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 = 0xff010000
++ IPV6_ADDR_INT32_MLL = 0xff020000
++ 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 = 0xffff0000
++ 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_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_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_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 \
++
++ 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_PKTINFO = 19
++ IPV6_HOPLIMIT = 20
++ IPV6_NEXTHOP = 21
++ IPV6_HOPOPTS = 22
++ IPV6_DSTOPTS = 23
++ IPV6_RTHDR = 24
++ IPV6_PKTOPTIONS = 25
++ IPV6_CHECKSUM = 26
++ IPV6_BINDV6ONLY = 27
++ 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_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_BINDV6ONLY = 24
++ IPV6CTL_RTEXPIRE = 25
++ IPV6CTL_RTMINEXPIRE = 26
++ IPV6CTL_RTMAXCACHE = 27
++ IPV6CTL_MAXID = 28
+*** misc/Python-2.3.4/Lib/plat-freebsd6/regen Tue Aug 9 06:26:27 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/regen Tue Aug 9 06:19:02 2005
+***************
+*** 0 ****
+--- 1,3 ----
++ #! /bin/sh
++ set -v
++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
+*** misc/Python-2.3.4/Lib/plat-freebsd7/IN.py Tue Aug 9 06:26:23 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/IN.py Tue Aug 9 06:20:25 2005
+***************
+*** 0 ****
+--- 1,355 ----
++ # Generated by h2py from /usr/include/netinet/in.h
++ IPPROTO_IP = 0
++ IPPROTO_HOPOPTS = 0
++ IPPROTO_ICMP = 1
++ IPPROTO_IGMP = 2
++ IPPROTO_GGP = 3
++ IPPROTO_IPV4 = 4
++ IPPROTO_IPIP = IPPROTO_IPV4
++ IPPROTO_TCP = 6
++ 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_UDP = 17
++ 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_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_DIVERT = 254
++ IPPROTO_RAW = 255
++ IPPROTO_MAX = 256
++ IPPROTO_DONE = 257
++ IPPORT_RESERVED = 1024
++ IPPORT_USERRESERVED = 5000
++ IPPORT_HIFIRSTAUTO = 49152
++ IPPORT_HILASTAUTO = 65535
++ IPPORT_RESERVEDSTART = 600
++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
++
++ IN_CLASSA_NET = 0xff000000
++ IN_CLASSA_NSHIFT = 24
++ IN_CLASSA_HOST = 0x00ffffff
++ IN_CLASSA_MAX = 128
++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
++
++ IN_CLASSB_NET = 0xffff0000
++ IN_CLASSB_NSHIFT = 16
++ IN_CLASSB_HOST = 0x0000ffff
++ IN_CLASSB_MAX = 65536
++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
++
++ IN_CLASSC_NET = 0xffffff00
++ IN_CLASSC_NSHIFT = 8
++ IN_CLASSC_HOST = 0x000000ff
++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
++
++ IN_CLASSD_NET = 0xf0000000
++ 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) & 0xf0000000) == 0xf0000000)
++
++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
++
++ INADDR_NONE = 0xffffffff
++ IN_LOOPBACKNET = 127
++ INET_ADDRSTRLEN = 16
++ IP_OPTIONS = 1
++ IP_HDRINCL = 2
++ IP_TOS = 3
++ IP_TTL = 4
++ IP_RECVOPTS = 5
++ IP_RECVRETOPTS = 6
++ IP_RECVDSTADDR = 7
++ 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_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_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
++
++ # Included from netinet6/in6.h
++
++ # Included from sys/queue.h
++ def SLIST_HEAD_INITIALIZER(head): return \
++
++ def SLIST_ENTRY(type): return \
++
++ def STAILQ_HEAD_INITIALIZER(head): return \
++
++ def STAILQ_ENTRY(type): return \
++
++ def LIST_HEAD_INITIALIZER(head): return \
++
++ def LIST_ENTRY(type): return \
++
++ def TAILQ_HEAD_INITIALIZER(head): return \
++
++ def TAILQ_ENTRY(type): return \
++
++ def CIRCLEQ_ENTRY(type): return \
++
++ __KAME_VERSION = "20000701/FreeBSD-current"
++ 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 = 0xff010000
++ IPV6_ADDR_INT32_MLL = 0xff020000
++ 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 = 0xffff0000
++ 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_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_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_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 \
++
++ 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_PKTINFO = 19
++ IPV6_HOPLIMIT = 20
++ IPV6_NEXTHOP = 21
++ IPV6_HOPOPTS = 22
++ IPV6_DSTOPTS = 23
++ IPV6_RTHDR = 24
++ IPV6_PKTOPTIONS = 25
++ IPV6_CHECKSUM = 26
++ IPV6_BINDV6ONLY = 27
++ 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_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_BINDV6ONLY = 24
++ IPV6CTL_RTEXPIRE = 25
++ IPV6CTL_RTMINEXPIRE = 26
++ IPV6CTL_RTMAXCACHE = 27
++ IPV6CTL_MAXID = 28
+*** misc/Python-2.3.4/Lib/plat-freebsd7/regen Tue Aug 9 06:26:27 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/regen Tue Aug 9 06:19:02 2005
+***************
+*** 0 ****
+--- 1,3 ----
++ #! /bin/sh
++ set -v
++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h

173
editors/openoffice.org-2-devel/files/patch-bridges
View File

@ -1,173 +0,0 @@
Issuetracker : #i56947#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : update files at bridges project
catch up version up of bridge project of GNU/Linux
--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Thu Sep 8 07:20:08 2005
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed Oct 26 15:10:05 2005
@@ -57,7 +57,7 @@
typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
sal_Int32 nParams, typelib_MethodParameter * pParams,
void ** pCallStack,
- sal_Int64 * pRegisterReturn /* space for register return */ )
+ void * pReturnValue )
{
// pCallStack: ret, [return ptr], this, params
char * pCppStack = (char *)(pCallStack +1);
@@ -74,7 +74,7 @@
{
if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
{
- pUnoReturn = pRegisterReturn; // direct way for simple types
+ pUnoReturn = pReturnValue; // direct way for simple types
}
else // complex return via ptr (pCppReturn)
{
@@ -215,7 +215,7 @@
uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
}
// complex return ptr is set to eax
- *(void **)pRegisterReturn = pCppReturn;
+ *static_cast< void ** >(pReturnValue) = pCppReturn;
}
if (pReturnTypeDescr)
{
@@ -228,7 +228,7 @@
//==================================================================================================
extern "C" void cpp_vtable_call(
int nFunctionIndex, int nVtableOffset, void** pCallStack,
- sal_Int64 nRegReturn )
+ void * pReturnValue )
{
OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
@@ -275,7 +275,7 @@
pCppI, aMemberDescr.get(),
((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
0, 0, // no params
- pCallStack, &nRegReturn );
+ pCallStack, pReturnValue );
}
else
{
@@ -290,7 +290,7 @@
pCppI, aMemberDescr.get(),
0, // indicates void return
1, &aParam,
- pCallStack, &nRegReturn );
+ pCallStack, pReturnValue );
}
break;
}
@@ -324,7 +324,7 @@
&pInterface, pTD, cpp_acquire );
pInterface->release();
TYPELIB_DANGER_RELEASE( pTD );
- *(void **)&nRegReturn = pCallStack[1];
+ *static_cast< void ** >(pReturnValue) = pCallStack[1];
break;
}
TYPELIB_DANGER_RELEASE( pTD );
@@ -336,7 +336,7 @@
((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
- pCallStack, &nRegReturn );
+ pCallStack, pReturnValue );
}
break;
}
--- bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Wed Jun 1 01:32:41 2005
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Wed Oct 26 15:10:04 2005
@@ -9,12 +9,13 @@
.LCFIg0:
movl %esp,%ebp
.LCFIg1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x4,%esp # 32bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- movl 12(%esp),%eax # 64 bit nRegReturn, lower half
+ movl 16(%esp),%eax # 32bit returnValue
leave
ret
.LFEg:
@@ -29,7 +30,7 @@
.LCFIv0:
movl %esp,%ebp
.LCFIv1:
- subl $0x8,%esp # 64bit nRegReturn
+ pushl $0 # 32bit null pointer (returnValue not used)
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
@@ -48,13 +49,14 @@
.LCFIh0:
movl %esp,%ebp
.LCFIh1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x8,%esp # 64bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- movl 12(%esp),%eax # 64 bit nRegReturn, lower half
- movl 16(%esp),%edx # 64 bit nRegReturn, upper half
+ movl 16(%esp),%eax # 64bit returnValue, lower half
+ movl 20(%esp),%edx # 64bit returnValue, upper half
leave
ret
.LFEh:
@@ -69,12 +71,13 @@
.LCFIf0:
movl %esp,%ebp
.LCFIf1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x4,%esp # 32bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- flds 12(%esp) # 64 bit nRegReturn, lower half
+ flds 16(%esp) # 32bit returnValue
leave
ret
.LFEf:
@@ -89,12 +92,13 @@
.LCFId0:
movl %esp,%ebp
.LCFId1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x8,%esp # 64bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- fldl 12(%esp) # 64 bit nRegReturn
+ fldl 16(%esp) # 64bit returnValue
leave
ret
.LFEd:
@@ -109,12 +113,13 @@
.LCFIc0:
movl %esp,%ebp
.LCFIc1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x4,%esp # 32bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- movl 12(%esp),%eax # 64 bit nRegReturn, lower half
+ movl 16(%esp),%eax # 32bit returnValue
leave
ret $4
.LFEc:

18
editors/openoffice.org-2-devel/files/patch-config_office+set_soenv.in
View File

@ -1,18 +0,0 @@
Issuetracker : #i56949#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : Add conditional the case of @GCCVER@ >= 30401.
Like GNU/Linux's case, we also need the case for $CVER if @GCCVER@ is equal to or larger than 3.4.1
--- config_office/set_soenv.in Thu Sep 22 23:30:56 2005
+++ config_office/set_soenv.in Sat Oct 1 12:59:30 2005
@@ -347,6 +347,9 @@
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ if( @GCCVER@ >= 30401 ) {
+ $CVER = "C341";
+ }
}
elsif ( $platform =~ m/linux-gnu/ )
{

87
editors/openoffice.org-2-devel/files/patch-epm+epm-3.7.patch
View File

@ -1,87 +0,0 @@
Issuetracker : #iXXXXX#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : epm porting for FreeBSD
o FreeBSD's package manager doesn't allow multiple lines for
@exec and @unexec
o chown is at /usr/sbin/
o the way to recording package dependency is incorrect
Index: epm/epm-3.7.patch
===================================================================
RCS file: /cvs/external/epm/epm-3.7.patch,v
retrieving revision 1.2
diff -u -r1.2 epm-3.7.patch
--- epm/epm-3.7.patch 10 Mar 2005 11:52:43 -0000 1.2
+++ epm/epm-3.7.patch 3 Jun 2005 22:05:23 -0000
@@ -1,3 +1,69 @@
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005
+***************
+*** 26,31 ****
+--- 26,38 ----
+
+ #include "epm.h"
+
++ void cr2semicolon(char *command)
++ {
++ int len, i;
++ len=strlen(command);
++ for (i=0;i<len;i++)
++ if(*(command+i)=='\n') *(command+i)=';';
++ }
+
+ /*
+ * 'make_bsd()' - Make a FreeBSD software distribution package.
+***************
+*** 150,156 ****
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+ if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s", d->product);
+ else
+ #ifdef __FreeBSD__
+ /*
+--- 157,163 ----
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+ if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
+ else
+ #ifdef __FreeBSD__
+ /*
+***************
+*** 179,187 ****
+--- 186,196 ----
+ " by the BSD packager.\n", stderr);
+ break;
+ case COMMAND_POST_INSTALL :
++ cr2semicolon(c->command);
+ fprintf(fp, "@exec %s\n", c->command);
+ break;
+ case COMMAND_PRE_REMOVE :
++ cr2semicolon(c->command);
+ fprintf(fp, "@unexec %s\n", c->command);
+ break;
+ case COMMAND_POST_REMOVE :
+***************
+*** 199,205 ****
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
+--- 208,214 ----
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
*** misc/epm-3.7/epm.c 2003-10-28 15:48:30.000000000 +0100
--- misc/build/epm-3.7/epm.c 2004-11-24 10:38:40.000000000 +0100
***************

45
editors/openoffice.org-2-devel/files/patch-icu+icu-2.6.patch
View File

@ -1,45 +0,0 @@
Issuetracker : #i56952#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : Passing $ORIGIN to linker at icu project
We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case.
Index: icu/icu-2.6.patch
===================================================================
RCS file: /cvs/external/icu/icu-2.6.patch,v
retrieving revision 1.15
diff -u -r1.15 icu-2.6.patch
--- icu/icu-2.6.patch 28 Dec 2005 16:54:16 -0000 1.15
+++ icu/icu-2.6.patch 5 Jan 2006 12:58:57 -0000
@@ -2775,3 +2775,31 @@
commands = pkg_appendToList(commands, NULL, uprv_strdup(stanza));
sprintf(stanza, "@$(RMV) $(TEMP_DIR)/%s", cfile+genFileOffset);
+*** misc/icu/source/config/mh-bsd-gcc Thu May 2 08:48:10 2002
+--- misc/build/icu/source/config/mh-bsd-gcc Mon Oct 24 18:16:57 2005
+***************
+*** 10,21 ****
+--- 10,30 ----
+ GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
+
+ ## Flags for position independent code
++ STATICCFLAGS = -fPIC
++ STATICCXXFLAGS = -fPIC
++ STATICCPPFLAGS = -DPIC
+ SHAREDLIBCFLAGS = -fPIC
+ SHAREDLIBCXXFLAGS = -fPIC
+ SHAREDLIBCPPFLAGS = -DPIC
+
+ ## Compiler switch to embed a runtime search path
+ LD_RPATH=
++ ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
++ ENABLE_RPATH=YES
++ RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN'
++
++ #SH# ENABLE_RPATH=YES
++ #SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN'"
+ LD_RPATH_PRE= -Wl,-rpath,
+
+ ## Compiler switch to embed a library name
+
+

154
editors/openoffice.org-2-devel/files/patch-instsetoo
View File

@ -1,154 +0,0 @@
Issuetracker : #i53288#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : remove circular dependency
in this case,
core01 is depend on core02-core08, and core0[2-9] and core10
depends on core01. for FreeBSD this is regarded as circular dependency
and pkg_add command is forked infinite times and eats up systems' resource.
namely when core01 tries to install core02, core02 also tries to
install core01.
Index: instsetoo_native/inc_openoffice/unix/packagelist.txt
===================================================================
RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v
retrieving revision 1.21
diff -u -r1.21 packagelist.txt
--- instsetoo_native/inc_openoffice/unix/packagelist.txt 30 Nov 2005 13:21:44 -0000 1.21
+++ instsetoo_native/inc_openoffice/unix/packagelist.txt 3 Dec 2005 22:26:12 -0000
@@ -37,6 +37,7 @@
packagename = "%UNIXPRODUCTNAME-core01"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-mailcap,%WITHOUTDOTUNIXPRODUCTNAME-core,%WITHOUTDOTUNIXPRODUCTNAME-core01"
requires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
+freebsdrequires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08,%UNIXPRODUCTNAME-core09,%UNIXPRODUCTNAME-core10"
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -278,6 +279,7 @@
packagename = "%UNIXPRODUCTNAME-core02"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core02"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -291,6 +293,7 @@
packagename = "%UNIXPRODUCTNAME-core03"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core03"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -304,6 +307,7 @@
packagename = "%UNIXPRODUCTNAME-core04"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core04"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -317,6 +321,7 @@
packagename = "%UNIXPRODUCTNAME-core05"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core05"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -330,6 +335,7 @@
packagename = "%UNIXPRODUCTNAME-core06"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core06"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -343,6 +349,7 @@
packagename = "%UNIXPRODUCTNAME-core07"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core07"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -356,6 +363,7 @@
packagename = "%UNIXPRODUCTNAME-core08"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core08"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -369,6 +377,7 @@
packagename = "%UNIXPRODUCTNAME-core09"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core09"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -383,6 +392,7 @@
packagename = "%UNIXPRODUCTNAME-core10"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core10"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
Index: solenv/bin/modules/installer/epmfile.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v
retrieving revision 1.42
diff -u -r1.42 epmfile.pm
--- solenv/bin/modules/installer/epmfile.pm 9 Nov 2005 09:09:49 -0000 1.42
+++ solenv/bin/modules/installer/epmfile.pm 3 Dec 2005 22:26:52 -0000
@@ -395,6 +395,11 @@
$provides = "solarisprovides"; # the name in the packagelist
$requires = "solarisrequires"; # the name in the packagelist
}
+ elsif ( $installer::globals::isfreebsdpkgbuild )
+ {
+ $provides = "freebsdprovides"; # the name in the packagelist
+ $requires = "freebsdrequires"; # the name in the packagelist
+ }
else
{
$provides = "provides"; # the name in the packagelist
Index: solenv/bin/modules/installer/globals.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
retrieving revision 1.47
diff -u -r1.47 globals.pm
--- solenv/bin/modules/installer/globals.pm 9 Nov 2005 09:10:01 -0000 1.47
+++ solenv/bin/modules/installer/globals.pm 3 Dec 2005 22:26:52 -0000
@@ -80,6 +80,7 @@
$issolarispkgbuild = 0;
$issolarissparcbuild = 0;
$issolarisx86build = 0;
+ $isfreebsdpkgbuild = 0;
$unpackpath = "";
$idttemplatepath = "";
$idtlanguagepath = "";
Index: solenv/bin/modules/installer/parameter.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
retrieving revision 1.29
diff -u -r1.29 parameter.pm
--- solenv/bin/modules/installer/parameter.pm 9 Nov 2005 09:10:12 -0000 1.29
+++ solenv/bin/modules/installer/parameter.pm 10 Dec 2005 13:11:30 -0000
@@ -304,6 +304,13 @@
$installer::globals::epmoutpath = "packages";
}
}
+ if ( $installer::globals::compiler =~ /unxfbsdi/ )
+ {
+ if ( $installer::globals::packageformat eq "bsd" )
+ {
+ $installer::globals::isfreebsdpkgbuild = 1;
+ }
+ }
if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; }

17
editors/openoffice.org-2-devel/files/patch-jvmfwk+distributions+OpenOfficeorg+makefile.mk
View File

@ -1,17 +0,0 @@
Issuetracker : #i56951#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : javavendors_linux.xml can be used for FreeBSD as well.
javavendors_linux.xml can be used for FreeBSD as well.
--- jvmfwk/distributions/OpenOfficeorg/makefile.mk Thu Sep 8 04:26:17 2005
+++ jvmfwk/distributions/OpenOfficeorg/makefile.mk Sat Oct 22 18:31:16 2005
@@ -49,7 +49,7 @@
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
+-$(COPY) javavendors_macosx.xml $(BIN)$/javavendors_ooo.xml
-.ELIF "$(OS)"=="LINUX"
+.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
+-$(COPY) javavendors_linux.xml $(BIN)$/javavendors_ooo.xml
.ELSE
+-$(COPY) javavendors_unx.xml $(BIN)$/javavendors_ooo.xml

7
editors/openoffice.org-2-devel/files/patch-jvmfwk+plugins+sunmajor+pluginlib+sunversion.cxx
View File

@ -12,18 +12,17 @@ java 1.4.1-p10 for example to 1.4.1_110.
--- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Thu Sep 8 04:31:40 2005
+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Sat Oct 22 18:25:49 2005
@@ -208,7 +208,16 @@
@@ -208,7 +208,15 @@
return false;
#if defined(FREEBSD)
if (m_preRelease == Rel_FreeBSD) {
- m_nUpdateSpecial = *pCur;
+ pCur++; //elemnate `p'
+ if (pCur < pEnd && isdigit(*pCur))
+ if (pCur < pEnd)
+ pCur ++;
+ pCur ++;
+ int len = pCur - pLast -1; //elemenate `p'
+ if (len >= 127)
+ return false;
+ return false;
+ strncpy(buf, (pLast+1), len); //elemenate `p'
+ buf[len] = 0;
+ m_nUpdateSpecial = atoi(buf)+100; //hack for FBSD

23
editors/openoffice.org-2-devel/files/patch-libxmlsec+makefile.mk
View File

@ -1,23 +0,0 @@
Issuetracker : #i56954#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : Passing $ORIGIN to linker at libxmlsec project
We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case.
Index: libxmlsec/makefile.mk
===================================================================
RCS file: /cvs/external/libxmlsec/makefile.mk,v
retrieving revision 1.7
diff -u -r1.7 makefile.mk
--- libxmlsec/makefile.mk 28 Dec 2005 16:58:06 -0000 1.7
+++ libxmlsec/makefile.mk 5 Jan 2006 12:34:24 -0000
@@ -98,6 +98,9 @@
.IF "$(OS)$(COM)"=="SOLARISC52"
xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN'
.ENDIF # "$(OS)$(COM)"=="SOLARISC52"
+.IF "$(OS)$(COM)"=="FREEBSDGCC"
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN'
+.ENDIF # "$(OS)$(COM)"=="FREEBSDGCC"
LDFLAGS:=$(xmlsec_LDFLAGS)
.EXPORT: LDFLAGS

65
editors/openoffice.org-2-devel/files/patch-psprint+source+fontmanager+parseAFM.cxx
View File

@ -1,65 +0,0 @@
Issuetracker : #i60097#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : getc and ungetc are defined at stdio.h
Index: psprint/source/fontmanager/parseAFM.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/parseAFM.cxx,v
retrieving revision 1.6
diff -u -r1.6 parseAFM.cxx
--- psprint/source/fontmanager/parseAFM.cxx 28 Dec 2005 17:08:38 -0000 1.6
+++ psprint/source/fontmanager/parseAFM.cxx 5 Jan 2006 22:05:26 -0000
@@ -113,8 +113,8 @@
FileInputStream( const char* pFilename );
~FileInputStream();
- int getc() { return (m_nPos < m_nLen) ? int(m_pMemory[m_nPos++]) : -1; }
- void ungetc()
+ int getChar() { return (m_nPos < m_nLen) ? int(m_pMemory[m_nPos++]) : -1; }
+ void ungetChar()
{
if( m_nPos > 0 )
m_nPos--;
@@ -278,18 +278,18 @@
/* skip over white space */
// relies on EOF = -1
- while( is_white_Array[ (ch = stream->getc()) & 255 ] )
+ while( is_white_Array[ (ch = stream->getChar()) & 255 ] )
;
idx = 0;
while( ch != -1 && ! is_delimiter_Array[ ch & 255 ] )
{
ident[idx++] = ch;
- ch = stream->getc();
+ ch = stream->getChar();
}
if (ch == -1 && idx < 1) return ((char *)NULL);
- if (idx >= 1 && ch != ':' ) stream->ungetc();
+ if (idx >= 1 && ch != ':' ) stream->ungetChar();
if (idx < 1 ) ident[idx++] = ch; /* single-character token */
ident[idx] = 0;
rLen = idx;
@@ -311,16 +311,16 @@
static char ident[MAX_NAME]; /* storage buffer for keywords */
int ch, idx;
- while ((ch = stream->getc()) == ' ' || ch == '\t' );
+ while ((ch = stream->getChar()) == ' ' || ch == '\t' );
idx = 0;
while (ch != -1 && ch != lineterm && ch != '\r')
{
ident[idx++] = ch;
- ch = stream->getc();
+ ch = stream->getChar();
} /* while */
- stream->ungetc();
+ stream->ungetChar();
ident[idx] = 0;
return(ident); /* returns pointer to the token */

64
editors/openoffice.org-2-devel/files/patch-sdkoo
View File

@ -1,64 +0,0 @@
Issuetracker : #iXXXXX#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : building sdk fails for FreeBSD
1. Build error
dmake sdkoo fails like:
##############################################################################
... starting unpatched epm ...
... epm -f bsd openoffice.org-sdk /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/listfile/en-US/epm_OpenOffice_SDK_gid_Module_Root_unxfbsd_SRC680__en-US.lst -v 2>&1 | ...
**************************************************
ERROR: ERROR: "epm -f bsd openoffice.org-sdk /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/listfile/en-US/epm_OpenOffice_SDK_gid_Module_Root_unxfbsd_SRC680__en-US.lst -v 2>&1 |"!
in function: call_epm
**************************************************
**************************************************
ERROR: Saved logfile: /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/logging/en-US/log_SRC680__en-US.log
**************************************************
... cleaning the output tree ...
... removing directory /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/zip/en-US ...
Fri Nov 18 22:49:33 2005 (08:05 min.)
dmake: Error code 255, while making 'sdkoo_en-US.bsd'
'---* tg_merge.mk *---'
##############################################################################
2. Reason why it fails:
since quoting for filename containing `$' produces an error
tar: opt/openoffice.org2.0_sdk/classes/com/sun/star/lib/loader/InstallationFinder\$StreamGobbler.class: Could not stat: No such file or directory
tar: opt/openoffice.org2.0_sdk/classes/com/sun/star/lib/loader/Loader\$CustomURLClassLoader.class: Could not stat: No such file or directory
3. Solution
For FreeBSD, we don't need quoting. We use printf for files names
instead of using qprintf, a function that treats quoting string.
--- epm/epm-3.7.patch Sat Nov 19 10:21:34 2005
+++ epm/epm-3.7.patch Sat Nov 19 10:22:23 2005
@@ -586,3 +586,23 @@
}
--- 457,462 ----
+
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005
+***************
+*** 234,240 ****
+ case 'c' :
+ case 'f' :
+ case 'l' :
+! qprintf(fp, "%s\n", file->dst + 1);
+ break;
+ }
+ }
+--- 243,249 ----
+ case 'c' :
+ case 'f' :
+ case 'l' :
+! fprintf(fp, "%s\n", file->dst + 1);
+ break;
+ }
+ }

31
editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,31 +0,0 @@
Issuetracker : #i56956#
CWS : N/A
Author: : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : catch up recent version of solenv/inc/unxlngi6.mk
catch up recent version of solenv/inc/unxlngi6.mk and STLPORT_VERSION is 450 in FreeBSD
--- solenv/inc/unxfbsdi.mk Wed Oct 5 20:33:12 2005
+++ solenv/inc/unxfbsdi.mk Mon Oct 24 11:13:39 2005
@@ -45,7 +45,7 @@
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
# _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -190,8 +190,13 @@
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+.IF "$(USE_STLP_DEBUG)" != ""
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
+.ELSE # "$(USE_STLP_DEBUG)" != ""
LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)

53
editors/openoffice.org-2.0-devel/Makefile
View File

@ -9,15 +9,19 @@ PORTNAME?= openoffice.org
PORTVERSION?= 2.0.${SNAPDATE}
CATEGORIES+= editors java
MASTER_SITES+= http://openoffice.lunarshells.com/sources/ \
ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= OOo_${OOOTAG}_source.tar.bz2
DISTFILES+= OOo_${OOOTAG}_source${EXTRACT_SUFX}
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
.endif
EXTRACT_ONLY= OOo_${OOOTAG}_source.tar.bz2
.if defined(WITH_GNUGCJ)
DISTFILES+= ${ANT_DISTFILE}:antbin
.endif
EXTRACT_ONLY= OOo_${OOOTAG}_source${EXTRACT_SUFX}
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@ -59,9 +63,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 151
MILESTONE?= 155
OOOTAG?= SRC680_m${MILESTONE}
SNAPDATE= 20060117
SNAPDATE= 20060203
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -78,7 +82,7 @@ PKGNAMESUFFIX?= -${LANG_SUFFIX}
.endif
.if defined(WITH_GNUGCJ)
BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41
#BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc41:${PORTSDIR}/lang/gcc41-wgcj
BROKEN= "still work in progress"
.else
BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo
@ -88,8 +92,8 @@ BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo
.if defined(WITH_CCACHE)
BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
.if defined(WITH_GNUGCJ)
CC= ccache gcc41
CXX= ccache g++41
CC= ccache ${LOCALBASE}/gcc41/bin/gcc
CXX= ccache ${LOCALBASE}/gcc41/bin/g++
.else
CC= ccache gcc-ooo
CXX= ccache g++-ooo
@ -97,8 +101,8 @@ CXX= ccache g++-ooo
.endif #WITH_CCACHE
.if !defined(WITH_CCACHE)
.if defined(WITH_GNUGCJ)
CC= gcc41
CXX= g++41
CC= ${LOCALBASE}/gcc41/bin/gcc
CXX= ${LOCALBASE}/gcc41/bin/g++
.else
CC= gcc-ooo
CXX= g++-ooo
@ -112,26 +116,40 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bison2:${PORTSDIR}/devel/bison2 \
imake:${X_IMAKE_PORT}
.if !defined(WITHOUT_JAVA)
BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant
.else
LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt
LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2
.endif
.if defined(WITH_GNUGCJ)
ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin.tar.bz2
ANT_VERSION= 1.6.5
.endif
.if !defined(WITH_GPC)
LIB_DEPENDS= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
.endif
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
ZIP?= ${PREFIX}/bin/zip
TCSH?= /bin/tcsh
PKGMESSAGE= ${WRKDIR}/pkg-message
NUMOFPROCESSES?= 1
USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
.if (${OSVERSION} <= 492000)
EXTRA_PATCHES+= ${FILESDIR}/fbsd4-workaroundpatch
.endif
.if defined(WITH_GNUGCJ)
EXTRA_PATCHES+= ${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches
.endif
#.if defined(WITH_TTF_BYTECODE_ENABLED)
#EXTRA_PATCHES+= ${FILESDIR}/optpatch-freetype
#.endif
.include <${FILESDIR}/Makefile.knobs>
pre-everything::
@ -152,11 +170,8 @@ pre-everything::
.endif
post-extract:
#.if defined(WITH_TTF_BYTECODE_ENABLED)
# @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
#.endif
.if (${OSVERSION} <= 492000)
@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/fbsd4-workaroundpatch
.if defined(WITH_GNUGCJ)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
.endif
.if defined(WITH_GPC)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -

9
editors/openoffice.org-2.0-devel/distinfo
View File

@ -1,9 +1,12 @@
MD5 (openoffice.org2.0/OOo_SRC680_m151_source.tar.bz2) = f652b703f21ade84d6ff814684df2327
SHA256 (openoffice.org2.0/OOo_SRC680_m151_source.tar.bz2) = 2c6a2e37ff5dd8b01c4d976239922e12b26bf948908f62d9e2df620c8ce4cf2d
SIZE (openoffice.org2.0/OOo_SRC680_m151_source.tar.bz2) = 236161920
MD5 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = b8a712737bb146baf1ebb00c88ed3dc3
SHA256 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 80b481f8815f7bc9263d9544f1a0326abeb61de7349e4947614a5e72e49c4b0b
SIZE (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 235716251
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024
MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
SHA256 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366

2
editors/openoffice.org-2.0-devel/files/Makefile.knobs
View File

@ -6,7 +6,7 @@
CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
.endif
.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
CONFIGURE_ARGS+= --with-java=gij --with-ant-home=${LOCALBASE}/ant
CONFIGURE_ARGS+= --with-jdk-home="${LOCALBASE}/gcc41" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}" --disable-qadevooo
.endif
.if defined(WITHOUT_JAVA)
CONFIGURE_ARGS+= --without-java

1308
editors/openoffice.org-2.0-devel/files/gcj-cws_jaxpapi Normal file
View File

File diff suppressed because it is too large Load Diff

137
editors/openoffice.org-2.0-devel/files/gcj-patches Normal file
View File

@ -0,0 +1,137 @@
Index: wizards/com/sun/star/wizards/ui/FilterComponent.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/ui/FilterComponent.java,v
retrieving revision 1.8
diff -u -r1.8 FilterComponent.java
--- wizards/com/sun/star/wizards/ui/FilterComponent.java 28 Dec 2005 17:25:36 -0000 1.8
+++ wizards/com/sun/star/wizards/ui/FilterComponent.java 27 Jan 2006 22:55:38 -0000
@@ -261,10 +261,7 @@
case DataType.BOOLEAN:
double dblvalue = ((Double) curValue).doubleValue();
curValue = new Boolean(dblvalue == 1.0);
- /**TODO: 1) Datei SingleSelectQueryComposer modifizieren:
- / Zeilen 1525ff in Methode auslagern und Aufruf in Zeile 1356 ändern TypeConverter is parameter
- * 2) setDisplayCondition ändern
- */
+ /* */
break;
default:
curValue = String.valueOf(curValue);
Index: solenv/inc/settings.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/settings.mk,v
retrieving revision 1.185
diff -u -r1.185 settings.mk
--- solenv/inc/settings.mk 20 Jan 2006 12:09:20 -0000 1.185
+++ solenv/inc/settings.mk 27 Jan 2006 23:11:31 -0000
@@ -187,7 +187,8 @@
#required arguments
.IF "$(JAVACACHE)" != ""
-JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
+#JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
+JAVAC=$(JAVACOMPILER) --encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
.ELSE
JAVAC=$(JAVACOMPILER)
Index: source/ui/slidesorter/cache/SlsQueueProcessor.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx,v
retrieving revision 1.10
diff -u -p -u -r1.10 SlsQueueProcessor.hxx
--- sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx 19 Jan 2006 12:52:20 -0000 1.10
+++ sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx 26 Jan 2006 08:29:38 -0000
@@ -164,7 +164,7 @@ template <class Queue, class RequestData
while ( ! mrQueue.IsEmpty())
{
// Determine whether the system is idle.
- sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mrView.GetWindow()));
+ sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(static_cast< ::Window* >(mrView.GetWindow())));
if (nIdleState != tools::IdleDetection::IDET_IDLE)
{
if ((nIdleState&tools::IdleDetection::IDET_FULL_SCREEN_SHOW_ACTIVE) != 0)
Index: config_office/configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.150
diff -u -r1.150 configure.in
--- config_office/configure.in 20 Jan 2006 13:28:25 -0000 1.150
+++ config_office/configure.in 2 Feb 2006 05:13:30 -0000
@@ -1975,6 +1975,7 @@
dnl Checks for javadoc
dnl ===================================================================
if test "$SOLAR_JAVA" != ""; then
+ if test "$JDK" != "gcj"; then
if test -z "$with_jdk_home"; then
AC_PATH_PROG(JAVADOC, javadoc)
else
@@ -1996,6 +1997,9 @@
JAVADOC=`cygpath -d "$JAVADOC"`
JAVADOC=`cygpath -u "$JAVADOC"`
fi
+ else
+ AC_PATH_PROG(JAVADOC, gjdoc)
+ fi
fi
if test "$SOLAR_JAVA" != ""; then
@@ -2032,8 +2036,14 @@
if test "$JDK" = "gcj"; then
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
- CFLAGS="$CFLAGS -I$JAVA_HOME/include"
- LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
+ CFLAGS="$CFLAGS -I$JAVA_HOME/include -pthread"
+ LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj -pthread"
+ JAR="$JAVA_HOME/bin/fastjar"
+ JAVACMD="$JAVA_HOME/bin/gij"
+ JAVA="$JAVA_HOME/bin/gij"
+ AC_SUBST(JAVA)
+ AC_SUBST(JAVACMD)
+ AC_SUBST(JAR)
AC_CHECK_HEADER(jni.h, [],
[AC_MSG_ERROR([jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?])], [])
@@ -4214,7 +4224,7 @@
EOF
oldJAVA_HOME=$JAVA_HOME
if test "$JDK" = "gcj"; then
- JAVA_HOME=; export JAVA_HOME
+ JAVACMD="$JAVA_HOME/bin/gij"; export JAVACMD
ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
else
ant_cmd="$ANT -buildfile conftest.xml 1>&2"
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.86
diff -u -r1.86 set_soenv.in
--- config_office/set_soenv.in 13 Jan 2006 16:37:16 -0000 1.86
+++ config_office/set_soenv.in 2 Feb 2006 05:13:31 -0000
@@ -68,7 +68,7 @@
#
# Help variables.
my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG,
- $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
+ $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE, $JAVACMD, $JAVA, $JAR,
$SOLARENVINC, $USR_DT, $USR_OPENWIN, $TCSH_PATH, $XLIB, $XINC,
$CYGWIN_PATH, $language, $dict, $ASM_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
$STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH );
@@ -1679,6 +1679,9 @@
ToFile( "JAVAINTERPRETER", "@JAVAINTERPRETER@","e" );
ToFile( "JAVACOMPILER", "@JAVACOMPILER@", "e" );
ToFile( "JAVADOC", "@JAVADOC@", "e" );
+ ToFile( "JAVA", "@JAVA@", "e" );
+ ToFile( "JAVACMD", "@JAVACMD@", "e" );
+ ToFile( "JAR", "@JAR@", "e" );
}
if ( $platform =~ m/darwin/ )
{ ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH, "e" );
Javadoc@xmerge http://qa.openoffice.org/issues/show_bug.cgi?id=57286
JAVA@berkeleydb http://qa.openoffice.org/issues/show_bug.cgi?id=54657
JAVACMD@ant
JAR@berkeleydb

752
editors/openoffice.org-2.0-devel/files/patch-Python-2.3.4.patch
View File

@ -1,752 +0,0 @@
Issuetracker : #i53287#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : Support for FreeBSD 6 and 7
Index: python/Python-2.3.4.patch
===================================================================
RCS file: /cvs/external/python/Python-2.3.4.patch,v
retrieving revision 1.6
diff -u -r1.6 Python-2.3.4.patch
--- python/Python-2.3.4.patch 3 Mar 2005 17:33:54 -0000 1.6
+++ python/Python-2.3.4.patch 8 Aug 2005 21:50:08 -0000
@@ -13776,3 +13776,739 @@
atheos*) DYNLOADFILE="dynload_atheos.o";;
*)
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
+*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py Tue Aug 9 06:26:23 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py Tue Aug 9 06:20:25 2005
+***************
+*** 0 ****
+--- 1,355 ----
++ # Generated by h2py from /usr/include/netinet/in.h
++ IPPROTO_IP = 0
++ IPPROTO_HOPOPTS = 0
++ IPPROTO_ICMP = 1
++ IPPROTO_IGMP = 2
++ IPPROTO_GGP = 3
++ IPPROTO_IPV4 = 4
++ IPPROTO_IPIP = IPPROTO_IPV4
++ IPPROTO_TCP = 6
++ 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_UDP = 17
++ 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_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_DIVERT = 254
++ IPPROTO_RAW = 255
++ IPPROTO_MAX = 256
++ IPPROTO_DONE = 257
++ IPPORT_RESERVED = 1024
++ IPPORT_USERRESERVED = 5000
++ IPPORT_HIFIRSTAUTO = 49152
++ IPPORT_HILASTAUTO = 65535
++ IPPORT_RESERVEDSTART = 600
++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
++
++ IN_CLASSA_NET = 0xff000000
++ IN_CLASSA_NSHIFT = 24
++ IN_CLASSA_HOST = 0x00ffffff
++ IN_CLASSA_MAX = 128
++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
++
++ IN_CLASSB_NET = 0xffff0000
++ IN_CLASSB_NSHIFT = 16
++ IN_CLASSB_HOST = 0x0000ffff
++ IN_CLASSB_MAX = 65536
++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
++
++ IN_CLASSC_NET = 0xffffff00
++ IN_CLASSC_NSHIFT = 8
++ IN_CLASSC_HOST = 0x000000ff
++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
++
++ IN_CLASSD_NET = 0xf0000000
++ 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) & 0xf0000000) == 0xf0000000)
++
++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
++
++ INADDR_NONE = 0xffffffff
++ IN_LOOPBACKNET = 127
++ INET_ADDRSTRLEN = 16
++ IP_OPTIONS = 1
++ IP_HDRINCL = 2
++ IP_TOS = 3
++ IP_TTL = 4
++ IP_RECVOPTS = 5
++ IP_RECVRETOPTS = 6
++ IP_RECVDSTADDR = 7
++ 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_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_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
++
++ # Included from netinet6/in6.h
++
++ # Included from sys/queue.h
++ def SLIST_HEAD_INITIALIZER(head): return \
++
++ def SLIST_ENTRY(type): return \
++
++ def STAILQ_HEAD_INITIALIZER(head): return \
++
++ def STAILQ_ENTRY(type): return \
++
++ def LIST_HEAD_INITIALIZER(head): return \
++
++ def LIST_ENTRY(type): return \
++
++ def TAILQ_HEAD_INITIALIZER(head): return \
++
++ def TAILQ_ENTRY(type): return \
++
++ def CIRCLEQ_ENTRY(type): return \
++
++ __KAME_VERSION = "20000701/FreeBSD-current"
++ 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 = 0xff010000
++ IPV6_ADDR_INT32_MLL = 0xff020000
++ 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 = 0xffff0000
++ 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_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_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_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 \
++
++ 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_PKTINFO = 19
++ IPV6_HOPLIMIT = 20
++ IPV6_NEXTHOP = 21
++ IPV6_HOPOPTS = 22
++ IPV6_DSTOPTS = 23
++ IPV6_RTHDR = 24
++ IPV6_PKTOPTIONS = 25
++ IPV6_CHECKSUM = 26
++ IPV6_BINDV6ONLY = 27
++ 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_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_BINDV6ONLY = 24
++ IPV6CTL_RTEXPIRE = 25
++ IPV6CTL_RTMINEXPIRE = 26
++ IPV6CTL_RTMAXCACHE = 27
++ IPV6CTL_MAXID = 28
+*** misc/Python-2.3.4/Lib/plat-freebsd6/regen Tue Aug 9 06:26:27 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/regen Tue Aug 9 06:19:02 2005
+***************
+*** 0 ****
+--- 1,3 ----
++ #! /bin/sh
++ set -v
++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
+*** misc/Python-2.3.4/Lib/plat-freebsd7/IN.py Tue Aug 9 06:26:23 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/IN.py Tue Aug 9 06:20:25 2005
+***************
+*** 0 ****
+--- 1,355 ----
++ # Generated by h2py from /usr/include/netinet/in.h
++ IPPROTO_IP = 0
++ IPPROTO_HOPOPTS = 0
++ IPPROTO_ICMP = 1
++ IPPROTO_IGMP = 2
++ IPPROTO_GGP = 3
++ IPPROTO_IPV4 = 4
++ IPPROTO_IPIP = IPPROTO_IPV4
++ IPPROTO_TCP = 6
++ 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_UDP = 17
++ 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_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_DIVERT = 254
++ IPPROTO_RAW = 255
++ IPPROTO_MAX = 256
++ IPPROTO_DONE = 257
++ IPPORT_RESERVED = 1024
++ IPPORT_USERRESERVED = 5000
++ IPPORT_HIFIRSTAUTO = 49152
++ IPPORT_HILASTAUTO = 65535
++ IPPORT_RESERVEDSTART = 600
++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
++
++ IN_CLASSA_NET = 0xff000000
++ IN_CLASSA_NSHIFT = 24
++ IN_CLASSA_HOST = 0x00ffffff
++ IN_CLASSA_MAX = 128
++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
++
++ IN_CLASSB_NET = 0xffff0000
++ IN_CLASSB_NSHIFT = 16
++ IN_CLASSB_HOST = 0x0000ffff
++ IN_CLASSB_MAX = 65536
++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
++
++ IN_CLASSC_NET = 0xffffff00
++ IN_CLASSC_NSHIFT = 8
++ IN_CLASSC_HOST = 0x000000ff
++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
++
++ IN_CLASSD_NET = 0xf0000000
++ 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) & 0xf0000000) == 0xf0000000)
++
++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
++
++ INADDR_NONE = 0xffffffff
++ IN_LOOPBACKNET = 127
++ INET_ADDRSTRLEN = 16
++ IP_OPTIONS = 1
++ IP_HDRINCL = 2
++ IP_TOS = 3
++ IP_TTL = 4
++ IP_RECVOPTS = 5
++ IP_RECVRETOPTS = 6
++ IP_RECVDSTADDR = 7
++ 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_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_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
++
++ # Included from netinet6/in6.h
++
++ # Included from sys/queue.h
++ def SLIST_HEAD_INITIALIZER(head): return \
++
++ def SLIST_ENTRY(type): return \
++
++ def STAILQ_HEAD_INITIALIZER(head): return \
++
++ def STAILQ_ENTRY(type): return \
++
++ def LIST_HEAD_INITIALIZER(head): return \
++
++ def LIST_ENTRY(type): return \
++
++ def TAILQ_HEAD_INITIALIZER(head): return \
++
++ def TAILQ_ENTRY(type): return \
++
++ def CIRCLEQ_ENTRY(type): return \
++
++ __KAME_VERSION = "20000701/FreeBSD-current"
++ 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 = 0xff010000
++ IPV6_ADDR_INT32_MLL = 0xff020000
++ 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 = 0xffff0000
++ 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_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_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_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 \
++
++ 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_PKTINFO = 19
++ IPV6_HOPLIMIT = 20
++ IPV6_NEXTHOP = 21
++ IPV6_HOPOPTS = 22
++ IPV6_DSTOPTS = 23
++ IPV6_RTHDR = 24
++ IPV6_PKTOPTIONS = 25
++ IPV6_CHECKSUM = 26
++ IPV6_BINDV6ONLY = 27
++ 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_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_BINDV6ONLY = 24
++ IPV6CTL_RTEXPIRE = 25
++ IPV6CTL_RTMINEXPIRE = 26
++ IPV6CTL_RTMAXCACHE = 27
++ IPV6CTL_MAXID = 28
+*** misc/Python-2.3.4/Lib/plat-freebsd7/regen Tue Aug 9 06:26:27 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/regen Tue Aug 9 06:19:02 2005
+***************
+*** 0 ****
+--- 1,3 ----
++ #! /bin/sh
++ set -v
++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h

173
editors/openoffice.org-2.0-devel/files/patch-bridges
View File

@ -1,173 +0,0 @@
Issuetracker : #i56947#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : update files at bridges project
catch up version up of bridge project of GNU/Linux
--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Thu Sep 8 07:20:08 2005
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed Oct 26 15:10:05 2005
@@ -57,7 +57,7 @@
typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
sal_Int32 nParams, typelib_MethodParameter * pParams,
void ** pCallStack,
- sal_Int64 * pRegisterReturn /* space for register return */ )
+ void * pReturnValue )
{
// pCallStack: ret, [return ptr], this, params
char * pCppStack = (char *)(pCallStack +1);
@@ -74,7 +74,7 @@
{
if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
{
- pUnoReturn = pRegisterReturn; // direct way for simple types
+ pUnoReturn = pReturnValue; // direct way for simple types
}
else // complex return via ptr (pCppReturn)
{
@@ -215,7 +215,7 @@
uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
}
// complex return ptr is set to eax
- *(void **)pRegisterReturn = pCppReturn;
+ *static_cast< void ** >(pReturnValue) = pCppReturn;
}
if (pReturnTypeDescr)
{
@@ -228,7 +228,7 @@
//==================================================================================================
extern "C" void cpp_vtable_call(
int nFunctionIndex, int nVtableOffset, void** pCallStack,
- sal_Int64 nRegReturn )
+ void * pReturnValue )
{
OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
@@ -275,7 +275,7 @@
pCppI, aMemberDescr.get(),
((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
0, 0, // no params
- pCallStack, &nRegReturn );
+ pCallStack, pReturnValue );
}
else
{
@@ -290,7 +290,7 @@
pCppI, aMemberDescr.get(),
0, // indicates void return
1, &aParam,
- pCallStack, &nRegReturn );
+ pCallStack, pReturnValue );
}
break;
}
@@ -324,7 +324,7 @@
&pInterface, pTD, cpp_acquire );
pInterface->release();
TYPELIB_DANGER_RELEASE( pTD );
- *(void **)&nRegReturn = pCallStack[1];
+ *static_cast< void ** >(pReturnValue) = pCallStack[1];
break;
}
TYPELIB_DANGER_RELEASE( pTD );
@@ -336,7 +336,7 @@
((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
- pCallStack, &nRegReturn );
+ pCallStack, pReturnValue );
}
break;
}
--- bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Wed Jun 1 01:32:41 2005
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Wed Oct 26 15:10:04 2005
@@ -9,12 +9,13 @@
.LCFIg0:
movl %esp,%ebp
.LCFIg1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x4,%esp # 32bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- movl 12(%esp),%eax # 64 bit nRegReturn, lower half
+ movl 16(%esp),%eax # 32bit returnValue
leave
ret
.LFEg:
@@ -29,7 +30,7 @@
.LCFIv0:
movl %esp,%ebp
.LCFIv1:
- subl $0x8,%esp # 64bit nRegReturn
+ pushl $0 # 32bit null pointer (returnValue not used)
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
@@ -48,13 +49,14 @@
.LCFIh0:
movl %esp,%ebp
.LCFIh1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x8,%esp # 64bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- movl 12(%esp),%eax # 64 bit nRegReturn, lower half
- movl 16(%esp),%edx # 64 bit nRegReturn, upper half
+ movl 16(%esp),%eax # 64bit returnValue, lower half
+ movl 20(%esp),%edx # 64bit returnValue, upper half
leave
ret
.LFEh:
@@ -69,12 +71,13 @@
.LCFIf0:
movl %esp,%ebp
.LCFIf1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x4,%esp # 32bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- flds 12(%esp) # 64 bit nRegReturn, lower half
+ flds 16(%esp) # 32bit returnValue
leave
ret
.LFEf:
@@ -89,12 +92,13 @@
.LCFId0:
movl %esp,%ebp
.LCFId1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x8,%esp # 64bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- fldl 12(%esp) # 64 bit nRegReturn
+ fldl 16(%esp) # 64bit returnValue
leave
ret
.LFEd:
@@ -109,12 +113,13 @@
.LCFIc0:
movl %esp,%ebp
.LCFIc1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x4,%esp # 32bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- movl 12(%esp),%eax # 64 bit nRegReturn, lower half
+ movl 16(%esp),%eax # 32bit returnValue
leave
ret $4
.LFEc:

18
editors/openoffice.org-2.0-devel/files/patch-config_office+set_soenv.in
View File

@ -1,18 +0,0 @@
Issuetracker : #i56949#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : Add conditional the case of @GCCVER@ >= 30401.
Like GNU/Linux's case, we also need the case for $CVER if @GCCVER@ is equal to or larger than 3.4.1
--- config_office/set_soenv.in Thu Sep 22 23:30:56 2005
+++ config_office/set_soenv.in Sat Oct 1 12:59:30 2005
@@ -347,6 +347,9 @@
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ if( @GCCVER@ >= 30401 ) {
+ $CVER = "C341";
+ }
}
elsif ( $platform =~ m/linux-gnu/ )
{

87
editors/openoffice.org-2.0-devel/files/patch-epm+epm-3.7.patch
View File

@ -1,87 +0,0 @@
Issuetracker : #iXXXXX#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : epm porting for FreeBSD
o FreeBSD's package manager doesn't allow multiple lines for
@exec and @unexec
o chown is at /usr/sbin/
o the way to recording package dependency is incorrect
Index: epm/epm-3.7.patch
===================================================================
RCS file: /cvs/external/epm/epm-3.7.patch,v
retrieving revision 1.2
diff -u -r1.2 epm-3.7.patch
--- epm/epm-3.7.patch 10 Mar 2005 11:52:43 -0000 1.2
+++ epm/epm-3.7.patch 3 Jun 2005 22:05:23 -0000
@@ -1,3 +1,69 @@
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005
+***************
+*** 26,31 ****
+--- 26,38 ----
+
+ #include "epm.h"
+
++ void cr2semicolon(char *command)
++ {
++ int len, i;
++ len=strlen(command);
++ for (i=0;i<len;i++)
++ if(*(command+i)=='\n') *(command+i)=';';
++ }
+
+ /*
+ * 'make_bsd()' - Make a FreeBSD software distribution package.
+***************
+*** 150,156 ****
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+ if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s", d->product);
+ else
+ #ifdef __FreeBSD__
+ /*
+--- 157,163 ----
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+ if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
+ else
+ #ifdef __FreeBSD__
+ /*
+***************
+*** 179,187 ****
+--- 186,196 ----
+ " by the BSD packager.\n", stderr);
+ break;
+ case COMMAND_POST_INSTALL :
++ cr2semicolon(c->command);
+ fprintf(fp, "@exec %s\n", c->command);
+ break;
+ case COMMAND_PRE_REMOVE :
++ cr2semicolon(c->command);
+ fprintf(fp, "@unexec %s\n", c->command);
+ break;
+ case COMMAND_POST_REMOVE :
+***************
+*** 199,205 ****
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
+--- 208,214 ----
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
*** misc/epm-3.7/epm.c 2003-10-28 15:48:30.000000000 +0100
--- misc/build/epm-3.7/epm.c 2004-11-24 10:38:40.000000000 +0100
***************

45
editors/openoffice.org-2.0-devel/files/patch-icu+icu-2.6.patch
View File

@ -1,45 +0,0 @@
Issuetracker : #i56952#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : Passing $ORIGIN to linker at icu project
We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case.
Index: icu/icu-2.6.patch
===================================================================
RCS file: /cvs/external/icu/icu-2.6.patch,v
retrieving revision 1.15
diff -u -r1.15 icu-2.6.patch
--- icu/icu-2.6.patch 28 Dec 2005 16:54:16 -0000 1.15
+++ icu/icu-2.6.patch 5 Jan 2006 12:58:57 -0000
@@ -2775,3 +2775,31 @@
commands = pkg_appendToList(commands, NULL, uprv_strdup(stanza));
sprintf(stanza, "@$(RMV) $(TEMP_DIR)/%s", cfile+genFileOffset);
+*** misc/icu/source/config/mh-bsd-gcc Thu May 2 08:48:10 2002
+--- misc/build/icu/source/config/mh-bsd-gcc Mon Oct 24 18:16:57 2005
+***************
+*** 10,21 ****
+--- 10,30 ----
+ GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
+
+ ## Flags for position independent code
++ STATICCFLAGS = -fPIC
++ STATICCXXFLAGS = -fPIC
++ STATICCPPFLAGS = -DPIC
+ SHAREDLIBCFLAGS = -fPIC
+ SHAREDLIBCXXFLAGS = -fPIC
+ SHAREDLIBCPPFLAGS = -DPIC
+
+ ## Compiler switch to embed a runtime search path
+ LD_RPATH=
++ ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
++ ENABLE_RPATH=YES
++ RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN'
++
++ #SH# ENABLE_RPATH=YES
++ #SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN'"
+ LD_RPATH_PRE= -Wl,-rpath,
+
+ ## Compiler switch to embed a library name
+
+

154
editors/openoffice.org-2.0-devel/files/patch-instsetoo
View File

@ -1,154 +0,0 @@
Issuetracker : #i53288#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : remove circular dependency
in this case,
core01 is depend on core02-core08, and core0[2-9] and core10
depends on core01. for FreeBSD this is regarded as circular dependency
and pkg_add command is forked infinite times and eats up systems' resource.
namely when core01 tries to install core02, core02 also tries to
install core01.
Index: instsetoo_native/inc_openoffice/unix/packagelist.txt
===================================================================
RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v
retrieving revision 1.21
diff -u -r1.21 packagelist.txt
--- instsetoo_native/inc_openoffice/unix/packagelist.txt 30 Nov 2005 13:21:44 -0000 1.21
+++ instsetoo_native/inc_openoffice/unix/packagelist.txt 3 Dec 2005 22:26:12 -0000
@@ -37,6 +37,7 @@
packagename = "%UNIXPRODUCTNAME-core01"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-mailcap,%WITHOUTDOTUNIXPRODUCTNAME-core,%WITHOUTDOTUNIXPRODUCTNAME-core01"
requires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
+freebsdrequires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08,%UNIXPRODUCTNAME-core09,%UNIXPRODUCTNAME-core10"
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -278,6 +279,7 @@
packagename = "%UNIXPRODUCTNAME-core02"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core02"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -291,6 +293,7 @@
packagename = "%UNIXPRODUCTNAME-core03"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core03"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -304,6 +307,7 @@
packagename = "%UNIXPRODUCTNAME-core04"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core04"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -317,6 +321,7 @@
packagename = "%UNIXPRODUCTNAME-core05"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core05"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -330,6 +335,7 @@
packagename = "%UNIXPRODUCTNAME-core06"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core06"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -343,6 +349,7 @@
packagename = "%UNIXPRODUCTNAME-core07"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core07"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -356,6 +363,7 @@
packagename = "%UNIXPRODUCTNAME-core08"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core08"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -369,6 +377,7 @@
packagename = "%UNIXPRODUCTNAME-core09"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core09"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -383,6 +392,7 @@
packagename = "%UNIXPRODUCTNAME-core10"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core10"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
Index: solenv/bin/modules/installer/epmfile.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v
retrieving revision 1.42
diff -u -r1.42 epmfile.pm
--- solenv/bin/modules/installer/epmfile.pm 9 Nov 2005 09:09:49 -0000 1.42
+++ solenv/bin/modules/installer/epmfile.pm 3 Dec 2005 22:26:52 -0000
@@ -395,6 +395,11 @@
$provides = "solarisprovides"; # the name in the packagelist
$requires = "solarisrequires"; # the name in the packagelist
}
+ elsif ( $installer::globals::isfreebsdpkgbuild )
+ {
+ $provides = "freebsdprovides"; # the name in the packagelist
+ $requires = "freebsdrequires"; # the name in the packagelist
+ }
else
{
$provides = "provides"; # the name in the packagelist
Index: solenv/bin/modules/installer/globals.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
retrieving revision 1.47
diff -u -r1.47 globals.pm
--- solenv/bin/modules/installer/globals.pm 9 Nov 2005 09:10:01 -0000 1.47
+++ solenv/bin/modules/installer/globals.pm 3 Dec 2005 22:26:52 -0000
@@ -80,6 +80,7 @@
$issolarispkgbuild = 0;
$issolarissparcbuild = 0;
$issolarisx86build = 0;
+ $isfreebsdpkgbuild = 0;
$unpackpath = "";
$idttemplatepath = "";
$idtlanguagepath = "";
Index: solenv/bin/modules/installer/parameter.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
retrieving revision 1.29
diff -u -r1.29 parameter.pm
--- solenv/bin/modules/installer/parameter.pm 9 Nov 2005 09:10:12 -0000 1.29
+++ solenv/bin/modules/installer/parameter.pm 10 Dec 2005 13:11:30 -0000
@@ -304,6 +304,13 @@
$installer::globals::epmoutpath = "packages";
}
}
+ if ( $installer::globals::compiler =~ /unxfbsdi/ )
+ {
+ if ( $installer::globals::packageformat eq "bsd" )
+ {
+ $installer::globals::isfreebsdpkgbuild = 1;
+ }
+ }
if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; }

17
editors/openoffice.org-2.0-devel/files/patch-jvmfwk+distributions+OpenOfficeorg+makefile.mk
View File

@ -1,17 +0,0 @@
Issuetracker : #i56951#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : javavendors_linux.xml can be used for FreeBSD as well.
javavendors_linux.xml can be used for FreeBSD as well.
--- jvmfwk/distributions/OpenOfficeorg/makefile.mk Thu Sep 8 04:26:17 2005
+++ jvmfwk/distributions/OpenOfficeorg/makefile.mk Sat Oct 22 18:31:16 2005
@@ -49,7 +49,7 @@
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
+-$(COPY) javavendors_macosx.xml $(BIN)$/javavendors_ooo.xml
-.ELIF "$(OS)"=="LINUX"
+.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
+-$(COPY) javavendors_linux.xml $(BIN)$/javavendors_ooo.xml
.ELSE
+-$(COPY) javavendors_unx.xml $(BIN)$/javavendors_ooo.xml

7
editors/openoffice.org-2.0-devel/files/patch-jvmfwk+plugins+sunmajor+pluginlib+sunversion.cxx
View File

@ -12,18 +12,17 @@ java 1.4.1-p10 for example to 1.4.1_110.
--- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Thu Sep 8 04:31:40 2005
+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Sat Oct 22 18:25:49 2005
@@ -208,7 +208,16 @@
@@ -208,7 +208,15 @@
return false;
#if defined(FREEBSD)
if (m_preRelease == Rel_FreeBSD) {
- m_nUpdateSpecial = *pCur;
+ pCur++; //elemnate `p'
+ if (pCur < pEnd && isdigit(*pCur))
+ if (pCur < pEnd)
+ pCur ++;
+ pCur ++;
+ int len = pCur - pLast -1; //elemenate `p'
+ if (len >= 127)
+ return false;
+ return false;
+ strncpy(buf, (pLast+1), len); //elemenate `p'
+ buf[len] = 0;
+ m_nUpdateSpecial = atoi(buf)+100; //hack for FBSD

23
editors/openoffice.org-2.0-devel/files/patch-libxmlsec+makefile.mk
View File

@ -1,23 +0,0 @@
Issuetracker : #i56954#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : Passing $ORIGIN to linker at libxmlsec project
We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case.
Index: libxmlsec/makefile.mk
===================================================================
RCS file: /cvs/external/libxmlsec/makefile.mk,v
retrieving revision 1.7
diff -u -r1.7 makefile.mk
--- libxmlsec/makefile.mk 28 Dec 2005 16:58:06 -0000 1.7
+++ libxmlsec/makefile.mk 5 Jan 2006 12:34:24 -0000
@@ -98,6 +98,9 @@
.IF "$(OS)$(COM)"=="SOLARISC52"
xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN'
.ENDIF # "$(OS)$(COM)"=="SOLARISC52"
+.IF "$(OS)$(COM)"=="FREEBSDGCC"
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN'
+.ENDIF # "$(OS)$(COM)"=="FREEBSDGCC"
LDFLAGS:=$(xmlsec_LDFLAGS)
.EXPORT: LDFLAGS

65
editors/openoffice.org-2.0-devel/files/patch-psprint+source+fontmanager+parseAFM.cxx
View File

@ -1,65 +0,0 @@
Issuetracker : #i60097#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : getc and ungetc are defined at stdio.h
Index: psprint/source/fontmanager/parseAFM.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/parseAFM.cxx,v
retrieving revision 1.6
diff -u -r1.6 parseAFM.cxx
--- psprint/source/fontmanager/parseAFM.cxx 28 Dec 2005 17:08:38 -0000 1.6
+++ psprint/source/fontmanager/parseAFM.cxx 5 Jan 2006 22:05:26 -0000
@@ -113,8 +113,8 @@
FileInputStream( const char* pFilename );
~FileInputStream();
- int getc() { return (m_nPos < m_nLen) ? int(m_pMemory[m_nPos++]) : -1; }
- void ungetc()
+ int getChar() { return (m_nPos < m_nLen) ? int(m_pMemory[m_nPos++]) : -1; }
+ void ungetChar()
{
if( m_nPos > 0 )
m_nPos--;
@@ -278,18 +278,18 @@
/* skip over white space */
// relies on EOF = -1
- while( is_white_Array[ (ch = stream->getc()) & 255 ] )
+ while( is_white_Array[ (ch = stream->getChar()) & 255 ] )
;
idx = 0;
while( ch != -1 && ! is_delimiter_Array[ ch & 255 ] )
{
ident[idx++] = ch;
- ch = stream->getc();
+ ch = stream->getChar();
}
if (ch == -1 && idx < 1) return ((char *)NULL);
- if (idx >= 1 && ch != ':' ) stream->ungetc();
+ if (idx >= 1 && ch != ':' ) stream->ungetChar();
if (idx < 1 ) ident[idx++] = ch; /* single-character token */
ident[idx] = 0;
rLen = idx;
@@ -311,16 +311,16 @@
static char ident[MAX_NAME]; /* storage buffer for keywords */
int ch, idx;
- while ((ch = stream->getc()) == ' ' || ch == '\t' );
+ while ((ch = stream->getChar()) == ' ' || ch == '\t' );
idx = 0;
while (ch != -1 && ch != lineterm && ch != '\r')
{
ident[idx++] = ch;
- ch = stream->getc();
+ ch = stream->getChar();
} /* while */
- stream->ungetc();
+ stream->ungetChar();
ident[idx] = 0;
return(ident); /* returns pointer to the token */

64
editors/openoffice.org-2.0-devel/files/patch-sdkoo
View File

@ -1,64 +0,0 @@
Issuetracker : #iXXXXX#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : building sdk fails for FreeBSD
1. Build error
dmake sdkoo fails like:
##############################################################################
... starting unpatched epm ...
... epm -f bsd openoffice.org-sdk /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/listfile/en-US/epm_OpenOffice_SDK_gid_Module_Root_unxfbsd_SRC680__en-US.lst -v 2>&1 | ...
**************************************************
ERROR: ERROR: "epm -f bsd openoffice.org-sdk /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/listfile/en-US/epm_OpenOffice_SDK_gid_Module_Root_unxfbsd_SRC680__en-US.lst -v 2>&1 |"!
in function: call_epm
**************************************************
**************************************************
ERROR: Saved logfile: /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/logging/en-US/log_SRC680__en-US.log
**************************************************
... cleaning the output tree ...
... removing directory /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/zip/en-US ...
Fri Nov 18 22:49:33 2005 (08:05 min.)
dmake: Error code 255, while making 'sdkoo_en-US.bsd'
'---* tg_merge.mk *---'
##############################################################################
2. Reason why it fails:
since quoting for filename containing `$' produces an error
tar: opt/openoffice.org2.0_sdk/classes/com/sun/star/lib/loader/InstallationFinder\$StreamGobbler.class: Could not stat: No such file or directory
tar: opt/openoffice.org2.0_sdk/classes/com/sun/star/lib/loader/Loader\$CustomURLClassLoader.class: Could not stat: No such file or directory
3. Solution
For FreeBSD, we don't need quoting. We use printf for files names
instead of using qprintf, a function that treats quoting string.
--- epm/epm-3.7.patch Sat Nov 19 10:21:34 2005
+++ epm/epm-3.7.patch Sat Nov 19 10:22:23 2005
@@ -586,3 +586,23 @@
}
--- 457,462 ----
+
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005
+***************
+*** 234,240 ****
+ case 'c' :
+ case 'f' :
+ case 'l' :
+! qprintf(fp, "%s\n", file->dst + 1);
+ break;
+ }
+ }
+--- 243,249 ----
+ case 'c' :
+ case 'f' :
+ case 'l' :
+! fprintf(fp, "%s\n", file->dst + 1);
+ break;
+ }
+ }

31
editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,31 +0,0 @@
Issuetracker : #i56956#
CWS : N/A
Author: : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : catch up recent version of solenv/inc/unxlngi6.mk
catch up recent version of solenv/inc/unxlngi6.mk and STLPORT_VERSION is 450 in FreeBSD
--- solenv/inc/unxfbsdi.mk Wed Oct 5 20:33:12 2005
+++ solenv/inc/unxfbsdi.mk Mon Oct 24 11:13:39 2005
@@ -45,7 +45,7 @@
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
# _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -190,8 +190,13 @@
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+.IF "$(USE_STLP_DEBUG)" != ""
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
+.ELSE # "$(USE_STLP_DEBUG)" != ""
LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)

53
editors/openoffice.org-3-devel/Makefile
View File

@ -9,15 +9,19 @@ PORTNAME?= openoffice.org
PORTVERSION?= 2.0.${SNAPDATE}
CATEGORIES+= editors java
MASTER_SITES+= http://openoffice.lunarshells.com/sources/ \
ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= OOo_${OOOTAG}_source.tar.bz2
DISTFILES+= OOo_${OOOTAG}_source${EXTRACT_SUFX}
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
.endif
EXTRACT_ONLY= OOo_${OOOTAG}_source.tar.bz2
.if defined(WITH_GNUGCJ)
DISTFILES+= ${ANT_DISTFILE}:antbin
.endif
EXTRACT_ONLY= OOo_${OOOTAG}_source${EXTRACT_SUFX}
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@ -59,9 +63,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 151
MILESTONE?= 155
OOOTAG?= SRC680_m${MILESTONE}
SNAPDATE= 20060117
SNAPDATE= 20060203
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -78,7 +82,7 @@ PKGNAMESUFFIX?= -${LANG_SUFFIX}
.endif
.if defined(WITH_GNUGCJ)
BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41
#BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc41:${PORTSDIR}/lang/gcc41-wgcj
BROKEN= "still work in progress"
.else
BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo
@ -88,8 +92,8 @@ BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo
.if defined(WITH_CCACHE)
BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
.if defined(WITH_GNUGCJ)
CC= ccache gcc41
CXX= ccache g++41
CC= ccache ${LOCALBASE}/gcc41/bin/gcc
CXX= ccache ${LOCALBASE}/gcc41/bin/g++
.else
CC= ccache gcc-ooo
CXX= ccache g++-ooo
@ -97,8 +101,8 @@ CXX= ccache g++-ooo
.endif #WITH_CCACHE
.if !defined(WITH_CCACHE)
.if defined(WITH_GNUGCJ)
CC= gcc41
CXX= g++41
CC= ${LOCALBASE}/gcc41/bin/gcc
CXX= ${LOCALBASE}/gcc41/bin/g++
.else
CC= gcc-ooo
CXX= g++-ooo
@ -112,26 +116,40 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bison2:${PORTSDIR}/devel/bison2 \
imake:${X_IMAKE_PORT}
.if !defined(WITHOUT_JAVA)
BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant
.else
LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt
LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2
.endif
.if defined(WITH_GNUGCJ)
ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin.tar.bz2
ANT_VERSION= 1.6.5
.endif
.if !defined(WITH_GPC)
LIB_DEPENDS= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
.endif
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
ZIP?= ${PREFIX}/bin/zip
TCSH?= /bin/tcsh
PKGMESSAGE= ${WRKDIR}/pkg-message
NUMOFPROCESSES?= 1
USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
.if (${OSVERSION} <= 492000)
EXTRA_PATCHES+= ${FILESDIR}/fbsd4-workaroundpatch
.endif
.if defined(WITH_GNUGCJ)
EXTRA_PATCHES+= ${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches
.endif
#.if defined(WITH_TTF_BYTECODE_ENABLED)
#EXTRA_PATCHES+= ${FILESDIR}/optpatch-freetype
#.endif
.include <${FILESDIR}/Makefile.knobs>
pre-everything::
@ -152,11 +170,8 @@ pre-everything::
.endif
post-extract:
#.if defined(WITH_TTF_BYTECODE_ENABLED)
# @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
#.endif
.if (${OSVERSION} <= 492000)
@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/fbsd4-workaroundpatch
.if defined(WITH_GNUGCJ)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
.endif
.if defined(WITH_GPC)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -

9
editors/openoffice.org-3-devel/distinfo
View File

@ -1,9 +1,12 @@
MD5 (openoffice.org2.0/OOo_SRC680_m151_source.tar.bz2) = f652b703f21ade84d6ff814684df2327
SHA256 (openoffice.org2.0/OOo_SRC680_m151_source.tar.bz2) = 2c6a2e37ff5dd8b01c4d976239922e12b26bf948908f62d9e2df620c8ce4cf2d
SIZE (openoffice.org2.0/OOo_SRC680_m151_source.tar.bz2) = 236161920
MD5 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = b8a712737bb146baf1ebb00c88ed3dc3
SHA256 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 80b481f8815f7bc9263d9544f1a0326abeb61de7349e4947614a5e72e49c4b0b
SIZE (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 235716251
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024
MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
SHA256 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366

2
editors/openoffice.org-3-devel/files/Makefile.knobs
View File

@ -6,7 +6,7 @@
CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
.endif
.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
CONFIGURE_ARGS+= --with-java=gij --with-ant-home=${LOCALBASE}/ant
CONFIGURE_ARGS+= --with-jdk-home="${LOCALBASE}/gcc41" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}" --disable-qadevooo
.endif
.if defined(WITHOUT_JAVA)
CONFIGURE_ARGS+= --without-java

1308
editors/openoffice.org-3-devel/files/gcj-cws_jaxpapi Normal file
View File

File diff suppressed because it is too large Load Diff

137
editors/openoffice.org-3-devel/files/gcj-patches Normal file
View File

@ -0,0 +1,137 @@
Index: wizards/com/sun/star/wizards/ui/FilterComponent.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/ui/FilterComponent.java,v
retrieving revision 1.8
diff -u -r1.8 FilterComponent.java
--- wizards/com/sun/star/wizards/ui/FilterComponent.java 28 Dec 2005 17:25:36 -0000 1.8
+++ wizards/com/sun/star/wizards/ui/FilterComponent.java 27 Jan 2006 22:55:38 -0000
@@ -261,10 +261,7 @@
case DataType.BOOLEAN:
double dblvalue = ((Double) curValue).doubleValue();
curValue = new Boolean(dblvalue == 1.0);
- /**TODO: 1) Datei SingleSelectQueryComposer modifizieren:
- / Zeilen 1525ff in Methode auslagern und Aufruf in Zeile 1356 ändern TypeConverter is parameter
- * 2) setDisplayCondition ändern
- */
+ /* */
break;
default:
curValue = String.valueOf(curValue);
Index: solenv/inc/settings.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/settings.mk,v
retrieving revision 1.185
diff -u -r1.185 settings.mk
--- solenv/inc/settings.mk 20 Jan 2006 12:09:20 -0000 1.185
+++ solenv/inc/settings.mk 27 Jan 2006 23:11:31 -0000
@@ -187,7 +187,8 @@
#required arguments
.IF "$(JAVACACHE)" != ""
-JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
+#JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
+JAVAC=$(JAVACOMPILER) --encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
.ELSE
JAVAC=$(JAVACOMPILER)
Index: source/ui/slidesorter/cache/SlsQueueProcessor.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx,v
retrieving revision 1.10
diff -u -p -u -r1.10 SlsQueueProcessor.hxx
--- sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx 19 Jan 2006 12:52:20 -0000 1.10
+++ sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx 26 Jan 2006 08:29:38 -0000
@@ -164,7 +164,7 @@ template <class Queue, class RequestData
while ( ! mrQueue.IsEmpty())
{
// Determine whether the system is idle.
- sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mrView.GetWindow()));
+ sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(static_cast< ::Window* >(mrView.GetWindow())));
if (nIdleState != tools::IdleDetection::IDET_IDLE)
{
if ((nIdleState&tools::IdleDetection::IDET_FULL_SCREEN_SHOW_ACTIVE) != 0)
Index: config_office/configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.150
diff -u -r1.150 configure.in
--- config_office/configure.in 20 Jan 2006 13:28:25 -0000 1.150
+++ config_office/configure.in 2 Feb 2006 05:13:30 -0000
@@ -1975,6 +1975,7 @@
dnl Checks for javadoc
dnl ===================================================================
if test "$SOLAR_JAVA" != ""; then
+ if test "$JDK" != "gcj"; then
if test -z "$with_jdk_home"; then
AC_PATH_PROG(JAVADOC, javadoc)
else
@@ -1996,6 +1997,9 @@
JAVADOC=`cygpath -d "$JAVADOC"`
JAVADOC=`cygpath -u "$JAVADOC"`
fi
+ else
+ AC_PATH_PROG(JAVADOC, gjdoc)
+ fi
fi
if test "$SOLAR_JAVA" != ""; then
@@ -2032,8 +2036,14 @@
if test "$JDK" = "gcj"; then
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
- CFLAGS="$CFLAGS -I$JAVA_HOME/include"
- LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
+ CFLAGS="$CFLAGS -I$JAVA_HOME/include -pthread"
+ LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj -pthread"
+ JAR="$JAVA_HOME/bin/fastjar"
+ JAVACMD="$JAVA_HOME/bin/gij"
+ JAVA="$JAVA_HOME/bin/gij"
+ AC_SUBST(JAVA)
+ AC_SUBST(JAVACMD)
+ AC_SUBST(JAR)
AC_CHECK_HEADER(jni.h, [],
[AC_MSG_ERROR([jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?])], [])
@@ -4214,7 +4224,7 @@
EOF
oldJAVA_HOME=$JAVA_HOME
if test "$JDK" = "gcj"; then
- JAVA_HOME=; export JAVA_HOME
+ JAVACMD="$JAVA_HOME/bin/gij"; export JAVACMD
ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
else
ant_cmd="$ANT -buildfile conftest.xml 1>&2"
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.86
diff -u -r1.86 set_soenv.in
--- config_office/set_soenv.in 13 Jan 2006 16:37:16 -0000 1.86
+++ config_office/set_soenv.in 2 Feb 2006 05:13:31 -0000
@@ -68,7 +68,7 @@
#
# Help variables.
my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG,
- $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
+ $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE, $JAVACMD, $JAVA, $JAR,
$SOLARENVINC, $USR_DT, $USR_OPENWIN, $TCSH_PATH, $XLIB, $XINC,
$CYGWIN_PATH, $language, $dict, $ASM_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
$STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH );
@@ -1679,6 +1679,9 @@
ToFile( "JAVAINTERPRETER", "@JAVAINTERPRETER@","e" );
ToFile( "JAVACOMPILER", "@JAVACOMPILER@", "e" );
ToFile( "JAVADOC", "@JAVADOC@", "e" );
+ ToFile( "JAVA", "@JAVA@", "e" );
+ ToFile( "JAVACMD", "@JAVACMD@", "e" );
+ ToFile( "JAR", "@JAR@", "e" );
}
if ( $platform =~ m/darwin/ )
{ ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH, "e" );
Javadoc@xmerge http://qa.openoffice.org/issues/show_bug.cgi?id=57286
JAVA@berkeleydb http://qa.openoffice.org/issues/show_bug.cgi?id=54657
JAVACMD@ant
JAR@berkeleydb

752
editors/openoffice.org-3-devel/files/patch-Python-2.3.4.patch
View File

@ -1,752 +0,0 @@
Issuetracker : #i53287#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : Support for FreeBSD 6 and 7
Index: python/Python-2.3.4.patch
===================================================================
RCS file: /cvs/external/python/Python-2.3.4.patch,v
retrieving revision 1.6
diff -u -r1.6 Python-2.3.4.patch
--- python/Python-2.3.4.patch 3 Mar 2005 17:33:54 -0000 1.6
+++ python/Python-2.3.4.patch 8 Aug 2005 21:50:08 -0000
@@ -13776,3 +13776,739 @@
atheos*) DYNLOADFILE="dynload_atheos.o";;
*)
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
+*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py Tue Aug 9 06:26:23 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py Tue Aug 9 06:20:25 2005
+***************
+*** 0 ****
+--- 1,355 ----
++ # Generated by h2py from /usr/include/netinet/in.h
++ IPPROTO_IP = 0
++ IPPROTO_HOPOPTS = 0
++ IPPROTO_ICMP = 1
++ IPPROTO_IGMP = 2
++ IPPROTO_GGP = 3
++ IPPROTO_IPV4 = 4
++ IPPROTO_IPIP = IPPROTO_IPV4
++ IPPROTO_TCP = 6
++ 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_UDP = 17
++ 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_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_DIVERT = 254
++ IPPROTO_RAW = 255
++ IPPROTO_MAX = 256
++ IPPROTO_DONE = 257
++ IPPORT_RESERVED = 1024
++ IPPORT_USERRESERVED = 5000
++ IPPORT_HIFIRSTAUTO = 49152
++ IPPORT_HILASTAUTO = 65535
++ IPPORT_RESERVEDSTART = 600
++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
++
++ IN_CLASSA_NET = 0xff000000
++ IN_CLASSA_NSHIFT = 24
++ IN_CLASSA_HOST = 0x00ffffff
++ IN_CLASSA_MAX = 128
++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
++
++ IN_CLASSB_NET = 0xffff0000
++ IN_CLASSB_NSHIFT = 16
++ IN_CLASSB_HOST = 0x0000ffff
++ IN_CLASSB_MAX = 65536
++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
++
++ IN_CLASSC_NET = 0xffffff00
++ IN_CLASSC_NSHIFT = 8
++ IN_CLASSC_HOST = 0x000000ff
++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
++
++ IN_CLASSD_NET = 0xf0000000
++ 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) & 0xf0000000) == 0xf0000000)
++
++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
++
++ INADDR_NONE = 0xffffffff
++ IN_LOOPBACKNET = 127
++ INET_ADDRSTRLEN = 16
++ IP_OPTIONS = 1
++ IP_HDRINCL = 2
++ IP_TOS = 3
++ IP_TTL = 4
++ IP_RECVOPTS = 5
++ IP_RECVRETOPTS = 6
++ IP_RECVDSTADDR = 7
++ 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_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_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
++
++ # Included from netinet6/in6.h
++
++ # Included from sys/queue.h
++ def SLIST_HEAD_INITIALIZER(head): return \
++
++ def SLIST_ENTRY(type): return \
++
++ def STAILQ_HEAD_INITIALIZER(head): return \
++
++ def STAILQ_ENTRY(type): return \
++
++ def LIST_HEAD_INITIALIZER(head): return \
++
++ def LIST_ENTRY(type): return \
++
++ def TAILQ_HEAD_INITIALIZER(head): return \
++
++ def TAILQ_ENTRY(type): return \
++
++ def CIRCLEQ_ENTRY(type): return \
++
++ __KAME_VERSION = "20000701/FreeBSD-current"
++ 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 = 0xff010000
++ IPV6_ADDR_INT32_MLL = 0xff020000
++ 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 = 0xffff0000
++ 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_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_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_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 \
++
++ 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_PKTINFO = 19
++ IPV6_HOPLIMIT = 20
++ IPV6_NEXTHOP = 21
++ IPV6_HOPOPTS = 22
++ IPV6_DSTOPTS = 23
++ IPV6_RTHDR = 24
++ IPV6_PKTOPTIONS = 25
++ IPV6_CHECKSUM = 26
++ IPV6_BINDV6ONLY = 27
++ 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_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_BINDV6ONLY = 24
++ IPV6CTL_RTEXPIRE = 25
++ IPV6CTL_RTMINEXPIRE = 26
++ IPV6CTL_RTMAXCACHE = 27
++ IPV6CTL_MAXID = 28
+*** misc/Python-2.3.4/Lib/plat-freebsd6/regen Tue Aug 9 06:26:27 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/regen Tue Aug 9 06:19:02 2005
+***************
+*** 0 ****
+--- 1,3 ----
++ #! /bin/sh
++ set -v
++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
+*** misc/Python-2.3.4/Lib/plat-freebsd7/IN.py Tue Aug 9 06:26:23 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/IN.py Tue Aug 9 06:20:25 2005
+***************
+*** 0 ****
+--- 1,355 ----
++ # Generated by h2py from /usr/include/netinet/in.h
++ IPPROTO_IP = 0
++ IPPROTO_HOPOPTS = 0
++ IPPROTO_ICMP = 1
++ IPPROTO_IGMP = 2
++ IPPROTO_GGP = 3
++ IPPROTO_IPV4 = 4
++ IPPROTO_IPIP = IPPROTO_IPV4
++ IPPROTO_TCP = 6
++ 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_UDP = 17
++ 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_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_DIVERT = 254
++ IPPROTO_RAW = 255
++ IPPROTO_MAX = 256
++ IPPROTO_DONE = 257
++ IPPORT_RESERVED = 1024
++ IPPORT_USERRESERVED = 5000
++ IPPORT_HIFIRSTAUTO = 49152
++ IPPORT_HILASTAUTO = 65535
++ IPPORT_RESERVEDSTART = 600
++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
++
++ IN_CLASSA_NET = 0xff000000
++ IN_CLASSA_NSHIFT = 24
++ IN_CLASSA_HOST = 0x00ffffff
++ IN_CLASSA_MAX = 128
++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
++
++ IN_CLASSB_NET = 0xffff0000
++ IN_CLASSB_NSHIFT = 16
++ IN_CLASSB_HOST = 0x0000ffff
++ IN_CLASSB_MAX = 65536
++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
++
++ IN_CLASSC_NET = 0xffffff00
++ IN_CLASSC_NSHIFT = 8
++ IN_CLASSC_HOST = 0x000000ff
++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
++
++ IN_CLASSD_NET = 0xf0000000
++ 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) & 0xf0000000) == 0xf0000000)
++
++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
++
++ INADDR_NONE = 0xffffffff
++ IN_LOOPBACKNET = 127
++ INET_ADDRSTRLEN = 16
++ IP_OPTIONS = 1
++ IP_HDRINCL = 2
++ IP_TOS = 3
++ IP_TTL = 4
++ IP_RECVOPTS = 5
++ IP_RECVRETOPTS = 6
++ IP_RECVDSTADDR = 7
++ 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_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_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
++
++ # Included from netinet6/in6.h
++
++ # Included from sys/queue.h
++ def SLIST_HEAD_INITIALIZER(head): return \
++
++ def SLIST_ENTRY(type): return \
++
++ def STAILQ_HEAD_INITIALIZER(head): return \
++
++ def STAILQ_ENTRY(type): return \
++
++ def LIST_HEAD_INITIALIZER(head): return \
++
++ def LIST_ENTRY(type): return \
++
++ def TAILQ_HEAD_INITIALIZER(head): return \
++
++ def TAILQ_ENTRY(type): return \
++
++ def CIRCLEQ_ENTRY(type): return \
++
++ __KAME_VERSION = "20000701/FreeBSD-current"
++ 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 = 0xff010000
++ IPV6_ADDR_INT32_MLL = 0xff020000
++ 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 = 0xffff0000
++ 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_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_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_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 \
++
++ 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_PKTINFO = 19
++ IPV6_HOPLIMIT = 20
++ IPV6_NEXTHOP = 21
++ IPV6_HOPOPTS = 22
++ IPV6_DSTOPTS = 23
++ IPV6_RTHDR = 24
++ IPV6_PKTOPTIONS = 25
++ IPV6_CHECKSUM = 26
++ IPV6_BINDV6ONLY = 27
++ 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_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_BINDV6ONLY = 24
++ IPV6CTL_RTEXPIRE = 25
++ IPV6CTL_RTMINEXPIRE = 26
++ IPV6CTL_RTMAXCACHE = 27
++ IPV6CTL_MAXID = 28
+*** misc/Python-2.3.4/Lib/plat-freebsd7/regen Tue Aug 9 06:26:27 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/regen Tue Aug 9 06:19:02 2005
+***************
+*** 0 ****
+--- 1,3 ----
++ #! /bin/sh
++ set -v
++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h

173
editors/openoffice.org-3-devel/files/patch-bridges
View File

@ -1,173 +0,0 @@
Issuetracker : #i56947#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : update files at bridges project
catch up version up of bridge project of GNU/Linux
--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Thu Sep 8 07:20:08 2005
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed Oct 26 15:10:05 2005
@@ -57,7 +57,7 @@
typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
sal_Int32 nParams, typelib_MethodParameter * pParams,
void ** pCallStack,
- sal_Int64 * pRegisterReturn /* space for register return */ )
+ void * pReturnValue )
{
// pCallStack: ret, [return ptr], this, params
char * pCppStack = (char *)(pCallStack +1);
@@ -74,7 +74,7 @@
{
if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
{
- pUnoReturn = pRegisterReturn; // direct way for simple types
+ pUnoReturn = pReturnValue; // direct way for simple types
}
else // complex return via ptr (pCppReturn)
{
@@ -215,7 +215,7 @@
uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
}
// complex return ptr is set to eax
- *(void **)pRegisterReturn = pCppReturn;
+ *static_cast< void ** >(pReturnValue) = pCppReturn;
}
if (pReturnTypeDescr)
{
@@ -228,7 +228,7 @@
//==================================================================================================
extern "C" void cpp_vtable_call(
int nFunctionIndex, int nVtableOffset, void** pCallStack,
- sal_Int64 nRegReturn )
+ void * pReturnValue )
{
OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
@@ -275,7 +275,7 @@
pCppI, aMemberDescr.get(),
((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
0, 0, // no params
- pCallStack, &nRegReturn );
+ pCallStack, pReturnValue );
}
else
{
@@ -290,7 +290,7 @@
pCppI, aMemberDescr.get(),
0, // indicates void return
1, &aParam,
- pCallStack, &nRegReturn );
+ pCallStack, pReturnValue );
}
break;
}
@@ -324,7 +324,7 @@
&pInterface, pTD, cpp_acquire );
pInterface->release();
TYPELIB_DANGER_RELEASE( pTD );
- *(void **)&nRegReturn = pCallStack[1];
+ *static_cast< void ** >(pReturnValue) = pCallStack[1];
break;
}
TYPELIB_DANGER_RELEASE( pTD );
@@ -336,7 +336,7 @@
((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
- pCallStack, &nRegReturn );
+ pCallStack, pReturnValue );
}
break;
}
--- bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Wed Jun 1 01:32:41 2005
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Wed Oct 26 15:10:04 2005
@@ -9,12 +9,13 @@
.LCFIg0:
movl %esp,%ebp
.LCFIg1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x4,%esp # 32bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- movl 12(%esp),%eax # 64 bit nRegReturn, lower half
+ movl 16(%esp),%eax # 32bit returnValue
leave
ret
.LFEg:
@@ -29,7 +30,7 @@
.LCFIv0:
movl %esp,%ebp
.LCFIv1:
- subl $0x8,%esp # 64bit nRegReturn
+ pushl $0 # 32bit null pointer (returnValue not used)
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
@@ -48,13 +49,14 @@
.LCFIh0:
movl %esp,%ebp
.LCFIh1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x8,%esp # 64bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- movl 12(%esp),%eax # 64 bit nRegReturn, lower half
- movl 16(%esp),%edx # 64 bit nRegReturn, upper half
+ movl 16(%esp),%eax # 64bit returnValue, lower half
+ movl 20(%esp),%edx # 64bit returnValue, upper half
leave
ret
.LFEh:
@@ -69,12 +71,13 @@
.LCFIf0:
movl %esp,%ebp
.LCFIf1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x4,%esp # 32bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- flds 12(%esp) # 64 bit nRegReturn, lower half
+ flds 16(%esp) # 32bit returnValue
leave
ret
.LFEf:
@@ -89,12 +92,13 @@
.LCFId0:
movl %esp,%ebp
.LCFId1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x8,%esp # 64bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- fldl 12(%esp) # 64 bit nRegReturn
+ fldl 16(%esp) # 64bit returnValue
leave
ret
.LFEd:
@@ -109,12 +113,13 @@
.LCFIc0:
movl %esp,%ebp
.LCFIc1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x4,%esp # 32bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- movl 12(%esp),%eax # 64 bit nRegReturn, lower half
+ movl 16(%esp),%eax # 32bit returnValue
leave
ret $4
.LFEc:

18
editors/openoffice.org-3-devel/files/patch-config_office+set_soenv.in
View File

@ -1,18 +0,0 @@
Issuetracker : #i56949#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : Add conditional the case of @GCCVER@ >= 30401.
Like GNU/Linux's case, we also need the case for $CVER if @GCCVER@ is equal to or larger than 3.4.1
--- config_office/set_soenv.in Thu Sep 22 23:30:56 2005
+++ config_office/set_soenv.in Sat Oct 1 12:59:30 2005
@@ -347,6 +347,9 @@
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ if( @GCCVER@ >= 30401 ) {
+ $CVER = "C341";
+ }
}
elsif ( $platform =~ m/linux-gnu/ )
{

87
editors/openoffice.org-3-devel/files/patch-epm+epm-3.7.patch
View File

@ -1,87 +0,0 @@
Issuetracker : #iXXXXX#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : epm porting for FreeBSD
o FreeBSD's package manager doesn't allow multiple lines for
@exec and @unexec
o chown is at /usr/sbin/
o the way to recording package dependency is incorrect
Index: epm/epm-3.7.patch
===================================================================
RCS file: /cvs/external/epm/epm-3.7.patch,v
retrieving revision 1.2
diff -u -r1.2 epm-3.7.patch
--- epm/epm-3.7.patch 10 Mar 2005 11:52:43 -0000 1.2
+++ epm/epm-3.7.patch 3 Jun 2005 22:05:23 -0000
@@ -1,3 +1,69 @@
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005
+***************
+*** 26,31 ****
+--- 26,38 ----
+
+ #include "epm.h"
+
++ void cr2semicolon(char *command)
++ {
++ int len, i;
++ len=strlen(command);
++ for (i=0;i<len;i++)
++ if(*(command+i)=='\n') *(command+i)=';';
++ }
+
+ /*
+ * 'make_bsd()' - Make a FreeBSD software distribution package.
+***************
+*** 150,156 ****
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+ if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s", d->product);
+ else
+ #ifdef __FreeBSD__
+ /*
+--- 157,163 ----
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+ if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
+ else
+ #ifdef __FreeBSD__
+ /*
+***************
+*** 179,187 ****
+--- 186,196 ----
+ " by the BSD packager.\n", stderr);
+ break;
+ case COMMAND_POST_INSTALL :
++ cr2semicolon(c->command);
+ fprintf(fp, "@exec %s\n", c->command);
+ break;
+ case COMMAND_PRE_REMOVE :
++ cr2semicolon(c->command);
+ fprintf(fp, "@unexec %s\n", c->command);
+ break;
+ case COMMAND_POST_REMOVE :
+***************
+*** 199,205 ****
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
+--- 208,214 ----
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
*** misc/epm-3.7/epm.c 2003-10-28 15:48:30.000000000 +0100
--- misc/build/epm-3.7/epm.c 2004-11-24 10:38:40.000000000 +0100
***************

45
editors/openoffice.org-3-devel/files/patch-icu+icu-2.6.patch
View File

@ -1,45 +0,0 @@
Issuetracker : #i56952#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : Passing $ORIGIN to linker at icu project
We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case.
Index: icu/icu-2.6.patch
===================================================================
RCS file: /cvs/external/icu/icu-2.6.patch,v
retrieving revision 1.15
diff -u -r1.15 icu-2.6.patch
--- icu/icu-2.6.patch 28 Dec 2005 16:54:16 -0000 1.15
+++ icu/icu-2.6.patch 5 Jan 2006 12:58:57 -0000
@@ -2775,3 +2775,31 @@
commands = pkg_appendToList(commands, NULL, uprv_strdup(stanza));
sprintf(stanza, "@$(RMV) $(TEMP_DIR)/%s", cfile+genFileOffset);
+*** misc/icu/source/config/mh-bsd-gcc Thu May 2 08:48:10 2002
+--- misc/build/icu/source/config/mh-bsd-gcc Mon Oct 24 18:16:57 2005
+***************
+*** 10,21 ****
+--- 10,30 ----
+ GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
+
+ ## Flags for position independent code
++ STATICCFLAGS = -fPIC
++ STATICCXXFLAGS = -fPIC
++ STATICCPPFLAGS = -DPIC
+ SHAREDLIBCFLAGS = -fPIC
+ SHAREDLIBCXXFLAGS = -fPIC
+ SHAREDLIBCPPFLAGS = -DPIC
+
+ ## Compiler switch to embed a runtime search path
+ LD_RPATH=
++ ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
++ ENABLE_RPATH=YES
++ RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN'
++
++ #SH# ENABLE_RPATH=YES
++ #SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN'"
+ LD_RPATH_PRE= -Wl,-rpath,
+
+ ## Compiler switch to embed a library name
+
+

154
editors/openoffice.org-3-devel/files/patch-instsetoo
View File

@ -1,154 +0,0 @@
Issuetracker : #i53288#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : remove circular dependency
in this case,
core01 is depend on core02-core08, and core0[2-9] and core10
depends on core01. for FreeBSD this is regarded as circular dependency
and pkg_add command is forked infinite times and eats up systems' resource.
namely when core01 tries to install core02, core02 also tries to
install core01.
Index: instsetoo_native/inc_openoffice/unix/packagelist.txt
===================================================================
RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v
retrieving revision 1.21
diff -u -r1.21 packagelist.txt
--- instsetoo_native/inc_openoffice/unix/packagelist.txt 30 Nov 2005 13:21:44 -0000 1.21
+++ instsetoo_native/inc_openoffice/unix/packagelist.txt 3 Dec 2005 22:26:12 -0000
@@ -37,6 +37,7 @@
packagename = "%UNIXPRODUCTNAME-core01"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-mailcap,%WITHOUTDOTUNIXPRODUCTNAME-core,%WITHOUTDOTUNIXPRODUCTNAME-core01"
requires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
+freebsdrequires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08,%UNIXPRODUCTNAME-core09,%UNIXPRODUCTNAME-core10"
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -278,6 +279,7 @@
packagename = "%UNIXPRODUCTNAME-core02"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core02"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -291,6 +293,7 @@
packagename = "%UNIXPRODUCTNAME-core03"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core03"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -304,6 +307,7 @@
packagename = "%UNIXPRODUCTNAME-core04"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core04"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -317,6 +321,7 @@
packagename = "%UNIXPRODUCTNAME-core05"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core05"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -330,6 +335,7 @@
packagename = "%UNIXPRODUCTNAME-core06"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core06"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -343,6 +349,7 @@
packagename = "%UNIXPRODUCTNAME-core07"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core07"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -356,6 +363,7 @@
packagename = "%UNIXPRODUCTNAME-core08"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core08"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -369,6 +377,7 @@
packagename = "%UNIXPRODUCTNAME-core09"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core09"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -383,6 +392,7 @@
packagename = "%UNIXPRODUCTNAME-core10"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core10"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
Index: solenv/bin/modules/installer/epmfile.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v
retrieving revision 1.42
diff -u -r1.42 epmfile.pm
--- solenv/bin/modules/installer/epmfile.pm 9 Nov 2005 09:09:49 -0000 1.42
+++ solenv/bin/modules/installer/epmfile.pm 3 Dec 2005 22:26:52 -0000
@@ -395,6 +395,11 @@
$provides = "solarisprovides"; # the name in the packagelist
$requires = "solarisrequires"; # the name in the packagelist
}
+ elsif ( $installer::globals::isfreebsdpkgbuild )
+ {
+ $provides = "freebsdprovides"; # the name in the packagelist
+ $requires = "freebsdrequires"; # the name in the packagelist
+ }
else
{
$provides = "provides"; # the name in the packagelist
Index: solenv/bin/modules/installer/globals.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
retrieving revision 1.47
diff -u -r1.47 globals.pm
--- solenv/bin/modules/installer/globals.pm 9 Nov 2005 09:10:01 -0000 1.47
+++ solenv/bin/modules/installer/globals.pm 3 Dec 2005 22:26:52 -0000
@@ -80,6 +80,7 @@
$issolarispkgbuild = 0;
$issolarissparcbuild = 0;
$issolarisx86build = 0;
+ $isfreebsdpkgbuild = 0;
$unpackpath = "";
$idttemplatepath = "";
$idtlanguagepath = "";
Index: solenv/bin/modules/installer/parameter.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
retrieving revision 1.29
diff -u -r1.29 parameter.pm
--- solenv/bin/modules/installer/parameter.pm 9 Nov 2005 09:10:12 -0000 1.29
+++ solenv/bin/modules/installer/parameter.pm 10 Dec 2005 13:11:30 -0000
@@ -304,6 +304,13 @@
$installer::globals::epmoutpath = "packages";
}
}
+ if ( $installer::globals::compiler =~ /unxfbsdi/ )
+ {
+ if ( $installer::globals::packageformat eq "bsd" )
+ {
+ $installer::globals::isfreebsdpkgbuild = 1;
+ }
+ }
if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; }

17
editors/openoffice.org-3-devel/files/patch-jvmfwk+distributions+OpenOfficeorg+makefile.mk
View File

@ -1,17 +0,0 @@
Issuetracker : #i56951#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : javavendors_linux.xml can be used for FreeBSD as well.
javavendors_linux.xml can be used for FreeBSD as well.
--- jvmfwk/distributions/OpenOfficeorg/makefile.mk Thu Sep 8 04:26:17 2005
+++ jvmfwk/distributions/OpenOfficeorg/makefile.mk Sat Oct 22 18:31:16 2005
@@ -49,7 +49,7 @@
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
+-$(COPY) javavendors_macosx.xml $(BIN)$/javavendors_ooo.xml
-.ELIF "$(OS)"=="LINUX"
+.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
+-$(COPY) javavendors_linux.xml $(BIN)$/javavendors_ooo.xml
.ELSE
+-$(COPY) javavendors_unx.xml $(BIN)$/javavendors_ooo.xml

7
editors/openoffice.org-3-devel/files/patch-jvmfwk+plugins+sunmajor+pluginlib+sunversion.cxx
View File

@ -12,18 +12,17 @@ java 1.4.1-p10 for example to 1.4.1_110.
--- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Thu Sep 8 04:31:40 2005
+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Sat Oct 22 18:25:49 2005
@@ -208,7 +208,16 @@
@@ -208,7 +208,15 @@
return false;
#if defined(FREEBSD)
if (m_preRelease == Rel_FreeBSD) {
- m_nUpdateSpecial = *pCur;
+ pCur++; //elemnate `p'
+ if (pCur < pEnd && isdigit(*pCur))
+ if (pCur < pEnd)
+ pCur ++;
+ pCur ++;
+ int len = pCur - pLast -1; //elemenate `p'
+ if (len >= 127)
+ return false;
+ return false;
+ strncpy(buf, (pLast+1), len); //elemenate `p'
+ buf[len] = 0;
+ m_nUpdateSpecial = atoi(buf)+100; //hack for FBSD

23
editors/openoffice.org-3-devel/files/patch-libxmlsec+makefile.mk
View File

@ -1,23 +0,0 @@
Issuetracker : #i56954#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : Passing $ORIGIN to linker at libxmlsec project
We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case.
Index: libxmlsec/makefile.mk
===================================================================
RCS file: /cvs/external/libxmlsec/makefile.mk,v
retrieving revision 1.7
diff -u -r1.7 makefile.mk
--- libxmlsec/makefile.mk 28 Dec 2005 16:58:06 -0000 1.7
+++ libxmlsec/makefile.mk 5 Jan 2006 12:34:24 -0000
@@ -98,6 +98,9 @@
.IF "$(OS)$(COM)"=="SOLARISC52"
xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN'
.ENDIF # "$(OS)$(COM)"=="SOLARISC52"
+.IF "$(OS)$(COM)"=="FREEBSDGCC"
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN'
+.ENDIF # "$(OS)$(COM)"=="FREEBSDGCC"
LDFLAGS:=$(xmlsec_LDFLAGS)
.EXPORT: LDFLAGS

65
editors/openoffice.org-3-devel/files/patch-psprint+source+fontmanager+parseAFM.cxx
View File

@ -1,65 +0,0 @@
Issuetracker : #i60097#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : getc and ungetc are defined at stdio.h
Index: psprint/source/fontmanager/parseAFM.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/parseAFM.cxx,v
retrieving revision 1.6
diff -u -r1.6 parseAFM.cxx
--- psprint/source/fontmanager/parseAFM.cxx 28 Dec 2005 17:08:38 -0000 1.6
+++ psprint/source/fontmanager/parseAFM.cxx 5 Jan 2006 22:05:26 -0000
@@ -113,8 +113,8 @@
FileInputStream( const char* pFilename );
~FileInputStream();
- int getc() { return (m_nPos < m_nLen) ? int(m_pMemory[m_nPos++]) : -1; }
- void ungetc()
+ int getChar() { return (m_nPos < m_nLen) ? int(m_pMemory[m_nPos++]) : -1; }
+ void ungetChar()
{
if( m_nPos > 0 )
m_nPos--;
@@ -278,18 +278,18 @@
/* skip over white space */
// relies on EOF = -1
- while( is_white_Array[ (ch = stream->getc()) & 255 ] )
+ while( is_white_Array[ (ch = stream->getChar()) & 255 ] )
;
idx = 0;
while( ch != -1 && ! is_delimiter_Array[ ch & 255 ] )
{
ident[idx++] = ch;
- ch = stream->getc();
+ ch = stream->getChar();
}
if (ch == -1 && idx < 1) return ((char *)NULL);
- if (idx >= 1 && ch != ':' ) stream->ungetc();
+ if (idx >= 1 && ch != ':' ) stream->ungetChar();
if (idx < 1 ) ident[idx++] = ch; /* single-character token */
ident[idx] = 0;
rLen = idx;
@@ -311,16 +311,16 @@
static char ident[MAX_NAME]; /* storage buffer for keywords */
int ch, idx;
- while ((ch = stream->getc()) == ' ' || ch == '\t' );
+ while ((ch = stream->getChar()) == ' ' || ch == '\t' );
idx = 0;
while (ch != -1 && ch != lineterm && ch != '\r')
{
ident[idx++] = ch;
- ch = stream->getc();
+ ch = stream->getChar();
} /* while */
- stream->ungetc();
+ stream->ungetChar();
ident[idx] = 0;
return(ident); /* returns pointer to the token */

64
editors/openoffice.org-3-devel/files/patch-sdkoo
View File

@ -1,64 +0,0 @@
Issuetracker : #iXXXXX#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : building sdk fails for FreeBSD
1. Build error
dmake sdkoo fails like:
##############################################################################
... starting unpatched epm ...
... epm -f bsd openoffice.org-sdk /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/listfile/en-US/epm_OpenOffice_SDK_gid_Module_Root_unxfbsd_SRC680__en-US.lst -v 2>&1 | ...
**************************************************
ERROR: ERROR: "epm -f bsd openoffice.org-sdk /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/listfile/en-US/epm_OpenOffice_SDK_gid_Module_Root_unxfbsd_SRC680__en-US.lst -v 2>&1 |"!
in function: call_epm
**************************************************
**************************************************
ERROR: Saved logfile: /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/logging/en-US/log_SRC680__en-US.log
**************************************************
... cleaning the output tree ...
... removing directory /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/zip/en-US ...
Fri Nov 18 22:49:33 2005 (08:05 min.)
dmake: Error code 255, while making 'sdkoo_en-US.bsd'
'---* tg_merge.mk *---'
##############################################################################
2. Reason why it fails:
since quoting for filename containing `$' produces an error
tar: opt/openoffice.org2.0_sdk/classes/com/sun/star/lib/loader/InstallationFinder\$StreamGobbler.class: Could not stat: No such file or directory
tar: opt/openoffice.org2.0_sdk/classes/com/sun/star/lib/loader/Loader\$CustomURLClassLoader.class: Could not stat: No such file or directory
3. Solution
For FreeBSD, we don't need quoting. We use printf for files names
instead of using qprintf, a function that treats quoting string.
--- epm/epm-3.7.patch Sat Nov 19 10:21:34 2005
+++ epm/epm-3.7.patch Sat Nov 19 10:22:23 2005
@@ -586,3 +586,23 @@
}
--- 457,462 ----
+
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005
+***************
+*** 234,240 ****
+ case 'c' :
+ case 'f' :
+ case 'l' :
+! qprintf(fp, "%s\n", file->dst + 1);
+ break;
+ }
+ }
+--- 243,249 ----
+ case 'c' :
+ case 'f' :
+ case 'l' :
+! fprintf(fp, "%s\n", file->dst + 1);
+ break;
+ }
+ }

31
editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,31 +0,0 @@
Issuetracker : #i56956#
CWS : N/A
Author: : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : catch up recent version of solenv/inc/unxlngi6.mk
catch up recent version of solenv/inc/unxlngi6.mk and STLPORT_VERSION is 450 in FreeBSD
--- solenv/inc/unxfbsdi.mk Wed Oct 5 20:33:12 2005
+++ solenv/inc/unxfbsdi.mk Mon Oct 24 11:13:39 2005
@@ -45,7 +45,7 @@
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
# _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -190,8 +190,13 @@
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+.IF "$(USE_STLP_DEBUG)" != ""
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
+.ELSE # "$(USE_STLP_DEBUG)" != ""
LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)

53
editors/openoffice.org-vcltesttool/Makefile
View File

@ -9,15 +9,19 @@ PORTNAME?= openoffice.org
PORTVERSION?= 2.0.${SNAPDATE}
CATEGORIES+= editors java
MASTER_SITES+= http://openoffice.lunarshells.com/sources/ \
ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= OOo_${OOOTAG}_source.tar.bz2
DISTFILES+= OOo_${OOOTAG}_source${EXTRACT_SUFX}
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
.endif
EXTRACT_ONLY= OOo_${OOOTAG}_source.tar.bz2
.if defined(WITH_GNUGCJ)
DISTFILES+= ${ANT_DISTFILE}:antbin
.endif
EXTRACT_ONLY= OOo_${OOOTAG}_source${EXTRACT_SUFX}
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@ -59,9 +63,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 151
MILESTONE?= 155
OOOTAG?= SRC680_m${MILESTONE}
SNAPDATE= 20060117
SNAPDATE= 20060203
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -78,7 +82,7 @@ PKGNAMESUFFIX?= -${LANG_SUFFIX}
.endif
.if defined(WITH_GNUGCJ)
BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41
#BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc41:${PORTSDIR}/lang/gcc41-wgcj
BROKEN= "still work in progress"
.else
BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo
@ -88,8 +92,8 @@ BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo
.if defined(WITH_CCACHE)
BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
.if defined(WITH_GNUGCJ)
CC= ccache gcc41
CXX= ccache g++41
CC= ccache ${LOCALBASE}/gcc41/bin/gcc
CXX= ccache ${LOCALBASE}/gcc41/bin/g++
.else
CC= ccache gcc-ooo
CXX= ccache g++-ooo
@ -97,8 +101,8 @@ CXX= ccache g++-ooo
.endif #WITH_CCACHE
.if !defined(WITH_CCACHE)
.if defined(WITH_GNUGCJ)
CC= gcc41
CXX= g++41
CC= ${LOCALBASE}/gcc41/bin/gcc
CXX= ${LOCALBASE}/gcc41/bin/g++
.else
CC= gcc-ooo
CXX= g++-ooo
@ -112,26 +116,40 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bison2:${PORTSDIR}/devel/bison2 \
imake:${X_IMAKE_PORT}
.if !defined(WITHOUT_JAVA)
BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant
.else
LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt
LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2
.endif
.if defined(WITH_GNUGCJ)
ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin.tar.bz2
ANT_VERSION= 1.6.5
.endif
.if !defined(WITH_GPC)
LIB_DEPENDS= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
.endif
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
ZIP?= ${PREFIX}/bin/zip
TCSH?= /bin/tcsh
PKGMESSAGE= ${WRKDIR}/pkg-message
NUMOFPROCESSES?= 1
USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
.if (${OSVERSION} <= 492000)
EXTRA_PATCHES+= ${FILESDIR}/fbsd4-workaroundpatch
.endif
.if defined(WITH_GNUGCJ)
EXTRA_PATCHES+= ${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches
.endif
#.if defined(WITH_TTF_BYTECODE_ENABLED)
#EXTRA_PATCHES+= ${FILESDIR}/optpatch-freetype
#.endif
.include <${FILESDIR}/Makefile.knobs>
pre-everything::
@ -152,11 +170,8 @@ pre-everything::
.endif
post-extract:
#.if defined(WITH_TTF_BYTECODE_ENABLED)
# @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
#.endif
.if (${OSVERSION} <= 492000)
@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/fbsd4-workaroundpatch
.if defined(WITH_GNUGCJ)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
.endif
.if defined(WITH_GPC)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -

9
editors/openoffice.org-vcltesttool/distinfo
View File

@ -1,9 +1,12 @@
MD5 (openoffice.org2.0/OOo_SRC680_m151_source.tar.bz2) = f652b703f21ade84d6ff814684df2327
SHA256 (openoffice.org2.0/OOo_SRC680_m151_source.tar.bz2) = 2c6a2e37ff5dd8b01c4d976239922e12b26bf948908f62d9e2df620c8ce4cf2d
SIZE (openoffice.org2.0/OOo_SRC680_m151_source.tar.bz2) = 236161920
MD5 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = b8a712737bb146baf1ebb00c88ed3dc3
SHA256 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 80b481f8815f7bc9263d9544f1a0326abeb61de7349e4947614a5e72e49c4b0b
SIZE (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 235716251
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024
MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
SHA256 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366

2
editors/openoffice.org-vcltesttool/files/Makefile.knobs
View File

@ -6,7 +6,7 @@
CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
.endif
.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
CONFIGURE_ARGS+= --with-java=gij --with-ant-home=${LOCALBASE}/ant
CONFIGURE_ARGS+= --with-jdk-home="${LOCALBASE}/gcc41" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}" --disable-qadevooo
.endif
.if defined(WITHOUT_JAVA)
CONFIGURE_ARGS+= --without-java

1308
editors/openoffice.org-vcltesttool/files/gcj-cws_jaxpapi Normal file
View File

File diff suppressed because it is too large Load Diff

137
editors/openoffice.org-vcltesttool/files/gcj-patches Normal file
View File

@ -0,0 +1,137 @@
Index: wizards/com/sun/star/wizards/ui/FilterComponent.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/ui/FilterComponent.java,v
retrieving revision 1.8
diff -u -r1.8 FilterComponent.java
--- wizards/com/sun/star/wizards/ui/FilterComponent.java 28 Dec 2005 17:25:36 -0000 1.8
+++ wizards/com/sun/star/wizards/ui/FilterComponent.java 27 Jan 2006 22:55:38 -0000
@@ -261,10 +261,7 @@
case DataType.BOOLEAN:
double dblvalue = ((Double) curValue).doubleValue();
curValue = new Boolean(dblvalue == 1.0);
- /**TODO: 1) Datei SingleSelectQueryComposer modifizieren:
- / Zeilen 1525ff in Methode auslagern und Aufruf in Zeile 1356 ändern TypeConverter is parameter
- * 2) setDisplayCondition ändern
- */
+ /* */
break;
default:
curValue = String.valueOf(curValue);
Index: solenv/inc/settings.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/settings.mk,v
retrieving revision 1.185
diff -u -r1.185 settings.mk
--- solenv/inc/settings.mk 20 Jan 2006 12:09:20 -0000 1.185
+++ solenv/inc/settings.mk 27 Jan 2006 23:11:31 -0000
@@ -187,7 +187,8 @@
#required arguments
.IF "$(JAVACACHE)" != ""
-JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
+#JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
+JAVAC=$(JAVACOMPILER) --encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
.ELSE
JAVAC=$(JAVACOMPILER)
Index: source/ui/slidesorter/cache/SlsQueueProcessor.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx,v
retrieving revision 1.10
diff -u -p -u -r1.10 SlsQueueProcessor.hxx
--- sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx 19 Jan 2006 12:52:20 -0000 1.10
+++ sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx 26 Jan 2006 08:29:38 -0000
@@ -164,7 +164,7 @@ template <class Queue, class RequestData
while ( ! mrQueue.IsEmpty())
{
// Determine whether the system is idle.
- sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mrView.GetWindow()));
+ sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(static_cast< ::Window* >(mrView.GetWindow())));
if (nIdleState != tools::IdleDetection::IDET_IDLE)
{
if ((nIdleState&tools::IdleDetection::IDET_FULL_SCREEN_SHOW_ACTIVE) != 0)
Index: config_office/configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.150
diff -u -r1.150 configure.in
--- config_office/configure.in 20 Jan 2006 13:28:25 -0000 1.150
+++ config_office/configure.in 2 Feb 2006 05:13:30 -0000
@@ -1975,6 +1975,7 @@
dnl Checks for javadoc
dnl ===================================================================
if test "$SOLAR_JAVA" != ""; then
+ if test "$JDK" != "gcj"; then
if test -z "$with_jdk_home"; then
AC_PATH_PROG(JAVADOC, javadoc)
else
@@ -1996,6 +1997,9 @@
JAVADOC=`cygpath -d "$JAVADOC"`
JAVADOC=`cygpath -u "$JAVADOC"`
fi
+ else
+ AC_PATH_PROG(JAVADOC, gjdoc)
+ fi
fi
if test "$SOLAR_JAVA" != ""; then
@@ -2032,8 +2036,14 @@
if test "$JDK" = "gcj"; then
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
- CFLAGS="$CFLAGS -I$JAVA_HOME/include"
- LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
+ CFLAGS="$CFLAGS -I$JAVA_HOME/include -pthread"
+ LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj -pthread"
+ JAR="$JAVA_HOME/bin/fastjar"
+ JAVACMD="$JAVA_HOME/bin/gij"
+ JAVA="$JAVA_HOME/bin/gij"
+ AC_SUBST(JAVA)
+ AC_SUBST(JAVACMD)
+ AC_SUBST(JAR)
AC_CHECK_HEADER(jni.h, [],
[AC_MSG_ERROR([jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?])], [])
@@ -4214,7 +4224,7 @@
EOF
oldJAVA_HOME=$JAVA_HOME
if test "$JDK" = "gcj"; then
- JAVA_HOME=; export JAVA_HOME
+ JAVACMD="$JAVA_HOME/bin/gij"; export JAVACMD
ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
else
ant_cmd="$ANT -buildfile conftest.xml 1>&2"
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.86
diff -u -r1.86 set_soenv.in
--- config_office/set_soenv.in 13 Jan 2006 16:37:16 -0000 1.86
+++ config_office/set_soenv.in 2 Feb 2006 05:13:31 -0000
@@ -68,7 +68,7 @@
#
# Help variables.
my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG,
- $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
+ $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE, $JAVACMD, $JAVA, $JAR,
$SOLARENVINC, $USR_DT, $USR_OPENWIN, $TCSH_PATH, $XLIB, $XINC,
$CYGWIN_PATH, $language, $dict, $ASM_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
$STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH );
@@ -1679,6 +1679,9 @@
ToFile( "JAVAINTERPRETER", "@JAVAINTERPRETER@","e" );
ToFile( "JAVACOMPILER", "@JAVACOMPILER@", "e" );
ToFile( "JAVADOC", "@JAVADOC@", "e" );
+ ToFile( "JAVA", "@JAVA@", "e" );
+ ToFile( "JAVACMD", "@JAVACMD@", "e" );
+ ToFile( "JAR", "@JAR@", "e" );
}
if ( $platform =~ m/darwin/ )
{ ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH, "e" );
Javadoc@xmerge http://qa.openoffice.org/issues/show_bug.cgi?id=57286
JAVA@berkeleydb http://qa.openoffice.org/issues/show_bug.cgi?id=54657
JAVACMD@ant
JAR@berkeleydb

752
editors/openoffice.org-vcltesttool/files/patch-Python-2.3.4.patch
View File

@ -1,752 +0,0 @@
Issuetracker : #i53287#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : Support for FreeBSD 6 and 7
Index: python/Python-2.3.4.patch
===================================================================
RCS file: /cvs/external/python/Python-2.3.4.patch,v
retrieving revision 1.6
diff -u -r1.6 Python-2.3.4.patch
--- python/Python-2.3.4.patch 3 Mar 2005 17:33:54 -0000 1.6
+++ python/Python-2.3.4.patch 8 Aug 2005 21:50:08 -0000
@@ -13776,3 +13776,739 @@
atheos*) DYNLOADFILE="dynload_atheos.o";;
*)
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
+*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py Tue Aug 9 06:26:23 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py Tue Aug 9 06:20:25 2005
+***************
+*** 0 ****
+--- 1,355 ----
++ # Generated by h2py from /usr/include/netinet/in.h
++ IPPROTO_IP = 0
++ IPPROTO_HOPOPTS = 0
++ IPPROTO_ICMP = 1
++ IPPROTO_IGMP = 2
++ IPPROTO_GGP = 3
++ IPPROTO_IPV4 = 4
++ IPPROTO_IPIP = IPPROTO_IPV4
++ IPPROTO_TCP = 6
++ 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_UDP = 17
++ 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_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_DIVERT = 254
++ IPPROTO_RAW = 255
++ IPPROTO_MAX = 256
++ IPPROTO_DONE = 257
++ IPPORT_RESERVED = 1024
++ IPPORT_USERRESERVED = 5000
++ IPPORT_HIFIRSTAUTO = 49152
++ IPPORT_HILASTAUTO = 65535
++ IPPORT_RESERVEDSTART = 600
++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
++
++ IN_CLASSA_NET = 0xff000000
++ IN_CLASSA_NSHIFT = 24
++ IN_CLASSA_HOST = 0x00ffffff
++ IN_CLASSA_MAX = 128
++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
++
++ IN_CLASSB_NET = 0xffff0000
++ IN_CLASSB_NSHIFT = 16
++ IN_CLASSB_HOST = 0x0000ffff
++ IN_CLASSB_MAX = 65536
++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
++
++ IN_CLASSC_NET = 0xffffff00
++ IN_CLASSC_NSHIFT = 8
++ IN_CLASSC_HOST = 0x000000ff
++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
++
++ IN_CLASSD_NET = 0xf0000000
++ 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) & 0xf0000000) == 0xf0000000)
++
++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
++
++ INADDR_NONE = 0xffffffff
++ IN_LOOPBACKNET = 127
++ INET_ADDRSTRLEN = 16
++ IP_OPTIONS = 1
++ IP_HDRINCL = 2
++ IP_TOS = 3
++ IP_TTL = 4
++ IP_RECVOPTS = 5
++ IP_RECVRETOPTS = 6
++ IP_RECVDSTADDR = 7
++ 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_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_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
++
++ # Included from netinet6/in6.h
++
++ # Included from sys/queue.h
++ def SLIST_HEAD_INITIALIZER(head): return \
++
++ def SLIST_ENTRY(type): return \
++
++ def STAILQ_HEAD_INITIALIZER(head): return \
++
++ def STAILQ_ENTRY(type): return \
++
++ def LIST_HEAD_INITIALIZER(head): return \
++
++ def LIST_ENTRY(type): return \
++
++ def TAILQ_HEAD_INITIALIZER(head): return \
++
++ def TAILQ_ENTRY(type): return \
++
++ def CIRCLEQ_ENTRY(type): return \
++
++ __KAME_VERSION = "20000701/FreeBSD-current"
++ 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 = 0xff010000
++ IPV6_ADDR_INT32_MLL = 0xff020000
++ 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 = 0xffff0000
++ 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_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_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_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 \
++
++ 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_PKTINFO = 19
++ IPV6_HOPLIMIT = 20
++ IPV6_NEXTHOP = 21
++ IPV6_HOPOPTS = 22
++ IPV6_DSTOPTS = 23
++ IPV6_RTHDR = 24
++ IPV6_PKTOPTIONS = 25
++ IPV6_CHECKSUM = 26
++ IPV6_BINDV6ONLY = 27
++ 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_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_BINDV6ONLY = 24
++ IPV6CTL_RTEXPIRE = 25
++ IPV6CTL_RTMINEXPIRE = 26
++ IPV6CTL_RTMAXCACHE = 27
++ IPV6CTL_MAXID = 28
+*** misc/Python-2.3.4/Lib/plat-freebsd6/regen Tue Aug 9 06:26:27 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/regen Tue Aug 9 06:19:02 2005
+***************
+*** 0 ****
+--- 1,3 ----
++ #! /bin/sh
++ set -v
++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
+*** misc/Python-2.3.4/Lib/plat-freebsd7/IN.py Tue Aug 9 06:26:23 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/IN.py Tue Aug 9 06:20:25 2005
+***************
+*** 0 ****
+--- 1,355 ----
++ # Generated by h2py from /usr/include/netinet/in.h
++ IPPROTO_IP = 0
++ IPPROTO_HOPOPTS = 0
++ IPPROTO_ICMP = 1
++ IPPROTO_IGMP = 2
++ IPPROTO_GGP = 3
++ IPPROTO_IPV4 = 4
++ IPPROTO_IPIP = IPPROTO_IPV4
++ IPPROTO_TCP = 6
++ 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_UDP = 17
++ 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_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_DIVERT = 254
++ IPPROTO_RAW = 255
++ IPPROTO_MAX = 256
++ IPPROTO_DONE = 257
++ IPPORT_RESERVED = 1024
++ IPPORT_USERRESERVED = 5000
++ IPPORT_HIFIRSTAUTO = 49152
++ IPPORT_HILASTAUTO = 65535
++ IPPORT_RESERVEDSTART = 600
++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
++
++ IN_CLASSA_NET = 0xff000000
++ IN_CLASSA_NSHIFT = 24
++ IN_CLASSA_HOST = 0x00ffffff
++ IN_CLASSA_MAX = 128
++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
++
++ IN_CLASSB_NET = 0xffff0000
++ IN_CLASSB_NSHIFT = 16
++ IN_CLASSB_HOST = 0x0000ffff
++ IN_CLASSB_MAX = 65536
++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
++
++ IN_CLASSC_NET = 0xffffff00
++ IN_CLASSC_NSHIFT = 8
++ IN_CLASSC_HOST = 0x000000ff
++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
++
++ IN_CLASSD_NET = 0xf0000000
++ 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) & 0xf0000000) == 0xf0000000)
++
++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
++
++ INADDR_NONE = 0xffffffff
++ IN_LOOPBACKNET = 127
++ INET_ADDRSTRLEN = 16
++ IP_OPTIONS = 1
++ IP_HDRINCL = 2
++ IP_TOS = 3
++ IP_TTL = 4
++ IP_RECVOPTS = 5
++ IP_RECVRETOPTS = 6
++ IP_RECVDSTADDR = 7
++ 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_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_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
++
++ # Included from netinet6/in6.h
++
++ # Included from sys/queue.h
++ def SLIST_HEAD_INITIALIZER(head): return \
++
++ def SLIST_ENTRY(type): return \
++
++ def STAILQ_HEAD_INITIALIZER(head): return \
++
++ def STAILQ_ENTRY(type): return \
++
++ def LIST_HEAD_INITIALIZER(head): return \
++
++ def LIST_ENTRY(type): return \
++
++ def TAILQ_HEAD_INITIALIZER(head): return \
++
++ def TAILQ_ENTRY(type): return \
++
++ def CIRCLEQ_ENTRY(type): return \
++
++ __KAME_VERSION = "20000701/FreeBSD-current"
++ 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 = 0xff010000
++ IPV6_ADDR_INT32_MLL = 0xff020000
++ 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 = 0xffff0000
++ 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_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_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_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 \
++
++ 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_PKTINFO = 19
++ IPV6_HOPLIMIT = 20
++ IPV6_NEXTHOP = 21
++ IPV6_HOPOPTS = 22
++ IPV6_DSTOPTS = 23
++ IPV6_RTHDR = 24
++ IPV6_PKTOPTIONS = 25
++ IPV6_CHECKSUM = 26
++ IPV6_BINDV6ONLY = 27
++ 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_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_BINDV6ONLY = 24
++ IPV6CTL_RTEXPIRE = 25
++ IPV6CTL_RTMINEXPIRE = 26
++ IPV6CTL_RTMAXCACHE = 27
++ IPV6CTL_MAXID = 28
+*** misc/Python-2.3.4/Lib/plat-freebsd7/regen Tue Aug 9 06:26:27 2005
+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/regen Tue Aug 9 06:19:02 2005
+***************
+*** 0 ****
+--- 1,3 ----
++ #! /bin/sh
++ set -v
++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h

173
editors/openoffice.org-vcltesttool/files/patch-bridges
View File

@ -1,173 +0,0 @@
Issuetracker : #i56947#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : update files at bridges project
catch up version up of bridge project of GNU/Linux
--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Thu Sep 8 07:20:08 2005
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed Oct 26 15:10:05 2005
@@ -57,7 +57,7 @@
typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
sal_Int32 nParams, typelib_MethodParameter * pParams,
void ** pCallStack,
- sal_Int64 * pRegisterReturn /* space for register return */ )
+ void * pReturnValue )
{
// pCallStack: ret, [return ptr], this, params
char * pCppStack = (char *)(pCallStack +1);
@@ -74,7 +74,7 @@
{
if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
{
- pUnoReturn = pRegisterReturn; // direct way for simple types
+ pUnoReturn = pReturnValue; // direct way for simple types
}
else // complex return via ptr (pCppReturn)
{
@@ -215,7 +215,7 @@
uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
}
// complex return ptr is set to eax
- *(void **)pRegisterReturn = pCppReturn;
+ *static_cast< void ** >(pReturnValue) = pCppReturn;
}
if (pReturnTypeDescr)
{
@@ -228,7 +228,7 @@
//==================================================================================================
extern "C" void cpp_vtable_call(
int nFunctionIndex, int nVtableOffset, void** pCallStack,
- sal_Int64 nRegReturn )
+ void * pReturnValue )
{
OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
@@ -275,7 +275,7 @@
pCppI, aMemberDescr.get(),
((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
0, 0, // no params
- pCallStack, &nRegReturn );
+ pCallStack, pReturnValue );
}
else
{
@@ -290,7 +290,7 @@
pCppI, aMemberDescr.get(),
0, // indicates void return
1, &aParam,
- pCallStack, &nRegReturn );
+ pCallStack, pReturnValue );
}
break;
}
@@ -324,7 +324,7 @@
&pInterface, pTD, cpp_acquire );
pInterface->release();
TYPELIB_DANGER_RELEASE( pTD );
- *(void **)&nRegReturn = pCallStack[1];
+ *static_cast< void ** >(pReturnValue) = pCallStack[1];
break;
}
TYPELIB_DANGER_RELEASE( pTD );
@@ -336,7 +336,7 @@
((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
- pCallStack, &nRegReturn );
+ pCallStack, pReturnValue );
}
break;
}
--- bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Wed Jun 1 01:32:41 2005
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Wed Oct 26 15:10:04 2005
@@ -9,12 +9,13 @@
.LCFIg0:
movl %esp,%ebp
.LCFIg1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x4,%esp # 32bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- movl 12(%esp),%eax # 64 bit nRegReturn, lower half
+ movl 16(%esp),%eax # 32bit returnValue
leave
ret
.LFEg:
@@ -29,7 +30,7 @@
.LCFIv0:
movl %esp,%ebp
.LCFIv1:
- subl $0x8,%esp # 64bit nRegReturn
+ pushl $0 # 32bit null pointer (returnValue not used)
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
@@ -48,13 +49,14 @@
.LCFIh0:
movl %esp,%ebp
.LCFIh1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x8,%esp # 64bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- movl 12(%esp),%eax # 64 bit nRegReturn, lower half
- movl 16(%esp),%edx # 64 bit nRegReturn, upper half
+ movl 16(%esp),%eax # 64bit returnValue, lower half
+ movl 20(%esp),%edx # 64bit returnValue, upper half
leave
ret
.LFEh:
@@ -69,12 +71,13 @@
.LCFIf0:
movl %esp,%ebp
.LCFIf1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x4,%esp # 32bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- flds 12(%esp) # 64 bit nRegReturn, lower half
+ flds 16(%esp) # 32bit returnValue
leave
ret
.LFEf:
@@ -89,12 +92,13 @@
.LCFId0:
movl %esp,%ebp
.LCFId1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x8,%esp # 64bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- fldl 12(%esp) # 64 bit nRegReturn
+ fldl 16(%esp) # 64bit returnValue
leave
ret
.LFEd:
@@ -109,12 +113,13 @@
.LCFIc0:
movl %esp,%ebp
.LCFIc1:
- subl $0x8,%esp # 64bit nRegReturn
+ subl $0x4,%esp # 32bit returnValue
+ pushl %esp # 32bit &returnValue
pushl %ecx # 32bit pCallStack
pushl %edx # 32bit nVtableOffset
pushl %eax # 32bit nFunctionIndex
call cpp_vtable_call
- movl 12(%esp),%eax # 64 bit nRegReturn, lower half
+ movl 16(%esp),%eax # 32bit returnValue
leave
ret $4
.LFEc:

18
editors/openoffice.org-vcltesttool/files/patch-config_office+set_soenv.in
View File

@ -1,18 +0,0 @@
Issuetracker : #i56949#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : Add conditional the case of @GCCVER@ >= 30401.
Like GNU/Linux's case, we also need the case for $CVER if @GCCVER@ is equal to or larger than 3.4.1
--- config_office/set_soenv.in Thu Sep 22 23:30:56 2005
+++ config_office/set_soenv.in Sat Oct 1 12:59:30 2005
@@ -347,6 +347,9 @@
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ if( @GCCVER@ >= 30401 ) {
+ $CVER = "C341";
+ }
}
elsif ( $platform =~ m/linux-gnu/ )
{

87
editors/openoffice.org-vcltesttool/files/patch-epm+epm-3.7.patch
View File

@ -1,87 +0,0 @@
Issuetracker : #iXXXXX#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : epm porting for FreeBSD
o FreeBSD's package manager doesn't allow multiple lines for
@exec and @unexec
o chown is at /usr/sbin/
o the way to recording package dependency is incorrect
Index: epm/epm-3.7.patch
===================================================================
RCS file: /cvs/external/epm/epm-3.7.patch,v
retrieving revision 1.2
diff -u -r1.2 epm-3.7.patch
--- epm/epm-3.7.patch 10 Mar 2005 11:52:43 -0000 1.2
+++ epm/epm-3.7.patch 3 Jun 2005 22:05:23 -0000
@@ -1,3 +1,69 @@
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005
+***************
+*** 26,31 ****
+--- 26,38 ----
+
+ #include "epm.h"
+
++ void cr2semicolon(char *command)
++ {
++ int len, i;
++ len=strlen(command);
++ for (i=0;i<len;i++)
++ if(*(command+i)=='\n') *(command+i)=';';
++ }
+
+ /*
+ * 'make_bsd()' - Make a FreeBSD software distribution package.
+***************
+*** 150,156 ****
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+ if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s", d->product);
+ else
+ #ifdef __FreeBSD__
+ /*
+--- 157,163 ----
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+ if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
+ else
+ #ifdef __FreeBSD__
+ /*
+***************
+*** 179,187 ****
+--- 186,196 ----
+ " by the BSD packager.\n", stderr);
+ break;
+ case COMMAND_POST_INSTALL :
++ cr2semicolon(c->command);
+ fprintf(fp, "@exec %s\n", c->command);
+ break;
+ case COMMAND_PRE_REMOVE :
++ cr2semicolon(c->command);
+ fprintf(fp, "@unexec %s\n", c->command);
+ break;
+ case COMMAND_POST_REMOVE :
+***************
+*** 199,205 ****
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
+--- 208,214 ----
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
*** misc/epm-3.7/epm.c 2003-10-28 15:48:30.000000000 +0100
--- misc/build/epm-3.7/epm.c 2004-11-24 10:38:40.000000000 +0100
***************

45
editors/openoffice.org-vcltesttool/files/patch-icu+icu-2.6.patch
View File

@ -1,45 +0,0 @@
Issuetracker : #i56952#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : Passing $ORIGIN to linker at icu project
We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case.
Index: icu/icu-2.6.patch
===================================================================
RCS file: /cvs/external/icu/icu-2.6.patch,v
retrieving revision 1.15
diff -u -r1.15 icu-2.6.patch
--- icu/icu-2.6.patch 28 Dec 2005 16:54:16 -0000 1.15
+++ icu/icu-2.6.patch 5 Jan 2006 12:58:57 -0000
@@ -2775,3 +2775,31 @@
commands = pkg_appendToList(commands, NULL, uprv_strdup(stanza));
sprintf(stanza, "@$(RMV) $(TEMP_DIR)/%s", cfile+genFileOffset);
+*** misc/icu/source/config/mh-bsd-gcc Thu May 2 08:48:10 2002
+--- misc/build/icu/source/config/mh-bsd-gcc Mon Oct 24 18:16:57 2005
+***************
+*** 10,21 ****
+--- 10,30 ----
+ GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
+
+ ## Flags for position independent code
++ STATICCFLAGS = -fPIC
++ STATICCXXFLAGS = -fPIC
++ STATICCPPFLAGS = -DPIC
+ SHAREDLIBCFLAGS = -fPIC
+ SHAREDLIBCXXFLAGS = -fPIC
+ SHAREDLIBCPPFLAGS = -DPIC
+
+ ## Compiler switch to embed a runtime search path
+ LD_RPATH=
++ ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
++ ENABLE_RPATH=YES
++ RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN'
++
++ #SH# ENABLE_RPATH=YES
++ #SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN'"
+ LD_RPATH_PRE= -Wl,-rpath,
+
+ ## Compiler switch to embed a library name
+
+

154
editors/openoffice.org-vcltesttool/files/patch-instsetoo
View File

@ -1,154 +0,0 @@
Issuetracker : #i53288#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : remove circular dependency
in this case,
core01 is depend on core02-core08, and core0[2-9] and core10
depends on core01. for FreeBSD this is regarded as circular dependency
and pkg_add command is forked infinite times and eats up systems' resource.
namely when core01 tries to install core02, core02 also tries to
install core01.
Index: instsetoo_native/inc_openoffice/unix/packagelist.txt
===================================================================
RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v
retrieving revision 1.21
diff -u -r1.21 packagelist.txt
--- instsetoo_native/inc_openoffice/unix/packagelist.txt 30 Nov 2005 13:21:44 -0000 1.21
+++ instsetoo_native/inc_openoffice/unix/packagelist.txt 3 Dec 2005 22:26:12 -0000
@@ -37,6 +37,7 @@
packagename = "%UNIXPRODUCTNAME-core01"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-mailcap,%WITHOUTDOTUNIXPRODUCTNAME-core,%WITHOUTDOTUNIXPRODUCTNAME-core01"
requires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
+freebsdrequires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08,%UNIXPRODUCTNAME-core09,%UNIXPRODUCTNAME-core10"
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -278,6 +279,7 @@
packagename = "%UNIXPRODUCTNAME-core02"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core02"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -291,6 +293,7 @@
packagename = "%UNIXPRODUCTNAME-core03"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core03"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -304,6 +307,7 @@
packagename = "%UNIXPRODUCTNAME-core04"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core04"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -317,6 +321,7 @@
packagename = "%UNIXPRODUCTNAME-core05"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core05"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -330,6 +335,7 @@
packagename = "%UNIXPRODUCTNAME-core06"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core06"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -343,6 +349,7 @@
packagename = "%UNIXPRODUCTNAME-core07"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core07"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -356,6 +363,7 @@
packagename = "%UNIXPRODUCTNAME-core08"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core08"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -369,6 +377,7 @@
packagename = "%UNIXPRODUCTNAME-core09"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core09"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
@@ -383,6 +392,7 @@
packagename = "%UNIXPRODUCTNAME-core10"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core10"
requires = "%UNIXPRODUCTNAME-core01"
+freebsdrequires = ""
copyright = "1999-2005 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
Index: solenv/bin/modules/installer/epmfile.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v
retrieving revision 1.42
diff -u -r1.42 epmfile.pm
--- solenv/bin/modules/installer/epmfile.pm 9 Nov 2005 09:09:49 -0000 1.42
+++ solenv/bin/modules/installer/epmfile.pm 3 Dec 2005 22:26:52 -0000
@@ -395,6 +395,11 @@
$provides = "solarisprovides"; # the name in the packagelist
$requires = "solarisrequires"; # the name in the packagelist
}
+ elsif ( $installer::globals::isfreebsdpkgbuild )
+ {
+ $provides = "freebsdprovides"; # the name in the packagelist
+ $requires = "freebsdrequires"; # the name in the packagelist
+ }
else
{
$provides = "provides"; # the name in the packagelist
Index: solenv/bin/modules/installer/globals.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
retrieving revision 1.47
diff -u -r1.47 globals.pm
--- solenv/bin/modules/installer/globals.pm 9 Nov 2005 09:10:01 -0000 1.47
+++ solenv/bin/modules/installer/globals.pm 3 Dec 2005 22:26:52 -0000
@@ -80,6 +80,7 @@
$issolarispkgbuild = 0;
$issolarissparcbuild = 0;
$issolarisx86build = 0;
+ $isfreebsdpkgbuild = 0;
$unpackpath = "";
$idttemplatepath = "";
$idtlanguagepath = "";
Index: solenv/bin/modules/installer/parameter.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
retrieving revision 1.29
diff -u -r1.29 parameter.pm
--- solenv/bin/modules/installer/parameter.pm 9 Nov 2005 09:10:12 -0000 1.29
+++ solenv/bin/modules/installer/parameter.pm 10 Dec 2005 13:11:30 -0000
@@ -304,6 +304,13 @@
$installer::globals::epmoutpath = "packages";
}
}
+ if ( $installer::globals::compiler =~ /unxfbsdi/ )
+ {
+ if ( $installer::globals::packageformat eq "bsd" )
+ {
+ $installer::globals::isfreebsdpkgbuild = 1;
+ }
+ }
if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; }

17
editors/openoffice.org-vcltesttool/files/patch-jvmfwk+distributions+OpenOfficeorg+makefile.mk
View File

@ -1,17 +0,0 @@
Issuetracker : #i56951#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : javavendors_linux.xml can be used for FreeBSD as well.
javavendors_linux.xml can be used for FreeBSD as well.
--- jvmfwk/distributions/OpenOfficeorg/makefile.mk Thu Sep 8 04:26:17 2005
+++ jvmfwk/distributions/OpenOfficeorg/makefile.mk Sat Oct 22 18:31:16 2005
@@ -49,7 +49,7 @@
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
+-$(COPY) javavendors_macosx.xml $(BIN)$/javavendors_ooo.xml
-.ELIF "$(OS)"=="LINUX"
+.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
+-$(COPY) javavendors_linux.xml $(BIN)$/javavendors_ooo.xml
.ELSE
+-$(COPY) javavendors_unx.xml $(BIN)$/javavendors_ooo.xml

7
editors/openoffice.org-vcltesttool/files/patch-jvmfwk+plugins+sunmajor+pluginlib+sunversion.cxx
View File

@ -12,18 +12,17 @@ java 1.4.1-p10 for example to 1.4.1_110.
--- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Thu Sep 8 04:31:40 2005
+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Sat Oct 22 18:25:49 2005
@@ -208,7 +208,16 @@
@@ -208,7 +208,15 @@
return false;
#if defined(FREEBSD)
if (m_preRelease == Rel_FreeBSD) {
- m_nUpdateSpecial = *pCur;
+ pCur++; //elemnate `p'
+ if (pCur < pEnd && isdigit(*pCur))
+ if (pCur < pEnd)
+ pCur ++;
+ pCur ++;
+ int len = pCur - pLast -1; //elemenate `p'
+ if (len >= 127)
+ return false;
+ return false;
+ strncpy(buf, (pLast+1), len); //elemenate `p'
+ buf[len] = 0;
+ m_nUpdateSpecial = atoi(buf)+100; //hack for FBSD

23
editors/openoffice.org-vcltesttool/files/patch-libxmlsec+makefile.mk
View File

@ -1,23 +0,0 @@
Issuetracker : #i56954#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : Passing $ORIGIN to linker at libxmlsec project
We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case.
Index: libxmlsec/makefile.mk
===================================================================
RCS file: /cvs/external/libxmlsec/makefile.mk,v
retrieving revision 1.7
diff -u -r1.7 makefile.mk
--- libxmlsec/makefile.mk 28 Dec 2005 16:58:06 -0000 1.7
+++ libxmlsec/makefile.mk 5 Jan 2006 12:34:24 -0000
@@ -98,6 +98,9 @@
.IF "$(OS)$(COM)"=="SOLARISC52"
xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN'
.ENDIF # "$(OS)$(COM)"=="SOLARISC52"
+.IF "$(OS)$(COM)"=="FREEBSDGCC"
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN'
+.ENDIF # "$(OS)$(COM)"=="FREEBSDGCC"
LDFLAGS:=$(xmlsec_LDFLAGS)
.EXPORT: LDFLAGS

65
editors/openoffice.org-vcltesttool/files/patch-psprint+source+fontmanager+parseAFM.cxx
View File

@ -1,65 +0,0 @@
Issuetracker : #i60097#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : getc and ungetc are defined at stdio.h
Index: psprint/source/fontmanager/parseAFM.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/parseAFM.cxx,v
retrieving revision 1.6
diff -u -r1.6 parseAFM.cxx
--- psprint/source/fontmanager/parseAFM.cxx 28 Dec 2005 17:08:38 -0000 1.6
+++ psprint/source/fontmanager/parseAFM.cxx 5 Jan 2006 22:05:26 -0000
@@ -113,8 +113,8 @@
FileInputStream( const char* pFilename );
~FileInputStream();
- int getc() { return (m_nPos < m_nLen) ? int(m_pMemory[m_nPos++]) : -1; }
- void ungetc()
+ int getChar() { return (m_nPos < m_nLen) ? int(m_pMemory[m_nPos++]) : -1; }
+ void ungetChar()
{
if( m_nPos > 0 )
m_nPos--;
@@ -278,18 +278,18 @@
/* skip over white space */
// relies on EOF = -1
- while( is_white_Array[ (ch = stream->getc()) & 255 ] )
+ while( is_white_Array[ (ch = stream->getChar()) & 255 ] )
;
idx = 0;
while( ch != -1 && ! is_delimiter_Array[ ch & 255 ] )
{
ident[idx++] = ch;
- ch = stream->getc();
+ ch = stream->getChar();
}
if (ch == -1 && idx < 1) return ((char *)NULL);
- if (idx >= 1 && ch != ':' ) stream->ungetc();
+ if (idx >= 1 && ch != ':' ) stream->ungetChar();
if (idx < 1 ) ident[idx++] = ch; /* single-character token */
ident[idx] = 0;
rLen = idx;
@@ -311,16 +311,16 @@
static char ident[MAX_NAME]; /* storage buffer for keywords */
int ch, idx;
- while ((ch = stream->getc()) == ' ' || ch == '\t' );
+ while ((ch = stream->getChar()) == ' ' || ch == '\t' );
idx = 0;
while (ch != -1 && ch != lineterm && ch != '\r')
{
ident[idx++] = ch;
- ch = stream->getc();
+ ch = stream->getChar();
} /* while */
- stream->ungetc();
+ stream->ungetChar();
ident[idx] = 0;
return(ident); /* returns pointer to the token */

64
editors/openoffice.org-vcltesttool/files/patch-sdkoo
View File

@ -1,64 +0,0 @@
Issuetracker : #iXXXXX#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : building sdk fails for FreeBSD
1. Build error
dmake sdkoo fails like:
##############################################################################
... starting unpatched epm ...
... epm -f bsd openoffice.org-sdk /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/listfile/en-US/epm_OpenOffice_SDK_gid_Module_Root_unxfbsd_SRC680__en-US.lst -v 2>&1 | ...
**************************************************
ERROR: ERROR: "epm -f bsd openoffice.org-sdk /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/listfile/en-US/epm_OpenOffice_SDK_gid_Module_Root_unxfbsd_SRC680__en-US.lst -v 2>&1 |"!
in function: call_epm
**************************************************
**************************************************
ERROR: Saved logfile: /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/logging/en-US/log_SRC680__en-US.log
**************************************************
... cleaning the output tree ...
... removing directory /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/zip/en-US ...
Fri Nov 18 22:49:33 2005 (08:05 min.)
dmake: Error code 255, while making 'sdkoo_en-US.bsd'
'---* tg_merge.mk *---'
##############################################################################
2. Reason why it fails:
since quoting for filename containing `$' produces an error
tar: opt/openoffice.org2.0_sdk/classes/com/sun/star/lib/loader/InstallationFinder\$StreamGobbler.class: Could not stat: No such file or directory
tar: opt/openoffice.org2.0_sdk/classes/com/sun/star/lib/loader/Loader\$CustomURLClassLoader.class: Could not stat: No such file or directory
3. Solution
For FreeBSD, we don't need quoting. We use printf for files names
instead of using qprintf, a function that treats quoting string.
--- epm/epm-3.7.patch Sat Nov 19 10:21:34 2005
+++ epm/epm-3.7.patch Sat Nov 19 10:22:23 2005
@@ -586,3 +586,23 @@
}
--- 457,462 ----
+
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005
+***************
+*** 234,240 ****
+ case 'c' :
+ case 'f' :
+ case 'l' :
+! qprintf(fp, "%s\n", file->dst + 1);
+ break;
+ }
+ }
+--- 243,249 ----
+ case 'c' :
+ case 'f' :
+ case 'l' :
+! fprintf(fp, "%s\n", file->dst + 1);
+ break;
+ }
+ }

31
editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,31 +0,0 @@
Issuetracker : #i56956#
CWS : N/A
Author: : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : catch up recent version of solenv/inc/unxlngi6.mk
catch up recent version of solenv/inc/unxlngi6.mk and STLPORT_VERSION is 450 in FreeBSD
--- solenv/inc/unxfbsdi.mk Wed Oct 5 20:33:12 2005
+++ solenv/inc/unxfbsdi.mk Mon Oct 24 11:13:39 2005
@@ -45,7 +45,7 @@
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
# _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -190,8 +190,13 @@
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+.IF "$(USE_STLP_DEBUG)" != ""
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
+.ELSE # "$(USE_STLP_DEBUG)" != ""
LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)