mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00
Code Issues Releases Activity

Upgrade to 1.0.3. While we are here, backport 3 fixes from openoffice-devel

Browse Source 
which should fix some bugs related to temporary files, and one bug in the
gcc3 bridge code.
This commit is contained in:
Martin Blapp 2003-04-12 21:35:37 +00:00
parent a3544c2e3b
commit eac008a175
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=78827
33 changed files with 420 additions and 465 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editors/openoffice-1.0/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= openoffice
PORTVERSION= 1.0.2
PORTREVISION= 2
PORTVERSION= 1.0.3
CATEGORIES+= editors
MASTER_SITES+= http://ny1.mirror.openoffice.org/%SUBDIR%/ \
http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \
@ -355,6 +354,8 @@ post-extract:
@${MAKE} extract-mozilla
@-${RM} ${WRKSRC}/../moz/zipped/*.zip
@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
@${MKDIR} -p ${WRKSRC}/../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj
@${MKDIR} -p ${WRKSRC}/../bridges/source/cpp_uno/gcc3_freebsd_intel
.if defined(L10NHELP)
@${ECHO_MSG} "===> Extracting L10NHELP sub project"
@${MKDIR} ${WRKDIR}/L10NHELP

2
editors/openoffice-1.0/distinfo
View File

@ -1,4 +1,4 @@
MD5 (openoffice/OOo_1.0.2_source.tar.bz2) = 8a82b4dbdd4e305b6f6db70ea65dce8c
MD5 (openoffice/OOo_1.0.3_source.tar.bz2) = 984146931906a7d53300b29f58f6a899
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5

155
editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch
View File

@ -1,61 +1,23 @@
--- ../berkeleydb/db-3.2.9.patch.orig Sun Jan 19 14:58:19 2003
+++ ../berkeleydb/db-3.2.9.patch Sun Jan 19 15:00:02 2003
@@ -45,52 +45,82 @@
CCLINK= @MAKEFILE_CCLINK@
*** misc/db-3.2.9/dist/configure Wed Jan 24 10:16:18 2001
--- misc/build/db-3.2.9/dist/configure Tue Jan 7 11:37:05 2003
-***************
-*** 995,1000 ****
---- 995,1001 ----
- CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
- mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
- LIBS="-lsocket -lsvipc $LIBS";;
@@ -51,7 +51,7 @@
CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
LIBS="-lsocket -lsvipc $LIBS";;
-+ netbsd*) optimize_def="-O2";;
- osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
- *qnx) cat >> confdefs.h <<\EOF
- #define HAVE_QNX 1
-***************
-*** 1795,1800 ****
---- 1796,1803 ----
- case "$host_os" in
- solaris*) JINCSUBDIRS="solaris";;
- linux*) JINCSUBDIRS="linux genunix";;
-+ irix*) JINCSUBDIRS="irix";;
++ netbsd*) optimize_def="-O";;
osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
*qnx) cat >> confdefs.h <<\EOF
#define HAVE_QNX 1
@@ -62,54 +62,57 @@
solaris*) JINCSUBDIRS="solaris";;
linux*) JINCSUBDIRS="linux genunix";;
+ irix*) JINCSUBDIRS="irix";;
-+ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";;
- *) JINCSUBDIRS="genunix";;
- esac
-
+@@ -984,9 +984,9 @@
+ optimize_def="-O2"
+ LIBS="-lipc $LIBS";;
+ bsdi*) optimize_def="-O2";;
+-freebsd*) optimize_def="-O2"
+- CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS"
+- LIBS="-pthread";;
++freebsd*) optimize_def="-O"
++ CPPFLAGS="$PTHREAD_CFLAGS $CPPFLAGS"
++ LIBS="$PTHREAD_LIBS";;
+ hpux*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
+ irix*) optimize_def="-O2"
+ CPPFLAGS="-D_SGI_MP_SOURCE $CPPFLAGS";;
+@@ -995,6 +995,7 @@
+ CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
+ mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
+ LIBS="-lsocket -lsvipc $LIBS";;
++netbsd*) optimize_def="-O2";;
+ osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
+ *qnx) cat >> confdefs.h <<\EOF
+ #define HAVE_QNX 1
+@@ -1795,6 +1796,9 @@
+ case "$host_os" in
+ solaris*) JINCSUBDIRS="solaris";;
+ linux*) JINCSUBDIRS="linux genunix";;
++ irix*) JINCSUBDIRS="irix";;
++ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";;
++ freebsd*) JINCSUBDIRS="freebsd linux solaris genunix";;
+ *) JINCSUBDIRS="genunix";;
+ esac
+
++ freebsd*) JINCSUBDIRS="linux solaris genunix";;
*) JINCSUBDIRS="genunix";;
esac
*** misc/db-3.2.9/dist/ltconfig Fri Oct 13 16:23:00 2000
--- misc/build/db-3.2.9/dist/ltconfig Tue Jan 7 11:37:05 2003
-***************
@ -84,49 +46,70 @@
- fi
- ;;
-
+@@ -1194,11 +1194,12 @@
-*** misc/db-3.2.9/dist/ltconfig Fri Oct 13 16:23:00 2000
---- misc/build/db-3.2.9/dist/ltconfig Tue Jan 7 11:37:05 2003
-***************
-*** 1955,1961 ****
- version_type=irix
- need_lib_prefix=no
- need_version=no
-! soname_spec='${libname}${release}.so.$major'
- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
- case "$host_os" in
- irix5*)
---- 1955,1961 ----
- version_type=irix
- need_lib_prefix=no
- need_version=no
-! soname_spec='${libname}${release}.so'
- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
- case "$host_os" in
- irix5*)
+@@ -1202,6 +1202,17 @@
+ fi
+ ;;
+
+ netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+- else
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
+ # can we support soname and/or expsyms with a.out? -oliva
++ freebsd*)
++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
++ # can we support soname and/or expsyms with a.out? -oliva
++ else
++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ need_version=no
+ fi
+ ;;
+
+@@ -1365,10 +1366,13 @@
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+ freebsd*)
+- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname \
++ ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
++ need_version=no
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -2020,6 +2024,14 @@
++ fi
++ ;;
++
+ solaris* | sysv5*)
+ if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs=no
+@@ -1955,7 +1966,7 @@
+ version_type=irix
+ need_lib_prefix=no
+ need_version=no
+- soname_spec='${libname}${release}.so.$major'
++ soname_spec='${libname}${release}.so'
+ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
+ case "$host_os" in
+ irix5*)
+@@ -2019,6 +2030,20 @@
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
+ soname_spec='${libname}${release}.so$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
++ fi
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
++
++freebsd*)
++ version_type=sunos
++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
++ soname_spec='${libname}${release}.so$major'
++ dynamic_linker='FreeBSD ld.elf_so'
++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++ library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++ dynamic_linker='FreeBSD (a.out) ld.so'
++ else
++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
++ soname_spec='${libname}${release}.so$major'
++ dynamic_linker='FreeBSD ld.elf_so'
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+

12
editors/openoffice-1.0/files/patch-berkeleydb+makefile.mk Normal file
View File

@ -0,0 +1,12 @@
--- ../berkeleydb/makefile.mk.orig Sat Apr 12 14:45:40 2003
+++ ../berkeleydb/makefile.mk Sat Apr 12 14:46:29 2003
@@ -84,7 +84,9 @@
BUILD_DIR=$(CONFIGURE_DIR)
BUILD_ACTION=make
+.IF "$(OS)"!="FREEBSD"
BUILD_FLAGS=-j$(MAXPROCESS)
+.ENDIF
OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*.so

14
editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
View File

@ -1217,7 +1217,7 @@
+ *
+ ************************************************************************/
+
+#include <malloc.h>
+#include <stdlib.h>
+#include <rtl/alloc.h>
+
+#include <uno/data.h>
@ -1255,9 +1255,7 @@
+ if (! pThis) dummy_can_throw_anything("xxx"); // address something
+
+ volatile long edx = 0, eax = 0; // for register returns
+ void * stackptr;
+ asm volatile (
+ "mov %%esp, %6\n\t"
+ // copy values
+ "mov %0, %%eax\n\t"
+ "mov %%eax, %%edx\n\t"
@ -1281,11 +1279,13 @@
+ "mov %%eax, %4\n\t"
+ "mov %%edx, %5\n\t"
+ // cleanup stack
+ "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
+ :
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
+ : "eax", "edx" );
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "eax", "edx" );
+
+ switch( eReturnType )
+ {
+ case typelib_TypeClass_HYPER:

14
editors/openoffice-1.0/files/patch-codemaker+source+codemaker+global.cxx Normal file
View File

@ -0,0 +1,14 @@
--- ../codemaker/source/codemaker/global.cxx.orig Fri Apr 4 00:14:50 2003
+++ ../codemaker/source/codemaker/global.cxx Fri Apr 4 00:14:53 2003
@@ -164,11 +164,7 @@
strncat(tmpPattern, "/", sizeof(tmpPattern)-1-strlen(tmpPattern));
strncat(tmpPattern, pPrefix, sizeof(tmpPattern)-1-strlen(tmpPattern));
strncat(tmpPattern, "XXXXXX", sizeof(tmpPattern)-1-strlen(tmpPattern));
-#if defined(FREEBSD) || defined(MACOSX)
- pTmpName = mkstemp(tmpPattern);
-#else
pTmpName = mktemp(tmpPattern);
-#endif
#endif
return OString(pTmpName);

14
editors/openoffice-1.0/files/patch-registry+source+registry.cxx Normal file
View File

@ -0,0 +1,14 @@
--- ../registry/source/registry.cxx.orig Fri Apr 4 00:09:08 2003
+++ ../registry/source/registry.cxx Fri Apr 4 00:06:25 2003
@@ -145,11 +145,7 @@
+ RTL_CONSTASCII_LENGTH("/reg_XXXXXX") ) );
strncat(tmpPattern, "/reg_XXXXXX", sizeof(tmpPattern)-1-strlen(tmpPattern));
-#if defined(FREEBSD) || defined(MACOSX)
- pTmpName = mkstemp(tmpPattern);
-#else
pTmpName = mktemp(tmpPattern);
-#endif
#endif
return OString(pTmpName);

49
editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c
View File

@ -48,46 +48,7 @@
#if defined(SOLARIS)
@@ -299,23 +305,23 @@
#elif defined(IRIX)
const _pair _nl_language_list[] = {
- { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
- { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
- { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
- { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
- { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
- { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
- { "eucJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
- { "eucKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
- { "eucCN", RTL_TEXTENCODING_EUC_CN }, /* China */
- { "eucTW", RTL_TEXTENCODING_EUC_TW }, /* Taiwan - Traditional Chinese */
- { "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
- { "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
- { "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
- { "sjis", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */
+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China */
+ { "EUCGBK", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
+ { "EUCTW", RTL_TEXTENCODING_EUC_TW }, /* Taiwan - Traditional Chinese */
+ { "GBK", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS } /* Japan */
};
-#elif defined(LINUX) || defined(NETBSD)
+#elif defined(LINUX)
const _pair _nl_language_list[] = {
{ "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */
@@ -496,7 +502,59 @@
@@ -497,7 +503,59 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@ -148,7 +109,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
@@ -618,7 +676,7 @@
@@ -619,7 +677,7 @@
return ret;
}
@ -157,7 +118,7 @@
/*
* FIXME: the MacOS X implemetation is missing
@@ -651,7 +709,7 @@
@@ -652,7 +710,7 @@
return 0;
}
@ -166,7 +127,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
@@ -684,6 +742,7 @@
@@ -685,6 +743,7 @@
{ "iso8859-8", RTL_TEXTENCODING_ISO_8859_8 },
{ "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 },
{ "koi8-r", RTL_TEXTENCODING_KOI8_R },
@ -174,7 +135,7 @@
{ "pck", RTL_TEXTENCODING_MS_932 },
#if (0)
{ "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW },
@@ -887,6 +946,6 @@
@@ -888,6 +947,6 @@
return 0;
}

20
editors/openoffice-1.0/files/patch-svx+source+dialog+txenctab.src
View File

@ -32,13 +32,13 @@
< "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ;
< "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ;
< "Eastern Europe (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ;
@@ -512,7 +516,8 @@
< "Êèòàéñêèé òðàäèöèîííûé (BIG5)" ; RTL_TEXTENCODING_GBK ; > ;
< "ßïîíñêèé (EUC-JP)" ; RTL_TEXTENCODING_BIG5 ; > ;
< "Êèòàéñêèé óïðîùåííûé (EUC-CN)" ; RTL_TEXTENCODING_EUC_JP ; > ;
- < "Êèðèëëè÷åñêèé (KOI8-R)" ; RTL_TEXTENCODING_EUC_CN ; > ;
+ < "Êèðèëëè÷åñêèé (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;
+ < "Êèðèëëè÷åñêèé (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ;
< "Þíèêîä (UTF-7)" ; RTL_TEXTENCODING_EUC_TW ; > ;
< "Þíèêîä (UTF-8)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ;
< "Âîñòî÷íîåâðîïåéñêèé (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ;
@@ -1217,7 +1221,8 @@
< "繁体字中国語 (EUC-TW)" ; RTL_TEXTENCODING_EUC_TW ; > ;
< "日本語 (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ;
< "簡体字中国語 (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ;
- < "キリル語 (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;
+ < "\xe3\x82\xad\xe3\x83\xaa\xe3\x83\xab\xe8\xaa\x9e (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;
+ < "\xe3\x82\xad\xe3\x83\xaa\xe3\x83\xab\xe8\xaa\x9e (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ;
< "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ;
< "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ;
< "東欧 (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ;

4
editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx
View File

@ -4,8 +4,8 @@
#include <stdlib.h>
#include <stdio.h>
-#if defined( LINUX ) || defined (SOLARIS)
+#if defined(LINUX) || defined (SOLARIS) || defined (FREEBSD)
-#if defined( LINUX ) || defined (SOLARIS) || defined(IRIX)
+#if defined(LINUX) || defined (SOLARIS) || defined(IRIX) || defined (FREEBSD)
#include <locale.h>
#include <langinfo.h>
#endif

6
editors/openoffice-1.0/pkg-message
View File

@ -1,4 +1,4 @@
OpenOffice.org Build 1.0.2 Personal Install How-To
OpenOffice.org Build 1.0.3 Personal Install How-To
Written by: Martin Blapp <mbr@freebsd.org>
@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully
installed the package. If there is no installed
OO.org dir in your homedir, you'll be prompted to
install some files and choose a installed JDK.
The setup installs a "OpenOffice.org1.0.2" folder
The setup installs a "OpenOffice.org1.0.3" folder
in your homedir.
If the setup tells you there is already an installed
@ -76,7 +76,7 @@ If you had installed the english version, and then have
switched to a localized OO.org, it will crash instantly.
To solve this issue, please remove the already installed
OpenOffice.org1.0.2 dir in your homedir and remove the
OpenOffice.org1.0.3 dir in your homedir and remove the
appropriate entry from ".sversionrc". After you have done
this, redo the user installation and the problem will
go away.

5
editors/openoffice.org-1.0/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= openoffice
PORTVERSION= 1.0.2
PORTREVISION= 2
PORTVERSION= 1.0.3
CATEGORIES+= editors
MASTER_SITES+= http://ny1.mirror.openoffice.org/%SUBDIR%/ \
http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \
@ -355,6 +354,8 @@ post-extract:
@${MAKE} extract-mozilla
@-${RM} ${WRKSRC}/../moz/zipped/*.zip
@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
@${MKDIR} -p ${WRKSRC}/../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj
@${MKDIR} -p ${WRKSRC}/../bridges/source/cpp_uno/gcc3_freebsd_intel
.if defined(L10NHELP)
@${ECHO_MSG} "===> Extracting L10NHELP sub project"
@${MKDIR} ${WRKDIR}/L10NHELP

2
editors/openoffice.org-1.0/distinfo
View File

@ -1,4 +1,4 @@
MD5 (openoffice/OOo_1.0.2_source.tar.bz2) = 8a82b4dbdd4e305b6f6db70ea65dce8c
MD5 (openoffice/OOo_1.0.3_source.tar.bz2) = 984146931906a7d53300b29f58f6a899
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5

155
editors/openoffice.org-1.0/files/patch-berkeleydb+db-3.2.9.patch
View File

@ -1,61 +1,23 @@
--- ../berkeleydb/db-3.2.9.patch.orig Sun Jan 19 14:58:19 2003
+++ ../berkeleydb/db-3.2.9.patch Sun Jan 19 15:00:02 2003
@@ -45,52 +45,82 @@
CCLINK= @MAKEFILE_CCLINK@
*** misc/db-3.2.9/dist/configure Wed Jan 24 10:16:18 2001
--- misc/build/db-3.2.9/dist/configure Tue Jan 7 11:37:05 2003
-***************
-*** 995,1000 ****
---- 995,1001 ----
- CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
- mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
- LIBS="-lsocket -lsvipc $LIBS";;
@@ -51,7 +51,7 @@
CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
LIBS="-lsocket -lsvipc $LIBS";;
-+ netbsd*) optimize_def="-O2";;
- osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
- *qnx) cat >> confdefs.h <<\EOF
- #define HAVE_QNX 1
-***************
-*** 1795,1800 ****
---- 1796,1803 ----
- case "$host_os" in
- solaris*) JINCSUBDIRS="solaris";;
- linux*) JINCSUBDIRS="linux genunix";;
-+ irix*) JINCSUBDIRS="irix";;
++ netbsd*) optimize_def="-O";;
osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
*qnx) cat >> confdefs.h <<\EOF
#define HAVE_QNX 1
@@ -62,54 +62,57 @@
solaris*) JINCSUBDIRS="solaris";;
linux*) JINCSUBDIRS="linux genunix";;
+ irix*) JINCSUBDIRS="irix";;
-+ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";;
- *) JINCSUBDIRS="genunix";;
- esac
-
+@@ -984,9 +984,9 @@
+ optimize_def="-O2"
+ LIBS="-lipc $LIBS";;
+ bsdi*) optimize_def="-O2";;
+-freebsd*) optimize_def="-O2"
+- CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS"
+- LIBS="-pthread";;
++freebsd*) optimize_def="-O"
++ CPPFLAGS="$PTHREAD_CFLAGS $CPPFLAGS"
++ LIBS="$PTHREAD_LIBS";;
+ hpux*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
+ irix*) optimize_def="-O2"
+ CPPFLAGS="-D_SGI_MP_SOURCE $CPPFLAGS";;
+@@ -995,6 +995,7 @@
+ CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
+ mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
+ LIBS="-lsocket -lsvipc $LIBS";;
++netbsd*) optimize_def="-O2";;
+ osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
+ *qnx) cat >> confdefs.h <<\EOF
+ #define HAVE_QNX 1
+@@ -1795,6 +1796,9 @@
+ case "$host_os" in
+ solaris*) JINCSUBDIRS="solaris";;
+ linux*) JINCSUBDIRS="linux genunix";;
++ irix*) JINCSUBDIRS="irix";;
++ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";;
++ freebsd*) JINCSUBDIRS="freebsd linux solaris genunix";;
+ *) JINCSUBDIRS="genunix";;
+ esac
+
++ freebsd*) JINCSUBDIRS="linux solaris genunix";;
*) JINCSUBDIRS="genunix";;
esac
*** misc/db-3.2.9/dist/ltconfig Fri Oct 13 16:23:00 2000
--- misc/build/db-3.2.9/dist/ltconfig Tue Jan 7 11:37:05 2003
-***************
@ -84,49 +46,70 @@
- fi
- ;;
-
+@@ -1194,11 +1194,12 @@
-*** misc/db-3.2.9/dist/ltconfig Fri Oct 13 16:23:00 2000
---- misc/build/db-3.2.9/dist/ltconfig Tue Jan 7 11:37:05 2003
-***************
-*** 1955,1961 ****
- version_type=irix
- need_lib_prefix=no
- need_version=no
-! soname_spec='${libname}${release}.so.$major'
- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
- case "$host_os" in
- irix5*)
---- 1955,1961 ----
- version_type=irix
- need_lib_prefix=no
- need_version=no
-! soname_spec='${libname}${release}.so'
- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
- case "$host_os" in
- irix5*)
+@@ -1202,6 +1202,17 @@
+ fi
+ ;;
+
+ netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+- else
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
+ # can we support soname and/or expsyms with a.out? -oliva
++ freebsd*)
++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
++ # can we support soname and/or expsyms with a.out? -oliva
++ else
++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ need_version=no
+ fi
+ ;;
+
+@@ -1365,10 +1366,13 @@
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+ freebsd*)
+- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname \
++ ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
++ need_version=no
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -2020,6 +2024,14 @@
++ fi
++ ;;
++
+ solaris* | sysv5*)
+ if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs=no
+@@ -1955,7 +1966,7 @@
+ version_type=irix
+ need_lib_prefix=no
+ need_version=no
+- soname_spec='${libname}${release}.so.$major'
++ soname_spec='${libname}${release}.so'
+ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
+ case "$host_os" in
+ irix5*)
+@@ -2019,6 +2030,20 @@
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
+ soname_spec='${libname}${release}.so$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
++ fi
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
++
++freebsd*)
++ version_type=sunos
++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
++ soname_spec='${libname}${release}.so$major'
++ dynamic_linker='FreeBSD ld.elf_so'
++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++ library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++ dynamic_linker='FreeBSD (a.out) ld.so'
++ else
++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
++ soname_spec='${libname}${release}.so$major'
++ dynamic_linker='FreeBSD ld.elf_so'
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+

12
editors/openoffice.org-1.0/files/patch-berkeleydb+makefile.mk Normal file
View File

@ -0,0 +1,12 @@
--- ../berkeleydb/makefile.mk.orig Sat Apr 12 14:45:40 2003
+++ ../berkeleydb/makefile.mk Sat Apr 12 14:46:29 2003
@@ -84,7 +84,9 @@
BUILD_DIR=$(CONFIGURE_DIR)
BUILD_ACTION=make
+.IF "$(OS)"!="FREEBSD"
BUILD_FLAGS=-j$(MAXPROCESS)
+.ENDIF
OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*.so

14
editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
View File

@ -1217,7 +1217,7 @@
+ *
+ ************************************************************************/
+
+#include <malloc.h>
+#include <stdlib.h>
+#include <rtl/alloc.h>
+
+#include <uno/data.h>
@ -1255,9 +1255,7 @@
+ if (! pThis) dummy_can_throw_anything("xxx"); // address something
+
+ volatile long edx = 0, eax = 0; // for register returns
+ void * stackptr;
+ asm volatile (
+ "mov %%esp, %6\n\t"
+ // copy values
+ "mov %0, %%eax\n\t"
+ "mov %%eax, %%edx\n\t"
@ -1281,11 +1279,13 @@
+ "mov %%eax, %4\n\t"
+ "mov %%edx, %5\n\t"
+ // cleanup stack
+ "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
+ :
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
+ : "eax", "edx" );
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "eax", "edx" );
+
+ switch( eReturnType )
+ {
+ case typelib_TypeClass_HYPER:

14
editors/openoffice.org-1.0/files/patch-codemaker+source+codemaker+global.cxx Normal file
View File

@ -0,0 +1,14 @@
--- ../codemaker/source/codemaker/global.cxx.orig Fri Apr 4 00:14:50 2003
+++ ../codemaker/source/codemaker/global.cxx Fri Apr 4 00:14:53 2003
@@ -164,11 +164,7 @@
strncat(tmpPattern, "/", sizeof(tmpPattern)-1-strlen(tmpPattern));
strncat(tmpPattern, pPrefix, sizeof(tmpPattern)-1-strlen(tmpPattern));
strncat(tmpPattern, "XXXXXX", sizeof(tmpPattern)-1-strlen(tmpPattern));
-#if defined(FREEBSD) || defined(MACOSX)
- pTmpName = mkstemp(tmpPattern);
-#else
pTmpName = mktemp(tmpPattern);
-#endif
#endif
return OString(pTmpName);

14
editors/openoffice.org-1.0/files/patch-registry+source+registry.cxx Normal file
View File

@ -0,0 +1,14 @@
--- ../registry/source/registry.cxx.orig Fri Apr 4 00:09:08 2003
+++ ../registry/source/registry.cxx Fri Apr 4 00:06:25 2003
@@ -145,11 +145,7 @@
+ RTL_CONSTASCII_LENGTH("/reg_XXXXXX") ) );
strncat(tmpPattern, "/reg_XXXXXX", sizeof(tmpPattern)-1-strlen(tmpPattern));
-#if defined(FREEBSD) || defined(MACOSX)
- pTmpName = mkstemp(tmpPattern);
-#else
pTmpName = mktemp(tmpPattern);
-#endif
#endif
return OString(pTmpName);

49
editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c
View File

@ -48,46 +48,7 @@
#if defined(SOLARIS)
@@ -299,23 +305,23 @@
#elif defined(IRIX)
const _pair _nl_language_list[] = {
- { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
- { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
- { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
- { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
- { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
- { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
- { "eucJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
- { "eucKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
- { "eucCN", RTL_TEXTENCODING_EUC_CN }, /* China */
- { "eucTW", RTL_TEXTENCODING_EUC_TW }, /* Taiwan - Traditional Chinese */
- { "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
- { "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
- { "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
- { "sjis", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */
+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China */
+ { "EUCGBK", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
+ { "EUCTW", RTL_TEXTENCODING_EUC_TW }, /* Taiwan - Traditional Chinese */
+ { "GBK", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS } /* Japan */
};
-#elif defined(LINUX) || defined(NETBSD)
+#elif defined(LINUX)
const _pair _nl_language_list[] = {
{ "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */
@@ -496,7 +502,59 @@
@@ -497,7 +503,59 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@ -148,7 +109,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
@@ -618,7 +676,7 @@
@@ -619,7 +677,7 @@
return ret;
}
@ -157,7 +118,7 @@
/*
* FIXME: the MacOS X implemetation is missing
@@ -651,7 +709,7 @@
@@ -652,7 +710,7 @@
return 0;
}
@ -166,7 +127,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
@@ -684,6 +742,7 @@
@@ -685,6 +743,7 @@
{ "iso8859-8", RTL_TEXTENCODING_ISO_8859_8 },
{ "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 },
{ "koi8-r", RTL_TEXTENCODING_KOI8_R },
@ -174,7 +135,7 @@
{ "pck", RTL_TEXTENCODING_MS_932 },
#if (0)
{ "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW },
@@ -887,6 +946,6 @@
@@ -888,6 +947,6 @@
return 0;
}

20
editors/openoffice.org-1.0/files/patch-svx+source+dialog+txenctab.src
View File

@ -32,13 +32,13 @@
< "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ;
< "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ;
< "Eastern Europe (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ;
@@ -512,7 +516,8 @@
< "Êèòàéñêèé òðàäèöèîííûé (BIG5)" ; RTL_TEXTENCODING_GBK ; > ;
< "ßïîíñêèé (EUC-JP)" ; RTL_TEXTENCODING_BIG5 ; > ;
< "Êèòàéñêèé óïðîùåííûé (EUC-CN)" ; RTL_TEXTENCODING_EUC_JP ; > ;
- < "Êèðèëëè÷åñêèé (KOI8-R)" ; RTL_TEXTENCODING_EUC_CN ; > ;
+ < "Êèðèëëè÷åñêèé (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;
+ < "Êèðèëëè÷åñêèé (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ;
< "Þíèêîä (UTF-7)" ; RTL_TEXTENCODING_EUC_TW ; > ;
< "Þíèêîä (UTF-8)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ;
< "Âîñòî÷íîåâðîïåéñêèé (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ;
@@ -1217,7 +1221,8 @@
< "繁体字中国語 (EUC-TW)" ; RTL_TEXTENCODING_EUC_TW ; > ;
< "日本語 (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ;
< "簡体字中国語 (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ;
- < "キリル語 (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;
+ < "\xe3\x82\xad\xe3\x83\xaa\xe3\x83\xab\xe8\xaa\x9e (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;
+ < "\xe3\x82\xad\xe3\x83\xaa\xe3\x83\xab\xe8\xaa\x9e (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ;
< "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ;
< "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ;
< "東欧 (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ;

4
editors/openoffice.org-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx
View File

@ -4,8 +4,8 @@
#include <stdlib.h>
#include <stdio.h>
-#if defined( LINUX ) || defined (SOLARIS)
+#if defined(LINUX) || defined (SOLARIS) || defined (FREEBSD)
-#if defined( LINUX ) || defined (SOLARIS) || defined(IRIX)
+#if defined(LINUX) || defined (SOLARIS) || defined(IRIX) || defined (FREEBSD)
#include <locale.h>
#include <langinfo.h>
#endif

6
editors/openoffice.org-1.0/pkg-message
View File

@ -1,4 +1,4 @@
OpenOffice.org Build 1.0.2 Personal Install How-To
OpenOffice.org Build 1.0.3 Personal Install How-To
Written by: Martin Blapp <mbr@freebsd.org>
@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully
installed the package. If there is no installed
OO.org dir in your homedir, you'll be prompted to
install some files and choose a installed JDK.
The setup installs a "OpenOffice.org1.0.2" folder
The setup installs a "OpenOffice.org1.0.3" folder
in your homedir.
If the setup tells you there is already an installed
@ -76,7 +76,7 @@ If you had installed the english version, and then have
switched to a localized OO.org, it will crash instantly.
To solve this issue, please remove the already installed
OpenOffice.org1.0.2 dir in your homedir and remove the
OpenOffice.org1.0.3 dir in your homedir and remove the
appropriate entry from ".sversionrc". After you have done
this, redo the user installation and the problem will
go away.

5
editors/openoffice/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= openoffice
PORTVERSION= 1.0.2
PORTREVISION= 2
PORTVERSION= 1.0.3
CATEGORIES+= editors
MASTER_SITES+= http://ny1.mirror.openoffice.org/%SUBDIR%/ \
http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \
@ -355,6 +354,8 @@ post-extract:
@${MAKE} extract-mozilla
@-${RM} ${WRKSRC}/../moz/zipped/*.zip
@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
@${MKDIR} -p ${WRKSRC}/../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj
@${MKDIR} -p ${WRKSRC}/../bridges/source/cpp_uno/gcc3_freebsd_intel
.if defined(L10NHELP)
@${ECHO_MSG} "===> Extracting L10NHELP sub project"
@${MKDIR} ${WRKDIR}/L10NHELP

2
editors/openoffice/distinfo
View File

@ -1,4 +1,4 @@
MD5 (openoffice/OOo_1.0.2_source.tar.bz2) = 8a82b4dbdd4e305b6f6db70ea65dce8c
MD5 (openoffice/OOo_1.0.3_source.tar.bz2) = 984146931906a7d53300b29f58f6a899
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5

155
editors/openoffice/files/patch-berkeleydb+db-3.2.9.patch
View File

@ -1,61 +1,23 @@
--- ../berkeleydb/db-3.2.9.patch.orig Sun Jan 19 14:58:19 2003
+++ ../berkeleydb/db-3.2.9.patch Sun Jan 19 15:00:02 2003
@@ -45,52 +45,82 @@
CCLINK= @MAKEFILE_CCLINK@
*** misc/db-3.2.9/dist/configure Wed Jan 24 10:16:18 2001
--- misc/build/db-3.2.9/dist/configure Tue Jan 7 11:37:05 2003
-***************
-*** 995,1000 ****
---- 995,1001 ----
- CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
- mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
- LIBS="-lsocket -lsvipc $LIBS";;
@@ -51,7 +51,7 @@
CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
LIBS="-lsocket -lsvipc $LIBS";;
-+ netbsd*) optimize_def="-O2";;
- osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
- *qnx) cat >> confdefs.h <<\EOF
- #define HAVE_QNX 1
-***************
-*** 1795,1800 ****
---- 1796,1803 ----
- case "$host_os" in
- solaris*) JINCSUBDIRS="solaris";;
- linux*) JINCSUBDIRS="linux genunix";;
-+ irix*) JINCSUBDIRS="irix";;
++ netbsd*) optimize_def="-O";;
osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
*qnx) cat >> confdefs.h <<\EOF
#define HAVE_QNX 1
@@ -62,54 +62,57 @@
solaris*) JINCSUBDIRS="solaris";;
linux*) JINCSUBDIRS="linux genunix";;
+ irix*) JINCSUBDIRS="irix";;
-+ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";;
- *) JINCSUBDIRS="genunix";;
- esac
-
+@@ -984,9 +984,9 @@
+ optimize_def="-O2"
+ LIBS="-lipc $LIBS";;
+ bsdi*) optimize_def="-O2";;
+-freebsd*) optimize_def="-O2"
+- CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS"
+- LIBS="-pthread";;
++freebsd*) optimize_def="-O"
++ CPPFLAGS="$PTHREAD_CFLAGS $CPPFLAGS"
++ LIBS="$PTHREAD_LIBS";;
+ hpux*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
+ irix*) optimize_def="-O2"
+ CPPFLAGS="-D_SGI_MP_SOURCE $CPPFLAGS";;
+@@ -995,6 +995,7 @@
+ CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
+ mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
+ LIBS="-lsocket -lsvipc $LIBS";;
++netbsd*) optimize_def="-O2";;
+ osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
+ *qnx) cat >> confdefs.h <<\EOF
+ #define HAVE_QNX 1
+@@ -1795,6 +1796,9 @@
+ case "$host_os" in
+ solaris*) JINCSUBDIRS="solaris";;
+ linux*) JINCSUBDIRS="linux genunix";;
++ irix*) JINCSUBDIRS="irix";;
++ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";;
++ freebsd*) JINCSUBDIRS="freebsd linux solaris genunix";;
+ *) JINCSUBDIRS="genunix";;
+ esac
+
++ freebsd*) JINCSUBDIRS="linux solaris genunix";;
*) JINCSUBDIRS="genunix";;
esac
*** misc/db-3.2.9/dist/ltconfig Fri Oct 13 16:23:00 2000
--- misc/build/db-3.2.9/dist/ltconfig Tue Jan 7 11:37:05 2003
-***************
@ -84,49 +46,70 @@
- fi
- ;;
-
+@@ -1194,11 +1194,12 @@
-*** misc/db-3.2.9/dist/ltconfig Fri Oct 13 16:23:00 2000
---- misc/build/db-3.2.9/dist/ltconfig Tue Jan 7 11:37:05 2003
-***************
-*** 1955,1961 ****
- version_type=irix
- need_lib_prefix=no
- need_version=no
-! soname_spec='${libname}${release}.so.$major'
- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
- case "$host_os" in
- irix5*)
---- 1955,1961 ----
- version_type=irix
- need_lib_prefix=no
- need_version=no
-! soname_spec='${libname}${release}.so'
- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
- case "$host_os" in
- irix5*)
+@@ -1202,6 +1202,17 @@
+ fi
+ ;;
+
+ netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+- else
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
+ # can we support soname and/or expsyms with a.out? -oliva
++ freebsd*)
++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
++ # can we support soname and/or expsyms with a.out? -oliva
++ else
++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ need_version=no
+ fi
+ ;;
+
+@@ -1365,10 +1366,13 @@
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+ freebsd*)
+- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname \
++ ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
++ need_version=no
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -2020,6 +2024,14 @@
++ fi
++ ;;
++
+ solaris* | sysv5*)
+ if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs=no
+@@ -1955,7 +1966,7 @@
+ version_type=irix
+ need_lib_prefix=no
+ need_version=no
+- soname_spec='${libname}${release}.so.$major'
++ soname_spec='${libname}${release}.so'
+ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
+ case "$host_os" in
+ irix5*)
+@@ -2019,6 +2030,20 @@
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
+ soname_spec='${libname}${release}.so$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
++ fi
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
++
++freebsd*)
++ version_type=sunos
++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
++ soname_spec='${libname}${release}.so$major'
++ dynamic_linker='FreeBSD ld.elf_so'
++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++ library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++ dynamic_linker='FreeBSD (a.out) ld.so'
++ else
++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
++ soname_spec='${libname}${release}.so$major'
++ dynamic_linker='FreeBSD ld.elf_so'
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+

12
editors/openoffice/files/patch-berkeleydb+makefile.mk Normal file
View File

@ -0,0 +1,12 @@
--- ../berkeleydb/makefile.mk.orig Sat Apr 12 14:45:40 2003
+++ ../berkeleydb/makefile.mk Sat Apr 12 14:46:29 2003
@@ -84,7 +84,9 @@
BUILD_DIR=$(CONFIGURE_DIR)
BUILD_ACTION=make
+.IF "$(OS)"!="FREEBSD"
BUILD_FLAGS=-j$(MAXPROCESS)
+.ENDIF
OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*.so

14
editors/openoffice/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
View File

@ -1217,7 +1217,7 @@
+ *
+ ************************************************************************/
+
+#include <malloc.h>
+#include <stdlib.h>
+#include <rtl/alloc.h>
+
+#include <uno/data.h>
@ -1255,9 +1255,7 @@
+ if (! pThis) dummy_can_throw_anything("xxx"); // address something
+
+ volatile long edx = 0, eax = 0; // for register returns
+ void * stackptr;
+ asm volatile (
+ "mov %%esp, %6\n\t"
+ // copy values
+ "mov %0, %%eax\n\t"
+ "mov %%eax, %%edx\n\t"
@ -1281,11 +1279,13 @@
+ "mov %%eax, %4\n\t"
+ "mov %%edx, %5\n\t"
+ // cleanup stack
+ "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
+ :
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
+ : "eax", "edx" );
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "eax", "edx" );
+
+ switch( eReturnType )
+ {
+ case typelib_TypeClass_HYPER:

14
editors/openoffice/files/patch-codemaker+source+codemaker+global.cxx Normal file
View File

@ -0,0 +1,14 @@
--- ../codemaker/source/codemaker/global.cxx.orig Fri Apr 4 00:14:50 2003
+++ ../codemaker/source/codemaker/global.cxx Fri Apr 4 00:14:53 2003
@@ -164,11 +164,7 @@
strncat(tmpPattern, "/", sizeof(tmpPattern)-1-strlen(tmpPattern));
strncat(tmpPattern, pPrefix, sizeof(tmpPattern)-1-strlen(tmpPattern));
strncat(tmpPattern, "XXXXXX", sizeof(tmpPattern)-1-strlen(tmpPattern));
-#if defined(FREEBSD) || defined(MACOSX)
- pTmpName = mkstemp(tmpPattern);
-#else
pTmpName = mktemp(tmpPattern);
-#endif
#endif
return OString(pTmpName);

14
editors/openoffice/files/patch-registry+source+registry.cxx Normal file
View File

@ -0,0 +1,14 @@
--- ../registry/source/registry.cxx.orig Fri Apr 4 00:09:08 2003
+++ ../registry/source/registry.cxx Fri Apr 4 00:06:25 2003
@@ -145,11 +145,7 @@
+ RTL_CONSTASCII_LENGTH("/reg_XXXXXX") ) );
strncat(tmpPattern, "/reg_XXXXXX", sizeof(tmpPattern)-1-strlen(tmpPattern));
-#if defined(FREEBSD) || defined(MACOSX)
- pTmpName = mkstemp(tmpPattern);
-#else
pTmpName = mktemp(tmpPattern);
-#endif
#endif
return OString(pTmpName);

49
editors/openoffice/files/patch-sal+osl+unx+nlsupport.c
View File

@ -48,46 +48,7 @@
#if defined(SOLARIS)
@@ -299,23 +305,23 @@
#elif defined(IRIX)
const _pair _nl_language_list[] = {
- { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
- { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
- { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
- { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
- { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
- { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
- { "eucJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
- { "eucKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
- { "eucCN", RTL_TEXTENCODING_EUC_CN }, /* China */
- { "eucTW", RTL_TEXTENCODING_EUC_TW }, /* Taiwan - Traditional Chinese */
- { "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
- { "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
- { "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
- { "sjis", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */
+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China */
+ { "EUCGBK", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
+ { "EUCTW", RTL_TEXTENCODING_EUC_TW }, /* Taiwan - Traditional Chinese */
+ { "GBK", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS } /* Japan */
};
-#elif defined(LINUX) || defined(NETBSD)
+#elif defined(LINUX)
const _pair _nl_language_list[] = {
{ "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */
@@ -496,7 +502,59 @@
@@ -497,7 +503,59 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@ -148,7 +109,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
@@ -618,7 +676,7 @@
@@ -619,7 +677,7 @@
return ret;
}
@ -157,7 +118,7 @@
/*
* FIXME: the MacOS X implemetation is missing
@@ -651,7 +709,7 @@
@@ -652,7 +710,7 @@
return 0;
}
@ -166,7 +127,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
@@ -684,6 +742,7 @@
@@ -685,6 +743,7 @@
{ "iso8859-8", RTL_TEXTENCODING_ISO_8859_8 },
{ "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 },
{ "koi8-r", RTL_TEXTENCODING_KOI8_R },
@ -174,7 +135,7 @@
{ "pck", RTL_TEXTENCODING_MS_932 },
#if (0)
{ "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW },
@@ -887,6 +946,6 @@
@@ -888,6 +947,6 @@
return 0;
}

20
editors/openoffice/files/patch-svx+source+dialog+txenctab.src
View File

@ -32,13 +32,13 @@
< "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ;
< "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ;
< "Eastern Europe (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ;
@@ -512,7 +516,8 @@
< "Êèòàéñêèé òðàäèöèîííûé (BIG5)" ; RTL_TEXTENCODING_GBK ; > ;
< "ßïîíñêèé (EUC-JP)" ; RTL_TEXTENCODING_BIG5 ; > ;
< "Êèòàéñêèé óïðîùåííûé (EUC-CN)" ; RTL_TEXTENCODING_EUC_JP ; > ;
- < "Êèðèëëè÷åñêèé (KOI8-R)" ; RTL_TEXTENCODING_EUC_CN ; > ;
+ < "Êèðèëëè÷åñêèé (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;
+ < "Êèðèëëè÷åñêèé (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ;
< "Þíèêîä (UTF-7)" ; RTL_TEXTENCODING_EUC_TW ; > ;
< "Þíèêîä (UTF-8)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ;
< "Âîñòî÷íîåâðîïåéñêèé (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ;
@@ -1217,7 +1221,8 @@
< "繁体字中国語 (EUC-TW)" ; RTL_TEXTENCODING_EUC_TW ; > ;
< "日本語 (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ;
< "簡体字中国語 (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ;
- < "キリル語 (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;
+ < "\xe3\x82\xad\xe3\x83\xaa\xe3\x83\xab\xe8\xaa\x9e (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;
+ < "\xe3\x82\xad\xe3\x83\xaa\xe3\x83\xab\xe8\xaa\x9e (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ;
< "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ;
< "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ;
< "東欧 (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ;

4
editors/openoffice/files/patch-sysui+tools+lngconv+lngconv.cxx
View File

@ -4,8 +4,8 @@
#include <stdlib.h>
#include <stdio.h>
-#if defined( LINUX ) || defined (SOLARIS)
+#if defined(LINUX) || defined (SOLARIS) || defined (FREEBSD)
-#if defined( LINUX ) || defined (SOLARIS) || defined(IRIX)
+#if defined(LINUX) || defined (SOLARIS) || defined(IRIX) || defined (FREEBSD)
#include <locale.h>
#include <langinfo.h>
#endif

6
editors/openoffice/pkg-message
View File

@ -1,4 +1,4 @@
OpenOffice.org Build 1.0.2 Personal Install How-To
OpenOffice.org Build 1.0.3 Personal Install How-To
Written by: Martin Blapp <mbr@freebsd.org>
@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully
installed the package. If there is no installed
OO.org dir in your homedir, you'll be prompted to
install some files and choose a installed JDK.
The setup installs a "OpenOffice.org1.0.2" folder
The setup installs a "OpenOffice.org1.0.3" folder
in your homedir.
If the setup tells you there is already an installed
@ -76,7 +76,7 @@ If you had installed the english version, and then have
switched to a localized OO.org, it will crash instantly.
To solve this issue, please remove the already installed
OpenOffice.org1.0.2 dir in your homedir and remove the
OpenOffice.org1.0.3 dir in your homedir and remove the
appropriate entry from ".sversionrc". After you have done
this, redo the user installation and the problem will
go away.