diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2013-03-21 06:22:36 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2013-03-21 06:22:36 +0000 |
| commit | 488a5eaa127dd31eaa5349d780e7f32457e7435f (patch) | |
| tree | d4971d7a472582e76eb88654e1d443a73cb0f9ce /editors/openoffice.org-vcltesttool/files | |
| parent | Update to svn 1457623 (diff) | |
Remove editors/openoffice.org-vcltesttool as it is no longer used
for openoffice qa.
Notes
Notes:
svn path=/head/; revision=314807
Diffstat (limited to 'editors/openoffice.org-vcltesttool/files')
23 files changed, 0 insertions, 4354 deletions
diff --git a/editors/openoffice.org-vcltesttool/files/createTestTool.pl b/editors/openoffice.org-vcltesttool/files/createTestTool.pl deleted file mode 100644 index 0c24a702aa8a..000000000000 --- a/editors/openoffice.org-vcltesttool/files/createTestTool.pl +++ /dev/null @@ -1,270 +0,0 @@ -#!/usr/bin/perl - -############################################################# -# creation of a stand-alone-running Testtool for one platform -# -# created by thorsten.bosbach@sun.com 03.02.2003 -# -# has to be called with three parameters -# -# 1. the file list that should be processed -# that file list is system dependant and exists for -# a. windows -# b. linux -# c. solaris-sparc -# d. solaris-intel -# e. macos x -# -# 2. the path to the binary libraries in the build environment -# at least 3 parts: /SRX644/unxlngi4.pro/lib.r/ -# works also for: SRX644/unxlngi4/lib/ -# the last / has to be there!!!! -# -# 3. the path to where the files should be copied. -# the directory has to exist. -# the last / has to be there!!!! -# -# example ./createTestTool.pl filelinx.txt /net/jumbo/ws8/SRX644/unxlngi4.pro/lib.u/ /home/autotbo/work/c/ -############################################################## - -use File::Basename; -use File::Copy; -use Cwd 'abs_path'; - - $sScriptSource = dirname(abs_path($0)); - if ($#ARGV != 2) { - die "syntax: createTestTool.pl ListFileName SourceDirectory/LIB/ DestinationDirectory/ \n"; - } - $sFileWithFilenames = $ARGV[0]; - $sBaseSrcDirectory = $ARGV[1]; - $sBaseDestDirectory = $ARGV[2]; - $sBaseDestDirectoryOrg = $sBaseDestDirectory; - - # get the directory one level higher and set the Minor Version - print "$sBaseSrcDirectory \n"; - $sRootSrcDirectory = dirname($sBaseSrcDirectory),"\n"; - print $sRootSrcDirectory ,"\n"; - - $l2 = length($sRootSrcDirectory); - $temp = substr($sBaseSrcDirectory, $l2, length($sBaseSrcDirectory) - $l2); - print $temp, "\n"; - $iLib = index($temp, "lib"); - if ($iLib < 0) { - $iProgram = index($temp, "program"); - if ($iProgram < 0) { - $iProgram = index($temp, "MacOS"); - if ($iProgram < 0) { - die " Starting not in directory 'lib' nor directory 'program' nor 'MacOS' :-( \n"; - } else { - $bBuildEnvironment = 0; - } - } else { - $bBuildEnvironment = 0; - } - } else { - $bBuildEnvironment = 1; - } - if ($bBuildEnvironment) { - $iMinor = index($temp, "."); - if ($iMinor > -1) { - $sMinor = substr($temp, $iMinor, length($temp)-($iMinor+1)); - } else { - $sMinor = ""; - } - print $sMinor, "\n"; - $sMinor2 = substr($sMinor, 1, length($sMinor)-1); - - # get the directory one more level higher and set the Pro/NONPro Version - print "$sRootSrcDirectory \n"; - $sRootDirectory = dirname($sRootSrcDirectory),"\n"; - print $sRootDirectory ,"\n"; - - $l2 = length($sRootDirectory); - $temp = substr($sRootSrcDirectory, $l2, length($sRootSrcDirectory) - $l2); - print $temp, "\n"; - $sPlatform = substr($temp, 1, length($temp)-1); - $iPro = index($temp, "."); - if ($iPro > -1) { - $sPro = substr($temp, $iPro, 4); - } else { - $sPro = ""; - } - print $sPro, "\n"; - - # generate version.txt file with the version of the testtool like: Date; Time; this is a (pro/nonpro) TestTool version: 644v - if (! -e $sBaseDestDirectory) { - mkdir ($sBaseDestDirectory, 0777) or die "cannot create directory $sBaseDestDirectory: $!"; - } - if (! -e "$sBaseDestDirectory/resource") { - mkdir ("$sBaseDestDirectory/resource", 0777) or die "cannot create directory $sBaseDestDirectory: $!"; - } - open(OUT, ">$sBaseDestDirectory/Version.txt") or die "cannot write version.txt: $!"; - if ($sPro eq ".pro") { - $sKind = ""; - } else { - $sKind = "NON"; - } - $sTime = localtime; - $sVersion = basename($sRootDirectory); - print OUT "$sTime; This is a $sKind-Produkt TestTool; Version: $sVersion$sMinor\n"; - close(OUT); - } - - # read filenames from file and put into array, and count them - @asFileNames = (); - $iFiles = 0; - open(DATA, "< $sFileWithFilenames") or die "Couldn't read from datafile '$sFileWithFilenames': $!\n"; - while (<DATA>) { - chomp; - push(@asFileNames, $_); - ++$iFiles; - # print " $iFiles : ", $_, "\n"; - } - # print "--|$asFileNames[$#asFileNames]|--$#asFileNames \n"; - - # generate array with directories to proceed, 3 by now - # process the directory with the most files first (lib)(on unixen, for windoze it would be bin :-)) - @saTempDirectory = (); - push (@saTempDirectory, "$sBaseSrcDirectory/"); - if ($bBuildEnvironment) { - # special files in same level bin directory - push (@saTempDirectory, "$sRootSrcDirectory/bin$sMinor/"); - # special files in upper level common bin directory - push (@saTempDirectory, "$sRootDirectory/common$sPro/bin$sMinor/"); - } else { - # special files in recource directory - push (@saTempDirectory, "$sBaseSrcDirectory/resource/"); - } - - # find all files in filelist, try in all directories - if (! -e "$sBaseDestDirectory") { - $temp = mkdir ("$sBaseDestDirectory"); - if ($temp != 1) { - warn "Couldn't create dir -(\n"; - } - } - # if MacOS package, create .app - if (substr(basename($sFileWithFilenames),0,7) eq 'fileosx') { - print " Starting creating MacOS application package. \n"; - mkdir ("$sBaseDestDirectory/tt.app", 0777) or die "cannot create directory $sBaseDestDirectory/tt.app: $!"; - if (-e "$sScriptSource/macos-template.zip") { - $temp = system "unzip", "-q", "$sScriptSource/macos-template.zip", "-d$sBaseDestDirectory/tt.app"; - if ($temp != 0) { - warn "Couldn't unzip mactemplate :-(\n"; - } - } - $sBaseDestDirectory = "$sBaseDestDirectory/tt.app/Contents/MacOS/"; - } - if (! -e "$sBaseDestDirectory/resource") { - $temp = mkdir ("$sBaseDestDirectory/resource"); - if ($temp != 1) { - warn "Couldn't create dir -(\n"; - } - } - @asNotFoundFileNames = @asFileNames; - for ($n=0; $n<=$#saTempDirectory; $n++){ - $sTempDirectory = $saTempDirectory[$n]; - print " + processing directory '$sTempDirectory' \n"; - @asTempFileNames = @asNotFoundFileNames; - @asNotFoundFileNames = (); - for ($i=0; $i <= $#asTempFileNames; $i++) { - $name = "$sTempDirectory$asTempFileNames[$i]"; - if (-e $name) { - @a = $name; - } else { - @a = <$name*>; - } - - if ($#a > -1 ) { - foreach $aref (@a) { - if (-l "$aref") { - $temp = basename($aref); - symlink(readlink("$aref"), "$sBaseDestDirectory$temp"); - } else { - # Identify *.res files, to put them into the resource directory; otherwise they are not found :-( - if (substr($aref, -4, 4) eq ".res") { - copy("$aref", "$sBaseDestDirectory/resource/") or die "copy failed $asTempFileNames[$i] : $! $aref -> resource"; - } else { - copy("$aref", "$sBaseDestDirectory") or die "copy failed $asTempFileNames[$i] : $! $aref"; - } - } - } - } else { - push (@asNotFoundFileNames, $asTempFileNames[$i]); - } - } - # $temp = $#asTempFileNames - $#asNotFoundFileNames; - # print " - found files count: $temp' \n"; - # for ($i=0; $i <= $#asNotFoundFileNames; $i++) { - # print "--- $i: $asNotFoundFileNames[$i] \n"; - # } - } - - # print all not found files, if any - for ($i=0; $i <= $#asNotFoundFileNames; $i++) { - print "--- $i: $asNotFoundFileNames[$i] \n"; - } - - if ($#asNotFoundFileNames == -1) { - print " * * * * * * * * * * * * * * * * * * * * * * * * \n"; - print "* * * * * * FINISHED all files copied * * * * * * \n"; - print " * * * * * * * * * * * * * * * * * * * * * * * * \n"; - } else { - print "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ \n"; - print "@ ERROR there are files missing! @\n"; - print "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ \n"; - } - - if (-e "$sBaseDestDirectory/soffice") { - copy("$sBaseDestDirectory/soffice", "$sBaseDestDirectory/testtool") or die "copy failed soffice -> testtool"; - } - $temp = chmod (0555,<$sBaseDestDirectory/testtool*>); - if ($temp != 2) { - warn "Couldn't change permissions for testool* :-(\n"; - } - $temp = unlink (<$sBaseDestDirectory/*.a>); - print $temp; - # if ($temp != 2) { - # warn "Couldn't remove *.a files :-(\n"; - # } - if (-e "$sBaseDestDirectory/javaldx") { - $temp = chmod (0555,<$sBaseDestDirectory/javaldx>); - if ($temp != 1) { - warn "Couldn't change permissions for types.rdb :-(\n"; - } - } - # if images_tt.zip is missing or an image in that file is missing, use images.zip! - $images = "images_tt.zip"; - $path = ''; - if (-e "$sBaseDestDirectory/$images") { - $path = "$sBaseDestDirectory/$images"; - } else { - if (-e "$sScriptSource/$images") { - $path = "$sScriptSource/$images"; - } - } - if ($path) { - print " Starting unzipping $images file; This may take a while, please standby.... \n"; - $temp = system "unzip", "-q", "$path", "-d$sBaseDestDirectory"; - if ($temp != 0) { - warn "Couldn't unzip $images :-(\n"; - } - print " Finished unzipping. \n"; - if ($path eq "$sBaseDestDirectory/$images") { - unlink ("$sBaseDestDirectory/$images"); - } - } - # tar the directory to preserve links on moving between filesystems! - print " Starting creating compressed testtool archive. This may take a while, please standby.... \n"; - $temp = substr($sBaseDestDirectoryOrg, 0, length($sBaseDestDirectoryOrg) - 1); - $sMinor2 = $sMinor2,"_"; - $temp = system "tar", "cf", "tt_$sVersion$sMinor2$sPlatform.tar", "$temp"; - if ($temp != 0) { - warn "Couldn't tar :-(\n"; - } - print " Finished taring. \n"; - # TODO: print size! -exit; - -#---------------------------------------------------------------------------------------------------------- - diff --git a/editors/openoffice.org-vcltesttool/files/filefbsd.txt b/editors/openoffice.org-vcltesttool/files/filefbsd.txt deleted file mode 100644 index 13f62fe119e8..000000000000 --- a/editors/openoffice.org-vcltesttool/files/filefbsd.txt +++ /dev/null @@ -1,81 +0,0 @@ -types.rdb -javaldx -configmgr2.uno.so -libcomphelp*.so -libcppu* -libdict_ja.so -libdict_zh.so -libdtrans.so -libdtransX11?????.so -libfileacc.so -libfw*??.so -lib*_uno.so -libgcc_s.so* -libicu* -libj?????_g.so -libjvmaccess*.so.3 -liblocaledata_*.so -libmcnttype.so -libpsp?????.so -librmcxt* -libreg* -libsal* -libsb?????.so -libso?????.so -libsot?????.so -libstdc++.so.? -libstlport_*.so -libstore* -libsvl?????.so -libsvt?????.so -libtk?????.so -libtl?????.so -libucb1.so -libucbhelper*.so -libucpfile1.so -libucph*.so -libutl?????.so -libuui?????.so -libvcl?????.so -libvos3*.so -libxcr?????.so -svt*.res -vcl*.res -stt*.res -testtool.bin -testtoolrc -javaloader.uno.so -liburp_uno.so -sax.uno.so -textinstream.uno.so -textoutstream.uno.so -introspection.uno.so -reflection.uno.so -connector.uno.so -bridgefac.uno.so -remotebridge.uno.so -libi18nutil* -i18npool.uno.so -libvclplug_g*.so -libbasegfx?????.so -libjvmfwk.so* -libxml2.so* -images_tt.zip -libuno_cppuhelper* -libuno_sal.so* -libuno_salhelper* -libuno_cppu.so* -libsndfile.so* -libportaudio.so* -libcommuni*.so* -libsimplecm*.so* -libi18nisolang*.so -libuno_purpenvhelper*.so* -libunsafe_uno_uno.so -libaffine_uno_uno.so -sb*.res -services.rdb -unorc -bootstrap.uno.* -stocservices.uno.* -oovbaapi.rdb diff --git a/editors/openoffice.org-vcltesttool/files/ooovcltest.pl b/editors/openoffice.org-vcltesttool/files/ooovcltest.pl deleted file mode 100644 index 103701a964a2..000000000000 --- a/editors/openoffice.org-vcltesttool/files/ooovcltest.pl +++ /dev/null @@ -1,164 +0,0 @@ -#!/usr/bin/perl -# Copyright 2009 by NAKATA Maho <maho@FreeBSD.org> <maho@openoffice.org> -# All rights reserved. -use Cwd; -use File::HomeDir; #devel/p5-File-HomeDir, libfile-homedir-perl - -sub parse_option { - while ($_ = shift) { - if (substr($_, 0, 1) eq '-') { - if ($_ eq '-help') { - print "ooovcltest [-tag tag]\n"; - exit; - } elsif ($_ eq '-tag') { - $ooo_tag_flag=1; - $ooo_tag = shift; - } elsif ($_ eq '-returnaddress') { - $ooo_returnaddress_flag=1; - $ooo_returnaddress = shift; - } elsif ($_ eq '-pcname') { - $ooo_pcname_flag=1; - $ooo_pcname = shift; - } else { - die "Invalid option: \"$_\"\n"; - } - } - } -} - -#main -$ooo_tag_flag=0; -$ooo_email_flag=0; -$ooo_pcname_flag=0; -$ooo_returnaddress="dummy\@openoffice.org"; -$ooo_pcname="dummy"; -parse_option(@ARGV); -split('_',$ooo_tag); -$ooo_codeline=@_[0]; -$ooo_milestone=@_[1]; -$ooo_milestone=~ s/m//; - -#### -### Customize according your needs -$path_to_testttol = "/usr/local/openoffice.org-vcltesttool/program"; -$path_to_ooo = "/usr/local/openoffice.org-$ooo_tag/openoffice.org3/program"; -#for other environments -#$path_to_testttol = "/opt/openoffice-vcltesttool/testtool.bin"; -#$path_to_ooo = "/usr/lib/openoffice/program"; -#### - -$ooo_testautomation_archive_name="OOo_" . "$ooo_tag" . "_testautomation.tar.bz2" ; -$ooo_testautomation_site="http://ooopackages.good-day.net/pub/OpenOffice.org/qa/testautomation/"; - -if (!$ooo_tag_flag) {die "please speficy OOo tag\n";} -print "testing tag: $ooo_tag at "; -system("date\n"); -print "downloading testautomation environment....\n"; -system ("wget $ooo_testautomation_site" . "$ooo_testautomation_archive_name" . "\n"); -print "done\n"; - -print "Downloading category list for scripts at $ooo_tag \n"; - -$uri="index.php\?option=com_quaste\&task=tests_overview\&workspace=" . "$ooo_codeline" . "\&milestone=" . "m$ooo_milestone"; -$caturi="http://quaste.services.openoffice.org/" . $uri . "\&download=1"; -$catlist=$ooo_codeline . "_m$ooo_milestone" . ".txt" ; -system ("wget -O $catlist \"$caturi\"\n"); - -print "Downloading hid list for scripts at $ooo_tag \n"; -$hiduri="http://quaste.services.openoffice.org/" . $uri . "\&download=2"; -$hidlist="hid.lst"; -system ("wget -O $hidlist \"$hiduri\"\n"); -print "Download done...\n"; - -print "extracting testautomation environment....\n"; -system ("tar xfj $ooo_testautomation_archive_name\n"); -print "done\n"; - -#download is done.... - -########### -#settings... -#copying hid.lst and test list -system ("cp hid.lst $ooo_tag/testautomation/global/hid\n"); -system ("grep bas $catlist > $ooo_tag/testautomation/tools/run_tests/$catlist\n"); - -#settings of run_test.sh -$location=getcwd() . "/$ooo_tag/testautomation/" ; -system ("mkdir $location/errorlogs\n"); -$location=~ s/\//\\\//g; -$path_to_testttol =~ s/\//\\\//g; -system ("sed -i.bak 's/sLocation=\"\"/sLocation=\"$location\"/\' $ooo_tag/testautomation/tools/run_tests/run_tests.sh\n"); -system ("sed -i.bak 's/sTestTool=\"\"/sTestTool=\"$path_to_testttol\\/testtool\"/' $ooo_tag/testautomation/tools/run_tests/run_tests.sh\n"); - -#adjust ~/.testtoolrc -$HOME = File::HomeDir->my_home; -$location=getcwd() . "/$ooo_tag/testautomation" ; - -$testtoolrc="$HOME/.testtoolrc"; -open (TESTTOOLRC,">$testtoolrc") || die "Can't open file $testtoolrc !\n"; -print TESTTOOLRC "[Misc]\n"; -print TESTTOOLRC "CurrentProfile=_profile_Default\n"; -print TESTTOOLRC "ServerTimeout=4500\n"; -print TESTTOOLRC "[OOoProgramDir]\n"; -print TESTTOOLRC "Type=$path_to_ooo/\n"; -print TESTTOOLRC "Current=$path_to_ooo\n"; -print TESTTOOLRC "All=.\n"; -print TESTTOOLRC "\n"; -print TESTTOOLRC "[Crashreporter]\n"; -print TESTTOOLRC "UseProxy=false\n"; -print TESTTOOLRC "ProxyServer=none\n"; -print TESTTOOLRC "ProxyPort=8080\n"; -print TESTTOOLRC "AllowContact=false\n"; -print TESTTOOLRC "ReturnAddress=$ooo_returnaddress\n"; -print TESTTOOLRC "\n"; -print TESTTOOLRC "[_profile_Default]\n"; -print TESTTOOLRC "BaseDir=$location/\n"; -print TESTTOOLRC "LogBaseDir=$location/errorlogs/\n"; -print TESTTOOLRC "HIDDir=$location/global/hid\n"; -print TESTTOOLRC "StopOnSyntaxError=0\n"; -print TESTTOOLRC "AutoReload=0\n"; -print TESTTOOLRC "AutoSave=0\n"; -print TESTTOOLRC "[GUI Platform]\n"; -print TESTTOOLRC "Current=08\n"; -print TESTTOOLRC "\n"; -print TESTTOOLRC "[Communication]\n"; -print TESTTOOLRC "Host=localhost\n"; -print TESTTOOLRC "TTPort=12479\n"; -print TESTTOOLRC "UnoPort=12480\n"; -print TESTTOOLRC "\n"; -print TESTTOOLRC "[WinGeom]\n"; -print TESTTOOLRC "WinParams=180,74,920,875;1;0,0,0,0;\n"; -print TESTTOOLRC "\n"; -print TESTTOOLRC "[LRU]\n"; -print TESTTOOLRC "MaxLRU=4\n"; -print TESTTOOLRC "[Others]\n"; -print TESTTOOLRC "PCname=$ooo_pcname\n"; - -close(TESTTOOLRC); - -########### -#checking hid.lst (generated and QUASTe) -system ("cat $path_to_ooo/../../hid.lst | sort > hid.lst.$ooo_tag.genrated\n"); -system ("sed 's/\r//' hid.lst | sort > hid.lst.$ooo_tag.quaste\n"); -#see http://www.openoffice.org/issues/show_bug.cgi?id=104359 -system ("sed -i.bak '/^HID_EXPIRED.*/d' hid.lst.$ooo_tag.quaste\n"); -system ("sed -i.bak '/^HID_LICENSING_DIALOG.*/d' hid.lst.$ooo_tag.quaste\n"); -system ("sed -i.bak '/^HID_TP_LICENSE.*/d' hid.lst.$ooo_tag.quaste\n"); -system ("sed -i.bak '/^HID_TP_PURCHASE.*/d' hid.lst.$ooo_tag.quaste\n"); -system ("sed -i.bak '/^HID_TP_SUMMARY.*/d' hid.lst.$ooo_tag.quaste\n"); -system ("sed -i.bak '/^HID_TP_UNLOCK.*/d' hid.lst.$ooo_tag.quaste\n"); -system ("sed -i.bak '/^HID_WILL_EXPIRE.*/d' hid.lst.$ooo_tag.quaste\n"); -system ("sed -i.bak '/^tab:Edit:TP_UNLOCK:ED_UNLOCK_A.*/d' hid.lst.$ooo_tag.quaste\n"); -system ("sed -i.bak '/^tab:Edit:TP_UNLOCK:ED_UNLOCK_B.*/d' hid.lst.$ooo_tag.quaste\n"); -system ("sed -i.bak '/^tab:Edit:TP_UNLOCK:ED_UNLOCK_C.*/d' hid.lst.$ooo_tag.quaste\n"); -system ("sed -i.bak '/^tab:MultiLineEdit:TP_LICENSE:ML_LICENSE.*/d' hid.lst.$ooo_tag.quaste\n"); -system ("sed -i.bak '/^tab:PushButton:DLG_EXPIRED:PB_EXPIRED_EXIT.*/d' hid.lst.$ooo_tag.quaste\n"); -system ("sed -i.bak '/^tab:PushButton:DLG_EXPIRED:PB_EXPIRED_PURCHASE.*/d' hid.lst.$ooo_tag.quaste\n"); -system ("sed -i.bak '/^tab:PushButton:DLG_WILL_EXPIRE:PB_EXPIRE_CONTINUE.*/d' hid.lst.$ooo_tag.quaste\n"); -system ("sed -i.bak '/^tab:PushButton:DLG_WILL_EXPIRE:PB_EXPIRE_PURCHASE.*/d' hid.lst.$ooo_tag.quaste\n"); -system ("sed -i.bak '/^tab:PushButton:TP_LICENSE:PB_LICENSE_DOWN.*/d' hid.lst.$ooo_tag.quaste\n"); -system ("sed -i.bak '/^tab:PushButton:TP_PURCHASE:PB_PURCHASE_GET.*/d' hid.lst.$ooo_tag.quaste\n"); -system ("diff -u hid.lst.$ooo_tag.genrated hid.lst.$ooo_tag.quaste > hid.lst.$ooo_tag.diff\n"); -print "hid.lst diff...\n"; -system ("cat hid.lst.$ooo_tag.diff\n"); -print "hid.lst diff...done\n"; diff --git a/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper b/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper deleted file mode 100644 index 3e51965ea80c..000000000000 --- a/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper,v 1.4 2009-07-22 09:53:44 maho Exp $ - -oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -$oopath/testtool - diff --git a/editors/openoffice.org-vcltesttool/files/patch-i103628 b/editors/openoffice.org-vcltesttool/files/patch-i103628 deleted file mode 100644 index c3846bc27ae2..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i103628 +++ /dev/null @@ -1,26 +0,0 @@ -very strange workaround indeed. - ---- qadevOOo/runner/makefile.mk 2009-07-04 12:13:19.000000000 +0900 -+++ qadevOOo/runner/makefile.mk 2009-07-19 09:37:44.000000000 +0900 -@@ -42,6 +42,7 @@ SUBDIRS_RUNNER = util share stats lib co - - JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i) - JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i) -+JAR=${JAVA_HOME}/bin/jar - - # --- Targets ------------------------------------------------------ - .IF "$(SOLAR_JAVA)"=="TRUE" -@@ -52,11 +53,11 @@ OWNJAR: ALLTAR - - # LLA: parameter v is only verbose, need too long! - OWNJAR: LIGHT -- jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER) -+ ${JAR} cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER) - - # LLA: parameter v is only verbose, need too long! - LIGHT: -- jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER) -+ ${JAR} cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER) - - .ELSE - all: diff --git a/editors/openoffice.org-vcltesttool/files/patch-i65514 b/editors/openoffice.org-vcltesttool/files/patch-i65514 deleted file mode 100644 index 3a7cabaad912..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i65514 +++ /dev/null @@ -1,13 +0,0 @@ ---- berkeleydb/makefile.mk 25 May 2007 10:48:51 -0000 1.40 -+++ berkeleydb/makefile.mk 2 Jul 2007 20:15:24 -0000 -@@ -105,6 +105,10 @@ - ..$/dist$/configure - CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 - -+.IF "$(COM)$(CPU)"=="GCCX" -+CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly -+.ENDIF -+ - # just pass ARCH_FLAGS to native build - CFLAGS+:=$(ARCH_FLAGS) - CXXFLAGS+:=$(ARCH_FLAGS) diff --git a/editors/openoffice.org-vcltesttool/files/patch-i65974 b/editors/openoffice.org-vcltesttool/files/patch-i65974 deleted file mode 100644 index 40de0acde40f..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i65974 +++ /dev/null @@ -1,12 +0,0 @@ ---- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx 16 Sep 2006 17:46:13 -0000 1.7 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx 22 Jun 2007 21:36:24 -0000 -@@ -94,6 +94,9 @@ - static char const * ar[] = { - - "/lib/" JFW_PLUGIN_ARCH "/client", -+#if SAL_TYPES_SIZEOFPOINTER == 8 -+ "/lib/" JFW_PLUGIN_ARCH "/server", -+#endif - "/lib/" JFW_PLUGIN_ARCH "/native_threads", - "/lib/" JFW_PLUGIN_ARCH - diff --git a/editors/openoffice.org-vcltesttool/files/patch-i72515+84196 b/editors/openoffice.org-vcltesttool/files/patch-i72515+84196 deleted file mode 100644 index 02a2b6d9f5f2..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i72515+84196 +++ /dev/null @@ -1,1359 +0,0 @@ -Index: hsqldb/makefile.mk -=================================================================== -RCS file: /cvs/external/hsqldb/makefile.mk,v -retrieving revision 1.18.4.1 -retrieving revision 1.21 -diff -u -r1.18.4.1 -r1.21 ---- hsqldb/makefile.mk 18 Jan 2008 12:52:39 -0000 1.18.4.1 -+++ hsqldb/makefile.mk 14 May 2008 09:31:19 -0000 1.21 -@@ -56,7 +52,7 @@ - - TARFILE_ROOTDIR=hsqldb - --#CONVERTFILES=build$/build.xml -+CONVERTFILES=build$/build.xml - - PATCH_FILE_NAME=patches$/accumulated_patches.patch - -Index: hsqldb/patches/accumulated_patches.patch -=================================================================== -RCS file: /cvs/external/hsqldb/patches/accumulated_patches.patch,v -retrieving revision 1.1.6.2 -retrieving revision 1.3 -diff -u -r1.1.6.2 -r1.3 ---- hsqldb/patches/accumulated_patches.patch 18 Jan 2008 12:52:49 -0000 1.1.6.2 -+++ hsqldb/patches/accumulated_patches.patch 14 May 2008 09:31:32 -0000 1.3 -@@ -1,5 +1,1271 @@ -+*** misc/hsqldb/build/build.xml Mon Oct 22 16:17:31 2007 -+--- misc/build/hsqldb/build/build.xml Thu Mar 6 13:46:24 2008 -+*************** -+*** 97,104 **** -+ <available classname="javax.net.ssl.SSLSession" property="ant.java.hasjsse"/> -+ <echo message="ant.java.hasjsse=${ant.java.hasjsse}" /> -+ </target> -+ -+! <target name="-javaversion4"> -+ <available classname="java.nio.Buffer" property="ant.java.iscjava14"/> -+ <available classname="java.nio.Buffer" property="ant.java.iscjavamodern"/> -+ <available classname="com.jamonapi.MonitorFactory" property="jamon"/> -+--- 97,108 ---- -+ <available classname="javax.net.ssl.SSLSession" property="ant.java.hasjsse"/> -+ <echo message="ant.java.hasjsse=${ant.java.hasjsse}" /> -+ </target> -++ -++ <target name="-javaversion6"> -++ <available classname="java.sql.NClob" property="ant.java.iscjava16"/> -++ </target> -+ -+! <target name="-javaversion4" depends="-javaversion6" unless="ant.java.iscjava16"> -+ <available classname="java.nio.Buffer" property="ant.java.iscjava14"/> -+ <available classname="java.nio.Buffer" property="ant.java.iscjavamodern"/> -+ <available classname="com.jamonapi.MonitorFactory" property="jamon"/> -+*************** -+*** 131,137 **** -+ </target> -+ -+ <target name="codeswitcher" depends="-prepare" -+! description="uses +-JDBC2 +-JDBC2 +-JAVA2"> -+ <javac destdir="classes"> -+ <src path="${src}"/> -+ <include name="org/hsqldb/util/CodeSwitcher.java"/> -+--- 135,141 ---- -+ </target> -+ -+ <target name="codeswitcher" depends="-prepare" -+! description="uses +-JDBC2 +-JDBC2 +-JAVA2 +-JDBC4"> -+ <javac destdir="classes"> -+ <src path="${src}"/> -+ <include name="org/hsqldb/util/CodeSwitcher.java"/> -+*************** -+*** 217,223 **** -+ ${src}/org/hsqldb/jdbc/jdbcStatement.java -+ ${src}/org/hsqldb/lib/SimpleLog.java -+ ${src}/org/hsqldb/rowio/RowInputTextLog.java -+! ${src}/org/hsqldb/HsqlDateTime.java -JAVA2 -JDBC3"/> -+ </java> -+ <available classname="java.util.Vector" property="noswing"/> -+ </target> -+--- 221,227 ---- -+ ${src}/org/hsqldb/jdbc/jdbcStatement.java -+ ${src}/org/hsqldb/lib/SimpleLog.java -+ ${src}/org/hsqldb/rowio/RowInputTextLog.java -+! ${src}/org/hsqldb/HsqlDateTime.java -JAVA2 -JDBC3 -JDBC4"/> -+ </java> -+ <available classname="java.util.Vector" property="noswing"/> -+ </target> -+*************** -+*** 234,240 **** -+ ${src}/org/hsqldb/jdbc/jdbcStatement.java -+ ${src}/org/hsqldb/lib/SimpleLog.java -+ ${src}/org/hsqldb/rowio/RowInputTextLog.java -+! ${src}/org/hsqldb/HsqlDateTime.java +JAVA2 -JDBC3"/> -+ </java> -+ </target> -+ -+--- 238,244 ---- -+ ${src}/org/hsqldb/jdbc/jdbcStatement.java -+ ${src}/org/hsqldb/lib/SimpleLog.java -+ ${src}/org/hsqldb/rowio/RowInputTextLog.java -+! ${src}/org/hsqldb/HsqlDateTime.java +JAVA2 -JDBC3 -JDBC4"/> -+ </java> -+ </target> -+ -+*************** -+*** 248,260 **** -+ ${src}/org/hsqldb/jdbc/jdbcPreparedStatement.java -+ ${src}/org/hsqldb/jdbc/jdbcResultSet.java -+ ${src}/org/hsqldb/jdbc/jdbcStatement.java -+ ${src}/org/hsqldb/lib/SimpleLog.java -+ ${src}/org/hsqldb/rowio/RowInputTextLog.java -+! ${src}/org/hsqldb/HsqlDateTime.java +JAVA2 +JDBC3"/> -+ </java> -+ </target> -+ -+! <target name="store" depends="switchtojdk11,switchtojdk12,switchtojdk14" -+ description="compiles the /store folder"> -+ <javac srcdir="${src}" -+ destdir="classes" -+--- 252,284 ---- -+ ${src}/org/hsqldb/jdbc/jdbcPreparedStatement.java -+ ${src}/org/hsqldb/jdbc/jdbcResultSet.java -+ ${src}/org/hsqldb/jdbc/jdbcStatement.java -++ ${src}/org/hsqldb/jdbc/jdbcBlob.java -++ ${src}/org/hsqldb/jdbc/jdbcDataSource.java -++ ${src}/org/hsqldb/jdbc/jdbcParameterMetaData.java -++ ${src}/org/hsqldb/jdbc/jdbcResultSetMetaData.java -+ ${src}/org/hsqldb/lib/SimpleLog.java -+ ${src}/org/hsqldb/rowio/RowInputTextLog.java -+! ${src}/org/hsqldb/HsqlDateTime.java +JAVA2 +JDBC3 -JDBC4"/> -+! </java> -+! </target> -+! -+! <target name="switchtojdk16" depends="switches" -+! description="self explanatory" if="ant.java.iscjava16"> -+! <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" > -+! <arg line="${src}/org/hsqldb/jdbc/jdbcBlob.java -+! ${src}/org/hsqldb/jdbc/jdbcCallableStatement.java -+! ${src}/org/hsqldb/jdbc/jdbcConnection.java -+! ${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java -+! ${src}/org/hsqldb/jdbc/jdbcDataSource.java -+! ${src}/org/hsqldb/jdbc/jdbcParameterMetaData.java -+! ${src}/org/hsqldb/jdbc/jdbcPreparedStatement.java -+! ${src}/org/hsqldb/jdbc/jdbcResultSet.java -+! ${src}/org/hsqldb/jdbc/jdbcResultSetMetaData.java -+! ${src}/org/hsqldb/jdbc/jdbcStatement.java +JAVA2 +JDBC3 +JDBC4"/> -+ </java> -+ </target> -+ -+! <target name="store" depends="switchtojdk11,switchtojdk12,switchtojdk14,switchtojdk16" -+ description="compiles the /store folder"> -+ <javac srcdir="${src}" -+ destdir="classes" -+Files misc/hsqldb/lib/hsqldb.jar and misc/build/hsqldb/lib/hsqldb.jar differ -+*** misc/hsqldb/src/org/hsqldb/View.java Sun Jul 22 16:34:18 2007 -+--- misc/build/hsqldb/src/org/hsqldb/View.java Thu Mar 6 13:37:53 2008 -+*************** -+*** 218,226 **** -+ continue; -+ } -+ -+! expandedStatement.replace(pos, -+! expandedStatement.indexOf("*", pos) + 1, -+! colList); -+ } -+ -+ statement = expandedStatement.toString(); -+--- 218,228 ---- -+ continue; -+ } -+ -+! int foundPos = expandedStatement.indexOf("*", pos); -+! if ( foundPos != -1 ) -+! expandedStatement.replace(pos, -+! foundPos + 1, -+! colList); -+ } -+ -+ statement = expandedStatement.toString(); -+*** misc/hsqldb/src/org/hsqldb/jdbc/jdbcBlob.java Thu Feb 16 03:25:51 2006 -+--- misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcBlob.java Thu Mar 6 13:37:53 2008 -+*************** -+*** 460,465 **** -+--- 460,478 ---- -+ -+ data = newData; -+ } -++ //#ifdef JDBC4 -++ /* -++ public void free() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public InputStream getBinaryStream(long pos, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ */ -++ //#endif JDBC4 -+ -+ // public static void main(String[] args) throws Exception { -+ // -+*** misc/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java Sun Jan 29 13:58:58 2006 -+--- misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java Thu Mar 6 13:37:53 2008 -+*************** -+*** 31,39 **** -+--- 31,48 ---- -+ -+ package org.hsqldb.jdbc; -+ -++ import java.io.InputStream; -++ import java.io.Reader; -+ import java.math.BigDecimal; -+ import java.sql.CallableStatement; -+ import java.sql.Date; -++ //#ifdef JDBC4 -++ /* -++ import java.sql.NClob; -++ import java.sql.RowId; -++ import java.sql.SQLXML; -++ */ -++ //#endif JDBC4 -+ import java.sql.Time; -+ import java.sql.Timestamp; -+ import java.sql.SQLException; -+*************** -+*** 3085,3090 **** -+ public java.net.URL getURL(String parameterName) throws SQLException { -+ return getURL(findParameterIndex(parameterName)); -+ } -+- -+ //#endif JDBC3 -+ } -+--- 3094,3371 ---- -+ public java.net.URL getURL(String parameterName) throws SQLException { -+ return getURL(findParameterIndex(parameterName)); -+ } -+ //#endif JDBC3 -++ //#ifdef JDBC4 -++ /* -++ public void setPoolable(boolean poolable) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public boolean isPoolable() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public <T> T unwrap(Class<T> iface) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public boolean isWrapperFor(Class<?> iface) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setRowId(int parameterIndex, RowId x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNString(int parameterIndex, String value) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNClob(int parameterIndex, NClob value) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setClob(int parameterIndex, Reader reader, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setClob(int parameterIndex, Reader reader) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNClob(int parameterIndex, Reader reader) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public RowId getRowId(int parameterIndex) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public RowId getRowId(String parameterName) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setRowId(String parameterName, RowId x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNString(String parameterName, String value) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNClob(String parameterName, NClob value) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setClob(String parameterName, Reader reader, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNClob(String parameterName, Reader reader, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public NClob getNClob(int parameterIndex) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public NClob getNClob(String parameterName) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public SQLXML getSQLXML(int parameterIndex) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public SQLXML getSQLXML(String parameterName) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public String getNString(int parameterIndex) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public String getNString(String parameterName) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public Reader getNCharacterStream(int parameterIndex) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public Reader getNCharacterStream(String parameterName) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public Reader getCharacterStream(int parameterIndex) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public Reader getCharacterStream(String parameterName) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setBlob(String parameterName, Blob x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setClob(String parameterName, Clob x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setAsciiStream(String parameterName, InputStream x, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setBinaryStream(String parameterName, InputStream x, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setCharacterStream(String parameterName, Reader reader, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setAsciiStream(String parameterName, InputStream x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setBinaryStream(String parameterName, InputStream x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setCharacterStream(String parameterName, Reader reader) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNCharacterStream(String parameterName, Reader value) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setClob(String parameterName, Reader reader) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setBlob(String parameterName, InputStream inputStream) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNClob(String parameterName, Reader reader) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ */ -++ //#endif JDBC4 -+ } -+*** misc/hsqldb/src/org/hsqldb/jdbc/jdbcClob.java Thu Feb 16 03:27:44 2006 -+--- misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcClob.java Thu Mar 6 13:37:53 2008 -+*************** -+*** 31,36 **** -+--- 31,37 ---- -+ -+ package org.hsqldb.jdbc; -+ -++ import java.io.Reader; -+ import java.io.StringReader; -+ import java.sql.Clob; -+ import java.sql.SQLException; -+*************** -+*** 461,464 **** -+--- 462,476 ---- -+ data = new String(ldata.substring(0, (int) chars)); -+ } -+ } -++ //#ifdef JDBC4 -++ public void free() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public Reader getCharacterStream(long pos, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ //#endif JDBC4 -+ } -+*** misc/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java Tue Aug 28 14:26:44 2007 -+--- misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java Thu Mar 6 13:37:53 2008 -+*************** -+*** 31,39 **** -+--- 31,49 ---- -+ -+ package org.hsqldb.jdbc; -+ -++ import java.sql.Array; -++ import java.sql.Blob; -+ import java.sql.CallableStatement; -++ import java.sql.Clob; -+ import java.sql.Connection; -+ import java.sql.DatabaseMetaData; -++ //#ifdef JDBC4 -++ /* -++ import java.sql.NClob; -++ import java.sql.SQLClientInfoException; -++ import java.sql.SQLXML; -++ */ -++ //#endif JDBC4 -+ import java.sql.PreparedStatement; -+ import java.sql.SQLException; -+ import java.sql.SQLWarning; -+*************** -+*** 44,54 **** -+--- 54,66 ---- -+ -+ //#endif JDBC3 -+ //#ifdef JAVA2 -++ import java.sql.Struct; -+ import java.util.Map; -+ -+ //#endif JAVA2 -+ import java.util.Locale; -+ -++ import java.util.Properties; -+ import org.hsqldb.DatabaseManager; -+ import org.hsqldb.DatabaseURL; -+ import org.hsqldb.HSQLClientConnection; -+*************** -+*** 2704,2707 **** -+--- 2716,2787 ---- -+ -+ return i; -+ } -++ //#ifdef JDBC4 -++ /* -++ public Clob createClob() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public Blob createBlob() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public NClob createNClob() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public SQLXML createSQLXML() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public boolean isValid(int timeout) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setClientInfo(String name, String value) throws SQLClientInfoException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setClientInfo(Properties properties) throws SQLClientInfoException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public String getClientInfo(String name) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public Properties getClientInfo() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public Array createArrayOf(String typeName, Object[] elements) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public Struct createStruct(String typeName, Object[] attributes) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public <T> T unwrap(Class<T> iface) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public boolean isWrapperFor(Class<?> iface) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ */ -++ //#endif JDBC4 -+ } -+*** misc/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java Sun Oct 23 20:26:22 2005 -+--- misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java Thu Mar 6 13:37:53 2008 -+*************** -+*** 297,300 **** -+--- 297,313 ---- -+ public void setUser(String user) { -+ this.user = user; -+ } -++ //#ifdef JDBC4 -++ /* -++ public <T> T unwrap(Class<T> iface) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public boolean isWrapperFor(Class<?> iface) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ */ -++ //#endif JDBC4 -+ } -+*** misc/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java Fri Oct 13 17:36:27 2006 -+--- misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java Thu Mar 6 13:37:53 2008 -+*************** -+*** 35,41 **** -+ import java.sql.DatabaseMetaData; -+ import java.sql.ResultSet; -+ import java.sql.SQLException; -+! -+ import org.hsqldb.Column; -+ import org.hsqldb.Library; -+ import org.hsqldb.Trace; -+--- 35,45 ---- -+ import java.sql.DatabaseMetaData; -+ import java.sql.ResultSet; -+ import java.sql.SQLException; -+! //#ifdef JDBC4 -+! /* -+! import java.sql.RowIdLifetime; -+! */ -+! //#endif JDBC4 -+ import org.hsqldb.Column; -+ import org.hsqldb.Library; -+ import org.hsqldb.Trace; -+*************** -+*** 5643,5646 **** -+--- 5647,5700 ---- -+ -+ return schemaName; -+ } -++ //#ifdef JDBC4 -++ /* -++ public RowIdLifetime getRowIdLifetime() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public ResultSet getSchemas(String catalog, String schemaPattern) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public boolean supportsStoredFunctionsUsingCallSyntax() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ public boolean autoCommitFailureClosesAllResultSets() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public ResultSet getClientInfoProperties() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ */ -++ //#endif JDBC4 -++ //#ifdef JDBC4 -++ /* -++ public ResultSet getFunctions(String catalog, String schemaPattern, String functionNamePattern) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public ResultSet getFunctionColumns(String catalog, String schemaPattern, String functionNamePattern, String columnNamePattern) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public <T> T unwrap(Class<T> iface) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public boolean isWrapperFor(Class<?> iface) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ */ -++ //#endif JDBC4 -+ } -+*** misc/hsqldb/src/org/hsqldb/jdbc/jdbcParameterMetaData.java Sun Oct 23 20:26:22 2005 -+--- misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcParameterMetaData.java Thu Mar 6 13:37:53 2008 -+*************** -+*** 381,384 **** -+--- 381,397 ---- -+ -+ return sb.toString(); -+ } -++ //#ifdef JDBC4 -++ /* -++ public <T> T unwrap(Class<T> iface) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public boolean isWrapperFor(Class<?> iface) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ */ -++ //#endif JDBC4 -+ } -+*** misc/hsqldb/src/org/hsqldb/jdbc/jdbcPreparedStatement.java Sat Sep 23 01:37:27 2006 -+--- misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcPreparedStatement.java Thu Mar 6 13:37:53 2008 -+*************** -+*** 32,40 **** -+--- 32,49 ---- -+ package org.hsqldb.jdbc; -+ -+ import java.io.IOException; -++ import java.io.InputStream; -++ import java.io.Reader; -+ import java.io.Serializable; -+ import java.math.BigDecimal; -+ import java.sql.Date; -++ //#ifdef JDBC4 -++ /* -++ import java.sql.NClob; -++ import java.sql.RowId; -++ import java.sql.SQLXML; -++ */ -++ //#endif JDBC4 -+ import java.sql.PreparedStatement; -+ import java.sql.ResultSet; -+ import java.sql.ResultSetMetaData; -+*************** -+*** 2279,2282 **** -+--- 2288,2404 ---- -+ -+ return sb.toString(); -+ } -++ //#ifdef JDBC4 -++ /* -++ public void setPoolable(boolean poolable) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public boolean isPoolable() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public <T> T unwrap(Class<T> iface) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public boolean isWrapperFor(Class<?> iface) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setRowId(int parameterIndex, RowId x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNString(int parameterIndex, String value) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNClob(int parameterIndex, NClob value) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setClob(int parameterIndex, Reader reader, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setClob(int parameterIndex, Reader reader) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void setNClob(int parameterIndex, Reader reader) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ */ -++ //#endif JDBC4 -+ } -+*** misc/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java Sat Sep 23 01:29:39 2006 -+--- misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java Thu Mar 6 13:37:53 2008 -+*************** -+*** 67,77 **** -+--- 67,86 ---- -+ package org.hsqldb.jdbc; -+ -+ import java.io.ByteArrayInputStream; -++ import java.io.InputStream; -++ import java.io.Reader; -+ import java.io.StringReader; -+ import java.math.BigDecimal; -+ import java.sql.Date; -+ import java.sql.ResultSet; -+ import java.sql.ResultSetMetaData; -++ //#ifdef JDBC4 -++ /* -++ import java.sql.RowId; -++ import java.sql.NClob; -++ import java.sql.SQLXML; -++ */ -++ //#endif JDBC4 -+ import java.sql.SQLException; -+ import java.sql.SQLWarning; -+ import java.sql.Statement; -+*************** -+*** 5049,5052 **** -+--- 5058,5314 ---- -+ return rResult == null ? false -+ : true; -+ } -++ //#ifdef JDBC4 -++ /* -++ public RowId getRowId(int columnIndex) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public RowId getRowId(String columnLabel) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateRowId(int columnIndex, RowId x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateRowId(String columnLabel, RowId x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public int getHoldability() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public boolean isClosed() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateNString(int columnIndex, String nString) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateNString(String columnLabel, String nString) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateNClob(int columnIndex, NClob nClob) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateNClob(String columnLabel, NClob nClob) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public NClob getNClob(int columnIndex) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public NClob getNClob(String columnLabel) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public SQLXML getSQLXML(int columnIndex) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public SQLXML getSQLXML(String columnLabel) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public String getNString(int columnIndex) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public String getNString(String columnLabel) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public Reader getNCharacterStream(int columnIndex) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public Reader getNCharacterStream(String columnLabel) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateCharacterStream(int columnIndex, Reader x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateClob(int columnIndex, Reader reader) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateClob(String columnLabel, Reader reader) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateNClob(int columnIndex, Reader reader) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public void updateNClob(String columnLabel, Reader reader) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public <T> T unwrap(Class<T> iface) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public boolean isWrapperFor(Class<?> iface) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ */ -++ //#endif JDBC4 -+ } -+*** misc/hsqldb/src/org/hsqldb/jdbc/jdbcResultSetMetaData.java Sat Sep 23 01:38:15 2006 -+--- misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcResultSetMetaData.java Thu Mar 6 13:37:53 2008 -+*************** -+*** 1144,1147 **** -+--- 1144,1160 ---- -+ String.valueOf(column)); -+ } -+ } -++ //#ifdef JDBC4 -++ /* -++ public <T> T unwrap(Class<T> iface) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public boolean isWrapperFor(Class<?> iface) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ */ -++ //#endif JDBC4 -+ } -+*** misc/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java Sat Sep 23 01:40:01 2006 -+--- misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java Thu Mar 6 13:37:53 2008 -+*************** -+*** 1532,1538 **** -+ /** -+ * Retrieves whether this statement is closed. -+ */ -+! synchronized boolean isClosed() { -+ return isClosed; -+ } -+ -+--- 1532,1551 ---- -+ /** -+ * Retrieves whether this statement is closed. -+ */ -+! //#ifdef JDBC4 -+! /* -+! public -+! */ -+! //#else -+! synchronized -+! //#endif JDBC4 -+! boolean isClosed() -+! //#ifdef JDBC4 -+! /* -+! throws SQLException -+! */ -+! //#endif JDBC4 -+! { -+ return isClosed; -+ } -+ -+*************** -+*** 1579,1582 **** -+--- 1592,1618 ---- -+ throw Util.sqlException(e); -+ } -+ } -++ //#ifdef JDBC4 -++ /* -++ public void setPoolable(boolean poolable) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public boolean isPoolable() throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public <T> T unwrap(Class<T> iface) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ -++ public boolean isWrapperFor(Class<?> iface) throws SQLException -++ { -++ throw new UnsupportedOperationException("Not supported yet."); -++ } -++ */ -++ //#endif JDBC4 -+ } - *** misc/hsqldb/src/org/hsqldb/persist/DataFileCache.java Sat Oct 6 13:09:49 2007 ----- misc/build/hsqldb/src/org/hsqldb/persist/DataFileCache.java Tue Dec 4 10:16:41 2007 -+--- misc/build/hsqldb/src/org/hsqldb/persist/DataFileCache.java Thu Mar 6 13:37:53 2008 - *************** - *** 244,255 **** - } else { -@@ -30,28 +1296,22 @@ - } - - initBuffers(); --*** misc/hsqldb/src/org/hsqldb/View.java 2007-07-22 16:34:18.000000000 +0200 ----- misc/build/hsqldb/src/org/hsqldb/View.java 2008-01-08 07:57:29.375000000 +0100 -+*** misc/hsqldb/src/org/hsqldb/util/CodeSwitcher.java Mon Jul 17 00:29:35 2006 -+--- misc/build/hsqldb/src/org/hsqldb/util/CodeSwitcher.java Thu Mar 6 13:37:53 2008 - *************** --*** 218,226 **** -- continue; -- } -- --! expandedStatement.replace(pos, --! expandedStatement.indexOf("*", pos) + 1, --! colList); -- } -+*** 341,347 **** -+ } -+ } else if (line.startsWith("//#endif")) { -+ if (state == 0) { -+! printError("'#endif' without '#ifdef'"); - -- statement = expandedStatement.toString(); ----- 218,228 ---- -- continue; -- } -- --! int foundPos = expandedStatement.indexOf("*", pos); --! if ( foundPos != -1 ) --! expandedStatement.replace(pos, --! foundPos + 1, --! colList); -- } -+ return false; -+ } -+--- 341,347 ---- -+ } -+ } else if (line.startsWith("//#endif")) { -+ if (state == 0) { -+! printError("'#endif' without '#ifdef' LineNo: " + i); - -- statement = expandedStatement.toString(); -+ return false; -+ } -Index: hsqldb/patches/index.txt -=================================================================== -RCS file: /cvs/external/hsqldb/patches/index.txt,v -retrieving revision 1.6 -retrieving revision 1.7 -diff -u -r1.6 -r1.7 ---- hsqldb/patches/index.txt 21 Nov 2007 17:13:43 -0000 1.6 -+++ hsqldb/patches/index.txt 14 May 2008 09:31:45 -0000 1.7 -@@ -10,6 +10,7 @@ - Issue - ----- - http://www.openoffice.org/issues/show_bug.cgi?id=????? -+ http://www.openoffice.org/issues/show_bug.cgi?id=85087 - <summary> - - diff --git a/editors/openoffice.org-vcltesttool/files/patch-i73217 b/editors/openoffice.org-vcltesttool/files/patch-i73217 deleted file mode 100644 index 712631a136f1..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i73217 +++ /dev/null @@ -1,99 +0,0 @@ -It won't fix in the master as it breaks the POSIX. - -Index: epm/epm-3.7.patch -=================================================================== -RCS file: /cvs/external/epm/epm-3.7.patch,v -retrieving revision 1.11 -diff -u -r1.11 epm-3.7.patch ---- epm/epm-3.7.patch 1 Aug 2006 12:20:23 -0000 1.11 -+++ epm/epm-3.7.patch 6 Jan 2007 10:10:38 -0000 -@@ -247,6 +247,23 @@ - *** misc/epm-3.7/dist.c Thu Aug 7 16:14:40 2003 - --- misc/build/epm-3.7/dist.c Wed Jul 26 21:01:11 2006 - *************** -+*** 339,345 **** -+ const char *defval) /* I - Default value of option */ -+ { -+ char *ptr; /* Pointer to option */ -+! static char option[256]; /* Copy of file option */ -+ -+ -+ /* -+--- 339,345 ---- -+ const char *defval) /* I - Default value of option */ -+ { -+ char *ptr; /* Pointer to option */ -+! static char option[1024]; /* Copy of file option */ -+ -+ -+ /* -+*************** - *** 394,401 **** - strcpy(platform->machine, "mips"); - #elif defined(__hpux) -@@ -292,6 +309,35 @@ - else if (strncmp(platform->machine, "sun", 3) == 0) - strcpy(platform->machine, "sparc"); - #endif /* __sgi */ -+*************** -+*** 550,562 **** -+ char line[2048], /* Expanded line from list file */ -+ buf[1024], /* Original line from list file */ -+ type, /* File type */ -+! dst[256], /* Destination path */ -+! src[256], /* Source path */ -+! pattern[256], /* Pattern for source files */ -+ user[32], /* User */ -+ group[32], /* Group */ -+ *temp, /* Temporary pointer */ -+! options[256]; /* File options */ -+ int mode, /* File permissions */ -+ skip; /* 1 = skip files, 0 = archive files */ -+ dist_t *dist; /* Distribution data */ -+--- 560,572 ---- -+ char line[2048], /* Expanded line from list file */ -+ buf[1024], /* Original line from list file */ -+ type, /* File type */ -+! dst[1024], /* Destination path */ -+! src[1024], /* Source path */ -+! pattern[1024], /* Pattern for source files */ -+ user[32], /* User */ -+ group[32], /* Group */ -+ *temp, /* Temporary pointer */ -+! options[1024]; /* File options */ -+ int mode, /* File permissions */ -+ skip; /* 1 = skip files, 0 = archive files */ -+ dist_t *dist; /* Distribution data */ - *** misc/epm-3.7/epm.c Tue Oct 28 15:48:30 2003 - --- misc/build/epm-3.7/epm.c Wed Jul 26 20:59:48 2006 - *************** -@@ -304,6 +350,29 @@ - puts(""); - puts("EPM is free software and comes with ABSOLUTELY NO WARRANTY; for details"); - puts("see the GNU General Public License in the file COPYING or at"); -+*** misc/epm-3.7/epm.h Thu Jul 24 10:20:54 2003 -+--- misc/build/epm-3.7/epm.h Sat Jan 6 19:08:44 2007 -+*************** -+*** 167,175 **** -+ int mode; /* Permissions of file */ -+ char user[32], /* Owner of file */ -+ group[32], /* Group of file */ -+! src[512], /* Source path */ -+! dst[512], /* Destination path */ -+! options[256]; /* File options (nostrip, etc.) */ -+ } file_t; -+ -+ typedef struct /**** Install/Patch/Remove Commands ****/ -+--- 167,175 ---- -+ int mode; /* Permissions of file */ -+ char user[32], /* Owner of file */ -+ group[32], /* Group of file */ -+! src[1024], /* Source path */ -+! dst[1024], /* Destination path */ -+! options[1024]; /* File options (nostrip, etc.) */ -+ } file_t; -+ -+ typedef struct /**** Install/Patch/Remove Commands ****/ - *** misc/epm-3.7/file.c Wed Jul 23 23:41:08 2003 - --- misc/build/epm-3.7/file.c Wed Jul 26 20:59:48 2006 - *************** diff --git a/editors/openoffice.org-vcltesttool/files/patch-i75190 b/editors/openoffice.org-vcltesttool/files/patch-i75190 deleted file mode 100644 index f382267ffd7e..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i75190 +++ /dev/null @@ -1,107 +0,0 @@ -http://www.freebsd.org/cgi/query-pr.cgi?pr=121953 (Dwayne MacKinnon) -http://qa.openoffice.org/issues/show_bug.cgi?id=75190 -Turn the GTK Recent Manager feature off. -Other workaround -% setenv OOO_FORCE_DESKTOP gnome - -Backout of misfeature in cws_src680_obr05 branch. -* rev 1.9 of gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx -* rev 1.8 of gsl/shell/source/unix/sysshell/systemshell.cxx - -See also -http://lists.freebsd.org/pipermail/freebsd-openoffice/2007-December/003453.html -gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx -(rev. 1.8.44.2) -gsl/shell/source/unix/sysshell/systemshell.cxx -(rev. 1.7.44.1) - -Index: systemshell.cxx -=================================================================== -RCS file: /cvs/gsl/shell/source/unix/sysshell/systemshell.cxx,v -retrieving revision 1.8 -diff -u -u -r1.8 systemshell.cxx ---- shell/source/unix/sysshell/systemshell.cxx 19 Jun 2007 16:12:44 -0000 1.8 -+++ shell/source/unix/sysshell/systemshell.cxx 30 Mar 2008 22:06:15 -0000 -@@ -72,9 +72,6 @@ - const rtl::OUString LIB_RECENT_FILE = UNISTRING("librecentfile.so"); - const rtl::OUString DEFAULT_CONTEXT = UNISTRING("DefaultContext"); - --void * (* sym_gtk_recent_manager_get_default) () = NULL; --void (* sym_gtk_recent_manager_add_item) (void *, const char *) = NULL; -- - // We need to re-encode file urls because osl_getFileURLFromSystemPath converts - // to UTF-8 before encoding non ascii characters, which is not what other apps expect. - static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl) -@@ -114,57 +111,31 @@ - return url; - } - -- bool init_recent_manager_api() -- { -- oslModule hDefault; -- if( osl_getModuleHandle( NULL, &hDefault ) ) -- { -- sym_gtk_recent_manager_get_default = (void * (*)()) -- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_get_default"); -- sym_gtk_recent_manager_add_item = (void (*)(void *, const char *)) -- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_add_item"); -- -- } -- bool ret = (NULL != sym_gtk_recent_manager_get_default) && (NULL != sym_gtk_recent_manager_add_item); -- return ret; -- } -- -- - //############################## - void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType) - { -- static bool bIsRecentManagerPresent = init_recent_manager_api(); -- - // Convert file URL for external use (see above) - rtl::OUString externalUrl = translateToExternalUrl(aFileUrl); -+ rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); -+ - if( 0 == externalUrl.getLength() ) - externalUrl = aFileUrl; -- -- if( bIsRecentManagerPresent ) -- { -- void * recent_manager = sym_gtk_recent_manager_get_default(); -- sym_gtk_recent_manager_add_item(recent_manager, rtl::OUStringToOString(aFileUrl, RTL_TEXTENCODING_UTF8).getStr()); -- } -- else -+ -+ if (librecentfile_url.getLength()) - { -- rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); -- -- if (librecentfile_url.getLength()) -- { -- osl::Module module(librecentfile_url); -+ osl::Module module(librecentfile_url); - -- if (module.is()) -- { -- // convert from reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST> -- // not allowed in gcc 3.3 without permissive. -- PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = -- reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); -- -- if (add_to_recently_used_file_list) -- add_to_recently_used_file_list(aFileUrl, aMimeType); -- } -+ if (module.is()) -+ { -+ // convert from reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST> -+ // not allowed in gcc 3.3 without permissive. -+ PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = -+ reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); -+ -+ if (add_to_recently_used_file_list) -+ add_to_recently_used_file_list(aFileUrl, aMimeType); - } -- } -+ } - } - - } // namespace SystemShell diff --git a/editors/openoffice.org-vcltesttool/files/patch-i80129 b/editors/openoffice.org-vcltesttool/files/patch-i80129 deleted file mode 100644 index 90fd4ceb9dc5..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i80129 +++ /dev/null @@ -1,18 +0,0 @@ -Merely a workaround - -Index: scp2/source/ure/ure.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ure/ure.scp,v -retrieving revision 1.14 -diff -u -r1.14 ure.scp ---- scp2/source/ure/ure.scp 18 Jul 2007 08:07:32 -0000 1.14 -+++ scp2/source/ure/ure.scp 27 Jul 2007 22:07:16 -0000 -@@ -610,6 +610,8 @@ - #endif - #elif defined MACOSX - Name = SCP2_URE_DL_NORMAL(xml2.2); -+#elif defined FREEBSD -+ Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17)); - #else - Name = SCP2_URE_DL_VER(xml2, 2); - #endif diff --git a/editors/openoffice.org-vcltesttool/files/patch-i84549 b/editors/openoffice.org-vcltesttool/files/patch-i84549 deleted file mode 100644 index 3f1808c45b5a..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i84549 +++ /dev/null @@ -1,17 +0,0 @@ -? neon/unxfbsdi.pro -Index: neon/neon.patch -=================================================================== -RCS file: /cvs/external/neon/neon.patch,v -retrieving revision 1.20 -diff -u -r1.20 neon.patch ---- neon/neon.patch 14 Nov 2007 09:49:43 -0000 1.20 -+++ neon/neon.patch 13 Dec 2007 17:16:29 -0000 -@@ -268,7 +268,7 @@ - ! #define HAVE_SYS_TYPES_H 1 - ! - ! /* Define if the timezone global is available */ --! #ifndef MACOSX -+! #if !defined (MACOSX) && !defined (FREEBSD) - ! #define HAVE_TIMEZONE 1 - ! #endif - ! diff --git a/editors/openoffice.org-vcltesttool/files/patch-i84586 b/editors/openoffice.org-vcltesttool/files/patch-i84586 deleted file mode 100644 index 7b624c3f77f1..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i84586 +++ /dev/null @@ -1,43 +0,0 @@ -? sc/unxfbsdi.pro -Index: sc/source/ui/vba/vbaaxis.cxx -=================================================================== -RCS file: /cvs/sc/sc/source/ui/vba/vbaaxis.cxx,v -retrieving revision 1.2 -diff -u -r1.2 vbaaxis.cxx ---- sc/source/ui/vba/vbaaxis.cxx 7 Dec 2007 10:43:48 -0000 1.2 -+++ sc/source/ui/vba/vbaaxis.cxx 14 Dec 2007 23:40:31 -0000 -@@ -47,8 +47,8 @@ - - const rtl::OUString ORIGIN( RTL_CONSTASCII_USTRINGPARAM("Origin") ); - const rtl::OUString AUTOORIGIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") ); --const rtl::OUString MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") ); --const rtl::OUString MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") ); -+const rtl::OUString VBA_MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") ); -+const rtl::OUString VBA_MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") ); - ScVbaChart* - ScVbaAxis::getChartPtr() throw( uno::RuntimeException ) - { -@@ -142,12 +142,12 @@ - bCrossesAreCustomized = sal_False; - return; - case xlAxisCrossesMinimum: // The axis crosses at the minimum value. -- mxPropertySet->getPropertyValue(MIN) >>= fNum; -+ mxPropertySet->getPropertyValue(VBA_MIN) >>= fNum; - setCrossesAt( fNum ); - bCrossesAreCustomized = sal_False; - break; - case xlAxisCrossesMaximum: // The axis crosses at the maximum value. -- mxPropertySet->getPropertyValue(MAX) >>= fNum; -+ mxPropertySet->getPropertyValue(VBA_MAX) >>= fNum; - setCrossesAt(fNum); - bCrossesAreCustomized = sal_False; - break; -@@ -182,7 +182,7 @@ - mxPropertySet->getPropertyValue(ORIGIN) >>= forigin; - //obsolete double fmax = AnyConverter.toDouble(mxPropertySet.getPropertyValue("Max")); - double fmin = 0.0; -- mxPropertySet->getPropertyValue(MIN) >>= fmin; -+ mxPropertySet->getPropertyValue(VBA_MIN) >>= fmin; - if (forigin == fmin) - nCrosses = xlAxisCrossesMinimum; - else diff --git a/editors/openoffice.org-vcltesttool/files/patch-i85027 b/editors/openoffice.org-vcltesttool/files/patch-i85027 deleted file mode 100644 index 7afbd7d17349..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i85027 +++ /dev/null @@ -1,69 +0,0 @@ -Index: scp2/source/ooo/file_library_ooo.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v -retrieving revision 1.269 -diff -u -r1.269 file_library_ooo.scp ---- scp2/source/ooo/file_library_ooo.scp 12 Dec 2007 13:29:11 -0000 1.269 -+++ scp2/source/ooo/file_library_ooo.scp 6 Jan 2008 04:19:50 -0000 -@@ -979,7 +979,7 @@ - - STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwm , fwm) - --#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT)) -+#if ! (defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT)) - #if defined( _gcc3 ) - - File gid_File_Lib_Gcc -@@ -993,7 +993,7 @@ - - #endif - --#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT)) -+#if ! (defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT)) - #if defined( _gcc3 ) - - File gid_File_Lib_Stdc - - ------------------ -Strange behaviour of stock gcc of FreeBSD 7. - -# gcc -print-file-name=libgcc_s.so -/usr/lib/libgcc_s.so -# gcc -print-file-name=libgcc_s.so.1 -libgcc_s.so.1 -. This sould be -# gcc -print-file-name=libgcc_s.so.1 -/lib/libgcc_s.so.1 - -However gcc42 from ports behaves correctly; -and -# gcc42 -print-file-name=libgcc_s.so.1 -/usr/local/lib/gcc-4.2.3/gcc/i386-portbld-freebsd7.0/4.2.3/../../../libgcc_s.so.1 -# gcc42 -print-file-name=libgcc_s.so -/usr/local/lib/gcc-4.2.3/gcc/i386-portbld-freebsd7.0/4.2.3/../../../libgcc_s.so -. - -Index: work/OOH680_m1/external/gcc3_specific/makefile.mk -=================================================================== -RCS file: /cvs/util/external/gcc3_specific/makefile.mk,v -retrieving revision 1.5 -diff -u -r1.5 makefile.mk ---- external/gcc3_specific/makefile.mk 30 Aug 2006 12:39:00 -0000 1.5 -+++ external/gcc3_specific/makefile.mk 6 Jan 2008 08:10:19 -0000 -@@ -12,7 +12,6 @@ - - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" --.IF "$(OS)"!="FREEBSD" - - .EXPORT : CC - -@@ -25,7 +24,6 @@ - $(LB)$/libgcc_s.so.1 : - $(GCCINSTLIB) libgcc_s.so.1 $(LB) - --.ENDIF - .ENDIF - .ENDIF - diff --git a/editors/openoffice.org-vcltesttool/files/patch-i85126 b/editors/openoffice.org-vcltesttool/files/patch-i85126 deleted file mode 100644 index 61263d3e1d21..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i85126 +++ /dev/null @@ -1,145 +0,0 @@ -Merge from Linux CWS pj87 (#i83022#: Make bridges warning free) -also fixes -http://www.openoffice.org/issues/show_bug.cgi?id=98781 -http://www.openoffice.org/issues/show_bug.cgi?id=82690 -http://www.freebsd.org/cgi/query-pr.cgi?pr=127946 - ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 16 Sep 2006 15:46:23 -0000 1.3 -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 8 Jan 2008 16:57:00 -0000 -@@ -358,6 +358,8 @@ - case X86_64_SSEDF_CLASS: - *pStructAlign++ = *reinterpret_cast<sal_uInt64 *>( *pSSE++ ); - break; -+ default: -+ break; - } - } - ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx 16 Sep 2006 15:46:37 -0000 1.3 -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx 8 Jan 2008 16:57:00 -0000 -@@ -82,8 +82,8 @@ - void ** gpreg, void ** fpreg, void ** ovrflw, - sal_uInt64 * pRegisterReturn /* space for register return */ ) - { -- int nr_gpr = 0; //number of gpr registers used -- int nr_fpr = 0; //number of fpr regsiters used -+ unsigned int nr_gpr = 0; //number of gpr registers used -+ unsigned int nr_fpr = 0; //number of fpr registers used - - // return - typelib_TypeDescription * pReturnTypeDescr = 0; -@@ -492,7 +492,7 @@ - unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( - void ** slots, unsigned char * code, - typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset, -- sal_Int32 functionCount, sal_Int32 nVtableOffset ) -+ sal_Int32 /* functionCount */, sal_Int32 nVtableOffset ) - { - for ( sal_Int32 nPos = 0; nPos < type->nMembers; ++nPos ) - { ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 5 Jul 2007 09:01:44 -0000 1.4 -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 8 Jan 2008 16:57:00 -0000 -@@ -180,8 +180,8 @@ - else - { - // try to lookup the symbol in the generated rtti map -- t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) ); -- if (iFind == m_generatedRttis.end()) -+ t_rtti_map::const_iterator iFind2( m_generatedRttis.find( unoName ) ); -+ if (iFind2 == m_generatedRttis.end()) - { - // we must generate it ! - // symbol and rtti-name is nearly identical, -@@ -210,7 +210,7 @@ - } - else // taking already generated rtti - { -- rtti = iFind->second; -+ rtti = iFind2->second; - } - } - } ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx 5 Jul 2007 09:02:53 -0000 1.4 -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx 8 Jan 2008 16:57:00 -0000 -@@ -73,13 +73,13 @@ - // Let's figure out what is really going on here - { - fprintf( stderr, "= callVirtualMethod() =\nGPR's (%d): ", nGPR ); -- for ( int i = 0; i < nGPR; ++i ) -+ for ( unsigned int i = 0; i < nGPR; ++i ) - fprintf( stderr, "0x%lx, ", pGPR[i] ); - fprintf( stderr, "\nFPR's (%d): ", nFPR ); -- for ( int i = 0; i < nFPR; ++i ) -+ for ( unsigned int i = 0; i < nFPR; ++i ) - fprintf( stderr, "%f, ", pFPR[i] ); - fprintf( stderr, "\nStack (%d): ", nStack ); -- for ( int i = 0; i < nStack; ++i ) -+ for ( unsigned int i = 0; i < nStack; ++i ) - fprintf( stderr, "0x%lx, ", pStack[i] ); - fprintf( stderr, "\n" ); - } -@@ -328,6 +328,8 @@ - case typelib_TypeClass_DOUBLE: - INSERT_FLOAT_DOUBLE( pCppArgs[nPos], nFPR, pFPR, pStack ); - break; -+ default: -+ break; - } - - // no longer needed -@@ -440,16 +442,19 @@ - // is my surrogate - bridges::cpp_uno::shared::UnoInterfaceProxy * pThis - = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI); -+#if OSL_DEBUG_LEVEL > 0 - typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr; -+#endif - - switch (pMemberDescr->eTypeClass) - { - case typelib_TypeClass_INTERFACE_ATTRIBUTE: - { -+#if OSL_DEBUG_LEVEL > 0 - // determine vtable call index - sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; - OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -- -+#endif - VtableSlot aVtableSlot( - getVtableSlot( - reinterpret_cast< -@@ -494,10 +499,11 @@ - } - case typelib_TypeClass_INTERFACE_METHOD: - { -+#if OSL_DEBUG_LEVEL > 0 - // determine vtable call index - sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; - OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -- -+#endif - VtableSlot aVtableSlot( - getVtableSlot( - reinterpret_cast< - - ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2008-02-04 22:43:50.000000000 +0900 -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 21:41:29.000000000 +0900 -@@ -126,7 +126,7 @@ - }; - //__________________________________________________________________________________________________ - RTTI::RTTI() SAL_THROW( () ) --#if __FreeBSD_version < 602103 -+#if __FreeBSD_version < 702104 - : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) - #else - : m_hApp( dlopen( 0, RTLD_LAZY ) ) -@@ -165,7 +165,7 @@ - buf.append( 'E' ); - - OString symName( buf.makeStringAndClear() ); --#if __FreeBSD_version < 602103 /* #i22253# */ -+#if __FreeBSD_version < 702104 /* #i22253# */ - rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); - #else - rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); diff --git a/editors/openoffice.org-vcltesttool/files/patch-i85127 b/editors/openoffice.org-vcltesttool/files/patch-i85127 deleted file mode 100644 index 60d99db2fc18..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i85127 +++ /dev/null @@ -1,1659 +0,0 @@ -- Add support for FreeBSD 8.x. -- Add patches for setup.py and Lib/posixfile.py. - -Index: python/Python-2.3.4.patch -=================================================================== -RCS file: /cvs/external/python/Python-2.3.4.patch,v -retrieving revision 1.21 -diff -u -r1.21 Python-2.3.4.patch ---- python/Python-2.3.4.patch 4 Feb 2008 12:57:01 -0000 1.21 -+++ python/Python-2.3.4.patch 9 Feb 2008 05:09:14 -0000 -@@ -131,6 +131,1625 @@ - name = 'posix' - linesep = '\n' - from posix import * -+*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py Wed Dec 31 19:00:00 1969 -+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py Tue Jan 8 14:12:12 2008 -+*************** -+*** 0 **** -+--- 1,515 ---- -++ # Generated by h2py from /usr/include/netinet/in.h -++ -++ # Included from sys/cdefs.h -++ def __P(protos): return protos -++ -++ def __STRING(x): return #x -++ -++ def __XSTRING(x): return __STRING(x) -++ -++ def __P(protos): return () -++ -++ def __STRING(x): return "x" -++ -++ def __aligned(x): return __attribute__((__aligned__(x))) -++ -++ def __section(x): return __attribute__((__section__(x))) -++ -++ def __aligned(x): return __attribute__((__aligned__(x))) -++ -++ def __section(x): return __attribute__((__section__(x))) -++ -++ def __nonnull(x): return __attribute__((__nonnull__(x))) -++ -++ def __predict_true(exp): return __builtin_expect((exp), 1) -++ -++ def __predict_false(exp): return __builtin_expect((exp), 0) -++ -++ def __predict_true(exp): return (exp) -++ -++ def __predict_false(exp): return (exp) -++ -++ def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -++ -++ def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -++ -++ def __RCSID_SOURCE(s): return __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s) -++ -++ def __SCCSID(s): return __IDSTRING(__CONCAT(__sccsid_,__LINE__),s) -++ -++ def __COPYRIGHT(s): return __IDSTRING(__CONCAT(__copyright_,__LINE__),s) -++ -++ _POSIX_C_SOURCE = 199009 -++ _POSIX_C_SOURCE = 199209 -++ __XSI_VISIBLE = 600 -++ _POSIX_C_SOURCE = 200112 -++ __XSI_VISIBLE = 500 -++ _POSIX_C_SOURCE = 199506 -++ _POSIX_C_SOURCE = 198808 -++ __POSIX_VISIBLE = 200112 -++ __ISO_C_VISIBLE = 1999 -++ __POSIX_VISIBLE = 199506 -++ __ISO_C_VISIBLE = 1990 -++ __POSIX_VISIBLE = 199309 -++ __ISO_C_VISIBLE = 1990 -++ __POSIX_VISIBLE = 199209 -++ __ISO_C_VISIBLE = 1990 -++ __POSIX_VISIBLE = 199009 -++ __ISO_C_VISIBLE = 1990 -++ __POSIX_VISIBLE = 198808 -++ __ISO_C_VISIBLE = 0 -++ __POSIX_VISIBLE = 0 -++ __XSI_VISIBLE = 0 -++ __BSD_VISIBLE = 0 -++ __ISO_C_VISIBLE = 1990 -++ __POSIX_VISIBLE = 0 -++ __XSI_VISIBLE = 0 -++ __BSD_VISIBLE = 0 -++ __ISO_C_VISIBLE = 1999 -++ __POSIX_VISIBLE = 200112 -++ __XSI_VISIBLE = 600 -++ __BSD_VISIBLE = 1 -++ __ISO_C_VISIBLE = 1999 -++ -++ # Included from sys/_types.h -++ -++ # Included from machine/_types.h -++ -++ # Included from machine/endian.h -++ _QUAD_HIGHWORD = 1 -++ _QUAD_LOWWORD = 0 -++ _LITTLE_ENDIAN = 1234 -++ _BIG_ENDIAN = 4321 -++ _PDP_ENDIAN = 3412 -++ _BYTE_ORDER = _LITTLE_ENDIAN -++ LITTLE_ENDIAN = _LITTLE_ENDIAN -++ BIG_ENDIAN = _BIG_ENDIAN -++ PDP_ENDIAN = _PDP_ENDIAN -++ BYTE_ORDER = _BYTE_ORDER -++ __INTEL_COMPILER_with_FreeBSD_endian = 1 -++ __INTEL_COMPILER_with_FreeBSD_endian = 1 -++ def __word_swap_int_var(x): return \ -++ -++ def __word_swap_int_const(x): return \ -++ -++ def __word_swap_int(x): return __word_swap_int_var(x) -++ -++ def __byte_swap_int_var(x): return \ -++ -++ def __byte_swap_int_var(x): return \ -++ -++ def __byte_swap_int_const(x): return \ -++ -++ def __byte_swap_int(x): return __byte_swap_int_var(x) -++ -++ def __byte_swap_word_var(x): return \ -++ -++ def __byte_swap_word_const(x): return \ -++ -++ def __byte_swap_word(x): return __byte_swap_word_var(x) -++ -++ def __htonl(x): return __bswap32(x) -++ -++ def __htons(x): return __bswap16(x) -++ -++ def __ntohl(x): return __bswap32(x) -++ -++ def __ntohs(x): return __bswap16(x) -++ -++ IPPROTO_IP = 0 -++ IPPROTO_ICMP = 1 -++ IPPROTO_TCP = 6 -++ IPPROTO_UDP = 17 -++ def htonl(x): return __htonl(x) -++ -++ def htons(x): return __htons(x) -++ -++ def ntohl(x): return __ntohl(x) -++ -++ def ntohs(x): return __ntohs(x) -++ -++ IPPROTO_RAW = 255 -++ INET_ADDRSTRLEN = 16 -++ IPPROTO_HOPOPTS = 0 -++ IPPROTO_IGMP = 2 -++ IPPROTO_GGP = 3 -++ IPPROTO_IPV4 = 4 -++ IPPROTO_IPIP = IPPROTO_IPV4 -++ IPPROTO_ST = 7 -++ IPPROTO_EGP = 8 -++ IPPROTO_PIGP = 9 -++ IPPROTO_RCCMON = 10 -++ IPPROTO_NVPII = 11 -++ IPPROTO_PUP = 12 -++ IPPROTO_ARGUS = 13 -++ IPPROTO_EMCON = 14 -++ IPPROTO_XNET = 15 -++ IPPROTO_CHAOS = 16 -++ IPPROTO_MUX = 18 -++ IPPROTO_MEAS = 19 -++ IPPROTO_HMP = 20 -++ IPPROTO_PRM = 21 -++ IPPROTO_IDP = 22 -++ IPPROTO_TRUNK1 = 23 -++ IPPROTO_TRUNK2 = 24 -++ IPPROTO_LEAF1 = 25 -++ IPPROTO_LEAF2 = 26 -++ IPPROTO_RDP = 27 -++ IPPROTO_IRTP = 28 -++ IPPROTO_TP = 29 -++ IPPROTO_BLT = 30 -++ IPPROTO_NSP = 31 -++ IPPROTO_INP = 32 -++ IPPROTO_SEP = 33 -++ IPPROTO_3PC = 34 -++ IPPROTO_IDPR = 35 -++ IPPROTO_XTP = 36 -++ IPPROTO_DDP = 37 -++ IPPROTO_CMTP = 38 -++ IPPROTO_TPXX = 39 -++ IPPROTO_IL = 40 -++ IPPROTO_IPV6 = 41 -++ IPPROTO_SDRP = 42 -++ IPPROTO_ROUTING = 43 -++ IPPROTO_FRAGMENT = 44 -++ IPPROTO_IDRP = 45 -++ IPPROTO_RSVP = 46 -++ IPPROTO_GRE = 47 -++ IPPROTO_MHRP = 48 -++ IPPROTO_BHA = 49 -++ IPPROTO_ESP = 50 -++ IPPROTO_AH = 51 -++ IPPROTO_INLSP = 52 -++ IPPROTO_SWIPE = 53 -++ IPPROTO_NHRP = 54 -++ IPPROTO_MOBILE = 55 -++ IPPROTO_TLSP = 56 -++ IPPROTO_SKIP = 57 -++ IPPROTO_ICMPV6 = 58 -++ IPPROTO_NONE = 59 -++ IPPROTO_DSTOPTS = 60 -++ IPPROTO_AHIP = 61 -++ IPPROTO_CFTP = 62 -++ IPPROTO_HELLO = 63 -++ IPPROTO_SATEXPAK = 64 -++ IPPROTO_KRYPTOLAN = 65 -++ IPPROTO_RVD = 66 -++ IPPROTO_IPPC = 67 -++ IPPROTO_ADFS = 68 -++ IPPROTO_SATMON = 69 -++ IPPROTO_VISA = 70 -++ IPPROTO_IPCV = 71 -++ IPPROTO_CPNX = 72 -++ IPPROTO_CPHB = 73 -++ IPPROTO_WSN = 74 -++ IPPROTO_PVP = 75 -++ IPPROTO_BRSATMON = 76 -++ IPPROTO_ND = 77 -++ IPPROTO_WBMON = 78 -++ IPPROTO_WBEXPAK = 79 -++ IPPROTO_EON = 80 -++ IPPROTO_VMTP = 81 -++ IPPROTO_SVMTP = 82 -++ IPPROTO_VINES = 83 -++ IPPROTO_TTP = 84 -++ IPPROTO_IGP = 85 -++ IPPROTO_DGP = 86 -++ IPPROTO_TCF = 87 -++ IPPROTO_IGRP = 88 -++ IPPROTO_OSPFIGP = 89 -++ IPPROTO_SRPC = 90 -++ IPPROTO_LARP = 91 -++ IPPROTO_MTP = 92 -++ IPPROTO_AX25 = 93 -++ IPPROTO_IPEIP = 94 -++ IPPROTO_MICP = 95 -++ IPPROTO_SCCSP = 96 -++ IPPROTO_ETHERIP = 97 -++ IPPROTO_ENCAP = 98 -++ IPPROTO_APES = 99 -++ IPPROTO_GMTP = 100 -++ IPPROTO_IPCOMP = 108 -++ IPPROTO_PIM = 103 -++ IPPROTO_PGM = 113 -++ IPPROTO_PFSYNC = 240 -++ IPPROTO_OLD_DIVERT = 254 -++ IPPROTO_MAX = 256 -++ IPPROTO_DONE = 257 -++ IPPROTO_DIVERT = 258 -++ IPPORT_RESERVED = 1024 -++ IPPORT_HIFIRSTAUTO = 49152 -++ IPPORT_HILASTAUTO = 65535 -++ IPPORT_RESERVEDSTART = 600 -++ IPPORT_MAX = 65535 -++ def IN_CLASSA(i): return (((u_int32_t)(i) & (-2147483648)) == 0) -++ -++ IN_CLASSA_NET = (-16777216) -++ IN_CLASSA_NSHIFT = 24 -++ IN_CLASSA_HOST = 0x00ffffff -++ IN_CLASSA_MAX = 128 -++ def IN_CLASSB(i): return (((u_int32_t)(i) & (-1073741824)) == (-2147483648)) -++ -++ IN_CLASSB_NET = (-65536) -++ IN_CLASSB_NSHIFT = 16 -++ IN_CLASSB_HOST = 0x0000ffff -++ IN_CLASSB_MAX = 65536 -++ def IN_CLASSC(i): return (((u_int32_t)(i) & (-536870912)) == (-1073741824)) -++ -++ IN_CLASSC_NET = (-256) -++ IN_CLASSC_NSHIFT = 8 -++ IN_CLASSC_HOST = 0x000000ff -++ def IN_CLASSD(i): return (((u_int32_t)(i) & (-268435456)) == (-536870912)) -++ -++ IN_CLASSD_NET = (-268435456) -++ IN_CLASSD_NSHIFT = 28 -++ IN_CLASSD_HOST = 0x0fffffff -++ def IN_MULTICAST(i): return IN_CLASSD(i) -++ -++ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -++ -++ def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -++ -++ INADDR_NONE = (-1) -++ IN_LOOPBACKNET = 127 -++ IP_OPTIONS = 1 -++ IP_HDRINCL = 2 -++ IP_TOS = 3 -++ IP_TTL = 4 -++ IP_RECVOPTS = 5 -++ IP_RECVRETOPTS = 6 -++ IP_RECVDSTADDR = 7 -++ IP_SENDSRCADDR = IP_RECVDSTADDR -++ IP_RETOPTS = 8 -++ IP_MULTICAST_IF = 9 -++ IP_MULTICAST_TTL = 10 -++ IP_MULTICAST_LOOP = 11 -++ IP_ADD_MEMBERSHIP = 12 -++ IP_DROP_MEMBERSHIP = 13 -++ IP_MULTICAST_VIF = 14 -++ IP_RSVP_ON = 15 -++ IP_RSVP_OFF = 16 -++ IP_RSVP_VIF_ON = 17 -++ IP_RSVP_VIF_OFF = 18 -++ IP_PORTRANGE = 19 -++ IP_RECVIF = 20 -++ IP_IPSEC_POLICY = 21 -++ IP_FAITH = 22 -++ IP_ONESBCAST = 23 -++ IP_FW_TABLE_ADD = 40 -++ IP_FW_TABLE_DEL = 41 -++ IP_FW_TABLE_FLUSH = 42 -++ IP_FW_TABLE_GETSIZE = 43 -++ IP_FW_TABLE_LIST = 44 -++ IP_FW_ADD = 50 -++ IP_FW_DEL = 51 -++ IP_FW_FLUSH = 52 -++ IP_FW_ZERO = 53 -++ IP_FW_GET = 54 -++ IP_FW_RESETLOG = 55 -++ IP_DUMMYNET_CONFIGURE = 60 -++ IP_DUMMYNET_DEL = 61 -++ IP_DUMMYNET_FLUSH = 62 -++ IP_DUMMYNET_GET = 64 -++ IP_RECVTTL = 65 -++ IP_DEFAULT_MULTICAST_TTL = 1 -++ IP_DEFAULT_MULTICAST_LOOP = 1 -++ IP_MAX_MEMBERSHIPS = 20 -++ IP_PORTRANGE_DEFAULT = 0 -++ IP_PORTRANGE_HIGH = 1 -++ IP_PORTRANGE_LOW = 2 -++ IPPROTO_MAXID = (IPPROTO_AH + 1) -++ IPCTL_FORWARDING = 1 -++ IPCTL_SENDREDIRECTS = 2 -++ IPCTL_DEFTTL = 3 -++ IPCTL_DEFMTU = 4 -++ IPCTL_RTEXPIRE = 5 -++ IPCTL_RTMINEXPIRE = 6 -++ IPCTL_RTMAXCACHE = 7 -++ IPCTL_SOURCEROUTE = 8 -++ IPCTL_DIRECTEDBROADCAST = 9 -++ IPCTL_INTRQMAXLEN = 10 -++ IPCTL_INTRQDROPS = 11 -++ IPCTL_STATS = 12 -++ IPCTL_ACCEPTSOURCEROUTE = 13 -++ IPCTL_FASTFORWARDING = 14 -++ IPCTL_KEEPFAITH = 15 -++ IPCTL_GIF_TTL = 16 -++ IPCTL_MAXID = 17 -++ def in_nullhost(x): return ((x).s_addr == INADDR_ANY) -++ -++ -++ # Included from netinet6/in6.h -++ __KAME_VERSION = "20010528/FreeBSD" -++ IPV6PORT_RESERVED = 1024 -++ IPV6PORT_ANONMIN = 49152 -++ IPV6PORT_ANONMAX = 65535 -++ IPV6PORT_RESERVEDMIN = 600 -++ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -++ INET6_ADDRSTRLEN = 46 -++ IPV6_ADDR_INT32_ONE = 1 -++ IPV6_ADDR_INT32_TWO = 2 -++ IPV6_ADDR_INT32_MNL = (-16711680) -++ IPV6_ADDR_INT32_MLL = (-16646144) -++ IPV6_ADDR_INT32_SMP = 0x0000ffff -++ IPV6_ADDR_INT16_ULL = 0xfe80 -++ IPV6_ADDR_INT16_USL = 0xfec0 -++ IPV6_ADDR_INT16_MLL = 0xff02 -++ IPV6_ADDR_INT32_ONE = 0x01000000 -++ IPV6_ADDR_INT32_TWO = 0x02000000 -++ IPV6_ADDR_INT32_MNL = 0x000001ff -++ IPV6_ADDR_INT32_MLL = 0x000002ff -++ IPV6_ADDR_INT32_SMP = (-65536) -++ IPV6_ADDR_INT16_ULL = 0x80fe -++ IPV6_ADDR_INT16_USL = 0xc0fe -++ IPV6_ADDR_INT16_MLL = 0x02ff -++ def IN6_IS_ADDR_UNSPECIFIED(a): return \ -++ -++ def IN6_IS_ADDR_LOOPBACK(a): return \ -++ -++ def IN6_IS_ADDR_V4COMPAT(a): return \ -++ -++ def IN6_IS_ADDR_V4MAPPED(a): return \ -++ -++ IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -++ IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -++ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -++ IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -++ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -++ IPV6_ADDR_SCOPE_GLOBAL = 0x0e -++ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -++ __IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -++ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -++ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -++ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -++ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e -++ def IN6_IS_ADDR_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_INTFACELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_GLOBAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_GLOBAL(a): return \ -++ -++ def IN6_IS_SCOPE_LINKLOCAL(a): return \ -++ -++ def IFA6_IS_DEPRECATED(a): return \ -++ -++ def IFA6_IS_INVALID(a): return \ -++ -++ IPV6_OPTIONS = 1 -++ IPV6_RECVOPTS = 5 -++ IPV6_RECVRETOPTS = 6 -++ IPV6_RECVDSTADDR = 7 -++ IPV6_RETOPTS = 8 -++ IPV6_SOCKOPT_RESERVED1 = 3 -++ IPV6_UNICAST_HOPS = 4 -++ IPV6_MULTICAST_IF = 9 -++ IPV6_MULTICAST_HOPS = 10 -++ IPV6_MULTICAST_LOOP = 11 -++ IPV6_JOIN_GROUP = 12 -++ IPV6_LEAVE_GROUP = 13 -++ IPV6_PORTRANGE = 14 -++ ICMP6_FILTER = 18 -++ IPV6_2292PKTINFO = 19 -++ IPV6_2292HOPLIMIT = 20 -++ IPV6_2292NEXTHOP = 21 -++ IPV6_2292HOPOPTS = 22 -++ IPV6_2292DSTOPTS = 23 -++ IPV6_2292RTHDR = 24 -++ IPV6_2292PKTOPTIONS = 25 -++ IPV6_CHECKSUM = 26 -++ IPV6_V6ONLY = 27 -++ IPV6_BINDV6ONLY = IPV6_V6ONLY -++ IPV6_IPSEC_POLICY = 28 -++ IPV6_FAITH = 29 -++ IPV6_FW_ADD = 30 -++ IPV6_FW_DEL = 31 -++ IPV6_FW_FLUSH = 32 -++ IPV6_FW_ZERO = 33 -++ IPV6_FW_GET = 34 -++ IPV6_RTHDRDSTOPTS = 35 -++ IPV6_RECVPKTINFO = 36 -++ IPV6_RECVHOPLIMIT = 37 -++ IPV6_RECVRTHDR = 38 -++ IPV6_RECVHOPOPTS = 39 -++ IPV6_RECVDSTOPTS = 40 -++ IPV6_RECVRTHDRDSTOPTS = 41 -++ IPV6_USE_MIN_MTU = 42 -++ IPV6_RECVPATHMTU = 43 -++ IPV6_PATHMTU = 44 -++ IPV6_REACHCONF = 45 -++ IPV6_PKTINFO = 46 -++ IPV6_HOPLIMIT = 47 -++ IPV6_NEXTHOP = 48 -++ IPV6_HOPOPTS = 49 -++ IPV6_DSTOPTS = 50 -++ IPV6_RTHDR = 51 -++ IPV6_PKTOPTIONS = 52 -++ IPV6_RECVTCLASS = 57 -++ IPV6_AUTOFLOWLABEL = 59 -++ IPV6_TCLASS = 61 -++ IPV6_DONTFRAG = 62 -++ IPV6_PREFER_TEMPADDR = 63 -++ IPV6_RTHDR_LOOSE = 0 -++ IPV6_RTHDR_STRICT = 1 -++ IPV6_RTHDR_TYPE_0 = 0 -++ IPV6_DEFAULT_MULTICAST_HOPS = 1 -++ IPV6_DEFAULT_MULTICAST_LOOP = 1 -++ IPV6_PORTRANGE_DEFAULT = 0 -++ IPV6_PORTRANGE_HIGH = 1 -++ IPV6_PORTRANGE_LOW = 2 -++ IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -++ IPV6CTL_FORWARDING = 1 -++ IPV6CTL_SENDREDIRECTS = 2 -++ IPV6CTL_DEFHLIM = 3 -++ IPV6CTL_DEFMTU = 4 -++ IPV6CTL_FORWSRCRT = 5 -++ IPV6CTL_STATS = 6 -++ IPV6CTL_MRTSTATS = 7 -++ IPV6CTL_MRTPROTO = 8 -++ IPV6CTL_MAXFRAGPACKETS = 9 -++ IPV6CTL_SOURCECHECK = 10 -++ IPV6CTL_SOURCECHECK_LOGINT = 11 -++ IPV6CTL_ACCEPT_RTADV = 12 -++ IPV6CTL_KEEPFAITH = 13 -++ IPV6CTL_LOG_INTERVAL = 14 -++ IPV6CTL_HDRNESTLIMIT = 15 -++ IPV6CTL_DAD_COUNT = 16 -++ IPV6CTL_AUTO_FLOWLABEL = 17 -++ IPV6CTL_DEFMCASTHLIM = 18 -++ IPV6CTL_GIF_HLIM = 19 -++ IPV6CTL_KAME_VERSION = 20 -++ IPV6CTL_USE_DEPRECATED = 21 -++ IPV6CTL_RR_PRUNE = 22 -++ IPV6CTL_MAPPED_ADDR = 23 -++ IPV6CTL_V6ONLY = 24 -++ IPV6CTL_RTEXPIRE = 25 -++ IPV6CTL_RTMINEXPIRE = 26 -++ IPV6CTL_RTMAXCACHE = 27 -++ IPV6CTL_USETEMPADDR = 32 -++ IPV6CTL_TEMPPLTIME = 33 -++ IPV6CTL_TEMPVLTIME = 34 -++ IPV6CTL_AUTO_LINKLOCAL = 35 -++ IPV6CTL_RIP6STATS = 36 -++ IPV6CTL_PREFER_TEMPADDR = 37 -++ IPV6CTL_ADDRCTLPOLICY = 38 -++ IPV6CTL_MAXFRAGS = 41 -++ IPV6CTL_MAXID = 42 -+*** misc/Python-2.3.4/Lib/plat-freebsd7/IN.py Wed Dec 31 19:00:00 1969 -+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/IN.py Tue Jan 8 14:13:03 2008 -+*************** -+*** 0 **** -+--- 1,535 ---- -++ # Generated by h2py from /usr/include/netinet/in.h -++ -++ # Included from sys/cdefs.h -++ __GNUCLIKE_ASM = 3 -++ __GNUCLIKE_ASM = 2 -++ __GNUCLIKE___TYPEOF = 1 -++ __GNUCLIKE___OFFSETOF = 1 -++ __GNUCLIKE___SECTION = 1 -++ __GNUCLIKE_ATTRIBUTE_MODE_DI = 1 -++ __GNUCLIKE_CTOR_SECTION_HANDLING = 1 -++ __GNUCLIKE_BUILTIN_CONSTANT_P = 1 -++ __GNUCLIKE_BUILTIN_VARARGS = 1 -++ __GNUCLIKE_BUILTIN_VAALIST = 1 -++ __GNUC_VA_LIST_COMPATIBILITY = 1 -++ __GNUCLIKE_BUILTIN_STDARG = 1 -++ __GNUCLIKE_BUILTIN_NEXT_ARG = 1 -++ __GNUCLIKE_BUILTIN_MEMCPY = 1 -++ __CC_SUPPORTS_INLINE = 1 -++ __CC_SUPPORTS___INLINE = 1 -++ __CC_SUPPORTS___INLINE__ = 1 -++ __CC_SUPPORTS___FUNC__ = 1 -++ __CC_SUPPORTS_WARNING = 1 -++ __CC_SUPPORTS_VARADIC_XXX = 1 -++ __CC_SUPPORTS_DYNAMIC_ARRAY_INIT = 1 -++ __CC_INT_IS_32BIT = 1 -++ def __P(protos): return protos -++ -++ def __STRING(x): return #x -++ -++ def __XSTRING(x): return __STRING(x) -++ -++ def __P(protos): return () -++ -++ def __STRING(x): return "x" -++ -++ def __aligned(x): return __attribute__((__aligned__(x))) -++ -++ def __section(x): return __attribute__((__section__(x))) -++ -++ def __aligned(x): return __attribute__((__aligned__(x))) -++ -++ def __section(x): return __attribute__((__section__(x))) -++ -++ def __nonnull(x): return __attribute__((__nonnull__(x))) -++ -++ def __predict_true(exp): return __builtin_expect((exp), 1) -++ -++ def __predict_false(exp): return __builtin_expect((exp), 0) -++ -++ def __predict_true(exp): return (exp) -++ -++ def __predict_false(exp): return (exp) -++ -++ def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -++ -++ def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -++ -++ def __RCSID_SOURCE(s): return __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s) -++ -++ def __SCCSID(s): return __IDSTRING(__CONCAT(__sccsid_,__LINE__),s) -++ -++ def __COPYRIGHT(s): return __IDSTRING(__CONCAT(__copyright_,__LINE__),s) -++ -++ _POSIX_C_SOURCE = 199009 -++ _POSIX_C_SOURCE = 199209 -++ __XSI_VISIBLE = 600 -++ _POSIX_C_SOURCE = 200112 -++ __XSI_VISIBLE = 500 -++ _POSIX_C_SOURCE = 199506 -++ _POSIX_C_SOURCE = 198808 -++ __POSIX_VISIBLE = 200112 -++ __ISO_C_VISIBLE = 1999 -++ __POSIX_VISIBLE = 199506 -++ __ISO_C_VISIBLE = 1990 -++ __POSIX_VISIBLE = 199309 -++ __ISO_C_VISIBLE = 1990 -++ __POSIX_VISIBLE = 199209 -++ __ISO_C_VISIBLE = 1990 -++ __POSIX_VISIBLE = 199009 -++ __ISO_C_VISIBLE = 1990 -++ __POSIX_VISIBLE = 198808 -++ __ISO_C_VISIBLE = 0 -++ __POSIX_VISIBLE = 0 -++ __XSI_VISIBLE = 0 -++ __BSD_VISIBLE = 0 -++ __ISO_C_VISIBLE = 1990 -++ __POSIX_VISIBLE = 0 -++ __XSI_VISIBLE = 0 -++ __BSD_VISIBLE = 0 -++ __ISO_C_VISIBLE = 1999 -++ __POSIX_VISIBLE = 200112 -++ __XSI_VISIBLE = 600 -++ __BSD_VISIBLE = 1 -++ __ISO_C_VISIBLE = 1999 -++ -++ # Included from sys/_types.h -++ -++ # Included from machine/_types.h -++ -++ # Included from machine/endian.h -++ _QUAD_HIGHWORD = 1 -++ _QUAD_LOWWORD = 0 -++ _LITTLE_ENDIAN = 1234 -++ _BIG_ENDIAN = 4321 -++ _PDP_ENDIAN = 3412 -++ _BYTE_ORDER = _LITTLE_ENDIAN -++ LITTLE_ENDIAN = _LITTLE_ENDIAN -++ BIG_ENDIAN = _BIG_ENDIAN -++ PDP_ENDIAN = _PDP_ENDIAN -++ BYTE_ORDER = _BYTE_ORDER -++ def __word_swap_int_var(x): return \ -++ -++ def __word_swap_int_const(x): return \ -++ -++ def __word_swap_int(x): return __word_swap_int_var(x) -++ -++ def __byte_swap_int_var(x): return \ -++ -++ def __byte_swap_int_const(x): return \ -++ -++ def __byte_swap_int(x): return __byte_swap_int_var(x) -++ -++ def __byte_swap_word_var(x): return \ -++ -++ def __byte_swap_word_const(x): return \ -++ -++ def __byte_swap_word(x): return __byte_swap_word_var(x) -++ -++ def __htonl(x): return __bswap32(x) -++ -++ def __htons(x): return __bswap16(x) -++ -++ def __ntohl(x): return __bswap32(x) -++ -++ def __ntohs(x): return __bswap16(x) -++ -++ IPPROTO_IP = 0 -++ IPPROTO_ICMP = 1 -++ IPPROTO_TCP = 6 -++ IPPROTO_UDP = 17 -++ def htonl(x): return __htonl(x) -++ -++ def htons(x): return __htons(x) -++ -++ def ntohl(x): return __ntohl(x) -++ -++ def ntohs(x): return __ntohs(x) -++ -++ IPPROTO_RAW = 255 -++ INET_ADDRSTRLEN = 16 -++ IPPROTO_HOPOPTS = 0 -++ IPPROTO_IGMP = 2 -++ IPPROTO_GGP = 3 -++ IPPROTO_IPV4 = 4 -++ IPPROTO_IPIP = IPPROTO_IPV4 -++ IPPROTO_ST = 7 -++ IPPROTO_EGP = 8 -++ IPPROTO_PIGP = 9 -++ IPPROTO_RCCMON = 10 -++ IPPROTO_NVPII = 11 -++ IPPROTO_PUP = 12 -++ IPPROTO_ARGUS = 13 -++ IPPROTO_EMCON = 14 -++ IPPROTO_XNET = 15 -++ IPPROTO_CHAOS = 16 -++ IPPROTO_MUX = 18 -++ IPPROTO_MEAS = 19 -++ IPPROTO_HMP = 20 -++ IPPROTO_PRM = 21 -++ IPPROTO_IDP = 22 -++ IPPROTO_TRUNK1 = 23 -++ IPPROTO_TRUNK2 = 24 -++ IPPROTO_LEAF1 = 25 -++ IPPROTO_LEAF2 = 26 -++ IPPROTO_RDP = 27 -++ IPPROTO_IRTP = 28 -++ IPPROTO_TP = 29 -++ IPPROTO_BLT = 30 -++ IPPROTO_NSP = 31 -++ IPPROTO_INP = 32 -++ IPPROTO_SEP = 33 -++ IPPROTO_3PC = 34 -++ IPPROTO_IDPR = 35 -++ IPPROTO_XTP = 36 -++ IPPROTO_DDP = 37 -++ IPPROTO_CMTP = 38 -++ IPPROTO_TPXX = 39 -++ IPPROTO_IL = 40 -++ IPPROTO_IPV6 = 41 -++ IPPROTO_SDRP = 42 -++ IPPROTO_ROUTING = 43 -++ IPPROTO_FRAGMENT = 44 -++ IPPROTO_IDRP = 45 -++ IPPROTO_RSVP = 46 -++ IPPROTO_GRE = 47 -++ IPPROTO_MHRP = 48 -++ IPPROTO_BHA = 49 -++ IPPROTO_ESP = 50 -++ IPPROTO_AH = 51 -++ IPPROTO_INLSP = 52 -++ IPPROTO_SWIPE = 53 -++ IPPROTO_NHRP = 54 -++ IPPROTO_MOBILE = 55 -++ IPPROTO_TLSP = 56 -++ IPPROTO_SKIP = 57 -++ IPPROTO_ICMPV6 = 58 -++ IPPROTO_NONE = 59 -++ IPPROTO_DSTOPTS = 60 -++ IPPROTO_AHIP = 61 -++ IPPROTO_CFTP = 62 -++ IPPROTO_HELLO = 63 -++ IPPROTO_SATEXPAK = 64 -++ IPPROTO_KRYPTOLAN = 65 -++ IPPROTO_RVD = 66 -++ IPPROTO_IPPC = 67 -++ IPPROTO_ADFS = 68 -++ IPPROTO_SATMON = 69 -++ IPPROTO_VISA = 70 -++ IPPROTO_IPCV = 71 -++ IPPROTO_CPNX = 72 -++ IPPROTO_CPHB = 73 -++ IPPROTO_WSN = 74 -++ IPPROTO_PVP = 75 -++ IPPROTO_BRSATMON = 76 -++ IPPROTO_ND = 77 -++ IPPROTO_WBMON = 78 -++ IPPROTO_WBEXPAK = 79 -++ IPPROTO_EON = 80 -++ IPPROTO_VMTP = 81 -++ IPPROTO_SVMTP = 82 -++ IPPROTO_VINES = 83 -++ IPPROTO_TTP = 84 -++ IPPROTO_IGP = 85 -++ IPPROTO_DGP = 86 -++ IPPROTO_TCF = 87 -++ IPPROTO_IGRP = 88 -++ IPPROTO_OSPFIGP = 89 -++ IPPROTO_SRPC = 90 -++ IPPROTO_LARP = 91 -++ IPPROTO_MTP = 92 -++ IPPROTO_AX25 = 93 -++ IPPROTO_IPEIP = 94 -++ IPPROTO_MICP = 95 -++ IPPROTO_SCCSP = 96 -++ IPPROTO_ETHERIP = 97 -++ IPPROTO_ENCAP = 98 -++ IPPROTO_APES = 99 -++ IPPROTO_GMTP = 100 -++ IPPROTO_IPCOMP = 108 -++ IPPROTO_PIM = 103 -++ IPPROTO_CARP = 112 -++ IPPROTO_PGM = 113 -++ IPPROTO_PFSYNC = 240 -++ IPPROTO_OLD_DIVERT = 254 -++ IPPROTO_MAX = 256 -++ IPPROTO_DONE = 257 -++ IPPROTO_DIVERT = 258 -++ IPPROTO_SPACER = 32767 -++ IPPORT_RESERVED = 1024 -++ IPPORT_HIFIRSTAUTO = 49152 -++ IPPORT_HILASTAUTO = 65535 -++ IPPORT_RESERVEDSTART = 600 -++ IPPORT_MAX = 65535 -++ def IN_CLASSA(i): return (((u_int32_t)(i) & (-2147483648)) == 0) -++ -++ IN_CLASSA_NET = (-16777216) -++ IN_CLASSA_NSHIFT = 24 -++ IN_CLASSA_HOST = 0x00ffffff -++ IN_CLASSA_MAX = 128 -++ def IN_CLASSB(i): return (((u_int32_t)(i) & (-1073741824)) == (-2147483648)) -++ -++ IN_CLASSB_NET = (-65536) -++ IN_CLASSB_NSHIFT = 16 -++ IN_CLASSB_HOST = 0x0000ffff -++ IN_CLASSB_MAX = 65536 -++ def IN_CLASSC(i): return (((u_int32_t)(i) & (-536870912)) == (-1073741824)) -++ -++ IN_CLASSC_NET = (-256) -++ IN_CLASSC_NSHIFT = 8 -++ IN_CLASSC_HOST = 0x000000ff -++ def IN_CLASSD(i): return (((u_int32_t)(i) & (-268435456)) == (-536870912)) -++ -++ IN_CLASSD_NET = (-268435456) -++ IN_CLASSD_NSHIFT = 28 -++ IN_CLASSD_HOST = 0x0fffffff -++ def IN_MULTICAST(i): return IN_CLASSD(i) -++ -++ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -++ -++ def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -++ -++ INADDR_NONE = (-1) -++ IN_LOOPBACKNET = 127 -++ IP_OPTIONS = 1 -++ IP_HDRINCL = 2 -++ IP_TOS = 3 -++ IP_TTL = 4 -++ IP_RECVOPTS = 5 -++ IP_RECVRETOPTS = 6 -++ IP_RECVDSTADDR = 7 -++ IP_SENDSRCADDR = IP_RECVDSTADDR -++ IP_RETOPTS = 8 -++ IP_MULTICAST_IF = 9 -++ IP_MULTICAST_TTL = 10 -++ IP_MULTICAST_LOOP = 11 -++ IP_ADD_MEMBERSHIP = 12 -++ IP_DROP_MEMBERSHIP = 13 -++ IP_MULTICAST_VIF = 14 -++ IP_RSVP_ON = 15 -++ IP_RSVP_OFF = 16 -++ IP_RSVP_VIF_ON = 17 -++ IP_RSVP_VIF_OFF = 18 -++ IP_PORTRANGE = 19 -++ IP_RECVIF = 20 -++ IP_IPSEC_POLICY = 21 -++ IP_FAITH = 22 -++ IP_ONESBCAST = 23 -++ IP_FW_TABLE_ADD = 40 -++ IP_FW_TABLE_DEL = 41 -++ IP_FW_TABLE_FLUSH = 42 -++ IP_FW_TABLE_GETSIZE = 43 -++ IP_FW_TABLE_LIST = 44 -++ IP_FW_ADD = 50 -++ IP_FW_DEL = 51 -++ IP_FW_FLUSH = 52 -++ IP_FW_ZERO = 53 -++ IP_FW_GET = 54 -++ IP_FW_RESETLOG = 55 -++ IP_DUMMYNET_CONFIGURE = 60 -++ IP_DUMMYNET_DEL = 61 -++ IP_DUMMYNET_FLUSH = 62 -++ IP_DUMMYNET_GET = 64 -++ IP_RECVTTL = 65 -++ IP_DEFAULT_MULTICAST_TTL = 1 -++ IP_DEFAULT_MULTICAST_LOOP = 1 -++ IP_MAX_MEMBERSHIPS = 20 -++ IP_PORTRANGE_DEFAULT = 0 -++ IP_PORTRANGE_HIGH = 1 -++ IP_PORTRANGE_LOW = 2 -++ IPPROTO_MAXID = (IPPROTO_AH + 1) -++ IPCTL_FORWARDING = 1 -++ IPCTL_SENDREDIRECTS = 2 -++ IPCTL_DEFTTL = 3 -++ IPCTL_DEFMTU = 4 -++ IPCTL_RTEXPIRE = 5 -++ IPCTL_RTMINEXPIRE = 6 -++ IPCTL_RTMAXCACHE = 7 -++ IPCTL_SOURCEROUTE = 8 -++ IPCTL_DIRECTEDBROADCAST = 9 -++ IPCTL_INTRQMAXLEN = 10 -++ IPCTL_INTRQDROPS = 11 -++ IPCTL_STATS = 12 -++ IPCTL_ACCEPTSOURCEROUTE = 13 -++ IPCTL_FASTFORWARDING = 14 -++ IPCTL_KEEPFAITH = 15 -++ IPCTL_GIF_TTL = 16 -++ IPCTL_MAXID = 17 -++ def in_nullhost(x): return ((x).s_addr == INADDR_ANY) -++ -++ -++ # Included from netinet6/in6.h -++ __KAME_VERSION = "20010528/FreeBSD" -++ IPV6PORT_RESERVED = 1024 -++ IPV6PORT_ANONMIN = 49152 -++ IPV6PORT_ANONMAX = 65535 -++ IPV6PORT_RESERVEDMIN = 600 -++ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -++ INET6_ADDRSTRLEN = 46 -++ IPV6_ADDR_INT32_ONE = 1 -++ IPV6_ADDR_INT32_TWO = 2 -++ IPV6_ADDR_INT32_MNL = (-16711680) -++ IPV6_ADDR_INT32_MLL = (-16646144) -++ IPV6_ADDR_INT32_SMP = 0x0000ffff -++ IPV6_ADDR_INT16_ULL = 0xfe80 -++ IPV6_ADDR_INT16_USL = 0xfec0 -++ IPV6_ADDR_INT16_MLL = 0xff02 -++ IPV6_ADDR_INT32_ONE = 0x01000000 -++ IPV6_ADDR_INT32_TWO = 0x02000000 -++ IPV6_ADDR_INT32_MNL = 0x000001ff -++ IPV6_ADDR_INT32_MLL = 0x000002ff -++ IPV6_ADDR_INT32_SMP = (-65536) -++ IPV6_ADDR_INT16_ULL = 0x80fe -++ IPV6_ADDR_INT16_USL = 0xc0fe -++ IPV6_ADDR_INT16_MLL = 0x02ff -++ def IN6_IS_ADDR_UNSPECIFIED(a): return \ -++ -++ def IN6_IS_ADDR_LOOPBACK(a): return \ -++ -++ def IN6_IS_ADDR_V4COMPAT(a): return \ -++ -++ def IN6_IS_ADDR_V4MAPPED(a): return \ -++ -++ IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -++ IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -++ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -++ IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -++ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -++ IPV6_ADDR_SCOPE_GLOBAL = 0x0e -++ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -++ __IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -++ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -++ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -++ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -++ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e -++ def IN6_IS_ADDR_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_INTFACELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_GLOBAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_GLOBAL(a): return \ -++ -++ def IN6_IS_SCOPE_LINKLOCAL(a): return \ -++ -++ def IFA6_IS_DEPRECATED(a): return \ -++ -++ def IFA6_IS_INVALID(a): return \ -++ -++ IPV6_OPTIONS = 1 -++ IPV6_RECVOPTS = 5 -++ IPV6_RECVRETOPTS = 6 -++ IPV6_RECVDSTADDR = 7 -++ IPV6_RETOPTS = 8 -++ IPV6_SOCKOPT_RESERVED1 = 3 -++ IPV6_UNICAST_HOPS = 4 -++ IPV6_MULTICAST_IF = 9 -++ IPV6_MULTICAST_HOPS = 10 -++ IPV6_MULTICAST_LOOP = 11 -++ IPV6_JOIN_GROUP = 12 -++ IPV6_LEAVE_GROUP = 13 -++ IPV6_PORTRANGE = 14 -++ ICMP6_FILTER = 18 -++ IPV6_2292PKTINFO = 19 -++ IPV6_2292HOPLIMIT = 20 -++ IPV6_2292NEXTHOP = 21 -++ IPV6_2292HOPOPTS = 22 -++ IPV6_2292DSTOPTS = 23 -++ IPV6_2292RTHDR = 24 -++ IPV6_2292PKTOPTIONS = 25 -++ IPV6_CHECKSUM = 26 -++ IPV6_V6ONLY = 27 -++ IPV6_BINDV6ONLY = IPV6_V6ONLY -++ IPV6_IPSEC_POLICY = 28 -++ IPV6_FAITH = 29 -++ IPV6_FW_ADD = 30 -++ IPV6_FW_DEL = 31 -++ IPV6_FW_FLUSH = 32 -++ IPV6_FW_ZERO = 33 -++ IPV6_FW_GET = 34 -++ IPV6_RTHDRDSTOPTS = 35 -++ IPV6_RECVPKTINFO = 36 -++ IPV6_RECVHOPLIMIT = 37 -++ IPV6_RECVRTHDR = 38 -++ IPV6_RECVHOPOPTS = 39 -++ IPV6_RECVDSTOPTS = 40 -++ IPV6_RECVRTHDRDSTOPTS = 41 -++ IPV6_USE_MIN_MTU = 42 -++ IPV6_RECVPATHMTU = 43 -++ IPV6_PATHMTU = 44 -++ IPV6_REACHCONF = 45 -++ IPV6_PKTINFO = 46 -++ IPV6_HOPLIMIT = 47 -++ IPV6_NEXTHOP = 48 -++ IPV6_HOPOPTS = 49 -++ IPV6_DSTOPTS = 50 -++ IPV6_RTHDR = 51 -++ IPV6_PKTOPTIONS = 52 -++ IPV6_RECVTCLASS = 57 -++ IPV6_AUTOFLOWLABEL = 59 -++ IPV6_TCLASS = 61 -++ IPV6_DONTFRAG = 62 -++ IPV6_PREFER_TEMPADDR = 63 -++ IPV6_RTHDR_LOOSE = 0 -++ IPV6_RTHDR_STRICT = 1 -++ IPV6_RTHDR_TYPE_0 = 0 -++ IPV6_DEFAULT_MULTICAST_HOPS = 1 -++ IPV6_DEFAULT_MULTICAST_LOOP = 1 -++ IPV6_PORTRANGE_DEFAULT = 0 -++ IPV6_PORTRANGE_HIGH = 1 -++ IPV6_PORTRANGE_LOW = 2 -++ IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -++ IPV6CTL_FORWARDING = 1 -++ IPV6CTL_SENDREDIRECTS = 2 -++ IPV6CTL_DEFHLIM = 3 -++ IPV6CTL_DEFMTU = 4 -++ IPV6CTL_FORWSRCRT = 5 -++ IPV6CTL_STATS = 6 -++ IPV6CTL_MRTSTATS = 7 -++ IPV6CTL_MRTPROTO = 8 -++ IPV6CTL_MAXFRAGPACKETS = 9 -++ IPV6CTL_SOURCECHECK = 10 -++ IPV6CTL_SOURCECHECK_LOGINT = 11 -++ IPV6CTL_ACCEPT_RTADV = 12 -++ IPV6CTL_KEEPFAITH = 13 -++ IPV6CTL_LOG_INTERVAL = 14 -++ IPV6CTL_HDRNESTLIMIT = 15 -++ IPV6CTL_DAD_COUNT = 16 -++ IPV6CTL_AUTO_FLOWLABEL = 17 -++ IPV6CTL_DEFMCASTHLIM = 18 -++ IPV6CTL_GIF_HLIM = 19 -++ IPV6CTL_KAME_VERSION = 20 -++ IPV6CTL_USE_DEPRECATED = 21 -++ IPV6CTL_RR_PRUNE = 22 -++ IPV6CTL_MAPPED_ADDR = 23 -++ IPV6CTL_V6ONLY = 24 -++ IPV6CTL_RTEXPIRE = 25 -++ IPV6CTL_RTMINEXPIRE = 26 -++ IPV6CTL_RTMAXCACHE = 27 -++ IPV6CTL_USETEMPADDR = 32 -++ IPV6CTL_TEMPPLTIME = 33 -++ IPV6CTL_TEMPVLTIME = 34 -++ IPV6CTL_AUTO_LINKLOCAL = 35 -++ IPV6CTL_RIP6STATS = 36 -++ IPV6CTL_PREFER_TEMPADDR = 37 -++ IPV6CTL_ADDRCTLPOLICY = 38 -++ IPV6CTL_MAXFRAGS = 41 -++ IPV6CTL_MAXID = 42 -+*** misc/Python-2.3.4/Lib/plat-freebsd8/IN.py Wed Dec 31 19:00:00 1969 -+--- misc/build/Python-2.3.4/Lib/plat-freebsd8/IN.py Tue Jan 8 14:13:22 2008 -+*************** -+*** 0 **** -+--- 1,535 ---- -++ # Generated by h2py from /usr/include/netinet/in.h -++ -++ # Included from sys/cdefs.h -++ __GNUCLIKE_ASM = 3 -++ __GNUCLIKE_ASM = 2 -++ __GNUCLIKE___TYPEOF = 1 -++ __GNUCLIKE___OFFSETOF = 1 -++ __GNUCLIKE___SECTION = 1 -++ __GNUCLIKE_ATTRIBUTE_MODE_DI = 1 -++ __GNUCLIKE_CTOR_SECTION_HANDLING = 1 -++ __GNUCLIKE_BUILTIN_CONSTANT_P = 1 -++ __GNUCLIKE_BUILTIN_VARARGS = 1 -++ __GNUCLIKE_BUILTIN_VAALIST = 1 -++ __GNUC_VA_LIST_COMPATIBILITY = 1 -++ __GNUCLIKE_BUILTIN_STDARG = 1 -++ __GNUCLIKE_BUILTIN_NEXT_ARG = 1 -++ __GNUCLIKE_BUILTIN_MEMCPY = 1 -++ __CC_SUPPORTS_INLINE = 1 -++ __CC_SUPPORTS___INLINE = 1 -++ __CC_SUPPORTS___INLINE__ = 1 -++ __CC_SUPPORTS___FUNC__ = 1 -++ __CC_SUPPORTS_WARNING = 1 -++ __CC_SUPPORTS_VARADIC_XXX = 1 -++ __CC_SUPPORTS_DYNAMIC_ARRAY_INIT = 1 -++ __CC_INT_IS_32BIT = 1 -++ def __P(protos): return protos -++ -++ def __STRING(x): return #x -++ -++ def __XSTRING(x): return __STRING(x) -++ -++ def __P(protos): return () -++ -++ def __STRING(x): return "x" -++ -++ def __aligned(x): return __attribute__((__aligned__(x))) -++ -++ def __section(x): return __attribute__((__section__(x))) -++ -++ def __aligned(x): return __attribute__((__aligned__(x))) -++ -++ def __section(x): return __attribute__((__section__(x))) -++ -++ def __nonnull(x): return __attribute__((__nonnull__(x))) -++ -++ def __predict_true(exp): return __builtin_expect((exp), 1) -++ -++ def __predict_false(exp): return __builtin_expect((exp), 0) -++ -++ def __predict_true(exp): return (exp) -++ -++ def __predict_false(exp): return (exp) -++ -++ def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -++ -++ def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) -++ -++ def __RCSID_SOURCE(s): return __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s) -++ -++ def __SCCSID(s): return __IDSTRING(__CONCAT(__sccsid_,__LINE__),s) -++ -++ def __COPYRIGHT(s): return __IDSTRING(__CONCAT(__copyright_,__LINE__),s) -++ -++ _POSIX_C_SOURCE = 199009 -++ _POSIX_C_SOURCE = 199209 -++ __XSI_VISIBLE = 600 -++ _POSIX_C_SOURCE = 200112 -++ __XSI_VISIBLE = 500 -++ _POSIX_C_SOURCE = 199506 -++ _POSIX_C_SOURCE = 198808 -++ __POSIX_VISIBLE = 200112 -++ __ISO_C_VISIBLE = 1999 -++ __POSIX_VISIBLE = 199506 -++ __ISO_C_VISIBLE = 1990 -++ __POSIX_VISIBLE = 199309 -++ __ISO_C_VISIBLE = 1990 -++ __POSIX_VISIBLE = 199209 -++ __ISO_C_VISIBLE = 1990 -++ __POSIX_VISIBLE = 199009 -++ __ISO_C_VISIBLE = 1990 -++ __POSIX_VISIBLE = 198808 -++ __ISO_C_VISIBLE = 0 -++ __POSIX_VISIBLE = 0 -++ __XSI_VISIBLE = 0 -++ __BSD_VISIBLE = 0 -++ __ISO_C_VISIBLE = 1990 -++ __POSIX_VISIBLE = 0 -++ __XSI_VISIBLE = 0 -++ __BSD_VISIBLE = 0 -++ __ISO_C_VISIBLE = 1999 -++ __POSIX_VISIBLE = 200112 -++ __XSI_VISIBLE = 600 -++ __BSD_VISIBLE = 1 -++ __ISO_C_VISIBLE = 1999 -++ -++ # Included from sys/_types.h -++ -++ # Included from machine/_types.h -++ -++ # Included from machine/endian.h -++ _QUAD_HIGHWORD = 1 -++ _QUAD_LOWWORD = 0 -++ _LITTLE_ENDIAN = 1234 -++ _BIG_ENDIAN = 4321 -++ _PDP_ENDIAN = 3412 -++ _BYTE_ORDER = _LITTLE_ENDIAN -++ LITTLE_ENDIAN = _LITTLE_ENDIAN -++ BIG_ENDIAN = _BIG_ENDIAN -++ PDP_ENDIAN = _PDP_ENDIAN -++ BYTE_ORDER = _BYTE_ORDER -++ def __word_swap_int_var(x): return \ -++ -++ def __word_swap_int_const(x): return \ -++ -++ def __word_swap_int(x): return __word_swap_int_var(x) -++ -++ def __byte_swap_int_var(x): return \ -++ -++ def __byte_swap_int_const(x): return \ -++ -++ def __byte_swap_int(x): return __byte_swap_int_var(x) -++ -++ def __byte_swap_word_var(x): return \ -++ -++ def __byte_swap_word_const(x): return \ -++ -++ def __byte_swap_word(x): return __byte_swap_word_var(x) -++ -++ def __htonl(x): return __bswap32(x) -++ -++ def __htons(x): return __bswap16(x) -++ -++ def __ntohl(x): return __bswap32(x) -++ -++ def __ntohs(x): return __bswap16(x) -++ -++ IPPROTO_IP = 0 -++ IPPROTO_ICMP = 1 -++ IPPROTO_TCP = 6 -++ IPPROTO_UDP = 17 -++ def htonl(x): return __htonl(x) -++ -++ def htons(x): return __htons(x) -++ -++ def ntohl(x): return __ntohl(x) -++ -++ def ntohs(x): return __ntohs(x) -++ -++ IPPROTO_RAW = 255 -++ INET_ADDRSTRLEN = 16 -++ IPPROTO_HOPOPTS = 0 -++ IPPROTO_IGMP = 2 -++ IPPROTO_GGP = 3 -++ IPPROTO_IPV4 = 4 -++ IPPROTO_IPIP = IPPROTO_IPV4 -++ IPPROTO_ST = 7 -++ IPPROTO_EGP = 8 -++ IPPROTO_PIGP = 9 -++ IPPROTO_RCCMON = 10 -++ IPPROTO_NVPII = 11 -++ IPPROTO_PUP = 12 -++ IPPROTO_ARGUS = 13 -++ IPPROTO_EMCON = 14 -++ IPPROTO_XNET = 15 -++ IPPROTO_CHAOS = 16 -++ IPPROTO_MUX = 18 -++ IPPROTO_MEAS = 19 -++ IPPROTO_HMP = 20 -++ IPPROTO_PRM = 21 -++ IPPROTO_IDP = 22 -++ IPPROTO_TRUNK1 = 23 -++ IPPROTO_TRUNK2 = 24 -++ IPPROTO_LEAF1 = 25 -++ IPPROTO_LEAF2 = 26 -++ IPPROTO_RDP = 27 -++ IPPROTO_IRTP = 28 -++ IPPROTO_TP = 29 -++ IPPROTO_BLT = 30 -++ IPPROTO_NSP = 31 -++ IPPROTO_INP = 32 -++ IPPROTO_SEP = 33 -++ IPPROTO_3PC = 34 -++ IPPROTO_IDPR = 35 -++ IPPROTO_XTP = 36 -++ IPPROTO_DDP = 37 -++ IPPROTO_CMTP = 38 -++ IPPROTO_TPXX = 39 -++ IPPROTO_IL = 40 -++ IPPROTO_IPV6 = 41 -++ IPPROTO_SDRP = 42 -++ IPPROTO_ROUTING = 43 -++ IPPROTO_FRAGMENT = 44 -++ IPPROTO_IDRP = 45 -++ IPPROTO_RSVP = 46 -++ IPPROTO_GRE = 47 -++ IPPROTO_MHRP = 48 -++ IPPROTO_BHA = 49 -++ IPPROTO_ESP = 50 -++ IPPROTO_AH = 51 -++ IPPROTO_INLSP = 52 -++ IPPROTO_SWIPE = 53 -++ IPPROTO_NHRP = 54 -++ IPPROTO_MOBILE = 55 -++ IPPROTO_TLSP = 56 -++ IPPROTO_SKIP = 57 -++ IPPROTO_ICMPV6 = 58 -++ IPPROTO_NONE = 59 -++ IPPROTO_DSTOPTS = 60 -++ IPPROTO_AHIP = 61 -++ IPPROTO_CFTP = 62 -++ IPPROTO_HELLO = 63 -++ IPPROTO_SATEXPAK = 64 -++ IPPROTO_KRYPTOLAN = 65 -++ IPPROTO_RVD = 66 -++ IPPROTO_IPPC = 67 -++ IPPROTO_ADFS = 68 -++ IPPROTO_SATMON = 69 -++ IPPROTO_VISA = 70 -++ IPPROTO_IPCV = 71 -++ IPPROTO_CPNX = 72 -++ IPPROTO_CPHB = 73 -++ IPPROTO_WSN = 74 -++ IPPROTO_PVP = 75 -++ IPPROTO_BRSATMON = 76 -++ IPPROTO_ND = 77 -++ IPPROTO_WBMON = 78 -++ IPPROTO_WBEXPAK = 79 -++ IPPROTO_EON = 80 -++ IPPROTO_VMTP = 81 -++ IPPROTO_SVMTP = 82 -++ IPPROTO_VINES = 83 -++ IPPROTO_TTP = 84 -++ IPPROTO_IGP = 85 -++ IPPROTO_DGP = 86 -++ IPPROTO_TCF = 87 -++ IPPROTO_IGRP = 88 -++ IPPROTO_OSPFIGP = 89 -++ IPPROTO_SRPC = 90 -++ IPPROTO_LARP = 91 -++ IPPROTO_MTP = 92 -++ IPPROTO_AX25 = 93 -++ IPPROTO_IPEIP = 94 -++ IPPROTO_MICP = 95 -++ IPPROTO_SCCSP = 96 -++ IPPROTO_ETHERIP = 97 -++ IPPROTO_ENCAP = 98 -++ IPPROTO_APES = 99 -++ IPPROTO_GMTP = 100 -++ IPPROTO_IPCOMP = 108 -++ IPPROTO_PIM = 103 -++ IPPROTO_CARP = 112 -++ IPPROTO_PGM = 113 -++ IPPROTO_PFSYNC = 240 -++ IPPROTO_OLD_DIVERT = 254 -++ IPPROTO_MAX = 256 -++ IPPROTO_DONE = 257 -++ IPPROTO_DIVERT = 258 -++ IPPROTO_SPACER = 32767 -++ IPPORT_RESERVED = 1024 -++ IPPORT_HIFIRSTAUTO = 49152 -++ IPPORT_HILASTAUTO = 65535 -++ IPPORT_RESERVEDSTART = 600 -++ IPPORT_MAX = 65535 -++ def IN_CLASSA(i): return (((u_int32_t)(i) & (-2147483648)) == 0) -++ -++ IN_CLASSA_NET = (-16777216) -++ IN_CLASSA_NSHIFT = 24 -++ IN_CLASSA_HOST = 0x00ffffff -++ IN_CLASSA_MAX = 128 -++ def IN_CLASSB(i): return (((u_int32_t)(i) & (-1073741824)) == (-2147483648)) -++ -++ IN_CLASSB_NET = (-65536) -++ IN_CLASSB_NSHIFT = 16 -++ IN_CLASSB_HOST = 0x0000ffff -++ IN_CLASSB_MAX = 65536 -++ def IN_CLASSC(i): return (((u_int32_t)(i) & (-536870912)) == (-1073741824)) -++ -++ IN_CLASSC_NET = (-256) -++ IN_CLASSC_NSHIFT = 8 -++ IN_CLASSC_HOST = 0x000000ff -++ def IN_CLASSD(i): return (((u_int32_t)(i) & (-268435456)) == (-536870912)) -++ -++ IN_CLASSD_NET = (-268435456) -++ IN_CLASSD_NSHIFT = 28 -++ IN_CLASSD_HOST = 0x0fffffff -++ def IN_MULTICAST(i): return IN_CLASSD(i) -++ -++ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -++ -++ def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) -++ -++ INADDR_NONE = (-1) -++ IN_LOOPBACKNET = 127 -++ IP_OPTIONS = 1 -++ IP_HDRINCL = 2 -++ IP_TOS = 3 -++ IP_TTL = 4 -++ IP_RECVOPTS = 5 -++ IP_RECVRETOPTS = 6 -++ IP_RECVDSTADDR = 7 -++ IP_SENDSRCADDR = IP_RECVDSTADDR -++ IP_RETOPTS = 8 -++ IP_MULTICAST_IF = 9 -++ IP_MULTICAST_TTL = 10 -++ IP_MULTICAST_LOOP = 11 -++ IP_ADD_MEMBERSHIP = 12 -++ IP_DROP_MEMBERSHIP = 13 -++ IP_MULTICAST_VIF = 14 -++ IP_RSVP_ON = 15 -++ IP_RSVP_OFF = 16 -++ IP_RSVP_VIF_ON = 17 -++ IP_RSVP_VIF_OFF = 18 -++ IP_PORTRANGE = 19 -++ IP_RECVIF = 20 -++ IP_IPSEC_POLICY = 21 -++ IP_FAITH = 22 -++ IP_ONESBCAST = 23 -++ IP_FW_TABLE_ADD = 40 -++ IP_FW_TABLE_DEL = 41 -++ IP_FW_TABLE_FLUSH = 42 -++ IP_FW_TABLE_GETSIZE = 43 -++ IP_FW_TABLE_LIST = 44 -++ IP_FW_ADD = 50 -++ IP_FW_DEL = 51 -++ IP_FW_FLUSH = 52 -++ IP_FW_ZERO = 53 -++ IP_FW_GET = 54 -++ IP_FW_RESETLOG = 55 -++ IP_DUMMYNET_CONFIGURE = 60 -++ IP_DUMMYNET_DEL = 61 -++ IP_DUMMYNET_FLUSH = 62 -++ IP_DUMMYNET_GET = 64 -++ IP_RECVTTL = 65 -++ IP_DEFAULT_MULTICAST_TTL = 1 -++ IP_DEFAULT_MULTICAST_LOOP = 1 -++ IP_MAX_MEMBERSHIPS = 20 -++ IP_PORTRANGE_DEFAULT = 0 -++ IP_PORTRANGE_HIGH = 1 -++ IP_PORTRANGE_LOW = 2 -++ IPPROTO_MAXID = (IPPROTO_AH + 1) -++ IPCTL_FORWARDING = 1 -++ IPCTL_SENDREDIRECTS = 2 -++ IPCTL_DEFTTL = 3 -++ IPCTL_DEFMTU = 4 -++ IPCTL_RTEXPIRE = 5 -++ IPCTL_RTMINEXPIRE = 6 -++ IPCTL_RTMAXCACHE = 7 -++ IPCTL_SOURCEROUTE = 8 -++ IPCTL_DIRECTEDBROADCAST = 9 -++ IPCTL_INTRQMAXLEN = 10 -++ IPCTL_INTRQDROPS = 11 -++ IPCTL_STATS = 12 -++ IPCTL_ACCEPTSOURCEROUTE = 13 -++ IPCTL_FASTFORWARDING = 14 -++ IPCTL_KEEPFAITH = 15 -++ IPCTL_GIF_TTL = 16 -++ IPCTL_MAXID = 17 -++ def in_nullhost(x): return ((x).s_addr == INADDR_ANY) -++ -++ -++ # Included from netinet6/in6.h -++ __KAME_VERSION = "20010528/FreeBSD" -++ IPV6PORT_RESERVED = 1024 -++ IPV6PORT_ANONMIN = 49152 -++ IPV6PORT_ANONMAX = 65535 -++ IPV6PORT_RESERVEDMIN = 600 -++ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -++ INET6_ADDRSTRLEN = 46 -++ IPV6_ADDR_INT32_ONE = 1 -++ IPV6_ADDR_INT32_TWO = 2 -++ IPV6_ADDR_INT32_MNL = (-16711680) -++ IPV6_ADDR_INT32_MLL = (-16646144) -++ IPV6_ADDR_INT32_SMP = 0x0000ffff -++ IPV6_ADDR_INT16_ULL = 0xfe80 -++ IPV6_ADDR_INT16_USL = 0xfec0 -++ IPV6_ADDR_INT16_MLL = 0xff02 -++ IPV6_ADDR_INT32_ONE = 0x01000000 -++ IPV6_ADDR_INT32_TWO = 0x02000000 -++ IPV6_ADDR_INT32_MNL = 0x000001ff -++ IPV6_ADDR_INT32_MLL = 0x000002ff -++ IPV6_ADDR_INT32_SMP = (-65536) -++ IPV6_ADDR_INT16_ULL = 0x80fe -++ IPV6_ADDR_INT16_USL = 0xc0fe -++ IPV6_ADDR_INT16_MLL = 0x02ff -++ def IN6_IS_ADDR_UNSPECIFIED(a): return \ -++ -++ def IN6_IS_ADDR_LOOPBACK(a): return \ -++ -++ def IN6_IS_ADDR_V4COMPAT(a): return \ -++ -++ def IN6_IS_ADDR_V4MAPPED(a): return \ -++ -++ IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -++ IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -++ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -++ IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -++ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -++ IPV6_ADDR_SCOPE_GLOBAL = 0x0e -++ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -++ __IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -++ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -++ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -++ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -++ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e -++ def IN6_IS_ADDR_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_INTFACELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_GLOBAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_GLOBAL(a): return \ -++ -++ def IN6_IS_SCOPE_LINKLOCAL(a): return \ -++ -++ def IFA6_IS_DEPRECATED(a): return \ -++ -++ def IFA6_IS_INVALID(a): return \ -++ -++ IPV6_OPTIONS = 1 -++ IPV6_RECVOPTS = 5 -++ IPV6_RECVRETOPTS = 6 -++ IPV6_RECVDSTADDR = 7 -++ IPV6_RETOPTS = 8 -++ IPV6_SOCKOPT_RESERVED1 = 3 -++ IPV6_UNICAST_HOPS = 4 -++ IPV6_MULTICAST_IF = 9 -++ IPV6_MULTICAST_HOPS = 10 -++ IPV6_MULTICAST_LOOP = 11 -++ IPV6_JOIN_GROUP = 12 -++ IPV6_LEAVE_GROUP = 13 -++ IPV6_PORTRANGE = 14 -++ ICMP6_FILTER = 18 -++ IPV6_2292PKTINFO = 19 -++ IPV6_2292HOPLIMIT = 20 -++ IPV6_2292NEXTHOP = 21 -++ IPV6_2292HOPOPTS = 22 -++ IPV6_2292DSTOPTS = 23 -++ IPV6_2292RTHDR = 24 -++ IPV6_2292PKTOPTIONS = 25 -++ IPV6_CHECKSUM = 26 -++ IPV6_V6ONLY = 27 -++ IPV6_BINDV6ONLY = IPV6_V6ONLY -++ IPV6_IPSEC_POLICY = 28 -++ IPV6_FAITH = 29 -++ IPV6_FW_ADD = 30 -++ IPV6_FW_DEL = 31 -++ IPV6_FW_FLUSH = 32 -++ IPV6_FW_ZERO = 33 -++ IPV6_FW_GET = 34 -++ IPV6_RTHDRDSTOPTS = 35 -++ IPV6_RECVPKTINFO = 36 -++ IPV6_RECVHOPLIMIT = 37 -++ IPV6_RECVRTHDR = 38 -++ IPV6_RECVHOPOPTS = 39 -++ IPV6_RECVDSTOPTS = 40 -++ IPV6_RECVRTHDRDSTOPTS = 41 -++ IPV6_USE_MIN_MTU = 42 -++ IPV6_RECVPATHMTU = 43 -++ IPV6_PATHMTU = 44 -++ IPV6_REACHCONF = 45 -++ IPV6_PKTINFO = 46 -++ IPV6_HOPLIMIT = 47 -++ IPV6_NEXTHOP = 48 -++ IPV6_HOPOPTS = 49 -++ IPV6_DSTOPTS = 50 -++ IPV6_RTHDR = 51 -++ IPV6_PKTOPTIONS = 52 -++ IPV6_RECVTCLASS = 57 -++ IPV6_AUTOFLOWLABEL = 59 -++ IPV6_TCLASS = 61 -++ IPV6_DONTFRAG = 62 -++ IPV6_PREFER_TEMPADDR = 63 -++ IPV6_RTHDR_LOOSE = 0 -++ IPV6_RTHDR_STRICT = 1 -++ IPV6_RTHDR_TYPE_0 = 0 -++ IPV6_DEFAULT_MULTICAST_HOPS = 1 -++ IPV6_DEFAULT_MULTICAST_LOOP = 1 -++ IPV6_PORTRANGE_DEFAULT = 0 -++ IPV6_PORTRANGE_HIGH = 1 -++ IPV6_PORTRANGE_LOW = 2 -++ IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -++ IPV6CTL_FORWARDING = 1 -++ IPV6CTL_SENDREDIRECTS = 2 -++ IPV6CTL_DEFHLIM = 3 -++ IPV6CTL_DEFMTU = 4 -++ IPV6CTL_FORWSRCRT = 5 -++ IPV6CTL_STATS = 6 -++ IPV6CTL_MRTSTATS = 7 -++ IPV6CTL_MRTPROTO = 8 -++ IPV6CTL_MAXFRAGPACKETS = 9 -++ IPV6CTL_SOURCECHECK = 10 -++ IPV6CTL_SOURCECHECK_LOGINT = 11 -++ IPV6CTL_ACCEPT_RTADV = 12 -++ IPV6CTL_KEEPFAITH = 13 -++ IPV6CTL_LOG_INTERVAL = 14 -++ IPV6CTL_HDRNESTLIMIT = 15 -++ IPV6CTL_DAD_COUNT = 16 -++ IPV6CTL_AUTO_FLOWLABEL = 17 -++ IPV6CTL_DEFMCASTHLIM = 18 -++ IPV6CTL_GIF_HLIM = 19 -++ IPV6CTL_KAME_VERSION = 20 -++ IPV6CTL_USE_DEPRECATED = 21 -++ IPV6CTL_RR_PRUNE = 22 -++ IPV6CTL_MAPPED_ADDR = 23 -++ IPV6CTL_V6ONLY = 24 -++ IPV6CTL_RTEXPIRE = 25 -++ IPV6CTL_RTMINEXPIRE = 26 -++ IPV6CTL_RTMAXCACHE = 27 -++ IPV6CTL_USETEMPADDR = 32 -++ IPV6CTL_TEMPPLTIME = 33 -++ IPV6CTL_TEMPVLTIME = 34 -++ IPV6CTL_AUTO_LINKLOCAL = 35 -++ IPV6CTL_RIP6STATS = 36 -++ IPV6CTL_PREFER_TEMPADDR = 37 -++ IPV6CTL_ADDRCTLPOLICY = 38 -++ IPV6CTL_MAXFRAGS = 41 -++ IPV6CTL_MAXID = 42 -+*** misc/Python-2.3.4/Lib/posixfile.py Wed Oct 24 18:03:35 2001 -+--- misc/build/Python-2.3.4/Lib/posixfile.py Tue Jan 8 14:16:12 2008 -+*************** -+*** 185,191 **** -+ if sys.platform in ('netbsd1', -+ 'openbsd2', -+ 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', -+! 'bsdos2', 'bsdos3', 'bsdos4'): -+ flock = struct.pack('lxxxxlxxxxlhh', \ -+ l_start, l_len, os.getpid(), l_type, l_whence) -+ elif sys.platform in ['aix3', 'aix4']: -+--- 185,191 ---- -+ if sys.platform in ('netbsd1', -+ 'openbsd2', -+ 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', -+! 'freebsd6', 'freebsd7', 'freebsd8', 'bsdos2', 'bsdos3', 'bsdos4'): -+ flock = struct.pack('lxxxxlxxxxlhh', \ -+ l_start, l_len, os.getpid(), l_type, l_whence) -+ elif sys.platform in ['aix3', 'aix4']: - *** misc/Python-2.3.4/Mac/OSX/Makefile Tue Nov 4 23:45:16 2003 - --- misc/build/Python-2.3.4/Mac/OSX/Makefile Tue Jan 15 12:11:51 2008 - *************** -@@ -15547,3 +17166,22 @@ - - /* Define the macros needed if on a UnixWare 7.x system. */ - #if defined(__USLC__) && defined(__SCO_VERSION__) -+*** misc/Python-2.3.4/setup.py Tue Oct 21 16:01:21 2003 -+--- misc/build/Python-2.3.4/setup.py Tue Jan 8 14:17:55 2008 -+*************** -+*** 770,776 **** -+ # Linux-specific modules -+ exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) -+ -+! if platform in ('linux2', 'freebsd4'): -+ exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) -+ -+ if platform == 'sunos5': -+--- 770,776 ---- -+ # Linux-specific modules -+ exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) -+ -+! if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'): -+ exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) -+ -+ if platform == 'sunos5': diff --git a/editors/openoffice.org-vcltesttool/files/patch-i85972 b/editors/openoffice.org-vcltesttool/files/patch-i85972 deleted file mode 100644 index 4b24c9d2ca7d..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i85972 +++ /dev/null @@ -1,68 +0,0 @@ -Index: lpsolve/lp_solve_5.5.patch -=================================================================== -RCS file: /cvs/external/lpsolve/lp_solve_5.5.patch,v -retrieving revision 1.2 -diff -u -r1.2 lp_solve_5.5.patch ---- lpsolve/lp_solve_5.5.patch 20 Dec 2007 15:58:45 -0000 1.2 -+++ lpsolve/lp_solve_5.5.patch 9 Feb 2008 07:19:59 -0000 -@@ -29,3 +29,27 @@ - ! fi - ! - ! rm *.o 2>/dev/null -+*** misc/lp_solve_5.5/lpsolve55/ccc.freebsd Fri Nov 23 21:38:12 2007 -+--- misc/build/lp_solve_5.5/lpsolve55/ccc.freebsd Fri Nov 23 21:58:29 2007 -+*************** -+*** 1 **** -+! dummy -+--- 1,18 ---- -+! src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' -+! -+! def= -+! so=yes -+! -+! opts='-O3 -DINTEGERTIME' -+! -+! $CC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -+! ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -+! ranlib liblpsolve55.a -+! -+! if [ "$so" != "" ] -+! then -+! $CC -fPIC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -+! $CC -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -+! fi -+! -+! rm *.o 2>/dev/null -Index: lpsolve/makefile.mk -=================================================================== -RCS file: /cvs/external/lpsolve/makefile.mk,v -retrieving revision 1.3 -diff -u -r1.3 makefile.mk ---- lpsolve/makefile.mk 21 Dec 2007 09:32:37 -0000 1.3 -+++ lpsolve/makefile.mk 9 Feb 2008 07:20:00 -0000 -@@ -50,7 +50,7 @@ - PATCH_FILE_NAME=lp_solve_5.5-windows.patch - .ELSE - PATCH_FILE_NAME=lp_solve_5.5.patch --ADDITIONAL_FILES=lpsolve55$/ccc.solaris -+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.freebsd - .ENDIF - - CONFIGURE_DIR= -@@ -70,11 +70,16 @@ - .IF "$(COMNAME)"=="sunpro5" - BUILD_ACTION=sh ccc.solaris - .ELSE -+.IF "$(OS)"=="FREEBSD" -+BUILD_ACTION=sh -x ccc.freebsd -+OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so -+.ELSE - BUILD_ACTION=sh ccc - .ENDIF - OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so - .ENDIF - .ENDIF -+.ENDIF - - OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h - diff --git a/editors/openoffice.org-vcltesttool/files/patch-i86558 b/editors/openoffice.org-vcltesttool/files/patch-i86558 deleted file mode 100644 index ff723e835f09..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i86558 +++ /dev/null @@ -1,18 +0,0 @@ ---- psprint/source/printer/printerinfomanager.cxx.orig 2007-12-12 09:56:19.000000000 -0500 -+++ psprint/source/printer/printerinfomanager.cxx 2008-02-28 17:46:34.000000000 -0500 -@@ -145,12 +145,12 @@ - bool bSuccess = false; - - // try libpaper -- #ifdef SOLARIS -+ #ifdef LINUX - // #i78617# workaround missing paperconf command; on e.g. Linux - // the 2>/dev/null works on the started shell also -- FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); -- #else - FILE* pPipe = popen( "paperconf 2>/dev/null", "r" ); -+ #else -+ FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); - #endif - if( pPipe ) - { diff --git a/editors/openoffice.org-vcltesttool/files/patch-i88955 b/editors/openoffice.org-vcltesttool/files/patch-i88955 deleted file mode 100644 index 24e97420faa7..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i88955 +++ /dev/null @@ -1,17 +0,0 @@ -Removing OC lang as it is not supported. - -Index: solenv/inc/postset.mk -=================================================================== -RCS file: /cvs/tools/solenv/inc/postset.mk,v -retrieving revision 1.41.50.2 -diff -u -r1.41.50.2 postset.mk ---- solenv/inc/postset.mk 18 Jan 2008 13:44:54 -0000 1.41.50.2 -+++ solenv/inc/postset.mk 4 Sep 2008 00:15:33 -0000 -@@ -39,6 +39,6 @@ - defaultlangiso=en-US - - # Complete list of all supported ISO codes --completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu -+completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns or-IN pa-IN pl pt pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu - - alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG))))) diff --git a/editors/openoffice.org-vcltesttool/files/patch-i91369 b/editors/openoffice.org-vcltesttool/files/patch-i91369 deleted file mode 100644 index d042a4cb5e0f..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i91369 +++ /dev/null @@ -1,25 +0,0 @@ -#FBSD7+amd64+gcc421 is okay without the patch (w/o -lsupc++ is fine) -#FBSD6+amd64+gcc342 is okay with the patch (w/o -lsupc++ is fine) - ...-lsupc++ is static, and cannot find -lgcc_s -#FBSD6+i386+gcc342 is okay with the patch (w/o -lsupc++ -lgcc_s is fine) - cannot find -lgcc_s - ---- store/util/makefile.mk.orig 2007-12-12 22:23:13.000000000 +0900 -+++ store/util/makefile.mk 2008-08-16 20:52:44.000000000 +0900 -@@ -76,6 +76,7 @@ - .ENDIF - - # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so -+# FBSD6+amd64+gcc342 does not require -lsupc++. only libsupc++.a is supplied - .IF "$(COMID)"=="gcc3" && "$(GUI)"!="OS2" - .IF "$(GUI)"=="WNT" - SHL1STDLIBS+= -lsupc++ -@@ -86,6 +87,8 @@ - .IF "$(CCNUMVER)"<="000399999999" - SHL1STDLIBS+= -lsupc++ - .ENDIF # CCNUMVER -+.ELIF "$(OS)"=="FREEBSD" -+SHL1STDLIBS+= - .ELIF "$(CCNUMVER)"<="000400000999" - SHL1STDLIBS+= -lsupc++ -lgcc_s - .ENDIF diff --git a/editors/openoffice.org-vcltesttool/files/patch-i93235 b/editors/openoffice.org-vcltesttool/files/patch-i93235 deleted file mode 100644 index 8f50a337c76f..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i93235 +++ /dev/null @@ -1,102 +0,0 @@ ---- /dev/null 2008-08-27 17:05:37.000000000 -0400 -+++ jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml 2008-08-27 17:20:55.000000000 -0400 -@@ -0,0 +1,38 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+ -+<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" -+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> -+ -+ <updated>2008-08-27</updated> -+ -+ <vendorInfos> -+ <vendor name="Sun Microsystems Inc."> -+ <minVersion>1.3.1</minVersion> -+ </vendor> -+ <vendor name="The FreeBSD Foundation"> -+ <minVersion>1.6.0</minVersion> -+ </vendor> -+ <vendor name="IBM Corporation"> -+ <minVersion>1.3.1</minVersion> -+ <maxVersion>1.4.2</maxVersion> -+ </vendor> -+ <vendor name="Blackdown Java-Linux Team"> -+ <minVersion>1.3.1</minVersion> -+ </vendor> -+ <vendor name="Free Software Foundation, Inc."> -+ <minVersion>1.4.2</minVersion> -+ </vendor> -+ <vendor name="BEA Systems, Inc."> -+ <minVersion>1.4.1</minVersion> -+ </vendor> -+ </vendorInfos> -+ -+ <plugins> -+ <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> -+ <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> -+ <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> -+ <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> -+ <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> -+ <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> -+ </plugins> -+</javaSelection> - -Index: jvmfwk/distributions/OpenOfficeorg/makefile.mk -=================================================================== -RCS file: /cvs/udk/jvmfwk/distributions/OpenOfficeorg/makefile.mk,v -retrieving revision 1.7 -diff -u -r1.7 makefile.mk ---- jvmfwk/distributions/OpenOfficeorg/makefile.mk 2 Nov 2007 12:26:51 -0000 1.7 -+++ jvmfwk/distributions/OpenOfficeorg/makefile.mk 28 Aug 2008 23:58:26 -0000 -@@ -47,9 +47,11 @@ - .IF "$(SOLAR_JAVA)"!="" - $(BIN)$/javavendors_ooo.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_macosx.xml javavendors_linux.xml - .IF "$(GUI)"=="UNX" --.IF "$(OS)"=="MACOSX" -+.IF "$(OS)"=="FREEBSD" -+ -$(COPY) javavendors_freebsd.xml $(BIN)$/javavendors_ooo.xml -+.ELIF "$(OS)"=="MACOSX" - -$(COPY) javavendors_macosx.xml $(BIN)$/javavendors_ooo.xml --.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" -+.ELIF "$(OS)"=="LINUX" - -$(COPY) javavendors_linux.xml $(BIN)$/javavendors_ooo.xml - .ELSE - -$(COPY) javavendors_unx.xml $(BIN)$/javavendors_ooo.xml -Index: jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx,v -retrieving revision 1.14 -diff -u -r1.14 javaldx.cxx ---- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 12 Nov 2007 15:31:19 -0000 1.14 -+++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 28 Aug 2008 23:58:26 -0000 -@@ -133,13 +133,15 @@ - rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("Apple Computer, Inc.")); - rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc.")); - rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc.")); -+ rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation")); - if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True - || sVendor2.equals(pInfo->sVendor) == sal_True - || sVendor3.equals(pInfo->sVendor) == sal_True - || sVendor4.equals(pInfo->sVendor) == sal_True - || sVendor5.equals(pInfo->sVendor) == sal_True - || sVendor6.equals(pInfo->sVendor) == sal_True -- || sVendor7.equals(pInfo->sVendor) == sal_True)) -+ || sVendor7.equals(pInfo->sVendor) == sal_True -+ || sVendor8.equals(pInfo->sVendor) == sal_True)) - return 0; - - rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData); -Index: jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx,v -retrieving revision 1.9 -diff -u -r1.9 vendorlist.cxx ---- jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx 12 Nov 2007 15:31:32 -0000 1.9 -+++ jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx 28 Aug 2008 23:58:26 -0000 -@@ -61,6 +61,7 @@ - VENDOR_MAP_ENTRY("Apple Computer, Inc.", OtherInfo) - VENDOR_MAP_ENTRY("BEA Systems, Inc.", OtherInfo) - VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo) -+ VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo) - END_VENDOR_MAP() - - diff --git a/editors/openoffice.org-vcltesttool/files/patch-i98781 b/editors/openoffice.org-vcltesttool/files/patch-i98781 deleted file mode 100644 index c334d5b97b02..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i98781 +++ /dev/null @@ -1,24 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=98781 -http://www.openoffice.org/issues/show_bug.cgi?id=82690 -http://www.freebsd.org/cgi/query-pr.cgi?pr=127946 - ---- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:53:52.000000000 +0900 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:56:37.000000000 +0900 -@@ -126,7 +126,7 @@ - }; - //__________________________________________________________________________________________________ - RTTI::RTTI() SAL_THROW( () ) --#if __FreeBSD_version < 602103 -+#if __FreeBSD_version < 702104 /* #i22253# */ - : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) - #else - : m_hApp( dlopen( 0, RTLD_LAZY ) ) -@@ -165,7 +165,7 @@ - buf.append( 'E' ); - - OString symName( buf.makeStringAndClear() ); --#if __FreeBSD_version < 602103 /* #i22253# */ -+#if __FreeBSD_version < 702104 /* #i22253# */ - rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); - #else - rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); diff --git a/editors/openoffice.org-vcltesttool/files/patch-libxslt b/editors/openoffice.org-vcltesttool/files/patch-libxslt deleted file mode 100644 index 4bdf4230014f..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-libxslt +++ /dev/null @@ -1,11 +0,0 @@ ---- libxslt/libxslt-1.1.16.patch~ 2009-07-11 13:38:52.000000000 +0900 -+++ libxslt/libxslt-1.1.16.patch 2009-07-11 13:39:11.000000000 +0900 -@@ -30,7 +30,7 @@ - fi - - --! if test "1" == "1" -+! if test "1" = "1" - then - XMLVERS=`$XML_CONFIG --version` - if test `echo $XMLVERS | sed -e 's/libxml //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -ge `echo $LIBXML_REQUIRED_VERSION | sed -e 's/libxml //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` |