diff options
author | mbr <mbr@FreeBSD.org> | 2002-07-17 15:41:47 +0800 |
---|---|---|
committer | mbr <mbr@FreeBSD.org> | 2002-07-17 15:41:47 +0800 |
commit | 5a74b54bca3fbbc58bcf0d4f2915678fcb4df888 (patch) | |
tree | 8802b97c4f7319d262d37802b3b85a3d8fb44751 /editors/openoffice-1.1-devel | |
parent | 684bc75c42e3cf463efea5e258a73ec975f9bd35 (diff) | |
download | freebsd-ports-gnome-5a74b54bca3fbbc58bcf0d4f2915678fcb4df888.tar.gz freebsd-ports-gnome-5a74b54bca3fbbc58bcf0d4f2915678fcb4df888.tar.zst freebsd-ports-gnome-5a74b54bca3fbbc58bcf0d4f2915678fcb4df888.zip |
Upgrade to 1.0.1
Diffstat (limited to 'editors/openoffice-1.1-devel')
6 files changed, 54 insertions, 168 deletions
diff --git a/editors/openoffice-1.1-devel/files/patch-config_office+configure.in b/editors/openoffice-1.1-devel/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice-1.1-devel/files/patch-config_office+configure.in +++ b/editors/openoffice-1.1-devel/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice-1.1-devel/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice-1.1-devel/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include <string.h> + #include <stdio.h> +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include <stdarg.h> + #else + #include <sys/varargs.h> diff --git a/editors/openoffice-1.1-devel/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice-1.1-devel/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice-1.1-devel/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice-1.1-devel/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice-1.1-devel/files/patch-product+util+makefile.mk b/editors/openoffice-1.1-devel/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice-1.1-devel/files/patch-product+util+makefile.mk +++ b/editors/openoffice-1.1-devel/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice-1.1-devel/files/patch-unzip+source+misc.c b/editors/openoffice-1.1-devel/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice-1.1-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice-1.1-devel/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ |