1. remove duplicated helpcontent_01.tgz in DISTFILES

   section
2. LC_ALL and LANG are C for building[1]
3. do not pass CPUTYPE, as in some environment build fails
   and basically ignores (this port doesn't honor CFLAGS etc)
4. adding memo for localized languages [2]
5. SDK is now buildable
6. change russian translation patch so as to apply much easier
7. helpcontent_31_unix.tgz does not exist, but 30.

PR: 84786 [1] 83502 [2]
Submitted by : achix mantzix[1] and Harald Schmalzbauer[2]

11 files changed, 206 insertions, 24 deletions

diff --git a/editors/openoffice-1.0/files/Makefile.knobs b/editors/openoffice-1.0/files/Makefile.knobs
index fd0e3da1125f..a62166a46a40 100644
--- a/editors/openoffice-1.0/files/Makefile.knobs
+++ b/editors/openoffice-1.0/files/Makefile.knobs
@@ -13,6 +13,12 @@ BUILD=		dmake strip="true"
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
+.if defined(ALL_LOCALIZED_LANGS)
+CONFIGURE_ARGS+=	--with-lang=ALL
+.else
+CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
+.endif
+
 pre-fetch:
 	@${ECHO}
 	@${ECHO} "OPTIONS:"
@@ -25,6 +31,14 @@ pre-fetch:
 	@${ECHO} "OO.org debug support."
 	@${ECHO}
 .endif
+.if !defined(LOCALIZED_LANG)
+	@${ECHO}
+	@${ECHO} "You can select the language for OOo by making it with 'make LOCALIZED_LANG=xx'"
+	@${ECHO} "while xx can be one of the following:"
+	@${ECHO} "ar de dk el es fr it ja ko nl pl pt ru"
+	@${ECHO} "sv tr zh-CN zh-TW"
+	@${ECHO}
+.endif
 .if !defined(WITH_TTF_BYTECODE_ENABLED)
 	@${ECHO}
 	@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
diff --git a/editors/openoffice-1.0/files/Makefile.localized b/editors/openoffice-1.0/files/Makefile.localized
index 7fe0ac466b66..1a267d20aaf2 100644
--- a/editors/openoffice-1.0/files/Makefile.localized
+++ b/editors/openoffice-1.0/files/Makefile.localized
@@ -44,7 +44,6 @@ LANG_CONFIGURE_ARG=     DAN
 .if ${LOCALIZED_LANG} == "nl"
 LANG_PKGNAME=	nl
 LANG_EXT=	31
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 LANG_CONFIGURE_ARG=	DTCH
 .endif
 ################################################################
diff --git a/editors/openoffice-1.0/files/generate.pl b/editors/openoffice-1.0/files/generate.pl
index 650fdc42b9ae..b9edd8f6fedd 100644
--- a/editors/openoffice-1.0/files/generate.pl
+++ b/editors/openoffice-1.0/files/generate.pl
@@ -1,12 +1,13 @@
 #!/usr/bin/perl
-
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.0/files/Attic/generate.pl,v 1.2 2005-07-29 03:06:51 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.0/files/Attic/generate.pl,v 1.3 2005-08-28 08:25:09 maho Exp $
 
 print "#!/bin/csh\n";
-print "/usr/bin/time make WITH_CCACHE=yes deinstall clean package package-rename solver sdk deinstall clean >& log.en\n";
-print "/usr/bin/time make ALL_LOCALIZED_LANGS=yes >& log.all\n";
+print "make deinstall clean\n";
+print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk deinstall clean >& log.en\n";
+print "rm work/.configure* work/.build* \n";
+print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n";
 
 open ( FILE,  "< Makefile.localized") ;
 while(<FILE>){
@@ -14,8 +15,7 @@ while(<FILE>){
 @tmp2=split ('"',$tmp[3]);
 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 deinstall package package-rename deinstall >& log.$LANG\n";
+	print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes package package-rename deinstall >& log.$LANG\n";
 	}
 }
 close FILE;
-
diff --git a/editors/openoffice-1.0/files/patch-config_office+setsoenv.in b/editors/openoffice-1.0/files/patch-config_office+setsoenv.in
index 0eab61ef13ae..5c894af6e1e2 100644
--- a/editors/openoffice-1.0/files/patch-config_office+setsoenv.in
+++ b/editors/openoffice-1.0/files/patch-config_office+setsoenv.in
@@ -4,7 +4,7 @@ RCS file: /cvs/tools/config_office/set_soenv.in,v
 retrieving revision 1.3.2.2.2.8.2.2.2.3
 diff -u -r1.3.2.2.2.8.2.2.2.3 set_soenv.in
 --- config_office/set_soenv.in	3 Apr 2003 04:52:43 -0000	1.3.2.2.2.8.2.2.2.3
-+++ config_office/set_soenv.in	10 Jul 2005 03:39:39 -0000
++++ config_office/set_soenv.in	3 Aug 2005 22:14:14 -0000
 @@ -52,8 +52,8 @@
  #-------------------------------------------------
  #
@@ -16,7 +16,80 @@ diff -u -r1.3.2.2.2.8.2.2.2.3 set_soenv.in
  my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PRODUCT, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, 
       $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, 
       $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, 
-@@ -1251,7 +1251,9 @@
+@@ -65,7 +65,7 @@
+ my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
+       $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
+       $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR,
+-      $JRETOOLKITDIR, $JRETHREADDIR, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS, $WRAPCMD );
++      $JRETOOLKITDIR, $JRETHREADDIR, $JRETHREADDIR2, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS, $WRAPCMD );
+ #
+ #-------------------------------------------
+ # IIc. Declaring the environment variables.
+@@ -335,6 +335,7 @@
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads";
++      $JRETHREADDIR2  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."classic";
+ } 
+ elsif ( $platform eq "$Linux" ) 
+ {
+@@ -875,24 +876,18 @@
+                         $ps.$JRETHREADDIR.
+                         $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
+-elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64"))
++elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$FreeBSD") || ($platform eq "$Tru64"))
+ {  $LD_LIBRARY_PATH   = $cur_dir.
+                         $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+                         $ps.$JRELIBDIR.
+                         $ps.$JRETOOLKITDIR.
+                         $ps.$JRETHREADDIR.
++                        $ps.$JRETHREADDIR2.
+                         $ps.$par_dir.$LIB.
+                         $ps_STLPORT_LIB.
+                         $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
+                        $ps.$ENV{'LD_LIBRARY_PATH'};
+ }
+-elsif ($platform eq "$FreeBSD")
+-{  $LD_LIBRARY_PATH   = $cur_dir.
+-                        $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+-                        $ps.$par_dir.$LIB.
+-			$ps_STLPORT_LIB.
+-                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+-}
+ elsif ($platform eq "$Irix" || $platform eq "$Irix64")
+ {  $LD_LIBRARY_PATH   = $cur_dir.
+                         $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -1165,7 +1160,7 @@
+                         $L_STLPORT_LIB.
+                         $L.$XLIB;
+ }
+-elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64"))
++elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64") || ($platform eq "$FreeBSD"))
+ {  $SOLARLIB          = $L.$par_dir.$LIB.
+ 			$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+                         $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
+@@ -1174,18 +1169,10 @@
+                         $L.$JRELIBDIR.
+                         $L.$JRETOOLKITDIR.
+                         $L.$JRETHREADDIR.
++                        $L.$JRETHREADDIR2.
+                         $L_STLPORT_LIB.
+                         $L.$XLIB;
+ }
+-elsif ($platform eq "$FreeBSD")
+-{  $SOLARLIB          = $L.$par_dir.$LIB.
+-			$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+-                        $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
+-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+-                        $L.'$JAVA_HOME'.$LIB.
+-			$L_STLPORT_LIB.
+-                        $L.$XLIB;
+-}
+ elsif ($platform eq "$Winnt")
+ {  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
+                         $L.$par_dir.$LIB.
+@@ -1251,7 +1238,9 @@
  {  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
  }
  elsif ($platform eq "$FreeBSD")
diff --git a/editors/openoffice-1.0/files/patch-odk+pack+copying+makefile.mk b/editors/openoffice-1.0/files/patch-odk+pack+copying+makefile.mk
new file mode 100644
index 000000000000..13512504fa1c
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-odk+pack+copying+makefile.mk
@@ -0,0 +1,15 @@
+Index: odk/pack/copying/makefile.mk
+===================================================================
+RCS file: /cvs/api/odk/pack/copying/makefile.mk,v
+retrieving revision 1.46.2.9
+diff -u -r1.46.2.9 makefile.mk
+--- odk/pack/copying/makefile.mk	24 Feb 2003 16:48:59 -0000	1.46.2.9
++++ odk/pack/copying/makefile.mk	4 Aug 2005 03:03:48 -0000
+@@ -16,6 +16,7 @@
+ 
+ DIRLIST = \
+ 	$(DESTDIRDOCU) \
++	$(DESTDIR)$/settings \
+ 	$(DESTDIRDOCUIMAGES) \
+ 	$(DESTDIRDOCU)$/DevStudioWizards \
+ 	$(DESTDIRDOCU)$/DevStudioWizards$/images \
diff --git a/editors/openoffice-1.0/files/patch-odk+source+OOSupport+makefile.mk b/editors/openoffice-1.0/files/patch-odk+source+OOSupport+makefile.mk
new file mode 100644
index 000000000000..d29cebfd753d
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-odk+source+OOSupport+makefile.mk
@@ -0,0 +1,14 @@
+Index: odk/source/OOSupport/makefile.mk
+===================================================================
+RCS file: /cvs/api/odk/source/OOSupport/makefile.mk,v
+retrieving revision 1.1.2.1
+diff -u -r1.1.2.1 makefile.mk
+--- odk/source/OOSupport/makefile.mk	13 Jan 2003 10:58:17 -0000	1.1.2.1
++++ odk/source/OOSupport/makefile.mk	4 Aug 2005 03:44:04 -0000
+@@ -336,5 +336,5 @@
+ 	+cp -R ParserDB $(CLASSDIR)$/netbeans$/system
+ 	+cp openoffice-nbm-license.txt $(CLASSDIR)
+ 	+-mkdir $(CLASSDIR)$/netbeans$/modules
+-	+cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && java MakeModule
++	+cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && java -classpath $(CLASSDIR) MakeModule
+ 	+cd $(CLASSDIR) && jar -uvf $(TARGETNETBEANSMODULEFILE) netbeans
diff --git a/editors/openoffice-1.0/files/patch-odk+source+bean+native+unix+makefile.mk b/editors/openoffice-1.0/files/patch-odk+source+bean+native+unix+makefile.mk
new file mode 100644
index 000000000000..459335c2a3b1
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-odk+source+bean+native+unix+makefile.mk
@@ -0,0 +1,21 @@
+Index: odk/source/bean/native/unix/makefile.mk
+===================================================================
+RCS file: /cvs/api/odk/source/bean/native/unix/Attic/makefile.mk,v
+retrieving revision 1.4
+diff -u -r1.4 makefile.mk
+--- odk/source/bean/native/unix/makefile.mk	6 May 2002 18:56:38 -0000	1.4
++++ odk/source/bean/native/unix/makefile.mk	3 Aug 2005 07:10:36 -0000
+@@ -20,9 +20,12 @@
+ SHL1LIBS=	$(SLB)$/$(TARGET).lib
+ SHL1STDLIBS=-ljawt -lsal
+ 
+-.IF "$(OS)" == "LINUX"
++.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
+ SHL1STDLIBS+=-lstdc++
+ .ENDIF
++.IF "$(OS)" == "FREEBSD"
++SHL1STDLIBS+=-ljvm -lhpi
++.ENDIF
+ 
+ NO_SHL1DESCRIPTION=TRUE
+ 
diff --git a/editors/openoffice-1.0/files/patch-odk+util+makefile.pmk b/editors/openoffice-1.0/files/patch-odk+util+makefile.pmk
new file mode 100644
index 000000000000..f3056308a682
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-odk+util+makefile.pmk
@@ -0,0 +1,31 @@
+Index: odk/util/makefile.pmk
+===================================================================
+RCS file: /cvs/api/odk/util/makefile.pmk,v
+retrieving revision 1.26.2.4
+diff -u -r1.26.2.4 makefile.pmk
+--- odk/util/makefile.pmk	17 Feb 2003 15:51:33 -0000	1.26.2.4
++++ odk/util/makefile.pmk	29 Jul 2005 13:57:12 -0000
+@@ -76,7 +76,7 @@
+ #--------------------
+ MY_DELETE_RECURSIVE=rm -rf
+ MY_DIRCMP=dircmp 
+-MY_TEXTCOPY= tr -d "\015"
++MY_TEXTCOPY=%%GNUTR%% -d "\015"
+ #MY_COPY=cat
+ 
+ MY_DLLPREFIX=lib
+@@ -116,6 +116,14 @@
+ DESTDIRLIB=$(DESTDIR)$/netbsd$/lib
+ DESTDIRDLL=$(DESTDIRLIB)
+ 
++.ELIF "$(OS)"=="FREEBSD"
++###########
++# FREEBSD
++###########
++DESTDIRBIN=$(DESTDIR)$/freebsd$/bin
++DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
++DESTDIRDLL=$(DESTDIRLIB)
++
+ .ELIF "$(OS)"=="IRIX "
+ ###########
+ # IRIX
diff --git a/editors/openoffice-1.0/files/patch-product+settings+settings.mk b/editors/openoffice-1.0/files/patch-product+settings+settings.mk
index fe1093e1e772..c7824cec2938 100644
--- a/editors/openoffice-1.0/files/patch-product+settings+settings.mk
+++ b/editors/openoffice-1.0/files/patch-product+settings+settings.mk
@@ -60,7 +60,7 @@
 +SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd -I$(OO_SDK_JAVA_HOME)/include/linux
 +CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include
 +STL_INCLUDES=-I$(OO_STLPORT_HOME)/stlport
-+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV)
++CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) %%PTHREAD_CFLAGS%%
 +
 +# define for used compiler necessary for UNO
 +#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95
