Update to 1.9m97

4 files changed, 46 insertions, 14 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 0986ac47b8cc..af9ac9668861 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050422
+SNAPDATE=	20050426
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -49,7 +49,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		96
+MILESTONE=		97
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 623a7f5eab8b..9ac4f54eec9c 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m96_source.tar.bz2) = 0785d50a3e121ee465b58af36146ac43
-SIZE (openoffice.org2.0/OOo_1.9m96_source.tar.bz2) = 249553902
+MD5 (openoffice.org2.0/OOo_1.9m97_source.tar.bz2) = 5183a720712e0e097a8b8ed0470d0bff
+SIZE (openoffice.org2.0/OOo_1.9m97_source.tar.bz2) = 249715267
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index e27c8d6c5e87..eb56de86ad55 100644
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/files/Makefile.knobs
@@ -68,11 +68,11 @@ pre-fetch:
 	@${ECHO} "If you set WITH_DEBUG=2, you add internal"
 	@${ECHO} "OOo debug support."
 .endif
-.if !defined(WITHOUT_MOZILLA)
-	@${ECHO}
-	@${ECHO} "You can compile OOo without Mozilla connectivity by"
-	@${ECHO} "make -DWITHOUT_MOZILLA"
-.endif
+#.if !defined(WITHOUT_MOZILLA)
+#	@${ECHO}
+#	@${ECHO} "You can compile OOo without Mozilla connectivity by"
+#	@${ECHO} "make -DWITHOUT_MOZILLA"
+#.endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
 	@${ECHO}
 	@${ECHO} "You may get better quality of glyphs"
@@ -87,11 +87,11 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without Java support by"
 	@${ECHO} "make -DWITHOUT_JAVA"
 .endif
-.if !defined(WITH_CUPS)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with CUPS support by"
-	@${ECHO} "make -DWITH_CUPS"
-.endif
+#.if !defined(WITH_CUPS)
+#	@${ECHO}
+#	@${ECHO} "You can compile OOo with CUPS support by"
+#	@${ECHO} "make -DWITH_CUPS"
+#.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo to use Qt/KDE vclplug"
diff --git a/editors/openoffice-3/files/patch-solenv b/editors/openoffice-3/files/patch-solenv
new file mode 100644
index 000000000000..09aea487e79d
--- /dev/null
+++ b/editors/openoffice-3/files/patch-solenv
@@ -0,0 +1,32 @@
+http://qa.openoffice.org/issues/show_bug.cgi?id=48304
+
+Index: bin/modules/installer/download.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/download.pm,v
+retrieving revision 1.13
+diff -u -r1.13 download.pm
+--- solenv/bin/modules/installer/download.pm	25 Apr 2005 11:55:33 -0000	1.13
++++ solenv/bin/modules/installer/download.pm	28 Apr 2005 00:11:54 -0000
+@@ -189,9 +189,10 @@
+ #	my $systemcall = "cd $installdir; tar $ownerstring -cf - * | /usr/bin/sum |";
+ 
+ #	$ENV{'LD_PRELOAD'} = $getuidlibrary;
+-#	my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |";
++#getuid.so is req'ed for Linux/Solaris? FreeBSD/MacOSX don't need it.
++	my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |";
+ 
+-	my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |";
++#	my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |";
+ 
+ 	my $sumoutput = "";
+ 
+@@ -228,7 +229,8 @@
+ 	
+ 	my $getuidlibraryname = "getuid.so";
+ 	my $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0);
+-	if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); }
++# ad hock prohibiting error
++#	if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); }
+ 
+ 	return $$getuidlibraryref;
+ }