11 files changed, 148 insertions, 183 deletions

diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index e39d08db6fa9..42c087b9906e 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -11,28 +11,27 @@ CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:mozprj \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla1.7b/src/&,}:mozsrc
-DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
-EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
+DISTFILES+=	OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz gpc231.tar.Z:gpc
+EXTRACT_ONLY=	OOo_${RELEASE_NR}.m${MILESTONE}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050211
+SNAPDATE=	20050217
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
-MOZILLA_PROJECT=	cws_srx645_mozooo.20041016.tar.gz
-MOZILLA_SOURCE=		mozilla-source-1.7b-source.tar.gz
+MOZILLA_PROJECT=	cws_srx645_mozooo.20050212.tar.gz
+MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
+MOZILLA_VERSION=	1.7.5
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_PROJECT}:mozprj ${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	orbit gtk12
 .endif
 
+USE_GMAKE=	yes
 USE_PERL5=	yes
-#USE_BISON=	yes #this bison should be later than bison1.875a
 USE_REINPLACE=	yes
-USE_BZIP2=	yes
-USE_GMAKE=	yes
 
 .if !defined(WITHOUT_JAVA)
 USE_JAVA=	yes
@@ -49,7 +48,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		78
+MILESTONE=		79
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -97,14 +96,14 @@ BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 GNU_CONFIGURE=	yes
 USE_AUTOCONF_VER=	259
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/OOo_${RELEASE_NR}.m${MILESTONE}_src
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 TCSH?=		/bin/tcsh
 ZIP?=		${PREFIX}/bin/zip
 UNZIP?=		${PREFIX}/bin/unzip
 PKGMESSAGE=	${WRKDIR}/pkg-message
-NUMOFPROCESSES?=	8
+NUMOFPROCESSES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch
 
@@ -135,19 +134,20 @@ post-extract:
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
 .if !defined(WITHOUT_MOZILLA)
-	@cd ${WRKSRC} ; ${MV} moz moz.old ; ${TAR} xfz ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_PROJECT} ; ${PATCH} < ${FILESDIR}/moz-patch
-	@${MKDIR} ${WRKSRC}/moz/download
+	@cd ${WRKSRC} ; ${RM} -rf moz ; ${TAR} xfz ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_PROJECT}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
-	@cd ${WRKSRC} ; ${MV} moz moz.runtime ; ${MV} moz.old moz
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's#%%NUMOFPROCESSES%%#${NUMOFPROCESSES}#g' ${WRKSRC}/config_office/makefile.rc
+
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
-#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
 .if !defined(WITHOUT_MOZILLA)
-	@cd ${WRKSRC}/moz.runtime ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
+	@cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; deliver.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
 .endif