@@ -70,6 +70,6 @@
 +
 +LIBRARY_LINK_FLAGS=-shared
 +EXE_LINK_FLAGS=-Wl -export-dynamic
-+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) -pthread
++LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%%
 +
 +endif
diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+unitools.mk b/editors/openoffice-1.0/files/patch-solenv+inc+unitools.mk
new file mode 100644
index 000000000000..983adcf1cf4f
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-solenv+inc+unitools.mk
@@ -0,0 +1,16 @@
+Index: solenv/inc/unitools.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/unitools.mk,v
+retrieving revision 1.12.4.2
+diff -u -r1.12.4.2 unitools.mk
+--- solenv/inc/unitools.mk	7 Jan 2003 15:22:16 -0000	1.12.4.2
++++ solenv/inc/unitools.mk	4 Aug 2005 01:42:23 -0000
+@@ -147,7 +147,7 @@
+ GNUPATCH=gnupatch
+ .ELSE			# "$(OS)"=="SOLARIS"
+ AWK=awk
+-GNUCOPY=cp
++GNUCOPY=%%GNUCOPY%%
+ GNUPATCH=patch
+ .ENDIF			# "$(OS)"=="SOLARIS"
+ .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"
diff --git a/editors/openoffice-1.0/files/pkg-message.in b/editors/openoffice-1.0/files/pkg-message.in
index 5cdb0eeb5156..4e72dc891b04 100644
--- a/editors/openoffice-1.0/files/pkg-message.in
+++ b/editors/openoffice-1.0/files/pkg-message.in
@@ -3,7 +3,7 @@ OpenOffice.org Build 1.0.3 Personal Install How-To
 Written by:	Martin Blapp <mbr@freebsd.org>
 
 OpenOffice.org will soon been installed in
