From cfd4604d8b64193e53491c1cd9391d413cd3369b Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Sun, 29 Apr 2007 23:21:24 +0000 Subject: Update to SRC680_210. RCVS: ---------------------------------------------------------------------- --- editors/openoffice-3-devel/Makefile | 7 +- editors/openoffice-3-devel/distinfo | 6 +- editors/openoffice-3-devel/files/patch-i65514 | 32 +- editors/openoffice-3-devel/files/patch-i67904 | 27 +- editors/openoffice-3-devel/files/patch-i75732 | 18 - editors/openoffice-3-devel/files/patch-i76141 | 819 ++++++++++++++++----- editors/openoffice.org-2-devel/Makefile | 7 +- editors/openoffice.org-2-devel/distinfo | 6 +- editors/openoffice.org-2-devel/files/patch-i65514 | 32 +- editors/openoffice.org-2-devel/files/patch-i67904 | 27 +- editors/openoffice.org-2-devel/files/patch-i75732 | 18 - editors/openoffice.org-2-devel/files/patch-i76141 | 819 ++++++++++++++++----- editors/openoffice.org-3-devel/Makefile | 7 +- editors/openoffice.org-3-devel/distinfo | 6 +- editors/openoffice.org-3-devel/files/patch-i65514 | 32 +- editors/openoffice.org-3-devel/files/patch-i67904 | 27 +- editors/openoffice.org-3-devel/files/patch-i75732 | 18 - editors/openoffice.org-3-devel/files/patch-i76141 | 819 ++++++++++++++++----- editors/openoffice.org-vcltesttool/Makefile | 7 +- editors/openoffice.org-vcltesttool/distinfo | 6 +- .../openoffice.org-vcltesttool/files/patch-i65514 | 32 +- .../openoffice.org-vcltesttool/files/patch-i67904 | 27 +- .../openoffice.org-vcltesttool/files/patch-i75732 | 18 - .../openoffice.org-vcltesttool/files/patch-i76141 | 819 ++++++++++++++++----- 24 files changed, 2724 insertions(+), 912 deletions(-) delete mode 100644 editors/openoffice-3-devel/files/patch-i75732 delete mode 100644 editors/openoffice.org-2-devel/files/patch-i75732 delete mode 100644 editors/openoffice.org-3-devel/files/patch-i75732 delete mode 100644 editors/openoffice.org-vcltesttool/files/patch-i75732 diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 79d7d90588f6..07ffec1aa3ad 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -8,8 +8,7 @@ PORTNAME?= openoffice.org PORTVERSION?= 2.3.${SNAPDATE} CATEGORIES+= editors java -MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \ - http://openoffice.lunarshells.com/sources/ \ +MASTER_SITES+= http://openoffice.lunarshells.com/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ @@ -74,10 +73,10 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif CODELINE= 680 -MILESTONE?= 206 +MILESTONE?= 210 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20070319 +SNAPDATE= 20070421 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} .if defined(WITH_CWS) diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index bd6d678ca7c9..456e5be0baf6 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = 23680cf7036d0f06bc664070c30b68ad -SHA256 (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = af45a0327679fd2e5de7bd04f6f559a6c836f9bcfb4b77d0a3fcc1a05104ebf7 -SIZE (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = 268728654 +MD5 (openoffice.org2.0/OOo_SRC680_m210_source.tar.bz2) = 41bc2bdf099da4eabb96306cf29f7a60 +SHA256 (openoffice.org2.0/OOo_SRC680_m210_source.tar.bz2) = b0f341f17be1ff6461d287652102d99ed56ca63d1e74d78042a39b692bdeb6da +SIZE (openoffice.org2.0/OOo_SRC680_m210_source.tar.bz2) = 272272535 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2.0/unowinreg.dll) = 6144 diff --git a/editors/openoffice-3-devel/files/patch-i65514 b/editors/openoffice-3-devel/files/patch-i65514 index fa21fa13c3b3..59b7cd68b7ce 100644 --- a/editors/openoffice-3-devel/files/patch-i65514 +++ b/editors/openoffice-3-devel/files/patch-i65514 @@ -1,11 +1,6 @@ -Index: berkeleydb/db-4.2.52.patch -=================================================================== -RCS file: /cvs/external/berkeleydb/db-4.2.52.patch,v -retrieving revision 1.18 -diff -u -r1.18 db-4.2.52.patch ---- berkeleydb/db-4.2.52.patch 25 Jan 2007 12:11:26 -0000 1.18 -+++ berkeleydb/db-4.2.52.patch 1 Feb 2007 01:37:17 -0000 -@@ -499,6 +499,20 @@ +--- berkeleydb/db-4.2.52.patch Fri Apr 27 17:14:50 2007 ++++ berkeleydb/db-4.2.52.patch Fri Apr 27 17:14:15 2007 +@@ -221,6 +221,20 @@ ! $(SLO)$/dbreg_util.obj ! ! .INCLUDE : target.mk @@ -23,13 +18,13 @@ diff -u -r1.18 db-4.2.52.patch + /* Define to 1 if you have the header file, and it defines `DIR'. */ + #undef HAVE_NDIR_H + - *** misc/db-4.2.52.NC/dist/Makefile.in Fri Nov 28 19:50:06 2003 - --- misc/build/db-4.2.52.NC/dist/Makefile.in Tue Jul 25 09:32:28 2006 + *** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100 + --- misc/build/db-4.2.52.NC/dist/configure 2007-02-19 16:12:12.000000000 +0100 *************** -@@ -554,6 +568,77 @@ - fi - - # Commands to make compiler produce verbose output that lists +@@ -327,6 +341,76 @@ + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +*************** +*** 28556,28561 **** +--- 28556,28606 ---- @@ -98,13 +93,12 @@ diff -u -r1.18 db-4.2.52.patch ++ cat >>confdefs.h <<\_ACEOF ++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1 + _ACEOF -+ -+ + - *** misc/db-4.2.52.NC/dist/ltmain.sh Sat Apr 26 19:45:37 2003 - --- misc/build/db-4.2.52.NC/dist/ltmain.sh Tue Jul 25 09:05:20 2006 ++ + *** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 + --- misc/build/db-4.2.52.NC/dist/ltmain.sh 2007-02-19 16:12:12.000000000 +0100 *************** -@@ -1010,3 +1095,39 @@ +@@ -1080,3 +1164,39 @@ ! $(SLO)$/xa_map.obj ! ! .INCLUDE : target.mk diff --git a/editors/openoffice-3-devel/files/patch-i67904 b/editors/openoffice-3-devel/files/patch-i67904 index d2fb32236151..520242bb45a0 100644 --- a/editors/openoffice-3-devel/files/patch-i67904 +++ b/editors/openoffice-3-devel/files/patch-i67904 @@ -64,17 +64,16 @@ diff -u -r1.33 system.h Index: moz/mozilla-source-1.7.5.patch =================================================================== RCS file: /cvs/external/moz/mozilla-source-1.7.5.patch,v -retrieving revision 1.11 -diff -u -r1.11 mozilla-source-1.7.5.patch ---- moz/mozilla-source-1.7.5.patch 19 Jul 2006 09:37:17 -0000 1.11 -+++ moz/mozilla-source-1.7.5.patch 29 Jul 2006 09:53:10 -0000 -@@ -7705,7 +7705,7 @@ - - -#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) - +#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ --+ (defined(__FreeBSD__) && __FreeBSD_version > 700016) -++ (defined(__FreeBSD__) && __FreeBSD_version > 601103) - #define _PR_HAVE_GETPROTO_R - #define _PR_HAVE_5_ARG_GETPROTO_R - #endif - +retrieving revision 1.14 +diff -u -r1.14 mozilla-source-1.7.5.patch +--- moz/mozilla-source-1.7.5.patch 17 Apr 2007 08:54:47 -0000 1.14 ++++ moz/mozilla-source-1.7.5.patch 27 Apr 2007 05:57:10 -0000 +@@ -7821,7 +7821,7 @@ + #endif + + ! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ +-! (defined(__FreeBSD__) && __FreeBSD_version > 700016) ++! (defined(__FreeBSD__) && __FreeBSD_version > 601103) + #define _PR_HAVE_GETPROTO_R + #define _PR_HAVE_5_ARG_GETPROTO_R + #endif diff --git a/editors/openoffice-3-devel/files/patch-i75732 b/editors/openoffice-3-devel/files/patch-i75732 deleted file mode 100644 index 58dd524e660c..000000000000 --- a/editors/openoffice-3-devel/files/patch-i75732 +++ /dev/null @@ -1,18 +0,0 @@ -? sw/unxfbsdx.pro -Index: sw/source/core/doc/makefile.mk -=================================================================== -RCS file: /cvs/sw/sw/source/core/doc/makefile.mk,v -retrieving revision 1.16 -diff -u -r1.16 makefile.mk ---- sw/source/core/doc/makefile.mk 28 Feb 2007 15:40:53 -0000 1.16 -+++ sw/source/core/doc/makefile.mk 26 Mar 2007 05:08:30 -0000 -@@ -94,7 +94,8 @@ - - EXCEPTIONSFILES = \ - $(SLO)$/doclay.obj \ -- $(SLO)$/docnew.obj -+ $(SLO)$/docnew.obj \ -+ $(SLO)$/tblrwcl.obj - - # --- Tagets ------------------------------------------------------- - diff --git a/editors/openoffice-3-devel/files/patch-i76141 b/editors/openoffice-3-devel/files/patch-i76141 index df70a3ea7055..1698b377a94f 100644 --- a/editors/openoffice-3-devel/files/patch-i76141 +++ b/editors/openoffice-3-devel/files/patch-i76141 @@ -1,6 +1,6 @@ --- berkeleydb/db-4.2.52.patch Thu Apr 5 14:04:49 2007 +++ berkeleydb/db-4.2.52.patch Thu Apr 5 14:26:49 2007 -@@ -552,6 +552,23 @@ +@@ -276,6 +276,23 @@ test "$with_gnu_ld" != no && break ;; *************** @@ -21,13 +21,13 @@ + case $version_type in + freebsd-elf*) +*************** - *** 11180,11186 **** - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on -@@ -568,6 +585,57 @@ - fi - - # Commands to make compiler produce verbose output that lists + *** 10398,10404 **** + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! +@@ -341,6 +358,57 @@ + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +*************** +*** 12872,12878 **** + ;; @@ -82,6 +82,7 @@ *************** *** 28556,28561 **** --- 28556,28606 ---- + --- curl/curl-7.12.2.patch 25 Sep 2006 13:33:49 -0000 1.9 +++ curl/curl-7.12.2.patch 5 Apr 2007 00:01:20 -0000 @@ -1,3 +1,73 @@ @@ -314,142 +315,12 @@ *** misc/libwpd-0.8.8/src/lib/WP1Part.cpp 2007-01-03 14:07:55.000000000 +0100 --- misc/build/libwpd-0.8.8/src/lib/WP1Part.cpp 2007-01-13 00:18:52.000000000 +0100 *************** ---- libxml2/libxml2-2.6.17.patch Thu Jan 19 13:23:31 2006 -+++ libxml2/libxml2-2.6.17.patch Wed Apr 4 18:38:01 2007 -@@ -1,6 +1,40 @@ - *** misc/libxml2-2.6.17/configure 2005-01-16 20:24:22.000000000 +0100 - --- misc/build/libxml2-2.6.17/configure 2005-02-02 17:41:10.751412243 +0100 - *************** -+*** 8547,8553 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 8547,8553 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 15436,15442 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 15436,15442 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 26339,26347 **** - - echo "$as_me:$LINENO: checking for setsockopt" >&5 ---- libxmlsec/xmlsec1-1.2.6.patch 24 Oct 2006 13:31:14 -0000 1.16 -+++ libxmlsec/xmlsec1-1.2.6.patch 5 Apr 2007 00:47:31 -0000 -@@ -17,8 +17,25 @@ - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --*** misc/xmlsec1-1.2.6/configure Thu Aug 26 08:00:34 2004 ----- misc/build/xmlsec1-1.2.6/configure Thu Sep 28 18:00:38 2006 -+*** misc/xmlsec1-1.2.6/configure Thu Aug 26 02:00:34 2004 -+--- misc/build/xmlsec1-1.2.6/configure Wed Apr 4 20:43:24 2007 -+*************** -+*** 7778,7784 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 7778,7784 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) - *************** - *** 9046,9052 **** - ;; -@@ -37,6 +54,57 @@ - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - *************** -+*** 11497,11503 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 11497,11503 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 14667,14673 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 14667,14673 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 17035,17041 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 17035,17041 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 24598,24604 **** - fi - ---- moz/mozilla-source-1.7.5.patch Wed Apr 4 19:22:49 2007 -+++ moz/mozilla-source-1.7.5.patch Wed Apr 4 21:08:38 2007 -@@ -134,6 +134,23 @@ - *** misc/mozilla/configure 2004-10-12 06:13:29.000000000 +0200 - --- misc/build/mozilla/configure 2006-02-24 09:41:55.000000000 +0100 + +--- moz/mozilla-source-1.7.5.patch.orig Fri Apr 27 15:23:29 2007 ++++ moz/mozilla-source-1.7.5.patch Fri Apr 27 15:32:07 2007 +@@ -266,6 +266,23 @@ + *** misc/mozilla/configure Tue Oct 12 00:13:29 2004 + --- misc/build/mozilla/configure Thu Mar 29 14:27:08 2007 *************** +*** 5228,5234 **** + ;; @@ -471,9 +342,9 @@ *** 5895,5901 **** MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@' MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' -@@ -174,6 +202,23 @@ - *** misc/mozilla/configure.in 2004-10-12 06:13:29.000000000 +0200 - --- misc/build/mozilla/configure.in 2006-02-24 09:41:55.000000000 +0100 +@@ -311,6 +328,23 @@ + *** misc/mozilla/configure.in Tue Oct 12 00:13:29 2004 + --- misc/build/mozilla/configure.in Thu Mar 29 14:27:08 2007 *************** +*** 1006,1012 **** + ;; @@ -495,10 +366,10 @@ *** 1536,1542 **** MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@' MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' -@@ -211,6 +267,25 @@ - CC="\$(CYGWIN_WRAPPER) $CC" - CXX="\$(CYGWIN_WRAPPER) $CXX" - CPP="\$(CYGWIN_WRAPPER) $CPP" +@@ -449,6 +483,25 @@ + ASM_SUFFIX = @ASM_SUFFIX@ + PROG_SUFFIX = @PROG_SUFFIX@ + MOD_NAME = @NSPR_MODNAME@ +*** misc/mozilla/directory/c-sdk/config/FreeBSD.mk Tue Mar 26 16:51:46 2002 +--- misc/build/mozilla/directory/c-sdk/config/FreeBSD.mk Wed Apr 4 20:56:05 2007 +*************** @@ -518,12 +389,12 @@ + + ifeq ($(MOZ_OBJFORMAT),elf) + DLL_SUFFIX = so - *** misc/mozilla/directory/c-sdk/config/cygwin-wrapper 2003-04-03 01:22:39.000000000 +0200 - --- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper 2006-02-24 09:41:55.000000000 +0100 + *** misc/mozilla/directory/c-sdk/config/cygwin-wrapper Wed Apr 2 19:22:39 2003 + --- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper Thu Mar 29 14:27:08 2007 *************** -@@ -341,6 +416,23 @@ - *** misc/mozilla/directory/c-sdk/configure 2004-09-14 23:14:38.000000000 +0200 - --- misc/build/mozilla/directory/c-sdk/configure 2006-02-24 09:41:55.000000000 +0100 +@@ -524,6 +577,23 @@ + MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' + PR_MD_ASFILES= *************** +*** 3465,3471 **** + EOF @@ -543,11 +414,11 @@ + else +*************** *** 3832,3837 **** - --- 3832,3838 ---- + --- 3833,3839 ---- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' -@@ -363,6 +455,23 @@ - *** misc/mozilla/directory/c-sdk/configure.in 2004-09-14 23:14:38.000000000 +0200 - --- misc/build/mozilla/directory/c-sdk/configure.in 2006-02-24 09:41:55.000000000 +0100 +@@ -604,6 +674,23 @@ + MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' + PR_MD_ASFILES= *************** +*** 896,902 **** + AC_DEFINE(FREEBSD) @@ -567,9 +438,9 @@ + else +*************** *** 1144,1149 **** - --- 1144,1150 ---- + --- 1145,1151 ---- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' -@@ -6830,6 +6939,44 @@ +@@ -7562,6 +7649,44 @@ switch (name) { case MAX_CONNECTIONS: @@ -611,13 +482,13 @@ + if test "$MOZ_OBJFORMAT" = "elf"; then + DLL_SUFFIX=so + else - *** misc/mozilla/nsprpub/build/cygwin-wrapper 2003-04-03 01:22:38.000000000 +0200 - --- misc/build/mozilla/nsprpub/build/cygwin-wrapper 2006-02-24 09:41:55.000000000 +0100 + *** misc/mozilla/nsprpub/build/cygwin-wrapper Wed Apr 2 19:22:38 2003 + --- misc/build/mozilla/nsprpub/build/cygwin-wrapper Thu Mar 29 14:27:08 2007 *************** -@@ -7060,6 +7207,25 @@ - gDirServiceProvider->SetProfileDir(profileDir); - mCurrentProfileName.Assign(aCurrentProfile); - gProfileDataAccess->SetCurrentProfile(aCurrentProfile); +@@ -8090,6 +8215,25 @@ + + ifdef NS_USE_GCC + + NSPR31_LIB_PREFIX = lib + + endif +*** misc/mozilla/security/coreconf/FreeBSD.mk Wed Mar 26 20:17:25 2003 +--- misc/build/mozilla/security/coreconf/FreeBSD.mk Wed Apr 4 20:56:48 2007 +*************** @@ -637,8 +508,8 @@ + + ifeq ($(MOZ_OBJFORMAT),elf) + DLL_SUFFIX = so - *** misc/mozilla/security/coreconf/command.mk 2002-02-15 23:53:12.000000000 +0100 - --- misc/build/mozilla/security/coreconf/command.mk 2006-02-24 09:41:55.000000000 +0100 + *** misc/mozilla/security/coreconf/command.mk Fri Feb 15 17:53:12 2002 + --- misc/build/mozilla/security/coreconf/command.mk Thu Mar 29 14:27:09 2007 *************** --- neon/neon.patch Tue Feb 6 09:08:59 2007 +++ neon/neon.patch Thu Apr 5 14:36:14 2007 @@ -837,3 +708,611 @@ diff -uprN misc/vigra1.4.0/include/vigra/array_vector.hxx misc/build/vigra1.4.0/include/vigra/array_vector.hxx --- misc/vigra1.4.0/include/vigra/array_vector.hxx 2005-12-21 05:53:30.000000000 +0100 +++ misc/build/vigra1.4.0/include/vigra/array_vector.hxx 2006-08-31 12:08:15.172679000 +0200 + + +Index: libxmlsec/xmlsec1-1.2.6.patch +=================================================================== +RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v +retrieving revision 1.19 +diff -u -r1.19 xmlsec1-1.2.6.patch +--- libxmlsec/xmlsec1-1.2.6.patch 27 Mar 2007 09:36:38 -0000 1.19 ++++ libxmlsec/xmlsec1-1.2.6.patch 28 Apr 2007 23:12:51 -0000 +@@ -1,5 +1,5 @@ +-*** misc/xmlsec1-1.2.6/apps/Makefile.in Thu Aug 26 08:00:30 2004 +---- misc/build/xmlsec1-1.2.6/apps/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/apps/Makefile.in Thu Aug 26 15:00:30 2004 ++--- misc/build/xmlsec1-1.2.6/apps/Makefile.in Sun Apr 29 08:10:05 2007 + *************** + *** 370,376 **** + $(CRYPTO_DEPS) \ +@@ -17,8 +17,8 @@ + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-*** misc/xmlsec1-1.2.6/configure Thu Aug 26 08:00:34 2004 +---- misc/build/xmlsec1-1.2.6/configure Tue Mar 27 11:26:19 2007 ++*** misc/xmlsec1-1.2.6/configure Thu Aug 26 15:00:34 2004 ++--- misc/build/xmlsec1-1.2.6/configure Sun Apr 29 08:10:06 2007 + *************** + *** 463,469 **** + # include +@@ -158,6 +158,23 @@ + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + *************** ++*** 7778,7784 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 7779,7785 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++*************** + *** 9046,9052 **** + ;; + esac +@@ -215,6 +232,23 @@ + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + *************** ++*** 11497,11503 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 11498,11504 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++*************** + *** 13259,13269 **** + lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' + ;; +@@ -257,6 +291,23 @@ + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + *************** ++*** 14667,14673 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 14668,14674 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++*************** + *** 15607,15617 **** + lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' + ;; +@@ -316,6 +367,23 @@ + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + *************** ++*** 17035,17041 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 17036,17042 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++*************** + *** 24598,24604 **** + fi + +@@ -2379,8 +2447,8 @@ + s,@XMLSEC_NO_SHA1_TRUE@,$XMLSEC_NO_SHA1_TRUE,;t t + s,@XMLSEC_NO_SHA1_FALSE@,$XMLSEC_NO_SHA1_FALSE,;t t + s,@XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t +-*** misc/xmlsec1-1.2.6/configure.in Thu Aug 26 04:49:24 2004 +---- misc/build/xmlsec1-1.2.6/configure.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/configure.in Thu Aug 26 11:49:24 2004 ++--- misc/build/xmlsec1-1.2.6/configure.in Sun Apr 29 08:10:06 2007 + *************** + *** 143,149 **** + dnl find libxml +@@ -2496,8 +2564,8 @@ + dnl do not add -L/usr/lib because compiler does it anyway + if test "z$dir" = "z/usr/lib" ; then + NSS_LIBS="$NSS_LIBS_LIST" +-*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -2560,8 +2628,8 @@ + ! # Tell versions [3.59,3.63) of GNU make to not export all variables. + ! # Otherwise a system limit (for SysV at least) may be exceeded. + ! .NOEXPORT: +-*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -2637,8 +2705,8 @@ + ! #endif /* __XMLSEC_MSCRYPTO_AKMNGR_H__ */ + ! + ! +-*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Fri Sep 26 08:12:46 2003 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Fri Sep 26 15:12:46 2003 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Sun Apr 29 08:10:06 2007 + *************** + *** 77,82 **** + --- 77,97 ---- +@@ -2663,8 +2731,8 @@ + + #endif /* XMLSEC_NO_X509 */ + +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Wed Jul 30 04:46:35 2003 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Wed Jul 30 11:46:35 2003 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Sun Apr 29 08:10:06 2007 + *************** + *** 3,8 **** + --- 3,9 ---- +@@ -2686,8 +2754,8 @@ + $(NULL) + + install-exec-hook: +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Thu Aug 26 08:00:31 2004 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Thu Aug 26 15:00:31 2004 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Sun Apr 29 08:10:06 2007 + *************** + *** 273,278 **** + --- 273,279 ---- +@@ -2709,8 +2777,8 @@ + $(NULL) + + all: all-am +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -2771,8 +2839,8 @@ + ! #endif /* __XMLSEC_NSS_AKMNGR_H__ */ + ! + ! +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/app.h Mon Jan 12 22:06:14 2004 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/app.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/app.h Tue Jan 13 06:06:14 2004 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/app.h Sun Apr 29 08:10:06 2007 + *************** + *** 22,27 **** + --- 22,30 ---- +@@ -2796,8 +2864,8 @@ + XMLSEC_CRYPTO_EXPORT int xmlSecNssAppDefaultKeysMngrLoad (xmlSecKeysMngrPtr mngr, + const char* uri); + XMLSEC_CRYPTO_EXPORT int xmlSecNssAppDefaultKeysMngrSave (xmlSecKeysMngrPtr mngr, +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -2837,8 +2905,8 @@ + ! #endif /* __XMLSEC_NSS_CIPHERS_H__ */ + ! + ! +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Mon Jan 12 22:06:14 2004 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Tue Jan 13 06:06:14 2004 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Sun Apr 29 08:10:06 2007 + *************** + *** 264,269 **** + --- 264,278 ---- +@@ -2857,8 +2925,8 @@ + #endif /* XMLSEC_NO_RSA */ + + +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Wed Jul 30 04:46:35 2003 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Wed Jul 30 11:46:35 2003 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Sun Apr 29 08:10:06 2007 + *************** + *** 16,21 **** + --- 16,23 ---- +@@ -2881,8 +2949,8 @@ + XMLSEC_CRYPTO_EXPORT int xmlSecNssKeysStoreLoad (xmlSecKeyStorePtr store, + const char *uri, + xmlSecKeysMngrPtr keysMngr); +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -3069,8 +3137,8 @@ + ! + ! #endif /* __XMLSEC_NSS_TOKENS_H__ */ + ! +-*** misc/xmlsec1-1.2.6/libxml2-config Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/libxml2-config Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/libxml2-config Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/libxml2-config Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -3123,8 +3191,8 @@ + ! done + ! + ! exit 0 +-*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 08:00:15 2004 +---- misc/build/xmlsec1-1.2.6/ltmain.sh Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 15:00:15 2004 ++--- misc/build/xmlsec1-1.2.6/ltmain.sh Sun Apr 29 08:10:06 2007 + *************** + *** 1661,1666 **** + --- 1661,1671 ---- +@@ -3199,8 +3267,8 @@ + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in +-*** misc/xmlsec1-1.2.6/src/bn.c Mon Jun 21 20:33:27 2004 +---- misc/build/xmlsec1-1.2.6/src/bn.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/bn.c Tue Jun 22 03:33:27 2004 ++--- misc/build/xmlsec1-1.2.6/src/bn.c Sun Apr 29 08:10:06 2007 + *************** + *** 170,177 **** + */ +@@ -3766,8 +3834,8 @@ + } + + return(0); +-*** misc/xmlsec1-1.2.6/src/dl.c Wed Oct 29 16:57:20 2003 +---- misc/build/xmlsec1-1.2.6/src/dl.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/dl.c Thu Oct 30 00:57:20 2003 ++--- misc/build/xmlsec1-1.2.6/src/dl.c Sun Apr 29 08:10:06 2007 + *************** + *** 329,334 **** + --- 329,338 ---- +@@ -3793,8 +3861,8 @@ + } + + --- 354,359 ---- +-*** misc/xmlsec1-1.2.6/src/mscrypto/Makefile.in Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/Makefile.in Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/Makefile.in Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -3977,8 +4045,8 @@ + ! # Tell versions [3.59,3.63) of GNU make to not export all variables. + ! # Otherwise a system limit (for SysV at least) may be exceeded. + ! .NOEXPORT: +-*** misc/xmlsec1-1.2.6/src/mscrypto/akmngr.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/akmngr.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/akmngr.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/akmngr.c Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -4218,8 +4286,8 @@ + ! return( 0 ) ; + ! } + ! +-*** misc/xmlsec1-1.2.6/src/mscrypto/certkeys.c Wed Mar 17 06:06:43 2004 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/certkeys.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/certkeys.c Wed Mar 17 14:06:43 2004 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/certkeys.c Sun Apr 29 08:10:06 2007 + *************** + *** 41,46 **** + --- 41,47 ---- +@@ -4896,8 +4964,8 @@ + } + + static xmlSecKeyDataType +-*** misc/xmlsec1-1.2.6/src/mscrypto/ciphers.c Fri Sep 26 08:12:51 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/ciphers.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/ciphers.c Fri Sep 26 15:12:51 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/ciphers.c Sun Apr 29 08:10:06 2007 + *************** + *** 785,791 **** + * AES CBC cipher transforms +@@ -4966,8 +5034,8 @@ + /* klass/object sizes */ + sizeof(xmlSecTransformKlass), /* size_t klassSize */ + xmlSecMSCryptoBlockCipherSize, /* size_t objSize */ +-*** misc/xmlsec1-1.2.6/src/mscrypto/crypto.c Wed Nov 12 03:38:51 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/crypto.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/crypto.c Wed Nov 12 11:38:51 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/crypto.c Sun Apr 29 08:10:06 2007 + *************** + *** 330,342 **** + BYTE* +@@ -4999,8 +5067,8 @@ + return(NULL); + } + +-*** misc/xmlsec1-1.2.6/src/mscrypto/digests.c Tue Sep 30 04:09:51 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/digests.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/digests.c Tue Sep 30 11:09:51 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/digests.c Sun Apr 29 08:10:06 2007 + *************** + *** 96,107 **** + +@@ -5031,8 +5099,8 @@ + } + + return(0); +-*** misc/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Fri Sep 26 22:29:25 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Sat Sep 27 05:29:25 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Sun Apr 29 08:10:06 2007 + *************** + *** 66,72 **** + static int xmlSecMSCryptoRsaPkcs1Process (xmlSecTransformPtr transform, +@@ -5050,8 +5118,8 @@ + /* klass/object sizes */ + sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ + xmlSecMSCryptoRsaPkcs1Size, /* xmlSecSize objSize */ +-*** misc/xmlsec1-1.2.6/src/mscrypto/signatures.c Fri Sep 26 22:29:25 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/signatures.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/signatures.c Sat Sep 27 05:29:25 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/signatures.c Sun Apr 29 08:10:06 2007 + *************** + *** 483,489 **** + * RSA-SHA1 signature transform +@@ -5086,8 +5154,8 @@ + /* klass/object sizes */ + sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ + xmlSecMSCryptoSignatureSize, /* xmlSecSize objSize */ +-*** misc/xmlsec1-1.2.6/src/mscrypto/symkeys.c Fri Sep 26 02:58:13 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/symkeys.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/symkeys.c Fri Sep 26 09:58:13 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/symkeys.c Sun Apr 29 08:10:06 2007 + *************** + *** 72,78 **** + * processing +@@ -5122,8 +5190,8 @@ + sizeof(xmlSecKeyDataKlass), + xmlSecKeyDataBinarySize, + +-*** misc/xmlsec1-1.2.6/src/mscrypto/x509.c Fri Sep 26 02:58:13 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/x509.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/x509.c Fri Sep 26 09:58:13 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/x509.c Sun Apr 29 08:10:06 2007 + *************** + *** 240,246 **** + +@@ -5369,8 +5437,8 @@ + sizeof(xmlSecKeyDataKlass), + sizeof(xmlSecKeyData), + +-*** misc/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Sat Sep 27 05:12:22 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Sat Sep 27 12:12:22 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Sun Apr 29 08:10:06 2007 + *************** + *** 70,76 **** + static xmlSecByte * xmlSecMSCryptoX509NameRead (xmlSecByte *str, +@@ -6115,8 +6183,8 @@ + } + } + xmlFree(cName); +-*** misc/xmlsec1-1.2.6/src/nss/Makefile.am Tue Sep 16 11:43:03 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/Makefile.am Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/Makefile.am Tue Sep 16 18:43:03 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/Makefile.am Sun Apr 29 08:10:06 2007 + *************** + *** 20,40 **** + $(NULL) +@@ -6163,8 +6231,8 @@ + $(NULL) + + libxmlsec1_nss_la_LIBADD = \ +-*** misc/xmlsec1-1.2.6/src/nss/Makefile.in Thu Aug 26 08:00:32 2004 +---- misc/build/xmlsec1-1.2.6/src/nss/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/Makefile.in Thu Aug 26 15:00:32 2004 ++--- misc/build/xmlsec1-1.2.6/src/nss/Makefile.in Sun Apr 29 08:10:06 2007 + *************** + *** 54,62 **** + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +@@ -6288,8 +6356,8 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkikeys.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signatures.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symkeys.Plo@am__quote@ +-*** misc/xmlsec1-1.2.6/src/nss/akmngr.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/nss/akmngr.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/akmngr.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/nss/akmngr.c Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -6678,8 +6746,8 @@ + ! return(0) ; + ! } + ! +-*** misc/xmlsec1-1.2.6/src/nss/ciphers.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/ciphers.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/ciphers.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/ciphers.c Sun Apr 29 08:10:06 2007 + *************** + *** 1,838 **** + ! /** +@@ -8472,8 +8540,8 @@ + } + ! + +-*** misc/xmlsec1-1.2.6/src/nss/crypto.c Wed Oct 29 16:57:25 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/crypto.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/crypto.c Thu Oct 30 00:57:25 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/crypto.c Sun Apr 29 08:10:06 2007 + *************** + *** 130,135 **** + --- 130,136 ---- +@@ -8526,8 +8594,8 @@ + + return(gXmlSecNssFunctions); + } +-*** misc/xmlsec1-1.2.6/src/nss/digests.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/digests.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/digests.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/digests.c Sun Apr 29 08:10:06 2007 + *************** + *** 21,27 **** + #include +@@ -8623,8 +8691,8 @@ + return(-1); + } + xmlSecAssert2(ctx->dgstSize > 0, -1); +-*** misc/xmlsec1-1.2.6/src/nss/hmac.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/hmac.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/hmac.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/hmac.c Sun Apr 29 08:10:06 2007 + *************** + *** 23,30 **** + #include +@@ -8758,8 +8826,8 @@ + return(-1); + } + xmlSecAssert2(dgstSize > 0, -1); +-*** misc/xmlsec1-1.2.6/src/nss/keysstore.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/keysstore.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/keysstore.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/keysstore.c Sun Apr 29 08:10:06 2007 + *************** + *** 1,119 **** + /** +@@ -9826,8 +9894,8 @@ + ! return(0); + } + + +-*** misc/xmlsec1-1.2.6/src/nss/keytrans.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/nss/keytrans.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/keytrans.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/nss/keytrans.c Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -10576,8 +10644,8 @@ + ! + ! #endif /* XMLSEC_NO_RSA */ + ! +-*** misc/xmlsec1-1.2.6/src/nss/keywrapers.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/nss/keywrapers.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/keywrapers.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/nss/keywrapers.c Sun Apr 29 08:10:07 2007 + *************** + *** 1 **** + ! dummy +@@ -11779,8 +11847,8 @@ + ! + ! #endif /* XMLSEC_NO_DES */ + ! +-*** misc/xmlsec1-1.2.6/src/nss/pkikeys.c Wed Mar 17 06:06:45 2004 +---- misc/build/xmlsec1-1.2.6/src/nss/pkikeys.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/pkikeys.c Wed Mar 17 14:06:45 2004 ++--- misc/build/xmlsec1-1.2.6/src/nss/pkikeys.c Sun Apr 29 08:10:07 2007 + *************** + *** 5,10 **** + --- 5,11 ---- +@@ -12579,8 +12647,8 @@ + + return(8 * SECKEY_PublicKeyStrength(ctx->pubkey)); + } +-*** misc/xmlsec1-1.2.6/src/nss/signatures.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/signatures.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/signatures.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/signatures.c Sun Apr 29 08:10:07 2007 + *************** + *** 199,205 **** + xmlSecErrorsSafeString(xmlSecTransformGetName(transform)), +@@ -12717,8 +12785,8 @@ + return(-1); + } + +-*** misc/xmlsec1-1.2.6/src/nss/symkeys.c Mon Jul 21 05:12:52 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/symkeys.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/symkeys.c Mon Jul 21 12:12:52 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/symkeys.c Sun Apr 29 08:10:07 2007 + *************** + *** 15,192 **** + #include +@@ -14049,8 +14117,8 @@ + * + * Sets the value of HMAC key data. + * +-*** misc/xmlsec1-1.2.6/src/nss/tokens.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/nss/tokens.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/tokens.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/nss/tokens.c Sun Apr 29 08:10:07 2007 + *************** + *** 1 **** + ! dummy +@@ -14599,8 +14667,8 @@ + ! return(0); + ! } + ! +-*** misc/xmlsec1-1.2.6/src/nss/x509.c Fri Sep 26 05:53:09 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/x509.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/x509.c Fri Sep 26 12:53:09 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/x509.c Sun Apr 29 08:10:07 2007 + *************** + *** 34,40 **** + #include +@@ -15708,8 +15776,8 @@ + static void + xmlSecNssX509CertDebugDump(CERTCertificate* cert, FILE* output) { + --- 1700,1705 ---- +-*** misc/xmlsec1-1.2.6/src/nss/x509vfy.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/x509vfy.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/x509vfy.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/x509vfy.c Sun Apr 29 08:10:07 2007 + *************** + *** 30,35 **** + --- 30,36 ---- +@@ -16851,8 +16919,8 @@ + + + #endif /* XMLSEC_NO_X509 */ + +-*** misc/xmlsec1-1.2.6/win32/Makefile.msvc Wed Jun 9 16:35:12 2004 +---- misc/build/xmlsec1-1.2.6/win32/Makefile.msvc Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/win32/Makefile.msvc Wed Jun 9 23:35:12 2004 ++--- misc/build/xmlsec1-1.2.6/win32/Makefile.msvc Sun Apr 29 08:10:07 2007 + *************** + *** 223,228 **** + --- 223,232 ---- diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 79d7d90588f6..07ffec1aa3ad 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -8,8 +8,7 @@ PORTNAME?= openoffice.org PORTVERSION?= 2.3.${SNAPDATE} CATEGORIES+= editors java -MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \ - http://openoffice.lunarshells.com/sources/ \ +MASTER_SITES+= http://openoffice.lunarshells.com/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ @@ -74,10 +73,10 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif CODELINE= 680 -MILESTONE?= 206 +MILESTONE?= 210 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20070319 +SNAPDATE= 20070421 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} .if defined(WITH_CWS) diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo index bd6d678ca7c9..456e5be0baf6 100644 --- a/editors/openoffice.org-2-devel/distinfo +++ b/editors/openoffice.org-2-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = 23680cf7036d0f06bc664070c30b68ad -SHA256 (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = af45a0327679fd2e5de7bd04f6f559a6c836f9bcfb4b77d0a3fcc1a05104ebf7 -SIZE (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = 268728654 +MD5 (openoffice.org2.0/OOo_SRC680_m210_source.tar.bz2) = 41bc2bdf099da4eabb96306cf29f7a60 +SHA256 (openoffice.org2.0/OOo_SRC680_m210_source.tar.bz2) = b0f341f17be1ff6461d287652102d99ed56ca63d1e74d78042a39b692bdeb6da +SIZE (openoffice.org2.0/OOo_SRC680_m210_source.tar.bz2) = 272272535 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2.0/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-2-devel/files/patch-i65514 b/editors/openoffice.org-2-devel/files/patch-i65514 index fa21fa13c3b3..59b7cd68b7ce 100644 --- a/editors/openoffice.org-2-devel/files/patch-i65514 +++ b/editors/openoffice.org-2-devel/files/patch-i65514 @@ -1,11 +1,6 @@ -Index: berkeleydb/db-4.2.52.patch -=================================================================== -RCS file: /cvs/external/berkeleydb/db-4.2.52.patch,v -retrieving revision 1.18 -diff -u -r1.18 db-4.2.52.patch ---- berkeleydb/db-4.2.52.patch 25 Jan 2007 12:11:26 -0000 1.18 -+++ berkeleydb/db-4.2.52.patch 1 Feb 2007 01:37:17 -0000 -@@ -499,6 +499,20 @@ +--- berkeleydb/db-4.2.52.patch Fri Apr 27 17:14:50 2007 ++++ berkeleydb/db-4.2.52.patch Fri Apr 27 17:14:15 2007 +@@ -221,6 +221,20 @@ ! $(SLO)$/dbreg_util.obj ! ! .INCLUDE : target.mk @@ -23,13 +18,13 @@ diff -u -r1.18 db-4.2.52.patch + /* Define to 1 if you have the header file, and it defines `DIR'. */ + #undef HAVE_NDIR_H + - *** misc/db-4.2.52.NC/dist/Makefile.in Fri Nov 28 19:50:06 2003 - --- misc/build/db-4.2.52.NC/dist/Makefile.in Tue Jul 25 09:32:28 2006 + *** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100 + --- misc/build/db-4.2.52.NC/dist/configure 2007-02-19 16:12:12.000000000 +0100 *************** -@@ -554,6 +568,77 @@ - fi - - # Commands to make compiler produce verbose output that lists +@@ -327,6 +341,76 @@ + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +*************** +*** 28556,28561 **** +--- 28556,28606 ---- @@ -98,13 +93,12 @@ diff -u -r1.18 db-4.2.52.patch ++ cat >>confdefs.h <<\_ACEOF ++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1 + _ACEOF -+ -+ + - *** misc/db-4.2.52.NC/dist/ltmain.sh Sat Apr 26 19:45:37 2003 - --- misc/build/db-4.2.52.NC/dist/ltmain.sh Tue Jul 25 09:05:20 2006 ++ + *** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 + --- misc/build/db-4.2.52.NC/dist/ltmain.sh 2007-02-19 16:12:12.000000000 +0100 *************** -@@ -1010,3 +1095,39 @@ +@@ -1080,3 +1164,39 @@ ! $(SLO)$/xa_map.obj ! ! .INCLUDE : target.mk diff --git a/editors/openoffice.org-2-devel/files/patch-i67904 b/editors/openoffice.org-2-devel/files/patch-i67904 index d2fb32236151..520242bb45a0 100644 --- a/editors/openoffice.org-2-devel/files/patch-i67904 +++ b/editors/openoffice.org-2-devel/files/patch-i67904 @@ -64,17 +64,16 @@ diff -u -r1.33 system.h Index: moz/mozilla-source-1.7.5.patch =================================================================== RCS file: /cvs/external/moz/mozilla-source-1.7.5.patch,v -retrieving revision 1.11 -diff -u -r1.11 mozilla-source-1.7.5.patch ---- moz/mozilla-source-1.7.5.patch 19 Jul 2006 09:37:17 -0000 1.11 -+++ moz/mozilla-source-1.7.5.patch 29 Jul 2006 09:53:10 -0000 -@@ -7705,7 +7705,7 @@ - - -#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) - +#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ --+ (defined(__FreeBSD__) && __FreeBSD_version > 700016) -++ (defined(__FreeBSD__) && __FreeBSD_version > 601103) - #define _PR_HAVE_GETPROTO_R - #define _PR_HAVE_5_ARG_GETPROTO_R - #endif - +retrieving revision 1.14 +diff -u -r1.14 mozilla-source-1.7.5.patch +--- moz/mozilla-source-1.7.5.patch 17 Apr 2007 08:54:47 -0000 1.14 ++++ moz/mozilla-source-1.7.5.patch 27 Apr 2007 05:57:10 -0000 +@@ -7821,7 +7821,7 @@ + #endif + + ! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ +-! (defined(__FreeBSD__) && __FreeBSD_version > 700016) ++! (defined(__FreeBSD__) && __FreeBSD_version > 601103) + #define _PR_HAVE_GETPROTO_R + #define _PR_HAVE_5_ARG_GETPROTO_R + #endif diff --git a/editors/openoffice.org-2-devel/files/patch-i75732 b/editors/openoffice.org-2-devel/files/patch-i75732 deleted file mode 100644 index 58dd524e660c..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-i75732 +++ /dev/null @@ -1,18 +0,0 @@ -? sw/unxfbsdx.pro -Index: sw/source/core/doc/makefile.mk -=================================================================== -RCS file: /cvs/sw/sw/source/core/doc/makefile.mk,v -retrieving revision 1.16 -diff -u -r1.16 makefile.mk ---- sw/source/core/doc/makefile.mk 28 Feb 2007 15:40:53 -0000 1.16 -+++ sw/source/core/doc/makefile.mk 26 Mar 2007 05:08:30 -0000 -@@ -94,7 +94,8 @@ - - EXCEPTIONSFILES = \ - $(SLO)$/doclay.obj \ -- $(SLO)$/docnew.obj -+ $(SLO)$/docnew.obj \ -+ $(SLO)$/tblrwcl.obj - - # --- Tagets ------------------------------------------------------- - diff --git a/editors/openoffice.org-2-devel/files/patch-i76141 b/editors/openoffice.org-2-devel/files/patch-i76141 index df70a3ea7055..1698b377a94f 100644 --- a/editors/openoffice.org-2-devel/files/patch-i76141 +++ b/editors/openoffice.org-2-devel/files/patch-i76141 @@ -1,6 +1,6 @@ --- berkeleydb/db-4.2.52.patch Thu Apr 5 14:04:49 2007 +++ berkeleydb/db-4.2.52.patch Thu Apr 5 14:26:49 2007 -@@ -552,6 +552,23 @@ +@@ -276,6 +276,23 @@ test "$with_gnu_ld" != no && break ;; *************** @@ -21,13 +21,13 @@ + case $version_type in + freebsd-elf*) +*************** - *** 11180,11186 **** - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on -@@ -568,6 +585,57 @@ - fi - - # Commands to make compiler produce verbose output that lists + *** 10398,10404 **** + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! +@@ -341,6 +358,57 @@ + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +*************** +*** 12872,12878 **** + ;; @@ -82,6 +82,7 @@ *************** *** 28556,28561 **** --- 28556,28606 ---- + --- curl/curl-7.12.2.patch 25 Sep 2006 13:33:49 -0000 1.9 +++ curl/curl-7.12.2.patch 5 Apr 2007 00:01:20 -0000 @@ -1,3 +1,73 @@ @@ -314,142 +315,12 @@ *** misc/libwpd-0.8.8/src/lib/WP1Part.cpp 2007-01-03 14:07:55.000000000 +0100 --- misc/build/libwpd-0.8.8/src/lib/WP1Part.cpp 2007-01-13 00:18:52.000000000 +0100 *************** ---- libxml2/libxml2-2.6.17.patch Thu Jan 19 13:23:31 2006 -+++ libxml2/libxml2-2.6.17.patch Wed Apr 4 18:38:01 2007 -@@ -1,6 +1,40 @@ - *** misc/libxml2-2.6.17/configure 2005-01-16 20:24:22.000000000 +0100 - --- misc/build/libxml2-2.6.17/configure 2005-02-02 17:41:10.751412243 +0100 - *************** -+*** 8547,8553 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 8547,8553 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 15436,15442 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 15436,15442 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 26339,26347 **** - - echo "$as_me:$LINENO: checking for setsockopt" >&5 ---- libxmlsec/xmlsec1-1.2.6.patch 24 Oct 2006 13:31:14 -0000 1.16 -+++ libxmlsec/xmlsec1-1.2.6.patch 5 Apr 2007 00:47:31 -0000 -@@ -17,8 +17,25 @@ - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --*** misc/xmlsec1-1.2.6/configure Thu Aug 26 08:00:34 2004 ----- misc/build/xmlsec1-1.2.6/configure Thu Sep 28 18:00:38 2006 -+*** misc/xmlsec1-1.2.6/configure Thu Aug 26 02:00:34 2004 -+--- misc/build/xmlsec1-1.2.6/configure Wed Apr 4 20:43:24 2007 -+*************** -+*** 7778,7784 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 7778,7784 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) - *************** - *** 9046,9052 **** - ;; -@@ -37,6 +54,57 @@ - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - *************** -+*** 11497,11503 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 11497,11503 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 14667,14673 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 14667,14673 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 17035,17041 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 17035,17041 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 24598,24604 **** - fi - ---- moz/mozilla-source-1.7.5.patch Wed Apr 4 19:22:49 2007 -+++ moz/mozilla-source-1.7.5.patch Wed Apr 4 21:08:38 2007 -@@ -134,6 +134,23 @@ - *** misc/mozilla/configure 2004-10-12 06:13:29.000000000 +0200 - --- misc/build/mozilla/configure 2006-02-24 09:41:55.000000000 +0100 + +--- moz/mozilla-source-1.7.5.patch.orig Fri Apr 27 15:23:29 2007 ++++ moz/mozilla-source-1.7.5.patch Fri Apr 27 15:32:07 2007 +@@ -266,6 +266,23 @@ + *** misc/mozilla/configure Tue Oct 12 00:13:29 2004 + --- misc/build/mozilla/configure Thu Mar 29 14:27:08 2007 *************** +*** 5228,5234 **** + ;; @@ -471,9 +342,9 @@ *** 5895,5901 **** MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@' MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' -@@ -174,6 +202,23 @@ - *** misc/mozilla/configure.in 2004-10-12 06:13:29.000000000 +0200 - --- misc/build/mozilla/configure.in 2006-02-24 09:41:55.000000000 +0100 +@@ -311,6 +328,23 @@ + *** misc/mozilla/configure.in Tue Oct 12 00:13:29 2004 + --- misc/build/mozilla/configure.in Thu Mar 29 14:27:08 2007 *************** +*** 1006,1012 **** + ;; @@ -495,10 +366,10 @@ *** 1536,1542 **** MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@' MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' -@@ -211,6 +267,25 @@ - CC="\$(CYGWIN_WRAPPER) $CC" - CXX="\$(CYGWIN_WRAPPER) $CXX" - CPP="\$(CYGWIN_WRAPPER) $CPP" +@@ -449,6 +483,25 @@ + ASM_SUFFIX = @ASM_SUFFIX@ + PROG_SUFFIX = @PROG_SUFFIX@ + MOD_NAME = @NSPR_MODNAME@ +*** misc/mozilla/directory/c-sdk/config/FreeBSD.mk Tue Mar 26 16:51:46 2002 +--- misc/build/mozilla/directory/c-sdk/config/FreeBSD.mk Wed Apr 4 20:56:05 2007 +*************** @@ -518,12 +389,12 @@ + + ifeq ($(MOZ_OBJFORMAT),elf) + DLL_SUFFIX = so - *** misc/mozilla/directory/c-sdk/config/cygwin-wrapper 2003-04-03 01:22:39.000000000 +0200 - --- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper 2006-02-24 09:41:55.000000000 +0100 + *** misc/mozilla/directory/c-sdk/config/cygwin-wrapper Wed Apr 2 19:22:39 2003 + --- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper Thu Mar 29 14:27:08 2007 *************** -@@ -341,6 +416,23 @@ - *** misc/mozilla/directory/c-sdk/configure 2004-09-14 23:14:38.000000000 +0200 - --- misc/build/mozilla/directory/c-sdk/configure 2006-02-24 09:41:55.000000000 +0100 +@@ -524,6 +577,23 @@ + MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' + PR_MD_ASFILES= *************** +*** 3465,3471 **** + EOF @@ -543,11 +414,11 @@ + else +*************** *** 3832,3837 **** - --- 3832,3838 ---- + --- 3833,3839 ---- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' -@@ -363,6 +455,23 @@ - *** misc/mozilla/directory/c-sdk/configure.in 2004-09-14 23:14:38.000000000 +0200 - --- misc/build/mozilla/directory/c-sdk/configure.in 2006-02-24 09:41:55.000000000 +0100 +@@ -604,6 +674,23 @@ + MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' + PR_MD_ASFILES= *************** +*** 896,902 **** + AC_DEFINE(FREEBSD) @@ -567,9 +438,9 @@ + else +*************** *** 1144,1149 **** - --- 1144,1150 ---- + --- 1145,1151 ---- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' -@@ -6830,6 +6939,44 @@ +@@ -7562,6 +7649,44 @@ switch (name) { case MAX_CONNECTIONS: @@ -611,13 +482,13 @@ + if test "$MOZ_OBJFORMAT" = "elf"; then + DLL_SUFFIX=so + else - *** misc/mozilla/nsprpub/build/cygwin-wrapper 2003-04-03 01:22:38.000000000 +0200 - --- misc/build/mozilla/nsprpub/build/cygwin-wrapper 2006-02-24 09:41:55.000000000 +0100 + *** misc/mozilla/nsprpub/build/cygwin-wrapper Wed Apr 2 19:22:38 2003 + --- misc/build/mozilla/nsprpub/build/cygwin-wrapper Thu Mar 29 14:27:08 2007 *************** -@@ -7060,6 +7207,25 @@ - gDirServiceProvider->SetProfileDir(profileDir); - mCurrentProfileName.Assign(aCurrentProfile); - gProfileDataAccess->SetCurrentProfile(aCurrentProfile); +@@ -8090,6 +8215,25 @@ + + ifdef NS_USE_GCC + + NSPR31_LIB_PREFIX = lib + + endif +*** misc/mozilla/security/coreconf/FreeBSD.mk Wed Mar 26 20:17:25 2003 +--- misc/build/mozilla/security/coreconf/FreeBSD.mk Wed Apr 4 20:56:48 2007 +*************** @@ -637,8 +508,8 @@ + + ifeq ($(MOZ_OBJFORMAT),elf) + DLL_SUFFIX = so - *** misc/mozilla/security/coreconf/command.mk 2002-02-15 23:53:12.000000000 +0100 - --- misc/build/mozilla/security/coreconf/command.mk 2006-02-24 09:41:55.000000000 +0100 + *** misc/mozilla/security/coreconf/command.mk Fri Feb 15 17:53:12 2002 + --- misc/build/mozilla/security/coreconf/command.mk Thu Mar 29 14:27:09 2007 *************** --- neon/neon.patch Tue Feb 6 09:08:59 2007 +++ neon/neon.patch Thu Apr 5 14:36:14 2007 @@ -837,3 +708,611 @@ diff -uprN misc/vigra1.4.0/include/vigra/array_vector.hxx misc/build/vigra1.4.0/include/vigra/array_vector.hxx --- misc/vigra1.4.0/include/vigra/array_vector.hxx 2005-12-21 05:53:30.000000000 +0100 +++ misc/build/vigra1.4.0/include/vigra/array_vector.hxx 2006-08-31 12:08:15.172679000 +0200 + + +Index: libxmlsec/xmlsec1-1.2.6.patch +=================================================================== +RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v +retrieving revision 1.19 +diff -u -r1.19 xmlsec1-1.2.6.patch +--- libxmlsec/xmlsec1-1.2.6.patch 27 Mar 2007 09:36:38 -0000 1.19 ++++ libxmlsec/xmlsec1-1.2.6.patch 28 Apr 2007 23:12:51 -0000 +@@ -1,5 +1,5 @@ +-*** misc/xmlsec1-1.2.6/apps/Makefile.in Thu Aug 26 08:00:30 2004 +---- misc/build/xmlsec1-1.2.6/apps/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/apps/Makefile.in Thu Aug 26 15:00:30 2004 ++--- misc/build/xmlsec1-1.2.6/apps/Makefile.in Sun Apr 29 08:10:05 2007 + *************** + *** 370,376 **** + $(CRYPTO_DEPS) \ +@@ -17,8 +17,8 @@ + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-*** misc/xmlsec1-1.2.6/configure Thu Aug 26 08:00:34 2004 +---- misc/build/xmlsec1-1.2.6/configure Tue Mar 27 11:26:19 2007 ++*** misc/xmlsec1-1.2.6/configure Thu Aug 26 15:00:34 2004 ++--- misc/build/xmlsec1-1.2.6/configure Sun Apr 29 08:10:06 2007 + *************** + *** 463,469 **** + # include +@@ -158,6 +158,23 @@ + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + *************** ++*** 7778,7784 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 7779,7785 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++*************** + *** 9046,9052 **** + ;; + esac +@@ -215,6 +232,23 @@ + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + *************** ++*** 11497,11503 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 11498,11504 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++*************** + *** 13259,13269 **** + lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' + ;; +@@ -257,6 +291,23 @@ + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + *************** ++*** 14667,14673 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 14668,14674 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++*************** + *** 15607,15617 **** + lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' + ;; +@@ -316,6 +367,23 @@ + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + *************** ++*** 17035,17041 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 17036,17042 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++*************** + *** 24598,24604 **** + fi + +@@ -2379,8 +2447,8 @@ + s,@XMLSEC_NO_SHA1_TRUE@,$XMLSEC_NO_SHA1_TRUE,;t t + s,@XMLSEC_NO_SHA1_FALSE@,$XMLSEC_NO_SHA1_FALSE,;t t + s,@XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t +-*** misc/xmlsec1-1.2.6/configure.in Thu Aug 26 04:49:24 2004 +---- misc/build/xmlsec1-1.2.6/configure.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/configure.in Thu Aug 26 11:49:24 2004 ++--- misc/build/xmlsec1-1.2.6/configure.in Sun Apr 29 08:10:06 2007 + *************** + *** 143,149 **** + dnl find libxml +@@ -2496,8 +2564,8 @@ + dnl do not add -L/usr/lib because compiler does it anyway + if test "z$dir" = "z/usr/lib" ; then + NSS_LIBS="$NSS_LIBS_LIST" +-*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -2560,8 +2628,8 @@ + ! # Tell versions [3.59,3.63) of GNU make to not export all variables. + ! # Otherwise a system limit (for SysV at least) may be exceeded. + ! .NOEXPORT: +-*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -2637,8 +2705,8 @@ + ! #endif /* __XMLSEC_MSCRYPTO_AKMNGR_H__ */ + ! + ! +-*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Fri Sep 26 08:12:46 2003 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Fri Sep 26 15:12:46 2003 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Sun Apr 29 08:10:06 2007 + *************** + *** 77,82 **** + --- 77,97 ---- +@@ -2663,8 +2731,8 @@ + + #endif /* XMLSEC_NO_X509 */ + +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Wed Jul 30 04:46:35 2003 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Wed Jul 30 11:46:35 2003 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Sun Apr 29 08:10:06 2007 + *************** + *** 3,8 **** + --- 3,9 ---- +@@ -2686,8 +2754,8 @@ + $(NULL) + + install-exec-hook: +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Thu Aug 26 08:00:31 2004 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Thu Aug 26 15:00:31 2004 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Sun Apr 29 08:10:06 2007 + *************** + *** 273,278 **** + --- 273,279 ---- +@@ -2709,8 +2777,8 @@ + $(NULL) + + all: all-am +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -2771,8 +2839,8 @@ + ! #endif /* __XMLSEC_NSS_AKMNGR_H__ */ + ! + ! +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/app.h Mon Jan 12 22:06:14 2004 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/app.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/app.h Tue Jan 13 06:06:14 2004 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/app.h Sun Apr 29 08:10:06 2007 + *************** + *** 22,27 **** + --- 22,30 ---- +@@ -2796,8 +2864,8 @@ + XMLSEC_CRYPTO_EXPORT int xmlSecNssAppDefaultKeysMngrLoad (xmlSecKeysMngrPtr mngr, + const char* uri); + XMLSEC_CRYPTO_EXPORT int xmlSecNssAppDefaultKeysMngrSave (xmlSecKeysMngrPtr mngr, +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -2837,8 +2905,8 @@ + ! #endif /* __XMLSEC_NSS_CIPHERS_H__ */ + ! + ! +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Mon Jan 12 22:06:14 2004 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Tue Jan 13 06:06:14 2004 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Sun Apr 29 08:10:06 2007 + *************** + *** 264,269 **** + --- 264,278 ---- +@@ -2857,8 +2925,8 @@ + #endif /* XMLSEC_NO_RSA */ + + +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Wed Jul 30 04:46:35 2003 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Wed Jul 30 11:46:35 2003 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Sun Apr 29 08:10:06 2007 + *************** + *** 16,21 **** + --- 16,23 ---- +@@ -2881,8 +2949,8 @@ + XMLSEC_CRYPTO_EXPORT int xmlSecNssKeysStoreLoad (xmlSecKeyStorePtr store, + const char *uri, + xmlSecKeysMngrPtr keysMngr); +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -3069,8 +3137,8 @@ + ! + ! #endif /* __XMLSEC_NSS_TOKENS_H__ */ + ! +-*** misc/xmlsec1-1.2.6/libxml2-config Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/libxml2-config Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/libxml2-config Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/libxml2-config Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -3123,8 +3191,8 @@ + ! done + ! + ! exit 0 +-*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 08:00:15 2004 +---- misc/build/xmlsec1-1.2.6/ltmain.sh Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 15:00:15 2004 ++--- misc/build/xmlsec1-1.2.6/ltmain.sh Sun Apr 29 08:10:06 2007 + *************** + *** 1661,1666 **** + --- 1661,1671 ---- +@@ -3199,8 +3267,8 @@ + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in +-*** misc/xmlsec1-1.2.6/src/bn.c Mon Jun 21 20:33:27 2004 +---- misc/build/xmlsec1-1.2.6/src/bn.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/bn.c Tue Jun 22 03:33:27 2004 ++--- misc/build/xmlsec1-1.2.6/src/bn.c Sun Apr 29 08:10:06 2007 + *************** + *** 170,177 **** + */ +@@ -3766,8 +3834,8 @@ + } + + return(0); +-*** misc/xmlsec1-1.2.6/src/dl.c Wed Oct 29 16:57:20 2003 +---- misc/build/xmlsec1-1.2.6/src/dl.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/dl.c Thu Oct 30 00:57:20 2003 ++--- misc/build/xmlsec1-1.2.6/src/dl.c Sun Apr 29 08:10:06 2007 + *************** + *** 329,334 **** + --- 329,338 ---- +@@ -3793,8 +3861,8 @@ + } + + --- 354,359 ---- +-*** misc/xmlsec1-1.2.6/src/mscrypto/Makefile.in Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/Makefile.in Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/Makefile.in Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -3977,8 +4045,8 @@ + ! # Tell versions [3.59,3.63) of GNU make to not export all variables. + ! # Otherwise a system limit (for SysV at least) may be exceeded. + ! .NOEXPORT: +-*** misc/xmlsec1-1.2.6/src/mscrypto/akmngr.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/akmngr.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/akmngr.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/akmngr.c Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -4218,8 +4286,8 @@ + ! return( 0 ) ; + ! } + ! +-*** misc/xmlsec1-1.2.6/src/mscrypto/certkeys.c Wed Mar 17 06:06:43 2004 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/certkeys.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/certkeys.c Wed Mar 17 14:06:43 2004 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/certkeys.c Sun Apr 29 08:10:06 2007 + *************** + *** 41,46 **** + --- 41,47 ---- +@@ -4896,8 +4964,8 @@ + } + + static xmlSecKeyDataType +-*** misc/xmlsec1-1.2.6/src/mscrypto/ciphers.c Fri Sep 26 08:12:51 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/ciphers.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/ciphers.c Fri Sep 26 15:12:51 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/ciphers.c Sun Apr 29 08:10:06 2007 + *************** + *** 785,791 **** + * AES CBC cipher transforms +@@ -4966,8 +5034,8 @@ + /* klass/object sizes */ + sizeof(xmlSecTransformKlass), /* size_t klassSize */ + xmlSecMSCryptoBlockCipherSize, /* size_t objSize */ +-*** misc/xmlsec1-1.2.6/src/mscrypto/crypto.c Wed Nov 12 03:38:51 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/crypto.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/crypto.c Wed Nov 12 11:38:51 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/crypto.c Sun Apr 29 08:10:06 2007 + *************** + *** 330,342 **** + BYTE* +@@ -4999,8 +5067,8 @@ + return(NULL); + } + +-*** misc/xmlsec1-1.2.6/src/mscrypto/digests.c Tue Sep 30 04:09:51 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/digests.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/digests.c Tue Sep 30 11:09:51 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/digests.c Sun Apr 29 08:10:06 2007 + *************** + *** 96,107 **** + +@@ -5031,8 +5099,8 @@ + } + + return(0); +-*** misc/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Fri Sep 26 22:29:25 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Sat Sep 27 05:29:25 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Sun Apr 29 08:10:06 2007 + *************** + *** 66,72 **** + static int xmlSecMSCryptoRsaPkcs1Process (xmlSecTransformPtr transform, +@@ -5050,8 +5118,8 @@ + /* klass/object sizes */ + sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ + xmlSecMSCryptoRsaPkcs1Size, /* xmlSecSize objSize */ +-*** misc/xmlsec1-1.2.6/src/mscrypto/signatures.c Fri Sep 26 22:29:25 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/signatures.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/signatures.c Sat Sep 27 05:29:25 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/signatures.c Sun Apr 29 08:10:06 2007 + *************** + *** 483,489 **** + * RSA-SHA1 signature transform +@@ -5086,8 +5154,8 @@ + /* klass/object sizes */ + sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ + xmlSecMSCryptoSignatureSize, /* xmlSecSize objSize */ +-*** misc/xmlsec1-1.2.6/src/mscrypto/symkeys.c Fri Sep 26 02:58:13 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/symkeys.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/symkeys.c Fri Sep 26 09:58:13 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/symkeys.c Sun Apr 29 08:10:06 2007 + *************** + *** 72,78 **** + * processing +@@ -5122,8 +5190,8 @@ + sizeof(xmlSecKeyDataKlass), + xmlSecKeyDataBinarySize, + +-*** misc/xmlsec1-1.2.6/src/mscrypto/x509.c Fri Sep 26 02:58:13 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/x509.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/x509.c Fri Sep 26 09:58:13 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/x509.c Sun Apr 29 08:10:06 2007 + *************** + *** 240,246 **** + +@@ -5369,8 +5437,8 @@ + sizeof(xmlSecKeyDataKlass), + sizeof(xmlSecKeyData), + +-*** misc/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Sat Sep 27 05:12:22 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Sat Sep 27 12:12:22 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Sun Apr 29 08:10:06 2007 + *************** + *** 70,76 **** + static xmlSecByte * xmlSecMSCryptoX509NameRead (xmlSecByte *str, +@@ -6115,8 +6183,8 @@ + } + } + xmlFree(cName); +-*** misc/xmlsec1-1.2.6/src/nss/Makefile.am Tue Sep 16 11:43:03 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/Makefile.am Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/Makefile.am Tue Sep 16 18:43:03 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/Makefile.am Sun Apr 29 08:10:06 2007 + *************** + *** 20,40 **** + $(NULL) +@@ -6163,8 +6231,8 @@ + $(NULL) + + libxmlsec1_nss_la_LIBADD = \ +-*** misc/xmlsec1-1.2.6/src/nss/Makefile.in Thu Aug 26 08:00:32 2004 +---- misc/build/xmlsec1-1.2.6/src/nss/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/Makefile.in Thu Aug 26 15:00:32 2004 ++--- misc/build/xmlsec1-1.2.6/src/nss/Makefile.in Sun Apr 29 08:10:06 2007 + *************** + *** 54,62 **** + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +@@ -6288,8 +6356,8 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkikeys.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signatures.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symkeys.Plo@am__quote@ +-*** misc/xmlsec1-1.2.6/src/nss/akmngr.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/nss/akmngr.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/akmngr.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/nss/akmngr.c Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -6678,8 +6746,8 @@ + ! return(0) ; + ! } + ! +-*** misc/xmlsec1-1.2.6/src/nss/ciphers.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/ciphers.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/ciphers.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/ciphers.c Sun Apr 29 08:10:06 2007 + *************** + *** 1,838 **** + ! /** +@@ -8472,8 +8540,8 @@ + } + ! + +-*** misc/xmlsec1-1.2.6/src/nss/crypto.c Wed Oct 29 16:57:25 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/crypto.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/crypto.c Thu Oct 30 00:57:25 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/crypto.c Sun Apr 29 08:10:06 2007 + *************** + *** 130,135 **** + --- 130,136 ---- +@@ -8526,8 +8594,8 @@ + + return(gXmlSecNssFunctions); + } +-*** misc/xmlsec1-1.2.6/src/nss/digests.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/digests.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/digests.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/digests.c Sun Apr 29 08:10:06 2007 + *************** + *** 21,27 **** + #include +@@ -8623,8 +8691,8 @@ + return(-1); + } + xmlSecAssert2(ctx->dgstSize > 0, -1); +-*** misc/xmlsec1-1.2.6/src/nss/hmac.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/hmac.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/hmac.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/hmac.c Sun Apr 29 08:10:06 2007 + *************** + *** 23,30 **** + #include +@@ -8758,8 +8826,8 @@ + return(-1); + } + xmlSecAssert2(dgstSize > 0, -1); +-*** misc/xmlsec1-1.2.6/src/nss/keysstore.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/keysstore.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/keysstore.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/keysstore.c Sun Apr 29 08:10:06 2007 + *************** + *** 1,119 **** + /** +@@ -9826,8 +9894,8 @@ + ! return(0); + } + + +-*** misc/xmlsec1-1.2.6/src/nss/keytrans.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/nss/keytrans.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/keytrans.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/nss/keytrans.c Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -10576,8 +10644,8 @@ + ! + ! #endif /* XMLSEC_NO_RSA */ + ! +-*** misc/xmlsec1-1.2.6/src/nss/keywrapers.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/nss/keywrapers.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/keywrapers.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/nss/keywrapers.c Sun Apr 29 08:10:07 2007 + *************** + *** 1 **** + ! dummy +@@ -11779,8 +11847,8 @@ + ! + ! #endif /* XMLSEC_NO_DES */ + ! +-*** misc/xmlsec1-1.2.6/src/nss/pkikeys.c Wed Mar 17 06:06:45 2004 +---- misc/build/xmlsec1-1.2.6/src/nss/pkikeys.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/pkikeys.c Wed Mar 17 14:06:45 2004 ++--- misc/build/xmlsec1-1.2.6/src/nss/pkikeys.c Sun Apr 29 08:10:07 2007 + *************** + *** 5,10 **** + --- 5,11 ---- +@@ -12579,8 +12647,8 @@ + + return(8 * SECKEY_PublicKeyStrength(ctx->pubkey)); + } +-*** misc/xmlsec1-1.2.6/src/nss/signatures.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/signatures.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/signatures.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/signatures.c Sun Apr 29 08:10:07 2007 + *************** + *** 199,205 **** + xmlSecErrorsSafeString(xmlSecTransformGetName(transform)), +@@ -12717,8 +12785,8 @@ + return(-1); + } + +-*** misc/xmlsec1-1.2.6/src/nss/symkeys.c Mon Jul 21 05:12:52 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/symkeys.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/symkeys.c Mon Jul 21 12:12:52 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/symkeys.c Sun Apr 29 08:10:07 2007 + *************** + *** 15,192 **** + #include +@@ -14049,8 +14117,8 @@ + * + * Sets the value of HMAC key data. + * +-*** misc/xmlsec1-1.2.6/src/nss/tokens.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/nss/tokens.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/tokens.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/nss/tokens.c Sun Apr 29 08:10:07 2007 + *************** + *** 1 **** + ! dummy +@@ -14599,8 +14667,8 @@ + ! return(0); + ! } + ! +-*** misc/xmlsec1-1.2.6/src/nss/x509.c Fri Sep 26 05:53:09 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/x509.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/x509.c Fri Sep 26 12:53:09 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/x509.c Sun Apr 29 08:10:07 2007 + *************** + *** 34,40 **** + #include +@@ -15708,8 +15776,8 @@ + static void + xmlSecNssX509CertDebugDump(CERTCertificate* cert, FILE* output) { + --- 1700,1705 ---- +-*** misc/xmlsec1-1.2.6/src/nss/x509vfy.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/x509vfy.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/x509vfy.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/x509vfy.c Sun Apr 29 08:10:07 2007 + *************** + *** 30,35 **** + --- 30,36 ---- +@@ -16851,8 +16919,8 @@ + + + #endif /* XMLSEC_NO_X509 */ + +-*** misc/xmlsec1-1.2.6/win32/Makefile.msvc Wed Jun 9 16:35:12 2004 +---- misc/build/xmlsec1-1.2.6/win32/Makefile.msvc Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/win32/Makefile.msvc Wed Jun 9 23:35:12 2004 ++--- misc/build/xmlsec1-1.2.6/win32/Makefile.msvc Sun Apr 29 08:10:07 2007 + *************** + *** 223,228 **** + --- 223,232 ---- diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 79d7d90588f6..07ffec1aa3ad 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -8,8 +8,7 @@ PORTNAME?= openoffice.org PORTVERSION?= 2.3.${SNAPDATE} CATEGORIES+= editors java -MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \ - http://openoffice.lunarshells.com/sources/ \ +MASTER_SITES+= http://openoffice.lunarshells.com/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ @@ -74,10 +73,10 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif CODELINE= 680 -MILESTONE?= 206 +MILESTONE?= 210 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20070319 +SNAPDATE= 20070421 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} .if defined(WITH_CWS) diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo index bd6d678ca7c9..456e5be0baf6 100644 --- a/editors/openoffice.org-3-devel/distinfo +++ b/editors/openoffice.org-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = 23680cf7036d0f06bc664070c30b68ad -SHA256 (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = af45a0327679fd2e5de7bd04f6f559a6c836f9bcfb4b77d0a3fcc1a05104ebf7 -SIZE (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = 268728654 +MD5 (openoffice.org2.0/OOo_SRC680_m210_source.tar.bz2) = 41bc2bdf099da4eabb96306cf29f7a60 +SHA256 (openoffice.org2.0/OOo_SRC680_m210_source.tar.bz2) = b0f341f17be1ff6461d287652102d99ed56ca63d1e74d78042a39b692bdeb6da +SIZE (openoffice.org2.0/OOo_SRC680_m210_source.tar.bz2) = 272272535 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2.0/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-3-devel/files/patch-i65514 b/editors/openoffice.org-3-devel/files/patch-i65514 index fa21fa13c3b3..59b7cd68b7ce 100644 --- a/editors/openoffice.org-3-devel/files/patch-i65514 +++ b/editors/openoffice.org-3-devel/files/patch-i65514 @@ -1,11 +1,6 @@ -Index: berkeleydb/db-4.2.52.patch -=================================================================== -RCS file: /cvs/external/berkeleydb/db-4.2.52.patch,v -retrieving revision 1.18 -diff -u -r1.18 db-4.2.52.patch ---- berkeleydb/db-4.2.52.patch 25 Jan 2007 12:11:26 -0000 1.18 -+++ berkeleydb/db-4.2.52.patch 1 Feb 2007 01:37:17 -0000 -@@ -499,6 +499,20 @@ +--- berkeleydb/db-4.2.52.patch Fri Apr 27 17:14:50 2007 ++++ berkeleydb/db-4.2.52.patch Fri Apr 27 17:14:15 2007 +@@ -221,6 +221,20 @@ ! $(SLO)$/dbreg_util.obj ! ! .INCLUDE : target.mk @@ -23,13 +18,13 @@ diff -u -r1.18 db-4.2.52.patch + /* Define to 1 if you have the header file, and it defines `DIR'. */ + #undef HAVE_NDIR_H + - *** misc/db-4.2.52.NC/dist/Makefile.in Fri Nov 28 19:50:06 2003 - --- misc/build/db-4.2.52.NC/dist/Makefile.in Tue Jul 25 09:32:28 2006 + *** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100 + --- misc/build/db-4.2.52.NC/dist/configure 2007-02-19 16:12:12.000000000 +0100 *************** -@@ -554,6 +568,77 @@ - fi - - # Commands to make compiler produce verbose output that lists +@@ -327,6 +341,76 @@ + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +*************** +*** 28556,28561 **** +--- 28556,28606 ---- @@ -98,13 +93,12 @@ diff -u -r1.18 db-4.2.52.patch ++ cat >>confdefs.h <<\_ACEOF ++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1 + _ACEOF -+ -+ + - *** misc/db-4.2.52.NC/dist/ltmain.sh Sat Apr 26 19:45:37 2003 - --- misc/build/db-4.2.52.NC/dist/ltmain.sh Tue Jul 25 09:05:20 2006 ++ + *** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 + --- misc/build/db-4.2.52.NC/dist/ltmain.sh 2007-02-19 16:12:12.000000000 +0100 *************** -@@ -1010,3 +1095,39 @@ +@@ -1080,3 +1164,39 @@ ! $(SLO)$/xa_map.obj ! ! .INCLUDE : target.mk diff --git a/editors/openoffice.org-3-devel/files/patch-i67904 b/editors/openoffice.org-3-devel/files/patch-i67904 index d2fb32236151..520242bb45a0 100644 --- a/editors/openoffice.org-3-devel/files/patch-i67904 +++ b/editors/openoffice.org-3-devel/files/patch-i67904 @@ -64,17 +64,16 @@ diff -u -r1.33 system.h Index: moz/mozilla-source-1.7.5.patch =================================================================== RCS file: /cvs/external/moz/mozilla-source-1.7.5.patch,v -retrieving revision 1.11 -diff -u -r1.11 mozilla-source-1.7.5.patch ---- moz/mozilla-source-1.7.5.patch 19 Jul 2006 09:37:17 -0000 1.11 -+++ moz/mozilla-source-1.7.5.patch 29 Jul 2006 09:53:10 -0000 -@@ -7705,7 +7705,7 @@ - - -#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) - +#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ --+ (defined(__FreeBSD__) && __FreeBSD_version > 700016) -++ (defined(__FreeBSD__) && __FreeBSD_version > 601103) - #define _PR_HAVE_GETPROTO_R - #define _PR_HAVE_5_ARG_GETPROTO_R - #endif - +retrieving revision 1.14 +diff -u -r1.14 mozilla-source-1.7.5.patch +--- moz/mozilla-source-1.7.5.patch 17 Apr 2007 08:54:47 -0000 1.14 ++++ moz/mozilla-source-1.7.5.patch 27 Apr 2007 05:57:10 -0000 +@@ -7821,7 +7821,7 @@ + #endif + + ! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ +-! (defined(__FreeBSD__) && __FreeBSD_version > 700016) ++! (defined(__FreeBSD__) && __FreeBSD_version > 601103) + #define _PR_HAVE_GETPROTO_R + #define _PR_HAVE_5_ARG_GETPROTO_R + #endif diff --git a/editors/openoffice.org-3-devel/files/patch-i75732 b/editors/openoffice.org-3-devel/files/patch-i75732 deleted file mode 100644 index 58dd524e660c..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-i75732 +++ /dev/null @@ -1,18 +0,0 @@ -? sw/unxfbsdx.pro -Index: sw/source/core/doc/makefile.mk -=================================================================== -RCS file: /cvs/sw/sw/source/core/doc/makefile.mk,v -retrieving revision 1.16 -diff -u -r1.16 makefile.mk ---- sw/source/core/doc/makefile.mk 28 Feb 2007 15:40:53 -0000 1.16 -+++ sw/source/core/doc/makefile.mk 26 Mar 2007 05:08:30 -0000 -@@ -94,7 +94,8 @@ - - EXCEPTIONSFILES = \ - $(SLO)$/doclay.obj \ -- $(SLO)$/docnew.obj -+ $(SLO)$/docnew.obj \ -+ $(SLO)$/tblrwcl.obj - - # --- Tagets ------------------------------------------------------- - diff --git a/editors/openoffice.org-3-devel/files/patch-i76141 b/editors/openoffice.org-3-devel/files/patch-i76141 index df70a3ea7055..1698b377a94f 100644 --- a/editors/openoffice.org-3-devel/files/patch-i76141 +++ b/editors/openoffice.org-3-devel/files/patch-i76141 @@ -1,6 +1,6 @@ --- berkeleydb/db-4.2.52.patch Thu Apr 5 14:04:49 2007 +++ berkeleydb/db-4.2.52.patch Thu Apr 5 14:26:49 2007 -@@ -552,6 +552,23 @@ +@@ -276,6 +276,23 @@ test "$with_gnu_ld" != no && break ;; *************** @@ -21,13 +21,13 @@ + case $version_type in + freebsd-elf*) +*************** - *** 11180,11186 **** - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on -@@ -568,6 +585,57 @@ - fi - - # Commands to make compiler produce verbose output that lists + *** 10398,10404 **** + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! +@@ -341,6 +358,57 @@ + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +*************** +*** 12872,12878 **** + ;; @@ -82,6 +82,7 @@ *************** *** 28556,28561 **** --- 28556,28606 ---- + --- curl/curl-7.12.2.patch 25 Sep 2006 13:33:49 -0000 1.9 +++ curl/curl-7.12.2.patch 5 Apr 2007 00:01:20 -0000 @@ -1,3 +1,73 @@ @@ -314,142 +315,12 @@ *** misc/libwpd-0.8.8/src/lib/WP1Part.cpp 2007-01-03 14:07:55.000000000 +0100 --- misc/build/libwpd-0.8.8/src/lib/WP1Part.cpp 2007-01-13 00:18:52.000000000 +0100 *************** ---- libxml2/libxml2-2.6.17.patch Thu Jan 19 13:23:31 2006 -+++ libxml2/libxml2-2.6.17.patch Wed Apr 4 18:38:01 2007 -@@ -1,6 +1,40 @@ - *** misc/libxml2-2.6.17/configure 2005-01-16 20:24:22.000000000 +0100 - --- misc/build/libxml2-2.6.17/configure 2005-02-02 17:41:10.751412243 +0100 - *************** -+*** 8547,8553 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 8547,8553 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 15436,15442 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 15436,15442 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 26339,26347 **** - - echo "$as_me:$LINENO: checking for setsockopt" >&5 ---- libxmlsec/xmlsec1-1.2.6.patch 24 Oct 2006 13:31:14 -0000 1.16 -+++ libxmlsec/xmlsec1-1.2.6.patch 5 Apr 2007 00:47:31 -0000 -@@ -17,8 +17,25 @@ - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --*** misc/xmlsec1-1.2.6/configure Thu Aug 26 08:00:34 2004 ----- misc/build/xmlsec1-1.2.6/configure Thu Sep 28 18:00:38 2006 -+*** misc/xmlsec1-1.2.6/configure Thu Aug 26 02:00:34 2004 -+--- misc/build/xmlsec1-1.2.6/configure Wed Apr 4 20:43:24 2007 -+*************** -+*** 7778,7784 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 7778,7784 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) - *************** - *** 9046,9052 **** - ;; -@@ -37,6 +54,57 @@ - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - *************** -+*** 11497,11503 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 11497,11503 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 14667,14673 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 14667,14673 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 17035,17041 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 17035,17041 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 24598,24604 **** - fi - ---- moz/mozilla-source-1.7.5.patch Wed Apr 4 19:22:49 2007 -+++ moz/mozilla-source-1.7.5.patch Wed Apr 4 21:08:38 2007 -@@ -134,6 +134,23 @@ - *** misc/mozilla/configure 2004-10-12 06:13:29.000000000 +0200 - --- misc/build/mozilla/configure 2006-02-24 09:41:55.000000000 +0100 + +--- moz/mozilla-source-1.7.5.patch.orig Fri Apr 27 15:23:29 2007 ++++ moz/mozilla-source-1.7.5.patch Fri Apr 27 15:32:07 2007 +@@ -266,6 +266,23 @@ + *** misc/mozilla/configure Tue Oct 12 00:13:29 2004 + --- misc/build/mozilla/configure Thu Mar 29 14:27:08 2007 *************** +*** 5228,5234 **** + ;; @@ -471,9 +342,9 @@ *** 5895,5901 **** MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@' MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' -@@ -174,6 +202,23 @@ - *** misc/mozilla/configure.in 2004-10-12 06:13:29.000000000 +0200 - --- misc/build/mozilla/configure.in 2006-02-24 09:41:55.000000000 +0100 +@@ -311,6 +328,23 @@ + *** misc/mozilla/configure.in Tue Oct 12 00:13:29 2004 + --- misc/build/mozilla/configure.in Thu Mar 29 14:27:08 2007 *************** +*** 1006,1012 **** + ;; @@ -495,10 +366,10 @@ *** 1536,1542 **** MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@' MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' -@@ -211,6 +267,25 @@ - CC="\$(CYGWIN_WRAPPER) $CC" - CXX="\$(CYGWIN_WRAPPER) $CXX" - CPP="\$(CYGWIN_WRAPPER) $CPP" +@@ -449,6 +483,25 @@ + ASM_SUFFIX = @ASM_SUFFIX@ + PROG_SUFFIX = @PROG_SUFFIX@ + MOD_NAME = @NSPR_MODNAME@ +*** misc/mozilla/directory/c-sdk/config/FreeBSD.mk Tue Mar 26 16:51:46 2002 +--- misc/build/mozilla/directory/c-sdk/config/FreeBSD.mk Wed Apr 4 20:56:05 2007 +*************** @@ -518,12 +389,12 @@ + + ifeq ($(MOZ_OBJFORMAT),elf) + DLL_SUFFIX = so - *** misc/mozilla/directory/c-sdk/config/cygwin-wrapper 2003-04-03 01:22:39.000000000 +0200 - --- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper 2006-02-24 09:41:55.000000000 +0100 + *** misc/mozilla/directory/c-sdk/config/cygwin-wrapper Wed Apr 2 19:22:39 2003 + --- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper Thu Mar 29 14:27:08 2007 *************** -@@ -341,6 +416,23 @@ - *** misc/mozilla/directory/c-sdk/configure 2004-09-14 23:14:38.000000000 +0200 - --- misc/build/mozilla/directory/c-sdk/configure 2006-02-24 09:41:55.000000000 +0100 +@@ -524,6 +577,23 @@ + MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' + PR_MD_ASFILES= *************** +*** 3465,3471 **** + EOF @@ -543,11 +414,11 @@ + else +*************** *** 3832,3837 **** - --- 3832,3838 ---- + --- 3833,3839 ---- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' -@@ -363,6 +455,23 @@ - *** misc/mozilla/directory/c-sdk/configure.in 2004-09-14 23:14:38.000000000 +0200 - --- misc/build/mozilla/directory/c-sdk/configure.in 2006-02-24 09:41:55.000000000 +0100 +@@ -604,6 +674,23 @@ + MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' + PR_MD_ASFILES= *************** +*** 896,902 **** + AC_DEFINE(FREEBSD) @@ -567,9 +438,9 @@ + else +*************** *** 1144,1149 **** - --- 1144,1150 ---- + --- 1145,1151 ---- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' -@@ -6830,6 +6939,44 @@ +@@ -7562,6 +7649,44 @@ switch (name) { case MAX_CONNECTIONS: @@ -611,13 +482,13 @@ + if test "$MOZ_OBJFORMAT" = "elf"; then + DLL_SUFFIX=so + else - *** misc/mozilla/nsprpub/build/cygwin-wrapper 2003-04-03 01:22:38.000000000 +0200 - --- misc/build/mozilla/nsprpub/build/cygwin-wrapper 2006-02-24 09:41:55.000000000 +0100 + *** misc/mozilla/nsprpub/build/cygwin-wrapper Wed Apr 2 19:22:38 2003 + --- misc/build/mozilla/nsprpub/build/cygwin-wrapper Thu Mar 29 14:27:08 2007 *************** -@@ -7060,6 +7207,25 @@ - gDirServiceProvider->SetProfileDir(profileDir); - mCurrentProfileName.Assign(aCurrentProfile); - gProfileDataAccess->SetCurrentProfile(aCurrentProfile); +@@ -8090,6 +8215,25 @@ + + ifdef NS_USE_GCC + + NSPR31_LIB_PREFIX = lib + + endif +*** misc/mozilla/security/coreconf/FreeBSD.mk Wed Mar 26 20:17:25 2003 +--- misc/build/mozilla/security/coreconf/FreeBSD.mk Wed Apr 4 20:56:48 2007 +*************** @@ -637,8 +508,8 @@ + + ifeq ($(MOZ_OBJFORMAT),elf) + DLL_SUFFIX = so - *** misc/mozilla/security/coreconf/command.mk 2002-02-15 23:53:12.000000000 +0100 - --- misc/build/mozilla/security/coreconf/command.mk 2006-02-24 09:41:55.000000000 +0100 + *** misc/mozilla/security/coreconf/command.mk Fri Feb 15 17:53:12 2002 + --- misc/build/mozilla/security/coreconf/command.mk Thu Mar 29 14:27:09 2007 *************** --- neon/neon.patch Tue Feb 6 09:08:59 2007 +++ neon/neon.patch Thu Apr 5 14:36:14 2007 @@ -837,3 +708,611 @@ diff -uprN misc/vigra1.4.0/include/vigra/array_vector.hxx misc/build/vigra1.4.0/include/vigra/array_vector.hxx --- misc/vigra1.4.0/include/vigra/array_vector.hxx 2005-12-21 05:53:30.000000000 +0100 +++ misc/build/vigra1.4.0/include/vigra/array_vector.hxx 2006-08-31 12:08:15.172679000 +0200 + + +Index: libxmlsec/xmlsec1-1.2.6.patch +=================================================================== +RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v +retrieving revision 1.19 +diff -u -r1.19 xmlsec1-1.2.6.patch +--- libxmlsec/xmlsec1-1.2.6.patch 27 Mar 2007 09:36:38 -0000 1.19 ++++ libxmlsec/xmlsec1-1.2.6.patch 28 Apr 2007 23:12:51 -0000 +@@ -1,5 +1,5 @@ +-*** misc/xmlsec1-1.2.6/apps/Makefile.in Thu Aug 26 08:00:30 2004 +---- misc/build/xmlsec1-1.2.6/apps/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/apps/Makefile.in Thu Aug 26 15:00:30 2004 ++--- misc/build/xmlsec1-1.2.6/apps/Makefile.in Sun Apr 29 08:10:05 2007 + *************** + *** 370,376 **** + $(CRYPTO_DEPS) \ +@@ -17,8 +17,8 @@ + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-*** misc/xmlsec1-1.2.6/configure Thu Aug 26 08:00:34 2004 +---- misc/build/xmlsec1-1.2.6/configure Tue Mar 27 11:26:19 2007 ++*** misc/xmlsec1-1.2.6/configure Thu Aug 26 15:00:34 2004 ++--- misc/build/xmlsec1-1.2.6/configure Sun Apr 29 08:10:06 2007 + *************** + *** 463,469 **** + # include +@@ -158,6 +158,23 @@ + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + *************** ++*** 7778,7784 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 7779,7785 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++*************** + *** 9046,9052 **** + ;; + esac +@@ -215,6 +232,23 @@ + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + *************** ++*** 11497,11503 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 11498,11504 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++*************** + *** 13259,13269 **** + lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' + ;; +@@ -257,6 +291,23 @@ + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + *************** ++*** 14667,14673 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 14668,14674 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++*************** + *** 15607,15617 **** + lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' + ;; +@@ -316,6 +367,23 @@ + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + *************** ++*** 17035,17041 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 17036,17042 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++*************** + *** 24598,24604 **** + fi + +@@ -2379,8 +2447,8 @@ + s,@XMLSEC_NO_SHA1_TRUE@,$XMLSEC_NO_SHA1_TRUE,;t t + s,@XMLSEC_NO_SHA1_FALSE@,$XMLSEC_NO_SHA1_FALSE,;t t + s,@XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t +-*** misc/xmlsec1-1.2.6/configure.in Thu Aug 26 04:49:24 2004 +---- misc/build/xmlsec1-1.2.6/configure.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/configure.in Thu Aug 26 11:49:24 2004 ++--- misc/build/xmlsec1-1.2.6/configure.in Sun Apr 29 08:10:06 2007 + *************** + *** 143,149 **** + dnl find libxml +@@ -2496,8 +2564,8 @@ + dnl do not add -L/usr/lib because compiler does it anyway + if test "z$dir" = "z/usr/lib" ; then + NSS_LIBS="$NSS_LIBS_LIST" +-*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -2560,8 +2628,8 @@ + ! # Tell versions [3.59,3.63) of GNU make to not export all variables. + ! # Otherwise a system limit (for SysV at least) may be exceeded. + ! .NOEXPORT: +-*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -2637,8 +2705,8 @@ + ! #endif /* __XMLSEC_MSCRYPTO_AKMNGR_H__ */ + ! + ! +-*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Fri Sep 26 08:12:46 2003 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Fri Sep 26 15:12:46 2003 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Sun Apr 29 08:10:06 2007 + *************** + *** 77,82 **** + --- 77,97 ---- +@@ -2663,8 +2731,8 @@ + + #endif /* XMLSEC_NO_X509 */ + +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Wed Jul 30 04:46:35 2003 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Wed Jul 30 11:46:35 2003 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Sun Apr 29 08:10:06 2007 + *************** + *** 3,8 **** + --- 3,9 ---- +@@ -2686,8 +2754,8 @@ + $(NULL) + + install-exec-hook: +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Thu Aug 26 08:00:31 2004 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Thu Aug 26 15:00:31 2004 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Sun Apr 29 08:10:06 2007 + *************** + *** 273,278 **** + --- 273,279 ---- +@@ -2709,8 +2777,8 @@ + $(NULL) + + all: all-am +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -2771,8 +2839,8 @@ + ! #endif /* __XMLSEC_NSS_AKMNGR_H__ */ + ! + ! +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/app.h Mon Jan 12 22:06:14 2004 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/app.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/app.h Tue Jan 13 06:06:14 2004 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/app.h Sun Apr 29 08:10:06 2007 + *************** + *** 22,27 **** + --- 22,30 ---- +@@ -2796,8 +2864,8 @@ + XMLSEC_CRYPTO_EXPORT int xmlSecNssAppDefaultKeysMngrLoad (xmlSecKeysMngrPtr mngr, + const char* uri); + XMLSEC_CRYPTO_EXPORT int xmlSecNssAppDefaultKeysMngrSave (xmlSecKeysMngrPtr mngr, +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -2837,8 +2905,8 @@ + ! #endif /* __XMLSEC_NSS_CIPHERS_H__ */ + ! + ! +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Mon Jan 12 22:06:14 2004 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Tue Jan 13 06:06:14 2004 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Sun Apr 29 08:10:06 2007 + *************** + *** 264,269 **** + --- 264,278 ---- +@@ -2857,8 +2925,8 @@ + #endif /* XMLSEC_NO_RSA */ + + +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Wed Jul 30 04:46:35 2003 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Wed Jul 30 11:46:35 2003 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Sun Apr 29 08:10:06 2007 + *************** + *** 16,21 **** + --- 16,23 ---- +@@ -2881,8 +2949,8 @@ + XMLSEC_CRYPTO_EXPORT int xmlSecNssKeysStoreLoad (xmlSecKeyStorePtr store, + const char *uri, + xmlSecKeysMngrPtr keysMngr); +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -3069,8 +3137,8 @@ + ! + ! #endif /* __XMLSEC_NSS_TOKENS_H__ */ + ! +-*** misc/xmlsec1-1.2.6/libxml2-config Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/libxml2-config Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/libxml2-config Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/libxml2-config Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -3123,8 +3191,8 @@ + ! done + ! + ! exit 0 +-*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 08:00:15 2004 +---- misc/build/xmlsec1-1.2.6/ltmain.sh Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 15:00:15 2004 ++--- misc/build/xmlsec1-1.2.6/ltmain.sh Sun Apr 29 08:10:06 2007 + *************** + *** 1661,1666 **** + --- 1661,1671 ---- +@@ -3199,8 +3267,8 @@ + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in +-*** misc/xmlsec1-1.2.6/src/bn.c Mon Jun 21 20:33:27 2004 +---- misc/build/xmlsec1-1.2.6/src/bn.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/bn.c Tue Jun 22 03:33:27 2004 ++--- misc/build/xmlsec1-1.2.6/src/bn.c Sun Apr 29 08:10:06 2007 + *************** + *** 170,177 **** + */ +@@ -3766,8 +3834,8 @@ + } + + return(0); +-*** misc/xmlsec1-1.2.6/src/dl.c Wed Oct 29 16:57:20 2003 +---- misc/build/xmlsec1-1.2.6/src/dl.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/dl.c Thu Oct 30 00:57:20 2003 ++--- misc/build/xmlsec1-1.2.6/src/dl.c Sun Apr 29 08:10:06 2007 + *************** + *** 329,334 **** + --- 329,338 ---- +@@ -3793,8 +3861,8 @@ + } + + --- 354,359 ---- +-*** misc/xmlsec1-1.2.6/src/mscrypto/Makefile.in Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/Makefile.in Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/Makefile.in Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -3977,8 +4045,8 @@ + ! # Tell versions [3.59,3.63) of GNU make to not export all variables. + ! # Otherwise a system limit (for SysV at least) may be exceeded. + ! .NOEXPORT: +-*** misc/xmlsec1-1.2.6/src/mscrypto/akmngr.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/akmngr.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/akmngr.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/akmngr.c Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -4218,8 +4286,8 @@ + ! return( 0 ) ; + ! } + ! +-*** misc/xmlsec1-1.2.6/src/mscrypto/certkeys.c Wed Mar 17 06:06:43 2004 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/certkeys.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/certkeys.c Wed Mar 17 14:06:43 2004 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/certkeys.c Sun Apr 29 08:10:06 2007 + *************** + *** 41,46 **** + --- 41,47 ---- +@@ -4896,8 +4964,8 @@ + } + + static xmlSecKeyDataType +-*** misc/xmlsec1-1.2.6/src/mscrypto/ciphers.c Fri Sep 26 08:12:51 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/ciphers.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/ciphers.c Fri Sep 26 15:12:51 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/ciphers.c Sun Apr 29 08:10:06 2007 + *************** + *** 785,791 **** + * AES CBC cipher transforms +@@ -4966,8 +5034,8 @@ + /* klass/object sizes */ + sizeof(xmlSecTransformKlass), /* size_t klassSize */ + xmlSecMSCryptoBlockCipherSize, /* size_t objSize */ +-*** misc/xmlsec1-1.2.6/src/mscrypto/crypto.c Wed Nov 12 03:38:51 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/crypto.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/crypto.c Wed Nov 12 11:38:51 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/crypto.c Sun Apr 29 08:10:06 2007 + *************** + *** 330,342 **** + BYTE* +@@ -4999,8 +5067,8 @@ + return(NULL); + } + +-*** misc/xmlsec1-1.2.6/src/mscrypto/digests.c Tue Sep 30 04:09:51 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/digests.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/digests.c Tue Sep 30 11:09:51 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/digests.c Sun Apr 29 08:10:06 2007 + *************** + *** 96,107 **** + +@@ -5031,8 +5099,8 @@ + } + + return(0); +-*** misc/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Fri Sep 26 22:29:25 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Sat Sep 27 05:29:25 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Sun Apr 29 08:10:06 2007 + *************** + *** 66,72 **** + static int xmlSecMSCryptoRsaPkcs1Process (xmlSecTransformPtr transform, +@@ -5050,8 +5118,8 @@ + /* klass/object sizes */ + sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ + xmlSecMSCryptoRsaPkcs1Size, /* xmlSecSize objSize */ +-*** misc/xmlsec1-1.2.6/src/mscrypto/signatures.c Fri Sep 26 22:29:25 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/signatures.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/signatures.c Sat Sep 27 05:29:25 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/signatures.c Sun Apr 29 08:10:06 2007 + *************** + *** 483,489 **** + * RSA-SHA1 signature transform +@@ -5086,8 +5154,8 @@ + /* klass/object sizes */ + sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ + xmlSecMSCryptoSignatureSize, /* xmlSecSize objSize */ +-*** misc/xmlsec1-1.2.6/src/mscrypto/symkeys.c Fri Sep 26 02:58:13 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/symkeys.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/symkeys.c Fri Sep 26 09:58:13 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/symkeys.c Sun Apr 29 08:10:06 2007 + *************** + *** 72,78 **** + * processing +@@ -5122,8 +5190,8 @@ + sizeof(xmlSecKeyDataKlass), + xmlSecKeyDataBinarySize, + +-*** misc/xmlsec1-1.2.6/src/mscrypto/x509.c Fri Sep 26 02:58:13 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/x509.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/x509.c Fri Sep 26 09:58:13 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/x509.c Sun Apr 29 08:10:06 2007 + *************** + *** 240,246 **** + +@@ -5369,8 +5437,8 @@ + sizeof(xmlSecKeyDataKlass), + sizeof(xmlSecKeyData), + +-*** misc/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Sat Sep 27 05:12:22 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Sat Sep 27 12:12:22 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Sun Apr 29 08:10:06 2007 + *************** + *** 70,76 **** + static xmlSecByte * xmlSecMSCryptoX509NameRead (xmlSecByte *str, +@@ -6115,8 +6183,8 @@ + } + } + xmlFree(cName); +-*** misc/xmlsec1-1.2.6/src/nss/Makefile.am Tue Sep 16 11:43:03 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/Makefile.am Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/Makefile.am Tue Sep 16 18:43:03 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/Makefile.am Sun Apr 29 08:10:06 2007 + *************** + *** 20,40 **** + $(NULL) +@@ -6163,8 +6231,8 @@ + $(NULL) + + libxmlsec1_nss_la_LIBADD = \ +-*** misc/xmlsec1-1.2.6/src/nss/Makefile.in Thu Aug 26 08:00:32 2004 +---- misc/build/xmlsec1-1.2.6/src/nss/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/Makefile.in Thu Aug 26 15:00:32 2004 ++--- misc/build/xmlsec1-1.2.6/src/nss/Makefile.in Sun Apr 29 08:10:06 2007 + *************** + *** 54,62 **** + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +@@ -6288,8 +6356,8 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkikeys.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signatures.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symkeys.Plo@am__quote@ +-*** misc/xmlsec1-1.2.6/src/nss/akmngr.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/nss/akmngr.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/akmngr.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/nss/akmngr.c Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -6678,8 +6746,8 @@ + ! return(0) ; + ! } + ! +-*** misc/xmlsec1-1.2.6/src/nss/ciphers.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/ciphers.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/ciphers.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/ciphers.c Sun Apr 29 08:10:06 2007 + *************** + *** 1,838 **** + ! /** +@@ -8472,8 +8540,8 @@ + } + ! + +-*** misc/xmlsec1-1.2.6/src/nss/crypto.c Wed Oct 29 16:57:25 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/crypto.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/crypto.c Thu Oct 30 00:57:25 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/crypto.c Sun Apr 29 08:10:06 2007 + *************** + *** 130,135 **** + --- 130,136 ---- +@@ -8526,8 +8594,8 @@ + + return(gXmlSecNssFunctions); + } +-*** misc/xmlsec1-1.2.6/src/nss/digests.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/digests.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/digests.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/digests.c Sun Apr 29 08:10:06 2007 + *************** + *** 21,27 **** + #include +@@ -8623,8 +8691,8 @@ + return(-1); + } + xmlSecAssert2(ctx->dgstSize > 0, -1); +-*** misc/xmlsec1-1.2.6/src/nss/hmac.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/hmac.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/hmac.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/hmac.c Sun Apr 29 08:10:06 2007 + *************** + *** 23,30 **** + #include +@@ -8758,8 +8826,8 @@ + return(-1); + } + xmlSecAssert2(dgstSize > 0, -1); +-*** misc/xmlsec1-1.2.6/src/nss/keysstore.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/keysstore.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/keysstore.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/keysstore.c Sun Apr 29 08:10:06 2007 + *************** + *** 1,119 **** + /** +@@ -9826,8 +9894,8 @@ + ! return(0); + } + + +-*** misc/xmlsec1-1.2.6/src/nss/keytrans.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/nss/keytrans.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/keytrans.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/nss/keytrans.c Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -10576,8 +10644,8 @@ + ! + ! #endif /* XMLSEC_NO_RSA */ + ! +-*** misc/xmlsec1-1.2.6/src/nss/keywrapers.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/nss/keywrapers.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/keywrapers.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/nss/keywrapers.c Sun Apr 29 08:10:07 2007 + *************** + *** 1 **** + ! dummy +@@ -11779,8 +11847,8 @@ + ! + ! #endif /* XMLSEC_NO_DES */ + ! +-*** misc/xmlsec1-1.2.6/src/nss/pkikeys.c Wed Mar 17 06:06:45 2004 +---- misc/build/xmlsec1-1.2.6/src/nss/pkikeys.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/pkikeys.c Wed Mar 17 14:06:45 2004 ++--- misc/build/xmlsec1-1.2.6/src/nss/pkikeys.c Sun Apr 29 08:10:07 2007 + *************** + *** 5,10 **** + --- 5,11 ---- +@@ -12579,8 +12647,8 @@ + + return(8 * SECKEY_PublicKeyStrength(ctx->pubkey)); + } +-*** misc/xmlsec1-1.2.6/src/nss/signatures.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/signatures.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/signatures.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/signatures.c Sun Apr 29 08:10:07 2007 + *************** + *** 199,205 **** + xmlSecErrorsSafeString(xmlSecTransformGetName(transform)), +@@ -12717,8 +12785,8 @@ + return(-1); + } + +-*** misc/xmlsec1-1.2.6/src/nss/symkeys.c Mon Jul 21 05:12:52 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/symkeys.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/symkeys.c Mon Jul 21 12:12:52 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/symkeys.c Sun Apr 29 08:10:07 2007 + *************** + *** 15,192 **** + #include +@@ -14049,8 +14117,8 @@ + * + * Sets the value of HMAC key data. + * +-*** misc/xmlsec1-1.2.6/src/nss/tokens.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/nss/tokens.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/tokens.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/nss/tokens.c Sun Apr 29 08:10:07 2007 + *************** + *** 1 **** + ! dummy +@@ -14599,8 +14667,8 @@ + ! return(0); + ! } + ! +-*** misc/xmlsec1-1.2.6/src/nss/x509.c Fri Sep 26 05:53:09 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/x509.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/x509.c Fri Sep 26 12:53:09 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/x509.c Sun Apr 29 08:10:07 2007 + *************** + *** 34,40 **** + #include +@@ -15708,8 +15776,8 @@ + static void + xmlSecNssX509CertDebugDump(CERTCertificate* cert, FILE* output) { + --- 1700,1705 ---- +-*** misc/xmlsec1-1.2.6/src/nss/x509vfy.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/x509vfy.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/x509vfy.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/x509vfy.c Sun Apr 29 08:10:07 2007 + *************** + *** 30,35 **** + --- 30,36 ---- +@@ -16851,8 +16919,8 @@ + + + #endif /* XMLSEC_NO_X509 */ + +-*** misc/xmlsec1-1.2.6/win32/Makefile.msvc Wed Jun 9 16:35:12 2004 +---- misc/build/xmlsec1-1.2.6/win32/Makefile.msvc Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/win32/Makefile.msvc Wed Jun 9 23:35:12 2004 ++--- misc/build/xmlsec1-1.2.6/win32/Makefile.msvc Sun Apr 29 08:10:07 2007 + *************** + *** 223,228 **** + --- 223,232 ---- diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 79d7d90588f6..07ffec1aa3ad 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -8,8 +8,7 @@ PORTNAME?= openoffice.org PORTVERSION?= 2.3.${SNAPDATE} CATEGORIES+= editors java -MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \ - http://openoffice.lunarshells.com/sources/ \ +MASTER_SITES+= http://openoffice.lunarshells.com/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ @@ -74,10 +73,10 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif CODELINE= 680 -MILESTONE?= 206 +MILESTONE?= 210 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20070319 +SNAPDATE= 20070421 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} .if defined(WITH_CWS) diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo index bd6d678ca7c9..456e5be0baf6 100644 --- a/editors/openoffice.org-vcltesttool/distinfo +++ b/editors/openoffice.org-vcltesttool/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = 23680cf7036d0f06bc664070c30b68ad -SHA256 (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = af45a0327679fd2e5de7bd04f6f559a6c836f9bcfb4b77d0a3fcc1a05104ebf7 -SIZE (openoffice.org2.0/OOo_SRC680_m206_source.tar.bz2) = 268728654 +MD5 (openoffice.org2.0/OOo_SRC680_m210_source.tar.bz2) = 41bc2bdf099da4eabb96306cf29f7a60 +SHA256 (openoffice.org2.0/OOo_SRC680_m210_source.tar.bz2) = b0f341f17be1ff6461d287652102d99ed56ca63d1e74d78042a39b692bdeb6da +SIZE (openoffice.org2.0/OOo_SRC680_m210_source.tar.bz2) = 272272535 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2.0/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-vcltesttool/files/patch-i65514 b/editors/openoffice.org-vcltesttool/files/patch-i65514 index fa21fa13c3b3..59b7cd68b7ce 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-i65514 +++ b/editors/openoffice.org-vcltesttool/files/patch-i65514 @@ -1,11 +1,6 @@ -Index: berkeleydb/db-4.2.52.patch -=================================================================== -RCS file: /cvs/external/berkeleydb/db-4.2.52.patch,v -retrieving revision 1.18 -diff -u -r1.18 db-4.2.52.patch ---- berkeleydb/db-4.2.52.patch 25 Jan 2007 12:11:26 -0000 1.18 -+++ berkeleydb/db-4.2.52.patch 1 Feb 2007 01:37:17 -0000 -@@ -499,6 +499,20 @@ +--- berkeleydb/db-4.2.52.patch Fri Apr 27 17:14:50 2007 ++++ berkeleydb/db-4.2.52.patch Fri Apr 27 17:14:15 2007 +@@ -221,6 +221,20 @@ ! $(SLO)$/dbreg_util.obj ! ! .INCLUDE : target.mk @@ -23,13 +18,13 @@ diff -u -r1.18 db-4.2.52.patch + /* Define to 1 if you have the header file, and it defines `DIR'. */ + #undef HAVE_NDIR_H + - *** misc/db-4.2.52.NC/dist/Makefile.in Fri Nov 28 19:50:06 2003 - --- misc/build/db-4.2.52.NC/dist/Makefile.in Tue Jul 25 09:32:28 2006 + *** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100 + --- misc/build/db-4.2.52.NC/dist/configure 2007-02-19 16:12:12.000000000 +0100 *************** -@@ -554,6 +568,77 @@ - fi - - # Commands to make compiler produce verbose output that lists +@@ -327,6 +341,76 @@ + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +*************** +*** 28556,28561 **** +--- 28556,28606 ---- @@ -98,13 +93,12 @@ diff -u -r1.18 db-4.2.52.patch ++ cat >>confdefs.h <<\_ACEOF ++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1 + _ACEOF -+ -+ + - *** misc/db-4.2.52.NC/dist/ltmain.sh Sat Apr 26 19:45:37 2003 - --- misc/build/db-4.2.52.NC/dist/ltmain.sh Tue Jul 25 09:05:20 2006 ++ + *** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 + --- misc/build/db-4.2.52.NC/dist/ltmain.sh 2007-02-19 16:12:12.000000000 +0100 *************** -@@ -1010,3 +1095,39 @@ +@@ -1080,3 +1164,39 @@ ! $(SLO)$/xa_map.obj ! ! .INCLUDE : target.mk diff --git a/editors/openoffice.org-vcltesttool/files/patch-i67904 b/editors/openoffice.org-vcltesttool/files/patch-i67904 index d2fb32236151..520242bb45a0 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-i67904 +++ b/editors/openoffice.org-vcltesttool/files/patch-i67904 @@ -64,17 +64,16 @@ diff -u -r1.33 system.h Index: moz/mozilla-source-1.7.5.patch =================================================================== RCS file: /cvs/external/moz/mozilla-source-1.7.5.patch,v -retrieving revision 1.11 -diff -u -r1.11 mozilla-source-1.7.5.patch ---- moz/mozilla-source-1.7.5.patch 19 Jul 2006 09:37:17 -0000 1.11 -+++ moz/mozilla-source-1.7.5.patch 29 Jul 2006 09:53:10 -0000 -@@ -7705,7 +7705,7 @@ - - -#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) - +#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ --+ (defined(__FreeBSD__) && __FreeBSD_version > 700016) -++ (defined(__FreeBSD__) && __FreeBSD_version > 601103) - #define _PR_HAVE_GETPROTO_R - #define _PR_HAVE_5_ARG_GETPROTO_R - #endif - +retrieving revision 1.14 +diff -u -r1.14 mozilla-source-1.7.5.patch +--- moz/mozilla-source-1.7.5.patch 17 Apr 2007 08:54:47 -0000 1.14 ++++ moz/mozilla-source-1.7.5.patch 27 Apr 2007 05:57:10 -0000 +@@ -7821,7 +7821,7 @@ + #endif + + ! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ +-! (defined(__FreeBSD__) && __FreeBSD_version > 700016) ++! (defined(__FreeBSD__) && __FreeBSD_version > 601103) + #define _PR_HAVE_GETPROTO_R + #define _PR_HAVE_5_ARG_GETPROTO_R + #endif diff --git a/editors/openoffice.org-vcltesttool/files/patch-i75732 b/editors/openoffice.org-vcltesttool/files/patch-i75732 deleted file mode 100644 index 58dd524e660c..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i75732 +++ /dev/null @@ -1,18 +0,0 @@ -? sw/unxfbsdx.pro -Index: sw/source/core/doc/makefile.mk -=================================================================== -RCS file: /cvs/sw/sw/source/core/doc/makefile.mk,v -retrieving revision 1.16 -diff -u -r1.16 makefile.mk ---- sw/source/core/doc/makefile.mk 28 Feb 2007 15:40:53 -0000 1.16 -+++ sw/source/core/doc/makefile.mk 26 Mar 2007 05:08:30 -0000 -@@ -94,7 +94,8 @@ - - EXCEPTIONSFILES = \ - $(SLO)$/doclay.obj \ -- $(SLO)$/docnew.obj -+ $(SLO)$/docnew.obj \ -+ $(SLO)$/tblrwcl.obj - - # --- Tagets ------------------------------------------------------- - diff --git a/editors/openoffice.org-vcltesttool/files/patch-i76141 b/editors/openoffice.org-vcltesttool/files/patch-i76141 index df70a3ea7055..1698b377a94f 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-i76141 +++ b/editors/openoffice.org-vcltesttool/files/patch-i76141 @@ -1,6 +1,6 @@ --- berkeleydb/db-4.2.52.patch Thu Apr 5 14:04:49 2007 +++ berkeleydb/db-4.2.52.patch Thu Apr 5 14:26:49 2007 -@@ -552,6 +552,23 @@ +@@ -276,6 +276,23 @@ test "$with_gnu_ld" != no && break ;; *************** @@ -21,13 +21,13 @@ + case $version_type in + freebsd-elf*) +*************** - *** 11180,11186 **** - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on -@@ -568,6 +585,57 @@ - fi - - # Commands to make compiler produce verbose output that lists + *** 10398,10404 **** + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! +@@ -341,6 +358,57 @@ + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +*************** +*** 12872,12878 **** + ;; @@ -82,6 +82,7 @@ *************** *** 28556,28561 **** --- 28556,28606 ---- + --- curl/curl-7.12.2.patch 25 Sep 2006 13:33:49 -0000 1.9 +++ curl/curl-7.12.2.patch 5 Apr 2007 00:01:20 -0000 @@ -1,3 +1,73 @@ @@ -314,142 +315,12 @@ *** misc/libwpd-0.8.8/src/lib/WP1Part.cpp 2007-01-03 14:07:55.000000000 +0100 --- misc/build/libwpd-0.8.8/src/lib/WP1Part.cpp 2007-01-13 00:18:52.000000000 +0100 *************** ---- libxml2/libxml2-2.6.17.patch Thu Jan 19 13:23:31 2006 -+++ libxml2/libxml2-2.6.17.patch Wed Apr 4 18:38:01 2007 -@@ -1,6 +1,40 @@ - *** misc/libxml2-2.6.17/configure 2005-01-16 20:24:22.000000000 +0100 - --- misc/build/libxml2-2.6.17/configure 2005-02-02 17:41:10.751412243 +0100 - *************** -+*** 8547,8553 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 8547,8553 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 15436,15442 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 15436,15442 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 26339,26347 **** - - echo "$as_me:$LINENO: checking for setsockopt" >&5 ---- libxmlsec/xmlsec1-1.2.6.patch 24 Oct 2006 13:31:14 -0000 1.16 -+++ libxmlsec/xmlsec1-1.2.6.patch 5 Apr 2007 00:47:31 -0000 -@@ -17,8 +17,25 @@ - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --*** misc/xmlsec1-1.2.6/configure Thu Aug 26 08:00:34 2004 ----- misc/build/xmlsec1-1.2.6/configure Thu Sep 28 18:00:38 2006 -+*** misc/xmlsec1-1.2.6/configure Thu Aug 26 02:00:34 2004 -+--- misc/build/xmlsec1-1.2.6/configure Wed Apr 4 20:43:24 2007 -+*************** -+*** 7778,7784 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 7778,7784 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) - *************** - *** 9046,9052 **** - ;; -@@ -37,6 +54,57 @@ - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - *************** -+*** 11497,11503 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 11497,11503 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 14667,14673 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 14667,14673 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 17035,17041 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 17035,17041 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 24598,24604 **** - fi - ---- moz/mozilla-source-1.7.5.patch Wed Apr 4 19:22:49 2007 -+++ moz/mozilla-source-1.7.5.patch Wed Apr 4 21:08:38 2007 -@@ -134,6 +134,23 @@ - *** misc/mozilla/configure 2004-10-12 06:13:29.000000000 +0200 - --- misc/build/mozilla/configure 2006-02-24 09:41:55.000000000 +0100 + +--- moz/mozilla-source-1.7.5.patch.orig Fri Apr 27 15:23:29 2007 ++++ moz/mozilla-source-1.7.5.patch Fri Apr 27 15:32:07 2007 +@@ -266,6 +266,23 @@ + *** misc/mozilla/configure Tue Oct 12 00:13:29 2004 + --- misc/build/mozilla/configure Thu Mar 29 14:27:08 2007 *************** +*** 5228,5234 **** + ;; @@ -471,9 +342,9 @@ *** 5895,5901 **** MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@' MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' -@@ -174,6 +202,23 @@ - *** misc/mozilla/configure.in 2004-10-12 06:13:29.000000000 +0200 - --- misc/build/mozilla/configure.in 2006-02-24 09:41:55.000000000 +0100 +@@ -311,6 +328,23 @@ + *** misc/mozilla/configure.in Tue Oct 12 00:13:29 2004 + --- misc/build/mozilla/configure.in Thu Mar 29 14:27:08 2007 *************** +*** 1006,1012 **** + ;; @@ -495,10 +366,10 @@ *** 1536,1542 **** MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@' MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' -@@ -211,6 +267,25 @@ - CC="\$(CYGWIN_WRAPPER) $CC" - CXX="\$(CYGWIN_WRAPPER) $CXX" - CPP="\$(CYGWIN_WRAPPER) $CPP" +@@ -449,6 +483,25 @@ + ASM_SUFFIX = @ASM_SUFFIX@ + PROG_SUFFIX = @PROG_SUFFIX@ + MOD_NAME = @NSPR_MODNAME@ +*** misc/mozilla/directory/c-sdk/config/FreeBSD.mk Tue Mar 26 16:51:46 2002 +--- misc/build/mozilla/directory/c-sdk/config/FreeBSD.mk Wed Apr 4 20:56:05 2007 +*************** @@ -518,12 +389,12 @@ + + ifeq ($(MOZ_OBJFORMAT),elf) + DLL_SUFFIX = so - *** misc/mozilla/directory/c-sdk/config/cygwin-wrapper 2003-04-03 01:22:39.000000000 +0200 - --- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper 2006-02-24 09:41:55.000000000 +0100 + *** misc/mozilla/directory/c-sdk/config/cygwin-wrapper Wed Apr 2 19:22:39 2003 + --- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper Thu Mar 29 14:27:08 2007 *************** -@@ -341,6 +416,23 @@ - *** misc/mozilla/directory/c-sdk/configure 2004-09-14 23:14:38.000000000 +0200 - --- misc/build/mozilla/directory/c-sdk/configure 2006-02-24 09:41:55.000000000 +0100 +@@ -524,6 +577,23 @@ + MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' + PR_MD_ASFILES= *************** +*** 3465,3471 **** + EOF @@ -543,11 +414,11 @@ + else +*************** *** 3832,3837 **** - --- 3832,3838 ---- + --- 3833,3839 ---- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' -@@ -363,6 +455,23 @@ - *** misc/mozilla/directory/c-sdk/configure.in 2004-09-14 23:14:38.000000000 +0200 - --- misc/build/mozilla/directory/c-sdk/configure.in 2006-02-24 09:41:55.000000000 +0100 +@@ -604,6 +674,23 @@ + MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' + PR_MD_ASFILES= *************** +*** 896,902 **** + AC_DEFINE(FREEBSD) @@ -567,9 +438,9 @@ + else +*************** *** 1144,1149 **** - --- 1144,1150 ---- + --- 1145,1151 ---- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' -@@ -6830,6 +6939,44 @@ +@@ -7562,6 +7649,44 @@ switch (name) { case MAX_CONNECTIONS: @@ -611,13 +482,13 @@ + if test "$MOZ_OBJFORMAT" = "elf"; then + DLL_SUFFIX=so + else - *** misc/mozilla/nsprpub/build/cygwin-wrapper 2003-04-03 01:22:38.000000000 +0200 - --- misc/build/mozilla/nsprpub/build/cygwin-wrapper 2006-02-24 09:41:55.000000000 +0100 + *** misc/mozilla/nsprpub/build/cygwin-wrapper Wed Apr 2 19:22:38 2003 + --- misc/build/mozilla/nsprpub/build/cygwin-wrapper Thu Mar 29 14:27:08 2007 *************** -@@ -7060,6 +7207,25 @@ - gDirServiceProvider->SetProfileDir(profileDir); - mCurrentProfileName.Assign(aCurrentProfile); - gProfileDataAccess->SetCurrentProfile(aCurrentProfile); +@@ -8090,6 +8215,25 @@ + + ifdef NS_USE_GCC + + NSPR31_LIB_PREFIX = lib + + endif +*** misc/mozilla/security/coreconf/FreeBSD.mk Wed Mar 26 20:17:25 2003 +--- misc/build/mozilla/security/coreconf/FreeBSD.mk Wed Apr 4 20:56:48 2007 +*************** @@ -637,8 +508,8 @@ + + ifeq ($(MOZ_OBJFORMAT),elf) + DLL_SUFFIX = so - *** misc/mozilla/security/coreconf/command.mk 2002-02-15 23:53:12.000000000 +0100 - --- misc/build/mozilla/security/coreconf/command.mk 2006-02-24 09:41:55.000000000 +0100 + *** misc/mozilla/security/coreconf/command.mk Fri Feb 15 17:53:12 2002 + --- misc/build/mozilla/security/coreconf/command.mk Thu Mar 29 14:27:09 2007 *************** --- neon/neon.patch Tue Feb 6 09:08:59 2007 +++ neon/neon.patch Thu Apr 5 14:36:14 2007 @@ -837,3 +708,611 @@ diff -uprN misc/vigra1.4.0/include/vigra/array_vector.hxx misc/build/vigra1.4.0/include/vigra/array_vector.hxx --- misc/vigra1.4.0/include/vigra/array_vector.hxx 2005-12-21 05:53:30.000000000 +0100 +++ misc/build/vigra1.4.0/include/vigra/array_vector.hxx 2006-08-31 12:08:15.172679000 +0200 + + +Index: libxmlsec/xmlsec1-1.2.6.patch +=================================================================== +RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v +retrieving revision 1.19 +diff -u -r1.19 xmlsec1-1.2.6.patch +--- libxmlsec/xmlsec1-1.2.6.patch 27 Mar 2007 09:36:38 -0000 1.19 ++++ libxmlsec/xmlsec1-1.2.6.patch 28 Apr 2007 23:12:51 -0000 +@@ -1,5 +1,5 @@ +-*** misc/xmlsec1-1.2.6/apps/Makefile.in Thu Aug 26 08:00:30 2004 +---- misc/build/xmlsec1-1.2.6/apps/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/apps/Makefile.in Thu Aug 26 15:00:30 2004 ++--- misc/build/xmlsec1-1.2.6/apps/Makefile.in Sun Apr 29 08:10:05 2007 + *************** + *** 370,376 **** + $(CRYPTO_DEPS) \ +@@ -17,8 +17,8 @@ + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-*** misc/xmlsec1-1.2.6/configure Thu Aug 26 08:00:34 2004 +---- misc/build/xmlsec1-1.2.6/configure Tue Mar 27 11:26:19 2007 ++*** misc/xmlsec1-1.2.6/configure Thu Aug 26 15:00:34 2004 ++--- misc/build/xmlsec1-1.2.6/configure Sun Apr 29 08:10:06 2007 + *************** + *** 463,469 **** + # include +@@ -158,6 +158,23 @@ + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + *************** ++*** 7778,7784 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 7779,7785 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++*************** + *** 9046,9052 **** + ;; + esac +@@ -215,6 +232,23 @@ + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + *************** ++*** 11497,11503 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 11498,11504 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++*************** + *** 13259,13269 **** + lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' + ;; +@@ -257,6 +291,23 @@ + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + *************** ++*** 14667,14673 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 14668,14674 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++*************** + *** 15607,15617 **** + lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' + ;; +@@ -316,6 +367,23 @@ + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + *************** ++*** 17035,17041 **** ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++--- 17036,17042 ---- ++ ;; ++ ++ freebsd*) ++! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++*************** + *** 24598,24604 **** + fi + +@@ -2379,8 +2447,8 @@ + s,@XMLSEC_NO_SHA1_TRUE@,$XMLSEC_NO_SHA1_TRUE,;t t + s,@XMLSEC_NO_SHA1_FALSE@,$XMLSEC_NO_SHA1_FALSE,;t t + s,@XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t +-*** misc/xmlsec1-1.2.6/configure.in Thu Aug 26 04:49:24 2004 +---- misc/build/xmlsec1-1.2.6/configure.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/configure.in Thu Aug 26 11:49:24 2004 ++--- misc/build/xmlsec1-1.2.6/configure.in Sun Apr 29 08:10:06 2007 + *************** + *** 143,149 **** + dnl find libxml +@@ -2496,8 +2564,8 @@ + dnl do not add -L/usr/lib because compiler does it anyway + if test "z$dir" = "z/usr/lib" ; then + NSS_LIBS="$NSS_LIBS_LIST" +-*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -2560,8 +2628,8 @@ + ! # Tell versions [3.59,3.63) of GNU make to not export all variables. + ! # Otherwise a system limit (for SysV at least) may be exceeded. + ! .NOEXPORT: +-*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -2637,8 +2705,8 @@ + ! #endif /* __XMLSEC_MSCRYPTO_AKMNGR_H__ */ + ! + ! +-*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Fri Sep 26 08:12:46 2003 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Fri Sep 26 15:12:46 2003 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Sun Apr 29 08:10:06 2007 + *************** + *** 77,82 **** + --- 77,97 ---- +@@ -2663,8 +2731,8 @@ + + #endif /* XMLSEC_NO_X509 */ + +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Wed Jul 30 04:46:35 2003 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Wed Jul 30 11:46:35 2003 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Sun Apr 29 08:10:06 2007 + *************** + *** 3,8 **** + --- 3,9 ---- +@@ -2686,8 +2754,8 @@ + $(NULL) + + install-exec-hook: +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Thu Aug 26 08:00:31 2004 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Thu Aug 26 15:00:31 2004 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Sun Apr 29 08:10:06 2007 + *************** + *** 273,278 **** + --- 273,279 ---- +@@ -2709,8 +2777,8 @@ + $(NULL) + + all: all-am +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -2771,8 +2839,8 @@ + ! #endif /* __XMLSEC_NSS_AKMNGR_H__ */ + ! + ! +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/app.h Mon Jan 12 22:06:14 2004 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/app.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/app.h Tue Jan 13 06:06:14 2004 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/app.h Sun Apr 29 08:10:06 2007 + *************** + *** 22,27 **** + --- 22,30 ---- +@@ -2796,8 +2864,8 @@ + XMLSEC_CRYPTO_EXPORT int xmlSecNssAppDefaultKeysMngrLoad (xmlSecKeysMngrPtr mngr, + const char* uri); + XMLSEC_CRYPTO_EXPORT int xmlSecNssAppDefaultKeysMngrSave (xmlSecKeysMngrPtr mngr, +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -2837,8 +2905,8 @@ + ! #endif /* __XMLSEC_NSS_CIPHERS_H__ */ + ! + ! +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Mon Jan 12 22:06:14 2004 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Tue Jan 13 06:06:14 2004 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Sun Apr 29 08:10:06 2007 + *************** + *** 264,269 **** + --- 264,278 ---- +@@ -2857,8 +2925,8 @@ + #endif /* XMLSEC_NO_RSA */ + + +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Wed Jul 30 04:46:35 2003 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Wed Jul 30 11:46:35 2003 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Sun Apr 29 08:10:06 2007 + *************** + *** 16,21 **** + --- 16,23 ---- +@@ -2881,8 +2949,8 @@ + XMLSEC_CRYPTO_EXPORT int xmlSecNssKeysStoreLoad (xmlSecKeyStorePtr store, + const char *uri, + xmlSecKeysMngrPtr keysMngr); +-*** misc/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -3069,8 +3137,8 @@ + ! + ! #endif /* __XMLSEC_NSS_TOKENS_H__ */ + ! +-*** misc/xmlsec1-1.2.6/libxml2-config Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/libxml2-config Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/libxml2-config Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/libxml2-config Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -3123,8 +3191,8 @@ + ! done + ! + ! exit 0 +-*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 08:00:15 2004 +---- misc/build/xmlsec1-1.2.6/ltmain.sh Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 15:00:15 2004 ++--- misc/build/xmlsec1-1.2.6/ltmain.sh Sun Apr 29 08:10:06 2007 + *************** + *** 1661,1666 **** + --- 1661,1671 ---- +@@ -3199,8 +3267,8 @@ + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in +-*** misc/xmlsec1-1.2.6/src/bn.c Mon Jun 21 20:33:27 2004 +---- misc/build/xmlsec1-1.2.6/src/bn.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/bn.c Tue Jun 22 03:33:27 2004 ++--- misc/build/xmlsec1-1.2.6/src/bn.c Sun Apr 29 08:10:06 2007 + *************** + *** 170,177 **** + */ +@@ -3766,8 +3834,8 @@ + } + + return(0); +-*** misc/xmlsec1-1.2.6/src/dl.c Wed Oct 29 16:57:20 2003 +---- misc/build/xmlsec1-1.2.6/src/dl.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/dl.c Thu Oct 30 00:57:20 2003 ++--- misc/build/xmlsec1-1.2.6/src/dl.c Sun Apr 29 08:10:06 2007 + *************** + *** 329,334 **** + --- 329,338 ---- +@@ -3793,8 +3861,8 @@ + } + + --- 354,359 ---- +-*** misc/xmlsec1-1.2.6/src/mscrypto/Makefile.in Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/Makefile.in Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/Makefile.in Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -3977,8 +4045,8 @@ + ! # Tell versions [3.59,3.63) of GNU make to not export all variables. + ! # Otherwise a system limit (for SysV at least) may be exceeded. + ! .NOEXPORT: +-*** misc/xmlsec1-1.2.6/src/mscrypto/akmngr.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/akmngr.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/akmngr.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/akmngr.c Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -4218,8 +4286,8 @@ + ! return( 0 ) ; + ! } + ! +-*** misc/xmlsec1-1.2.6/src/mscrypto/certkeys.c Wed Mar 17 06:06:43 2004 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/certkeys.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/certkeys.c Wed Mar 17 14:06:43 2004 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/certkeys.c Sun Apr 29 08:10:06 2007 + *************** + *** 41,46 **** + --- 41,47 ---- +@@ -4896,8 +4964,8 @@ + } + + static xmlSecKeyDataType +-*** misc/xmlsec1-1.2.6/src/mscrypto/ciphers.c Fri Sep 26 08:12:51 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/ciphers.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/ciphers.c Fri Sep 26 15:12:51 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/ciphers.c Sun Apr 29 08:10:06 2007 + *************** + *** 785,791 **** + * AES CBC cipher transforms +@@ -4966,8 +5034,8 @@ + /* klass/object sizes */ + sizeof(xmlSecTransformKlass), /* size_t klassSize */ + xmlSecMSCryptoBlockCipherSize, /* size_t objSize */ +-*** misc/xmlsec1-1.2.6/src/mscrypto/crypto.c Wed Nov 12 03:38:51 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/crypto.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/crypto.c Wed Nov 12 11:38:51 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/crypto.c Sun Apr 29 08:10:06 2007 + *************** + *** 330,342 **** + BYTE* +@@ -4999,8 +5067,8 @@ + return(NULL); + } + +-*** misc/xmlsec1-1.2.6/src/mscrypto/digests.c Tue Sep 30 04:09:51 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/digests.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/digests.c Tue Sep 30 11:09:51 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/digests.c Sun Apr 29 08:10:06 2007 + *************** + *** 96,107 **** + +@@ -5031,8 +5099,8 @@ + } + + return(0); +-*** misc/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Fri Sep 26 22:29:25 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Sat Sep 27 05:29:25 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Sun Apr 29 08:10:06 2007 + *************** + *** 66,72 **** + static int xmlSecMSCryptoRsaPkcs1Process (xmlSecTransformPtr transform, +@@ -5050,8 +5118,8 @@ + /* klass/object sizes */ + sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ + xmlSecMSCryptoRsaPkcs1Size, /* xmlSecSize objSize */ +-*** misc/xmlsec1-1.2.6/src/mscrypto/signatures.c Fri Sep 26 22:29:25 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/signatures.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/signatures.c Sat Sep 27 05:29:25 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/signatures.c Sun Apr 29 08:10:06 2007 + *************** + *** 483,489 **** + * RSA-SHA1 signature transform +@@ -5086,8 +5154,8 @@ + /* klass/object sizes */ + sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ + xmlSecMSCryptoSignatureSize, /* xmlSecSize objSize */ +-*** misc/xmlsec1-1.2.6/src/mscrypto/symkeys.c Fri Sep 26 02:58:13 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/symkeys.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/symkeys.c Fri Sep 26 09:58:13 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/symkeys.c Sun Apr 29 08:10:06 2007 + *************** + *** 72,78 **** + * processing +@@ -5122,8 +5190,8 @@ + sizeof(xmlSecKeyDataKlass), + xmlSecKeyDataBinarySize, + +-*** misc/xmlsec1-1.2.6/src/mscrypto/x509.c Fri Sep 26 02:58:13 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/x509.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/x509.c Fri Sep 26 09:58:13 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/x509.c Sun Apr 29 08:10:06 2007 + *************** + *** 240,246 **** + +@@ -5369,8 +5437,8 @@ + sizeof(xmlSecKeyDataKlass), + sizeof(xmlSecKeyData), + +-*** misc/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Sat Sep 27 05:12:22 2003 +---- misc/build/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Sat Sep 27 12:12:22 2003 ++--- misc/build/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Sun Apr 29 08:10:06 2007 + *************** + *** 70,76 **** + static xmlSecByte * xmlSecMSCryptoX509NameRead (xmlSecByte *str, +@@ -6115,8 +6183,8 @@ + } + } + xmlFree(cName); +-*** misc/xmlsec1-1.2.6/src/nss/Makefile.am Tue Sep 16 11:43:03 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/Makefile.am Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/Makefile.am Tue Sep 16 18:43:03 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/Makefile.am Sun Apr 29 08:10:06 2007 + *************** + *** 20,40 **** + $(NULL) +@@ -6163,8 +6231,8 @@ + $(NULL) + + libxmlsec1_nss_la_LIBADD = \ +-*** misc/xmlsec1-1.2.6/src/nss/Makefile.in Thu Aug 26 08:00:32 2004 +---- misc/build/xmlsec1-1.2.6/src/nss/Makefile.in Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/Makefile.in Thu Aug 26 15:00:32 2004 ++--- misc/build/xmlsec1-1.2.6/src/nss/Makefile.in Sun Apr 29 08:10:06 2007 + *************** + *** 54,62 **** + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +@@ -6288,8 +6356,8 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkikeys.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signatures.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symkeys.Plo@am__quote@ +-*** misc/xmlsec1-1.2.6/src/nss/akmngr.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/nss/akmngr.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/akmngr.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/nss/akmngr.c Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -6678,8 +6746,8 @@ + ! return(0) ; + ! } + ! +-*** misc/xmlsec1-1.2.6/src/nss/ciphers.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/ciphers.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/ciphers.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/ciphers.c Sun Apr 29 08:10:06 2007 + *************** + *** 1,838 **** + ! /** +@@ -8472,8 +8540,8 @@ + } + ! + +-*** misc/xmlsec1-1.2.6/src/nss/crypto.c Wed Oct 29 16:57:25 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/crypto.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/crypto.c Thu Oct 30 00:57:25 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/crypto.c Sun Apr 29 08:10:06 2007 + *************** + *** 130,135 **** + --- 130,136 ---- +@@ -8526,8 +8594,8 @@ + + return(gXmlSecNssFunctions); + } +-*** misc/xmlsec1-1.2.6/src/nss/digests.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/digests.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/digests.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/digests.c Sun Apr 29 08:10:06 2007 + *************** + *** 21,27 **** + #include +@@ -8623,8 +8691,8 @@ + return(-1); + } + xmlSecAssert2(ctx->dgstSize > 0, -1); +-*** misc/xmlsec1-1.2.6/src/nss/hmac.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/hmac.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/hmac.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/hmac.c Sun Apr 29 08:10:06 2007 + *************** + *** 23,30 **** + #include +@@ -8758,8 +8826,8 @@ + return(-1); + } + xmlSecAssert2(dgstSize > 0, -1); +-*** misc/xmlsec1-1.2.6/src/nss/keysstore.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/keysstore.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/keysstore.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/keysstore.c Sun Apr 29 08:10:06 2007 + *************** + *** 1,119 **** + /** +@@ -9826,8 +9894,8 @@ + ! return(0); + } + + +-*** misc/xmlsec1-1.2.6/src/nss/keytrans.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/nss/keytrans.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/keytrans.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/nss/keytrans.c Sun Apr 29 08:10:06 2007 + *************** + *** 1 **** + ! dummy +@@ -10576,8 +10644,8 @@ + ! + ! #endif /* XMLSEC_NO_RSA */ + ! +-*** misc/xmlsec1-1.2.6/src/nss/keywrapers.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/nss/keywrapers.c Tue Mar 27 11:21:29 2007 ++*** misc/xmlsec1-1.2.6/src/nss/keywrapers.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/nss/keywrapers.c Sun Apr 29 08:10:07 2007 + *************** + *** 1 **** + ! dummy +@@ -11779,8 +11847,8 @@ + ! + ! #endif /* XMLSEC_NO_DES */ + ! +-*** misc/xmlsec1-1.2.6/src/nss/pkikeys.c Wed Mar 17 06:06:45 2004 +---- misc/build/xmlsec1-1.2.6/src/nss/pkikeys.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/pkikeys.c Wed Mar 17 14:06:45 2004 ++--- misc/build/xmlsec1-1.2.6/src/nss/pkikeys.c Sun Apr 29 08:10:07 2007 + *************** + *** 5,10 **** + --- 5,11 ---- +@@ -12579,8 +12647,8 @@ + + return(8 * SECKEY_PublicKeyStrength(ctx->pubkey)); + } +-*** misc/xmlsec1-1.2.6/src/nss/signatures.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/signatures.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/signatures.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/signatures.c Sun Apr 29 08:10:07 2007 + *************** + *** 199,205 **** + xmlSecErrorsSafeString(xmlSecTransformGetName(transform)), +@@ -12717,8 +12785,8 @@ + return(-1); + } + +-*** misc/xmlsec1-1.2.6/src/nss/symkeys.c Mon Jul 21 05:12:52 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/symkeys.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/symkeys.c Mon Jul 21 12:12:52 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/symkeys.c Sun Apr 29 08:10:07 2007 + *************** + *** 15,192 **** + #include +@@ -14049,8 +14117,8 @@ + * + * Sets the value of HMAC key data. + * +-*** misc/xmlsec1-1.2.6/src/nss/tokens.c Tue Mar 27 11:34:32 2007 +---- misc/build/xmlsec1-1.2.6/src/nss/tokens.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/tokens.c Sun Apr 29 08:10:41 2007 ++--- misc/build/xmlsec1-1.2.6/src/nss/tokens.c Sun Apr 29 08:10:07 2007 + *************** + *** 1 **** + ! dummy +@@ -14599,8 +14667,8 @@ + ! return(0); + ! } + ! +-*** misc/xmlsec1-1.2.6/src/nss/x509.c Fri Sep 26 05:53:09 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/x509.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/x509.c Fri Sep 26 12:53:09 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/x509.c Sun Apr 29 08:10:07 2007 + *************** + *** 34,40 **** + #include +@@ -15708,8 +15776,8 @@ + static void + xmlSecNssX509CertDebugDump(CERTCertificate* cert, FILE* output) { + --- 1700,1705 ---- +-*** misc/xmlsec1-1.2.6/src/nss/x509vfy.c Fri Sep 26 02:58:15 2003 +---- misc/build/xmlsec1-1.2.6/src/nss/x509vfy.c Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/src/nss/x509vfy.c Fri Sep 26 09:58:15 2003 ++--- misc/build/xmlsec1-1.2.6/src/nss/x509vfy.c Sun Apr 29 08:10:07 2007 + *************** + *** 30,35 **** + --- 30,36 ---- +@@ -16851,8 +16919,8 @@ + + + #endif /* XMLSEC_NO_X509 */ + +-*** misc/xmlsec1-1.2.6/win32/Makefile.msvc Wed Jun 9 16:35:12 2004 +---- misc/build/xmlsec1-1.2.6/win32/Makefile.msvc Tue Mar 27 11:21:30 2007 ++*** misc/xmlsec1-1.2.6/win32/Makefile.msvc Wed Jun 9 23:35:12 2004 ++--- misc/build/xmlsec1-1.2.6/win32/Makefile.msvc Sun Apr 29 08:10:07 2007 + *************** + *** 223,228 **** + --- 223,232 ---- -- cgit v1.2.3