-	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}'
+#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
+	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake'
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index c86a63e24046..602fc43cff10 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,8 +1,8 @@
-MD5 (openoffice.org2.0/OOo_1.9m78_source.tar.bz2) = ac9712cabcfdf11b70803bad8a539170
-SIZE (openoffice.org2.0/OOo_1.9m78_source.tar.bz2) = 243445063
+MD5 (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 63320182e22811417f2c2451f89e0054
+SIZE (openoffice.org2.0/OOo_1.9.m79_src.tar.gz) = 281478237
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
-MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
-SIZE (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = 75793
-MD5 (openoffice.org2.0/mozilla-source-1.7b-source.tar.gz) = 23ffd553d570869cf30b301f2564d2da
-SIZE (openoffice.org2.0/mozilla-source-1.7b-source.tar.gz) = 40747410
+MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
+SIZE (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = 114582
+MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
+SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366
diff --git a/editors/openoffice.org-2-RC/files/Makefile.localized b/editors/openoffice.org-2-RC/files/Makefile.localized
index 6484aa3c9fda..bba097a108d1 100644
--- a/editors/openoffice.org-2-RC/files/Makefile.localized
+++ b/editors/openoffice.org-2-RC/files/Makefile.localized
@@ -77,6 +77,10 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "hi-IN"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "hu"
 CATEGORIES=     hungarian
 LANG_PKGNAME=	${LOCALIZED_LANG}
@@ -106,6 +110,10 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "ms"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "nb"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
diff --git a/editors/openoffice.org-2-RC/files/generate.pl b/editors/openoffice.org-2-RC/files/generate.pl
index bc2326042665..0aee1199ceb7 100644
--- a/editors/openoffice.org-2-RC/files/generate.pl
+++ b/editors/openoffice.org-2-RC/files/generate.pl
@@ -2,12 +2,12 @@
 
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-RC/files/Attic/generate.pl,v 1.2 2005-01-24 12:45:55 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-RC/files/Attic/generate.pl,v 1.3 2005-02-20 04:38:57 maho Exp $
 
 print "#!/bin/csh\n";
-print "/usr/bin/time make WITH_CCACHE=yes package package-rename solver sdk deinstall languagepack >& log.en\n";
+print "/usr/bin/time -h make WITH_CCACHE=yes package package-rename solver sdk deinstall languagepack >& log.en\n";
 print "rm work/.configure* work/.build* \n";
-print "/usr/bin/time make ALL_LOCALIZED_LANGS=yes >& log.all\n";
+print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n";
 
 open ( FILE,  "< Makefile.localized") ;
 while(<FILE>){
@@ -15,7 +15,7 @@ while(<FILE>){
 @tmp2=split ('"',$tmp[3]);
 if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1]; 
 	print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n";
-	print "/usr/bin/time make LOCALIZED_LANG=$LANG WITH_CCACHE=yes languagepack package package-rename deinstall >& log.$LANG\n";
+	print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes languagepack package package-rename deinstall >& log.$LANG\n";
 	}
 }
 close FILE;
diff --git a/editors/openoffice.org-2-RC/files/moz-patch b/editors/openoffice.org-2-RC/files/moz-patch
deleted file mode 100644
index eb06154b2d97..000000000000
--- a/editors/openoffice.org-2-RC/files/moz-patch
+++ /dev/null
@@ -1,100 +0,0 @@
-#iZ 28398
-#iZ 11424
-
-http://qa.openoffice.org/issues/show_bug.cgi?id=28398
-http://qa.openoffice.org/issues/show_bug.cgi?id=11424
-
-diff -u moz/mozilla-source-1.7b.patch moz.new/mozilla-source-1.7b.patch
---- moz/mozilla-source-1.7b.patch	Wed Jul 14 13:22:36 2004
-+++ moz.new/mozilla-source-1.7b.patch	Mon Nov 22 18:22:38 2004
-@@ -4447,7 +4447,6 @@
- +#MKSHLIB += -R '$$ORIGIN'
-  endif
-  endif
-- endif
- 
- Index: mailnews/addrbook/src/nsAbMD5sum.cpp
- ===================================================================
-@@ -5104,3 +5103,81 @@
- +//#define HAVE_MMX_INTEL_MNEMONICS 
- +//#define HAVE_SSE2_INTEL_MNEMONICS 
-  #endif
-+
-+
-+
-+
-+--- misc/build/mozilla/configure.orig	Tue Mar 16 13:00:47 2004
-++++ misc/build/mozilla/configure	Sat Oct 16 15:59:50 2004
-+@@ -12507,15 +12507,15 @@
-+ 
-+ 
-+                     if test -z "$GSSAPI_LIBS" ; then
-+-        LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
-+-        echo $ac_n "checking for gss_init_sec_context in -lgssapi_krb5""... $ac_c" 1>&6
-+-echo "configure:12513: checking for gss_init_sec_context in -lgssapi_krb5" >&5
-+-ac_lib_var=`echo gssapi_krb5'_'gss_init_sec_context | sed 'y%./+-%__p_%'`
-++        LIBS="$LIBS -lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
-++        echo $ac_n "checking for gss_init_sec_context in -lgssapi""... $ac_c" 1>&6
-++echo "configure:12513: checking for gss_init_sec_context in -lgssapi" >&5
-++ac_lib_var=`echo gssapi'_'gss_init_sec_context | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   ac_save_LIBS="$LIBS"
-+-LIBS="-lgssapi_krb5  $LIBS"
-++LIBS="-lgssapi  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+ #line 12521 "configure"
-+ #include "confdefs.h"
-+@@ -12543,7 +12543,7 @@
-+ fi
-+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+   echo "$ac_t""yes" 1>&6
-+-  GSSAPI_LIBS="-L$GSSAPI_DIR/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
-++  GSSAPI_LIBS="-L$GSSAPI_DIR/lib -lgssapi -lkrb5 -lasn1 -lroken -lcrypto -lcom_err -lcrypt"
-+ else
-+   echo "$ac_t""no" 1>&6
-+ fi
-+@@ -12653,7 +12653,7 @@
-+         cat > conftest.$ac_ext <<EOF
-+ #line 12655 "configure"
-+ #include "confdefs.h"
-+- #include <gssapi/gssapi.h> 
-++ #include <gssapi.h> 
-+ int main() {
-+  gss_OID oid = GSS_C_NT_HOSTBASED_SERVICE; 
-+ ; return 0; }
-+
-+ endif
-+
-+--- misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in.org	Fri Oct 22 22:43:46 2004
-++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in	Fri Oct 22 22:44:01 2004
-+@@ -225,6 +225,10 @@
-+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe
-+ endif
-+ 
-++ifeq ($(OS_ARCH), FreeBSD)
-++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
-++endif
-++
-+ ifeq ($(OS_ARCH), NetBSD)
-+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
-+ endif
-+
-+
-+--- misc/build/mozilla/extensions/negotiateauth/nsHttpGssapiAuth.cpp.org	Tue Mar 16 09:34:01 2004
-++++ misc/build/mozilla/extensions/negotiateauth/nsHttpGssapiAuth.cpp	Mon Nov 22 18:21:07 2004
-+@@ -289,7 +289,7 @@
-+     return NS_OK;
-+ }
-+ 
-+-NS_IMPL_ISUPPORTS1(nsHttpGssapiAuth, nsIHttpAuthenticator);
-++NS_IMPL_ISUPPORTS1(nsHttpGssapiAuth, nsIHttpAuthenticator)
-+    
-+ //
-+ // GenerateCredentials
-+
-+
-+
-+
-+
diff --git a/editors/openoffice.org-2-RC/files/patch-bridges+prj+build.lst b/editors/openoffice.org-2-RC/files/patch-bridges+prj+build.lst
new file mode 100644
index 000000000000..3038806cca0e
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-bridges+prj+build.lst
@@ -0,0 +1,14 @@
+o add missing dependency
+o http://www.openoffice.org/issues/show_bug.cgi?id=43128
+
+--- bridges/prj/build.lst.old	Tue Jan 18 23:52:41 2005
++++ bridges/prj/build.lst	Sat Feb 19 19:31:14 2005
+@@ -7,7 +7,7 @@
+ br	bridges\source\remote\context			nmake	-	all	br_rcon br_unotypes NULL
+ br	bridges\source\cpp_uno\msvc_win32_intel	nmake	-	w	br_msci br_cppuno_shared br_unotypes NULL
+ br	bridges\source\cpp_uno\gcc3_linux_intel	nmake	-	u	br_gcc3li br_cppuno_shared br_unotypes NULL
+-br	bridges\source\cpp_uno\gcc3_freebsd_intel	nmake	-	u	br_gcc3fi br_unotypes NULL
++br	bridges\source\cpp_uno\gcc3_freebsd_intel	nmake	-	u	br_gcc3fi br_cppuno_shared br_unotypes NULL
+ br	bridges\source\cpp_uno\gcc3_linux_x86-64	nmake	-	u	br_gcc3lx br_unotypes NULL
+ br	bridges\source\cpp_uno\gcc3_linux_powerpc	nmake	-	u	br_gcclp3 br_cppuno_shared br_unotypes NULL
+ br	bridges\source\cpp_uno\gcc3_linux_s390		nmake	-	u	br_gccl33 br_unotypes NULL
diff --git a/editors/openoffice.org-2-RC/files/patch-config_office+makefile.rc b/editors/openoffice.org-2-RC/files/patch-config_office+makefile.rc
new file mode 100644
index 000000000000..5b41178a2c29
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-config_office+makefile.rc
@@ -0,0 +1,18 @@
+#iZ 43129
+top level makefile.mk doesn't understand parallele build
+
+--- config_office/makefile.rc.old	Thu Oct 28 17:53:25 2004
++++ config_office/makefile.rc	Sat Feb 19 12:21:23 2005
+@@ -188,10 +188,10 @@
+ 	zlib
+ 
+ build_all .SETDIR=instsetoo_native/prj:
+-	@+perl $(SOLARENV)$/bin$/build.pl --all $(PROFULLSWITCH)
++	@+perl $(SOLARENV)$/bin$/build.pl -P%%NUMOFPROCESSES%% --all $(PROFULLSWITCH)
+ 
+ depend .SETDIR=instsetoo_native/prj:
+-	@+perl $(SOLARENV)$/bin$/build.pl --all $(PROFULLSWITCH) depend=t
++	@+perl $(SOLARENV)$/bin$/build.pl -P%%NUMOFPROCESSES%% --all $(PROFULLSWITCH) depend=t
+ 
+ 
+ # 
diff --git a/editors/openoffice.org-2-RC/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-2-RC/files/patch-extensions+source+config+ldap+makefile.mk
new file mode 100644
index 000000000000..8cb2d5095d9e
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-extensions+source+config+ldap+makefile.mk
@@ -0,0 +1,19 @@
+o llber50 is missing
+o http://www.openoffice.org/issues/show_bug.cgi?id=43037
+
+Index: extensions/source/config/ldap/makefile.mk
+===================================================================
+RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- extensions/source/config/ldap/makefile.mk	18 Jan 2005 15:18:56 -0000	1.5
++++ extensions/source/config/ldap/makefile.mk	17 Feb 2005 23:21:16 -0000
+@@ -117,7 +117,7 @@
+         $(SALHELPERLIB) \
+         $(SALLIB)
+ .IF "$(OS)"=="FREEBSD"
+-SHL1STDLIBS+=-lcompat
++SHL1STDLIBS+=-lcompat -llber50
+ .ENDIF
+ 
+ DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-2-RC/files/patch-libxml2 b/editors/openoffice.org-2-RC/files/patch-libxml2
new file mode 100644
index 000000000000..b4d2aca8b1c5
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-libxml2
@@ -0,0 +1,61 @@
+o version number of libxml2
+o http://www.openoffice.org/issues/show_bug.cgi?id=42393
+
+Index: libxml2-2.6.17.patch
+===================================================================
+RCS file: /cvs/external/libxml2/libxml2-2.6.17.patch,v
+retrieving revision 1.2
+diff -u -r1.2 libxml2-2.6.17.patch
+--- libxml2/libxml2-2.6.17.patch.orig	4 Feb 2005 11:29:07 -0000	1.2
++++ libxml2/libxml2-2.6.17.patch	12 Feb 2005 13:11:40 -0000
+@@ -1,5 +1,5 @@
+-*** 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
++*** misc/libxml2-2.6.17/configure	Mon Jan 17 04:24:22 2005
++--- misc/build/libxml2-2.6.17/configure	Sat Feb 12 22:08:54 2005
+ ***************
+ *** 26339,26347 ****
+   
+@@ -38,8 +38,8 @@
+   echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5
+   echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
+   if test $ac_cv_func_setsockopt = yes; then
+-*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	2005-01-16 21:02:54.000000000 +0100
+---- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	2005-02-02 17:39:50.923232015 +0100
++*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	Mon Jan 17 05:02:54 2005
++--- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	Sat Feb 12 22:08:54 2005
+ ***************
+ *** 263,269 ****
+    *
+@@ -91,8 +91,29 @@
+   #define DEBUG_MEMORY_LOCATION
+   #endif
+   
+-*** misc/libxml2-2.6.17/nanohttp.c	2005-01-04 15:49:47.000000000 +0100
+---- misc/build/libxml2-2.6.17/nanohttp.c	2005-02-02 17:39:50.924231930 +0100
++*** misc/libxml2-2.6.17/ltmain.sh	Mon Jan 17 05:02:25 2005
++--- misc/build/libxml2-2.6.17/ltmain.sh	Sat Feb 12 22:10:00 2005
++***************
++*** 2999,3006 ****
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2999,3006 ----
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
++*** misc/libxml2-2.6.17/nanohttp.c	Tue Jan  4 23:49:47 2005
++--- misc/build/libxml2-2.6.17/nanohttp.c	Sat Feb 12 22:08:54 2005
+ ***************
+ *** 248,254 ****
+   void
diff --git a/editors/openoffice.org-2-RC/files/patch-project-python b/editors/openoffice.org-2-RC/files/patch-project-python
deleted file mode 100644
index 6487a9f9ddb8..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-project-python
+++ /dev/null
@@ -1,37 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=40181
-o pyunofixes1
-
-Desctiption
-need FreeBSD's definition
-
-Index: python/Python-2.3.4.patch
-===================================================================
-RCS file: /cvs/external/python/Python-2.3.4.patch,v
-retrieving revision 1.2
-diff -u -r1.2 Python-2.3.4.patch
---- python/Python-2.3.4.patch	15 Nov 2004 13:07:52 -0000	1.2
-+++ python/Python-2.3.4.patch	3 Dec 2004 09:51:31 -0000
-@@ -13513,6 +13513,22 @@
- *** misc/Python-2.3.4/configure	Fri May  7 21:13:40 2004
- --- misc/build/Python-2.3.4/configure	Sun Nov  7 11:43:10 2004
- ***************
-+*** 523,529 ****
-+  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-+  	  INSTSONAME="$LDLIBRARY".$SOVERSION
-+            ;;
-+!     Linux*|GNU*|NetBSD*)
-+  	  LDLIBRARY='libpython$(VERSION).so'
-+  	  BLDLIBRARY='-L. -lpython$(VERSION)'
-+  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-+--- 523,529 ----
-+  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-+  	  INSTSONAME="$LDLIBRARY".$SOVERSION
-+            ;;
-+!     Linux*|GNU*|NetBSD*|FreeBSD*)
-+  	  LDLIBRARY='libpython$(VERSION).so'
-+  	  BLDLIBRARY='-L. -lpython$(VERSION)'
-+  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
- *** 10129,10134 ****
- --- 10129,10135 ----
-   	case $ac_sys_system/$ac_sys_release in
diff --git a/editors/openoffice.org-2-RC/files/patch-scp2+source+ooo+file_library_ooo.scp b/editors/openoffice.org-2-RC/files/patch-scp2+source+ooo+file_library_ooo.scp
deleted file mode 100644
index a27b9099f0b2..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-scp2+source+ooo+file_library_ooo.scp
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: scp2/source/ooo/file_library_ooo.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
-retrieving revision 1.82
-diff -u -r1.82 file_library_ooo.scp
---- scp2/source/ooo/file_library_ooo.scp	4 Feb 2005 11:31:17 -0000	1.82
-+++ scp2/source/ooo/file_library_ooo.scp	11 Feb 2005 12:43:44 -0000
-@@ -2007,7 +2007,9 @@
-     TXT_FILE_BODY;
-     Styles = (PACKED);
-     Dir = gid_Dir_Program;
--  #ifdef UNX
-+  #if defined(FREEBSD)
-+    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.8));
-+  #elif defined(UNX)
-     Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17));
-   #else
-     Name = "libxml2.dll";