-${PREFIX}/OpenOffice.org1.0/
+${PREFIX}/OpenOffice.org1.0.3/
 
 1 User installation
 -------------------
@@ -17,7 +17,7 @@ in your homedir.
 
 If the setup tells you there is already an installed
 version, you may look at the file ".sversionrc" in
-your homedir. In this file OpenOffice and StarOffice
+your homedir. In this file OpenOffice.org and StarOffice
 have both a line for each version which is installed.
 After removing the problematic line you should be able to
 install again.
@@ -29,19 +29,18 @@ There are some wrappers installed for fast startup.
 Add "${PREFIX}/bin/" to your PATH and you will be able
 to use them.
 
-${PREFIX}/bin/openoffice.org-1.0
-${PREFIX}/bin/openoffice.org-1.0-sagenda
-${PREFIX}/bin/openoffice.org-1.0-scalc
-${PREFIX}/bin/openoffice.org-1.0-sdraw
-${PREFIX}/bin/openoffice.org-1.0-setup
-${PREFIX}/bin/openoffice.org-1.0-sfax
-${PREFIX}/bin/openoffice.org-1.0-simpress
-${PREFIX}/bin/openoffice.org-1.0-spadmin
-${PREFIX}/bin/openoffice.org-1.0-sweb
-${PREFIX}/bin/openoffice.org-1.0-swriter
+${PREFIX}/bin/openoffice.org-1.0.3
+${PREFIX}/bin/openoffice.org-1.0.3-sagenda
+${PREFIX}/bin/openoffice.org-1.0.3-scalc
+${PREFIX}/bin/openoffice.org-1.0.3-sdraw
+${PREFIX}/bin/openoffice.org-1.0.3-setup
+${PREFIX}/bin/openoffice.org-1.0.3-sfax
+${PREFIX}/bin/openoffice.org-1.0.3-simpress
+${PREFIX}/bin/openoffice.org-1.0.3-spadmin
+${PREFIX}/bin/openoffice.org-1.0.3-sweb
+${PREFIX}/bin/openoffice.org-1.0.3-swriter
 
 OO.org does need $LANG to be set to a suitable value.
-If it is not already set, a default value is chosen.
 Some old X-Servers before XFree86 4.2 do not like the
 western locale with Euro symbol (ISO_8859-15).
 You should ignore the warning message then or upgrade to