cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.02

Browse Source
This commit is contained in:
Martin Blapp 2003-01-21 22:13:13 +00:00
parent 797ca128e5
commit d0202038f2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=73749
87 changed files with 1245 additions and 11916 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
editors/openoffice-1.0/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= openoffice
PORTVERSION= 1.0.1
PORTREVISION= 4
PORTVERSION= 1.0.2
CATEGORIES+= editors
MASTER_SITES+= http://ny1.mirror.openoffice.org/%SUBDIR%/ \
http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \
@ -31,12 +30,14 @@ GREP?= /usr/bin/grep
MOUNT?= /sbin/mount
ZIP?= ${PREFIX}/bin/zip
UNZIP?= ${PREFIX}/bin/unzip
ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
PASTE?= /usr/bin/paste
.include <bsd.port.pre.mk>
INSTALLATION_BASEDIR= OpenOffice.org1.0
BUILD_NR= 641
DIST_SUBDIR= openoffice
DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
@ -104,11 +105,12 @@ CXX= g++32
EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
.if !defined(USE_GCC)
BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
.endif
#.if !defined(USE_GCC)
#BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
#.endif
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/jakarta-ant
BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
.if !defined(DISPLAY)
@ -133,7 +135,7 @@ USE_AUTOCONF= yes
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/
LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
.if defined(WITH_DEBUG)
CFLAGS+= -g
.if ${WITH_DEBUG} == 2
@ -153,11 +155,12 @@ CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
PTHREAD_LIBS=${PTHREAD_LIBS}
CONFIGURE_ARGS+= --with-jdk-home=${JDK13DIR} \
--with-os-version=${OSVERSION}
--with-os-version=${OSVERSION} \
--with-ant-home=${LOCALBASE}/
.if !defined(USE_GCC)
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX}
.endif
#.if !defined(USE_GCC)
#CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX}
#.endif
.if defined(WITH_DEBUG)
.if ${WITH_DEBUG} == 2
@ -464,8 +467,8 @@ do-build:
.endif
@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
.if defined(L10NHELP)
@${MKDIR} ${WRKSRC}/../solver/641/unxfbsd.pro/pck
@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/641/unxfbsd.pro/pck
@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
.endif
.if !defined(DISPLAY)
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \

2
editors/openoffice-1.0/distinfo
View File

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

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

@ -1,82 +1,132 @@
--- ../berkeleydb/db-3.2.9.patch.orig Mon Mar 18 15:53:40 2002
+++ ../berkeleydb/db-3.2.9.patch Mon Apr 15 18:43:43 2002
@@ -47,17 +47,27 @@
--- build/unxsols3.pro/db-3.2.9/dist/configure Tue Jan 8 13:56:05 2002
***************
*** 1795,1800 ****
---- 1795,1802 ----
+--- 1795,1803 ----
case "$host_os" in
solaris*) JINCSUBDIRS="solaris";;
linux*) JINCSUBDIRS="linux genunix";;
+ irix*) JINCSUBDIRS="irix";;
+ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";;
++ freebsd*) JINCSUBDIRS="freebsd genunix";;
*) JINCSUBDIRS="genunix";;
esac
--- misc/build/db-3.2.9/dist/configure.orig Sat Nov 24 14:56:48 2001
+++ misc/build/db-3.2.9/dist/configure Sat Nov 24 14:57:32 2001
+@@ -984,7 +984,7 @@
--- ../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";;
-+ 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*) 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="-D_THREAD_SAFE $CPPFLAGS"
+ LIBS="-pthread";;
++ CPPFLAGS="$PTHREAD_CFLAGS $CPPFLAGS"
++ LIBS="$PTHREAD_LIBS";;
+ hpux*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
@@ -995,6 +995,7 @@
CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
@@ -68,13 +78,22 @@
#define HAVE_QNX 1
--- misc/build/db-3.2.9/dist/ltconfig.orig Sat Nov 24 14:56:10 2001
+++ misc/build/db-3.2.9/dist/ltconfig Sat Nov 24 14:56:34 2001
-@@ -1194,11 +1194,12 @@
+@@ -1194,11 +1194,23 @@
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'
++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
++ # can we support soname and/or expsyms with a.out? -oliva
+ 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 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
-***************
-*** 1194,1204 ****
-
- 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
- fi
- ;;
-
---- 1194,1205 ----
-
- netbsd*)
- 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
- ;;
-
+@@ -1194,11 +1194,12 @@
+
+ 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
++ 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'
- 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
++ ;;
++
++ 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
@@ -84,3 +103,24 @@
fi
;;
+@@ -2019,6 +2031,20 @@
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
+ 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 @@
+ soname_spec='${libname}${release}.so$major'
+ dynamic_linker='NetBSD ld.elf_so'
++ fi
+ fi
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
++
++freebsd*)
++ version_type=sunos
++ 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
++ 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'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+

217
editors/openoffice-1.0/files/patch-config_office+configure.in
View File

@ -1,187 +1,46 @@
--- 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
],,)
+AC_ARG_ENABLE(debug,
+[ --enable-debug if you like to build with debug symbols
+
+ Usage: --enable-debug
+],,)
AC_ARG_WITH(stlport4-home,
[ --with-stlport4-home The location that STLport4 is installed in. The STL
header files are assumed to be in stlport4-home/stlport
@@ -103,6 +108,12 @@
Usage: --with-asm-home=<path to ml.exe directory>
],,)
+AC_ARG_WITH(os-version,
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
+ with the correct OSVERSION.
+
+ Usage: --with-os-version=<OSVERSION>
+],,)
AC_ARG_WITH(unzip-home,
[ --with-unzip-home For Windows users, please supply the path for
unzip.exe.
@@ -241,7 +252,7 @@
if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then
AC_PROG_CC
fi
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then
+if test "$_os" = "Linux" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then
dnl ******************************************
dnl Testing for GNU compiler and version...
dnl ******************************************
@@ -366,8 +377,9 @@
_gcc_include_path="NO_GCC_INCLUDE"
fi
else
- if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
- _gcc_include_path="/usr/include/g++"
+ if test "$_os" = "NetBSD" ; then
+ _gcc_include_path="/usr"
+ _gxx_include_path="/usr/include/g++"
else
AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler])
AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn
@@ -408,6 +420,71 @@
fi
--- configure.in.orig Thu Jan 16 13:42:46 2003
+++ configure.in Tue Jan 21 23:09:35 2003
@@ -352,10 +352,7 @@
if test "$COMPATH" != "NO_GCC"; then
AC_MSG_RESULT([checked (gcc $_gcc_version)])
fi
fi
+if test "$_os" = "FreeBSD"; then
+ dnl ******************************************
+ dnl Testing for GNU compiler and version...
+ dnl Adapted to the FreeBSD ports system
+ dnl ******************************************
+ dnl parametrise the various gcc pathnames so we can reuse for gcc2.95 and gcc3
+ if test -n "$enable_gcc3"; then
+ _gccincname1="g++-v3"
+ else
+ _gccincname1="g++-3"
+ fi
+ if test -z "$CC"; then
+ CC="cc";
+ fi
+ if test -z "$CXX"; then
+ CXX="c++";
+ fi
+ if which $CC; then
+ _gcc_releasetype=`echo $CC | $SED -e 's|[[:digit:]]\{1,\}||'`
+ _gcc_version=`$CC -dumpversion`
+ _gcc_major=`$CC -dumpversion | $AWK -F"." '{ print \$1 }'`
+ _gcc_machine=`$CC -dumpmachine`
+ else
+ COMPATH="NO_GCC"
+ fi
+ if test -n "$enable_gcc3"; then
+ if test "$_gcc_major" != "3"; then
+ AC_MSG_ERROR([found version "$_gcc_version", but use of gcc 3.x requested])
+ COMPATH="NO_GCC"
+ fi
+ else
+ if test "$_gcc_major" != "2"; 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_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=`$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
+ COMPATH="NO_GCC"
+ fi
+ fi
+ fi
+ fi
+ if test "$COMPATH" != "NO_GCC"; then
+ if test $CC != "gcc" -o $CC != "cc"; then
+ _gcc_include_path="$PREFIX/lib/gcc-lib/$_gcc_machine/$_gcc_version/include"
+ _gxx_include_path="$_gcc_include_path/g++"
+ else
+ _gcc_include_path="$PREFIX"
+ _gxx_include_path="$_gcc_include_path/g++"
+ fi
+ else
+ AC_MSG_WARN([no gcc compiler found])
+ AC_MSG_WARN([no gcc compiler found]) >> warn
+ fi
-
-dnl Set the include paths
- _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
-fi
+fi
+
if test "$_os" = "Darwin"; then
if test "$CC" = "cc"; then
AC_PATH_PROGS(_cc, cc)
@@ -589,6 +666,26 @@
fi
dnl ===================================================================
dnl Search all the common names for GNU make
@@ -553,14 +550,27 @@
fi
+dnl *************************************************************
+dnl Testing for exception handling - dwarf2 or sjlj exceptions...
+dnl *************************************************************
+AC_MSG_CHECKING([try to compile exception code])
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+AC_CACHE_VAL(exceptions_type, [AC_TRY_LINK(
+ [#include <iostream>
+
+extern "C" void __sjthrow(void) __attribute__ ((__noreturn__));
+
+ ],
+ [__sjthrow() ],
+ [exceptions_type="sjlj"],
+ [exceptions_type="dwarf2"])
+])
+
+AC_MSG_RESULT(Exceptions type: $exceptions_type)
+AC_LANG_RESTORE
+
dnl **************************************************************
dnl Testing for required Solaris and workshop compiler patches...
dnl **************************************************************
@@ -815,6 +912,10 @@
fi
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
+ _jdk_minor="true"
+ fi
fi
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
@@ -1170,6 +1271,12 @@
USE_GCC3="FALSE"
fi
+if test -n "$enable_debug"; then
+ ENABLE_DEBUG="TRUE"
dnl ===================================================================
-dnl Set the gxx include directories
+dnl Set the gcc/gxx include directories
dnl ===================================================================
+if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then
if test "$GXX" = "yes"; then
- _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1`
+ if test -n "$enable_gcc3"; then
+ _gccincname1="g++-v3"
+ else
+ _gccincname1="g++-3"
+ fi
+ _gcc_include_path=".."
+ _gxx_include_path="$_gcc_include_path/$_gccincname1"
+fi
+else
+ ENABLE_DEBUG="FALSE"
+if test "$GXX" = "yes"; then
+ _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
+ _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - \
+ | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1`
dnl This is the original code...
-dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
+dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
+fi
+
# Print args passed to set_soenv.
if test 1 = 1; then
echo
@@ -1197,12 +1304,14 @@
echo "\$MINGWIN32="$WITH_MINGWIN
echo "\$with_use_shell="$with_use_shell
echo "\$USE_GCC3="$USE_GCC3
+echo "\$EXCEPTIONS="$exceptions_type
+echo "\$ENABLE_DEBUG="$ENABLE_DEBUG
echo
fi
-
# Executing the set_soenv script to setup the environment variables.
if test -z "$enable_check_only"; then
- './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3
+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG
else
echo
echo Test Complete
dnl ===================================================================
dnl Extra checking for the SUN OS compiler

242
editors/openoffice-1.0/files/patch-config_office+set_soenv.1
View File

@ -1,242 +0,0 @@
--- set_soenv.1.orig Sun Jun 30 21:51:05 2002
+++ set_soenv.1 Mon Oct 28 15:01:58 2002
@@ -40,7 +40,7 @@
#
# Set this value equal to the corresponding amount of
# command line arguments.
-my $numArgs = 20;
+my $numArgs = 27;
# Determining the amount of arguments in the call.
my $numEnter = $#ARGV + 1;
if ( $numEnter != $numArgs )
@@ -66,14 +66,15 @@
my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $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,
- $TF_CFGDATA, $TF_SVDATA,
+ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX,
$USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC,
$USE_XPRINT, $BUILD_SOSL_RELEASE );
#
# Platform dependent constant values.
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, $JRETOOLKITDIR, $JRETHREADDIR );
+ $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);
#
#-------------------------------------------
# IIc. Declaring the environment variables.
@@ -96,7 +97,7 @@
$SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL,
$COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME,
$BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3 );
+ $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG);
#
#-------------------------------------------
# IId. Declaring the aliases.
@@ -145,7 +146,11 @@
$STLPORT4 = $ARGV [ 12 ]; # Location of STLport4
$MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32
$USE_SHELL = $ARGV [ 18 ]; # preferred shell
-$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 at the moment)
+$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment)
+$CC = $ARGV [ 23 ]; # get cc from environment
+$CXX = $ARGV [ 24 ]; # use c++ from environment
+$EXCEPTIONS = $ARGV [ 25 ]; # Exception handling type
+$ENABLE_DEBUG = $ARGV [ 26 ]; # Enable a debug build
#
#---------------------------------------------------------------
# IIIb. Initialising the variables for the system commands, etc.
@@ -335,7 +340,14 @@
$COMPATH = $ARGV[ 0 ];
$CPU = "I";
$CPUNAME = "INTEL";
+if ($USE_GCC3 eq "TRUE")
+ {
+ $CVER = "C300";
+ }
+else
+ {
$CVER = "C295";
+}
$DLLSUFFIX = "fi";
$GUI = "UNX";
$GUIBASE = "unx";
@@ -348,6 +360,9 @@
$PATH_SEPERATOR = $ps;
$PROSWITCH = "-DPRODUCT";
$XPVERSION = "3";
+ $OSVERSION = $ARGV[ 20 ];
+ $PTHREAD_CFLAGS = $ARGV[ 21 ];
+ $PTHREAD_LIBS = $ARGV[ 22 ];
$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";
@@ -927,7 +942,7 @@
$ps_STLPORT_LIB.
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
}
-elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64"))
+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64"))
{ $LD_LIBRARY_PATH = $cur_dir.
$ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
$ps.$USR_LOCAL.$LIB.
@@ -935,6 +950,13 @@
$ps_STLPORT_LIB.
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
}
+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.
@@ -970,15 +992,16 @@
$D.$COM.
$D.$CVER.
$D.$GVER.
- $D."_PTHREADS".
$D.$OS.
$D.$CPUNAME;
if ($platform eq "$FreeBSD")
-{ $SOLARDEF .= $D."X86";
+{ $SOLARDEF .= $D."X86".
+ $D."OSVERSION=$OSVERSION".
+ " ".$PTHREAD_CFLAGS;
}
$SOLARDEF .= $D."_REENTRANT".
$D."_POSIX_PTHREAD_SEMANTICS";
-if (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64"))
+if (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64") && ( $platform ne "FreeBSD" ) && ( $platform ne "NetBSD" ))
{ $SOLARDEF .= $D."GLIBC=".$GLIBC;
}
$SOLARDEF .= $D."SUPD=$UPD".
@@ -995,7 +1018,7 @@
$L.$USR_DT.$LIB.
$L.$USR_OPENWIN.$LIB.'"';
}
-elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($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"))
{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
$L.$LIB.
$L.$USR.$LIB.
@@ -1005,6 +1028,11 @@
{ $SOLAREXTRALIB = '"'.$L.$LIB.
$L.$USR.$LIB.'"';
}
+elsif ($platform eq "$FreeBSD")
+{
+ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.'"';
+}
+
# Compiler include search directory paths.
if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64"))
{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
@@ -1076,7 +1104,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
}
-elsif (($platform eq "$Linux") or ($platform eq "$FreeBSD") or ($platform eq "$NetBSD") or ($platform eq "$Tru64") or ($platform eq "$Irix") or ($platform eq "$Irix64"))
+elsif (($platform eq "$Linux") or ($platform eq "$NetBSD") or ($platform eq "$Tru64") or ($platform eq "$Irix") or ($platform eq "$Irix64"))
{ $PATH = $cur_dir.
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
@@ -1095,6 +1123,22 @@
$ps.$USR.$ds."X11".$BIN.
$ps.$USR.$LIB;
}
+elsif ($platform eq "$FreeBSD")
+{ $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
+ $ps.'$SOLARENV'.$BIN.
+ $ps.'$JAVA_HOME'.$BIN.
+
+ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
+
+ $PATH .= $ps.$USR.$ds."sbin".
+ $ps.$USR.$ds."X11R6".$ds."bin".
+ $ps.$USR_LOCAL.$BIN.
+ $ps.$USR_LOCAL.$ds."sbin";
+ $ps.$USR.$LIB;
+}
+
elsif ($platform eq "$Winnt")
{
my ( $noldPATH );
@@ -1195,7 +1239,7 @@
$L_STLPORT_LIB.
$L.$XLIB.'"';
}
-elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($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"))
{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
@@ -1210,6 +1254,15 @@
$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.
@@ -1242,7 +1295,7 @@
$SOLARINC .= $I.$USR.$INCLUDE;
}
$SOLARINC .= $STLPORT_stlport;
-if ($platform eq "$Linux")
+if ($platform eq "$Linux" || $platform eq "$FreeBSD")
{
# This simply adds an include path, so even cases that break the FHS work
$SOLARINC .= $STLPORT_inc_stlport;
@@ -1256,11 +1309,6 @@
{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
}
-if ($platform eq "$Linux")
-{
-# This simply adds an include path, so even cases that break the FHS work
-$SOLARINC .= $STLPORT_inc_stlport;
-}
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
$I.'$JAVA_HOME'.$INCLUDE;
@@ -1428,6 +1476,9 @@
ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" );
ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" );
ToFile( "TF_FILTER", "TRUE", "e" );
+if ($ENABLE_DEBUG eq "TRUE") {
+ToFile( "debug", "true", "e" );
+}
if ( $platform ne "$Macosx" )
{ ToFile( "PSPRINT", "TRUE", "e" );
} elsif ( $GUIBASE eq "unx" ) {
@@ -1453,6 +1504,12 @@
ToFile( "GUIENV", $GUIENV, "e" );
ToFile( "GVER", $GVER, "e" );
ToFile( "OS", $OS, "e" );
+ToFile( "CC", $CC, "e" );
+ToFile( "CXX", $CXX, "e" );
+ToFile( "EXCEPTIONS", $EXCEPTIONS, "e" );
+ToFile( "OSVERSION", $OSVERSION, "e" );
+ToFile( "PTHREAD_CFLAGS", $PTHREAD_CFLAGS, "e" );
+ToFile( "PTHREAD_LIBS", $PTHREAD_LIBS, "e" );
ToFile( "OUTPATH", $OUTPATH, "e" );
ToFile( "INPATH", $INPATH, "e" );
ToFile( "GVERDIR", $GVERDIR, "e" );

98
editors/openoffice-1.0/files/patch-connectivity+source+parse+sqlbison.y
View File

@ -1,98 +0,0 @@
--- ../connectivity/source/parse/sqlbison.y.orig Fri May 31 15:21:42 2002
+++ ../connectivity/source/parse/sqlbison.y Thu Nov 7 00:06:38 2002
@@ -134,21 +134,6 @@
%token <pParseNode> SQL_TOKEN_STRING SQL_TOKEN_ACCESS_DATE SQL_TOKEN_INT SQL_TOKEN_REAL_NUM
%token <pParseNode> SQL_TOKEN_INTNUM SQL_TOKEN_APPROXNUM SQL_TOKEN_NOT SQL_TOKEN_NAME
- /* operators */
-%left <pParseNode> SQL_TOKEN_NAME
-%left <pParseNode> SQL_TOKEN_OR
-%left <pParseNode> SQL_TOKEN_AND
-
-%left <pParseNode> LESSEQ GREATEQ NOTEQUAL LESS GREAT EQUAL /* '<' '>' = <> < > <= >= != */
-%left <pParseNode> '+' '-'
-%left <pParseNode> '*' '/'
-%left <pParseNode> SQL_TOKEN_NATURAL SQL_TOKEN_CROSS SQL_TOKEN_FULL SQL_TOKEN_LEFT SQL_TOKEN_RIGHT
-%left <pParseNode> ')'
-%right <pParseNode> '='
-%right <pParseNode> '.'
-%right <pParseNode> '('
-
-
%nonassoc <pParseNode> SQL_TOKEN_UMINUS
@@ -157,31 +142,31 @@
%token <pParseNode> SQL_TOKEN_ALL SQL_TOKEN_ALTER SQL_TOKEN_AMMSC SQL_TOKEN_ANY SQL_TOKEN_AS SQL_TOKEN_ASC SQL_TOKEN_AT SQL_TOKEN_AUTHORIZATION SQL_TOKEN_AVG
-%token <pParseNode> SQL_TOKEN_BETWEEN SQL_TOKEN_BIT SQL_TOKEN_BIT_LENGTH SQL_TOKEN_BOTH SQL_TOKEN_BY
+%token <pParseNode> SQL_TOKEN_BETWEEN SQL_TOKEN_BIT SQL_TOKEN_BOTH SQL_TOKEN_BY
-%token <pParseNode> SQL_TOKEN_CAST SQL_TOKEN_CHARACTER SQL_TOKEN_CHAR_LENGTH SQL_TOKEN_CHECK SQL_TOKEN_COLLATE SQL_TOKEN_COMMIT SQL_TOKEN_CONTINUE SQL_TOKEN_CONVERT SQL_TOKEN_COUNT SQL_TOKEN_CREATE SQL_TOKEN_CROSS
-%token <pParseNode> SQL_TOKEN_CURRENT SQL_TOKEN_CURRENT_DATE SQL_TOKEN_CURRENT_TIME SQL_TOKEN_CURRENT_TIMESTAMP SQL_TOKEN_CURSOR
+%token <pParseNode> SQL_TOKEN_CAST SQL_TOKEN_CHARACTER SQL_TOKEN_CHECK SQL_TOKEN_COLLATE SQL_TOKEN_COMMIT SQL_TOKEN_CONTINUE SQL_TOKEN_CONVERT SQL_TOKEN_COUNT SQL_TOKEN_CREATE SQL_TOKEN_CROSS
+%token <pParseNode> SQL_TOKEN_CURRENT SQL_TOKEN_CURSOR
%token <pParseNode> SQL_TOKEN_DATE SQL_TOKEN_DAY SQL_TOKEN_DEC SQL_TOKEN_DECIMAL SQL_TOKEN_DECLARE SQL_TOKEN_DEFAULT SQL_TOKEN_DELETE SQL_TOKEN_DESC
%token <pParseNode> SQL_TOKEN_DISTINCT SQL_TOKEN_DOUBLE SQL_TOKEN_DROP
-%token <pParseNode> SQL_TOKEN_ESCAPE SQL_TOKEN_EXCEPT SQL_TOKEN_EXISTS SQL_TOKEN_EXTRACT SQL_TOKEN_FALSE SQL_TOKEN_FETCH SQL_TOKEN_FLOAT SQL_TOKEN_FOR SQL_TOKEN_FOREIGN SQL_TOKEN_FOUND SQL_TOKEN_FROM SQL_TOKEN_FULL
+%token <pParseNode> SQL_TOKEN_ESCAPE SQL_TOKEN_EXCEPT SQL_TOKEN_EXISTS SQL_TOKEN_FALSE SQL_TOKEN_FETCH SQL_TOKEN_FLOAT SQL_TOKEN_FOR SQL_TOKEN_FOREIGN SQL_TOKEN_FOUND SQL_TOKEN_FROM SQL_TOKEN_FULL
-%token <pParseNode> SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING SQL_TOKEN_HOUR SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INSERT SQL_TOKEN_INTEGER SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT
+%token <pParseNode> SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INTEGER SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT
-%token <pParseNode> SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LEFT SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER SQL_TOKEN_MINUTE SQL_TOKEN_MONTH
+%token <pParseNode> SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER
%token <pParseNode> SQL_TOKEN_MAX SQL_TOKEN_MIN SQL_TOKEN_NATURAL SQL_TOKEN_NCHAR SQL_TOKEN_NULL SQL_TOKEN_NUMERIC
%token <pParseNode> SQL_TOKEN_OCTECT_LENGTH SQL_TOKEN_OF SQL_TOKEN_ON SQL_TOKEN_OPTION SQL_TOKEN_ORDER SQL_TOKEN_OUTER
-%token <pParseNode> SQL_TOKEN_POSITION SQL_TOKEN_PRECISION SQL_TOKEN_PRIMARY SQL_TOKEN_PRIVILEGES SQL_TOKEN_PROCEDURE SQL_TOKEN_PUBLIC
-%token <pParseNode> SQL_TOKEN_REAL SQL_TOKEN_REFERENCES SQL_TOKEN_ROLLBACK SQL_TOKEN_RIGHT
+%token <pParseNode> SQL_TOKEN_PRECISION SQL_TOKEN_PRIMARY SQL_TOKEN_PRIVILEGES SQL_TOKEN_PROCEDURE SQL_TOKEN_PUBLIC
+%token <pParseNode> SQL_TOKEN_REAL SQL_TOKEN_REFERENCES SQL_TOKEN_ROLLBACK
-%token <pParseNode> SQL_TOKEN_SCHEMA SQL_TOKEN_SECOND SQL_TOKEN_SELECT SQL_TOKEN_SET SQL_TOKEN_SIZE SQL_TOKEN_SMALLINT SQL_TOKEN_SOME SQL_TOKEN_SQLCODE SQL_TOKEN_SQLERROR SQL_TOKEN_SUBSTRING SQL_TOKEN_SUM
+%token <pParseNode> SQL_TOKEN_SCHEMA SQL_TOKEN_SELECT SQL_TOKEN_SET SQL_TOKEN_SIZE SQL_TOKEN_SMALLINT SQL_TOKEN_SOME SQL_TOKEN_SQLCODE SQL_TOKEN_SQLERROR SQL_TOKEN_SUM
%token <pParseNode> SQL_TOKEN_TABLE SQL_TOKEN_TIME SQL_TOKEN_TIMESTAMP SQL_TOKEN_TIMEZONE_HOUR SQL_TOKEN_TIMEZONE_MINUTE SQL_TOKEN_TO SQL_TOKEN_TRAILING SQL_TOKEN_TRANSLATE SQL_TOKEN_TRIM SQL_TOKEN_TRUE SQL_TOKEN_UNION
%token <pParseNode> SQL_TOKEN_UNIQUE SQL_TOKEN_UNKNOWN SQL_TOKEN_UPDATE SQL_TOKEN_UPPER SQL_TOKEN_USAGE SQL_TOKEN_USER SQL_TOKEN_USING SQL_TOKEN_VALUES SQL_TOKEN_VIEW
-%token <pParseNode> SQL_TOKEN_WHERE SQL_TOKEN_WITH SQL_TOKEN_WORK SQL_TOKEN_YEAR SQL_TOKEN_ZONE
+%token <pParseNode> SQL_TOKEN_WHERE SQL_TOKEN_WITH SQL_TOKEN_WORK SQL_TOKEN_ZONE
/* ODBC KEYWORDS */
%token <pParseNode> SQL_TOKEN_CALL SQL_TOKEN_D SQL_TOKEN_FN SQL_TOKEN_T SQL_TOKEN_TS SQL_TOKEN_OJ
@@ -204,6 +189,22 @@
%token <pParseNode> SQL_TOKEN_LOG10 SQL_TOKEN_MOD SQL_TOKEN_PI SQL_TOKEN_POWER SQL_TOKEN_RADIANS SQL_TOKEN_RAND
%token <pParseNode> SQL_TOKEN_ROUND SQL_TOKEN_SIGN SQL_TOKEN_SIN SQL_TOKEN_SQRT SQL_TOKEN_TAN SQL_TOKEN_TRUNCATE
+
+ /* operators */
+%left SQL_TOKEN_NAME
+%left <pParseNode> SQL_TOKEN_OR
+%left <pParseNode> SQL_TOKEN_AND
+
+%left <pParseNode> LESSEQ GREATEQ NOTEQUAL LESS GREAT EQUAL /* '<' '>' = <> < > <= >= != */
+%left <pParseNode> '+' '-'
+%left <pParseNode> '*' '/'
+%left SQL_TOKEN_NATURAL SQL_TOKEN_CROSS SQL_TOKEN_FULL SQL_TOKEN_LEFT SQL_TOKEN_RIGHT
+%left ')'
+%right '='
+%right '.'
+%right '('
+
+
%token <pParseNode> SQL_TOKEN_INVALIDSYMBOL
/*%type <pParseNode> sql_single_statement */
@@ -3019,7 +3020,7 @@
}
else
YYERROR;
- }
+ };
%%

11
editors/openoffice-1.0/files/patch-cosv+source+strings+streamstr.cxx
View File

@ -1,11 +0,0 @@
--- ../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>

13
editors/openoffice-1.0/files/patch-desktop+source+pkgchk_packages.cxx Normal file
View File

@ -0,0 +1,13 @@
--- ../desktop/source/pkgchk/pkgchk_packages.cxx.orig Sun Jan 19 20:00:08 2003
+++ ../desktop/source/pkgchk/pkgchk_packages.cxx Sun Jan 19 20:01:51 2003
@@ -124,6 +124,10 @@
static char const s_platform_path [] = "/macosx_powerpc.plt";
#elif defined (NETBSD) && defined (SPARC)
static char const s_platform_path [] = "/netbsd_sparc.plt";
+#elif defined (FREEBSD) && defined (INTEL)
+static char const s_platform_path [] = "/freebsd_x86.plt";
+#elif defined (FREEBSD) && defined (SPARC)
+static char const s_platform_path [] = "/freebsd_sparc.plt";
#else
#error "unkonwn platform"
insert your platform identifier above; inserted for the case the preprocessor ignores error

34
editors/openoffice-1.0/files/patch-freetype+makefile.mk
View File

@ -1,24 +1,24 @@
--- ../freetype/makefile.mk.orig Tue Feb 26 12:21:37 2002
+++ ../freetype/makefile.mk Thu Aug 1 00:51:46 2002
@@ -79,7 +79,11 @@
--- ../freetype/makefile.mk.orig Fri Aug 16 17:28:36 2002
+++ ../freetype/makefile.mk Sat Jan 18 13:39:03 2003
@@ -86,7 +86,11 @@
.IF "$(GUI)"=="UNX"
#relative to CONFIGURE_DIR
CONFIGURE_ACTION=$(GNUMAKE)
.IF "$(GUI)"=="UNX"
-CONFIGURE_FLAGS=setup
+.IF "$(debug)"==""
+CONFIGURE_FLAGS=setup CFLAGS="-O"
+.ELSE # "$(debug)"==""
+.ELSE # "$(debug)"==""
+CONFIGURE_FLAGS=setup CFLAGS="-O -g -ggdb"
+.ENDIF # "$(debug)"==""
.ELSE # "$(GUI)"=="UNX"
CONFIGURE_FLAGS=setup visualc
.ENDIF # "$(GUI)"=="UNX"
@@ -90,7 +94,7 @@
.IF "$(GUI)"=="UNX"
OUT2LIB= \
objs$/.libs$/libfreetype.a \
- objs$/.libs$/libfreetype.so.6*
+ objs$/.libs$/libfreetype.so.7
.ENDIF # "$(GUI)"=="UNX"
+.ENDIF
BUILD_DIR=$(CONFIGURE_DIR)
BUILD_ACTION=$(GNUMAKE)
@@ -95,6 +99,8 @@
objs$/.libs$/libfreetype.a
.IF "$(OS)"=="MACOSX"
OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+.ELIF "$(OS)"=="FREEBSD"
+OUT2LIB+=objs$/.libs$/libfreetype.so.7*
.ELSE
OUT2LIB+=objs$/.libs$/libfreetype.so.6*
.ENDIF # "$(OS)"=="MACOSX"

11
editors/openoffice-1.0/files/patch-idl+util+makefile.mk
View File

@ -1,11 +0,0 @@
--- ../idl/util/makefile.mk.orig Sun Jul 21 00:02:37 2002
+++ ../idl/util/makefile.mk Sun Jul 21 00:02:39 2002
@@ -110,7 +110,7 @@
.ENDIF
.ENDIF
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
APP1STDLIBS+=-lcrypt
.ENDIF

73
editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch
View File

@ -1,11 +1,41 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
+++ ../nas/nas-1.4.1.patch Thu Oct 31 10:17:40 2002
@@ -120,26 +120,157 @@
--- ../nas/nas-1.4.1.patch.orig Wed Jan 8 02:52:13 2003
+++ ../nas/nas-1.4.1.patch Sat Jan 18 17:55:19 2003
@@ -1,5 +1,5 @@
-*** misc/nas-1.4.1/config/NetAudio.tmpl Sat Mar 4 21:40:50 2000
---- misc/build/nas-1.4.1/config/NetAudio.tmpl Tue Jan 7 19:30:41 2003
+*** misc/nas-1.4.1/config/NetAudio.tmpl Sun Mar 5 03:40:50 2000
+--- misc/build/nas-1.4.1/config/NetAudio.tmpl Thu Nov 1 13:08:21 2001
***************
*** 166,171 ****
--- 166,177 ----
@@ -15,8 +15,8 @@
INCLUDESRC = $(TOP)/include
INCDIR = $(INCROOT)/audio
WIDGET_DIR = $(TOP)/clients/audio/widgets
-*** misc/nas-1.4.1/lib/audio/Alibint.c Sun Oct 24 13:45:21 1999
---- misc/build/nas-1.4.1/lib/audio/Alibint.c Tue Jan 7 19:30:41 2003
+*** misc/nas-1.4.1/lib/audio/Alibint.c Sun Oct 24 19:45:21 1999
+--- misc/build/nas-1.4.1/lib/audio/Alibint.c Thu Nov 1 13:11:51 2001
***************
*** 1336,1348 ****
static char *_SysErrorMsg (n)
@@ -40,8 +40,8 @@
}
#endif /* USL sharedlibs in don't define for AUD3.2 */
-*** misc/nas-1.4.1/lib/audio/Astreams.c Sat May 8 21:10:05 1999
---- misc/build/nas-1.4.1/lib/audio/Astreams.c Tue Jan 7 19:30:41 2003
+*** misc/nas-1.4.1/lib/audio/Astreams.c Sun May 9 03:10:05 1999
+--- misc/build/nas-1.4.1/lib/audio/Astreams.c Thu Nov 1 13:05:48 2001
***************
*** 51,59 ****
#include <errno.h>
@@ -120,59 +120,157 @@
return(-1);
}
-*** misc/nas-1.4.1/lib/audio/Imakefile Sat Jan 1 10:28:13 2000
---- misc/build/nas-1.4.1/lib/audio/Imakefile Thu Nov 1 13:12:56 2001
-*** misc/nas-1.4.1/lib/audio/Imakefile Sat Jan 1 04:28:13 2000
---- misc/build/nas-1.4.1/lib/audio/Imakefile Tue Jan 7 19:30:41 2003
-***************
-*** 25,30 ****
---- 25,32 ----
@ -27,6 +57,39 @@
- InstallMultiple($(HEADERS),$(INCDIR))
- #if ProjectX >= 5
- InstallNonExecFile(AuErrorDB,$(LIBDIR))
-*** misc/nas-1.4.1/server/dia/gram.y Sat Jan 1 22:35:49 2000
---- misc/build/nas-1.4.1/server/dia/gram.y Tue Jan 7 19:42:40 2003
-***************
-*** 119,132 ****
- }
- | MAXRATE number
- { ddaSetConfig(MAXRATE, (void *)$2); }
-! | MINRATE number
-! { ddaSetConfig(MINRATE, (void *)$2); }
-
- string : STRING { ptr = (char *)malloc(strlen($1)+1);
- strcpy(ptr, $1);
- RemoveDQuote(ptr);
- $$ = ptr;
-! }
- number : NUMBER { $$ = $1; }
- ;
-
---- 119,132 ----
- }
- | MAXRATE number
- { ddaSetConfig(MAXRATE, (void *)$2); }
-! | MINRATE number
-! { ddaSetConfig(MINRATE, (void *)$2); } ;
-
- string : STRING { ptr = (char *)malloc(strlen($1)+1);
- strcpy(ptr, $1);
- RemoveDQuote(ptr);
- $$ = ptr;
-! };
- number : NUMBER { $$ = $1; }
- ;
-
+--- misc/nas-1.4.1/Imakefile.orig Wed Mar 6 02:20:01 2002
++++ misc/build/nas-1.4.1/Imakefile Wed Mar 6 02:20:07 2002
+@@ -42,6 +42,8 @@

12
editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp
View File

@ -1,5 +1,5 @@
--- ../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
--- ../product/inc/scp/udk_basefiles.scp.orig Tue Jan 7 14:52:10 2003
+++ ../product/inc/scp/udk_basefiles.scp Sun Jan 19 22:37:05 2003
@@ -2,6 +2,7 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
@ -8,11 +8,11 @@
#if ( defined( _gcc3 ) && defined( C300 ) )
File gid_File_Lib_gcc
@@ -42,6 +43,7 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
@@ -34,6 +35,7 @@
End
+#endif
#endif
#endif
File gid_File_Lib_Sal

14
editors/openoffice-1.0/files/patch-product+settings+linux_gcc_settings.mk
View File

@ -1,14 +0,0 @@
--- ../product/settings/linux_gcc_settings.mk.orig Wed May 29 00:18:46 2002
+++ ../product/settings/linux_gcc_settings.mk Wed May 29 00:19:04 2002
@@ -3,9 +3,8 @@
OS=LINUX
PLATFORM=linux
PS=/
-CC=gcc
-LINK=gcc
-LIB=gcc
+LINK=$(CC)
+LIB=$(CC)
ECHO=@echo
MKDIR=mkdir -p
CAT=cat

95
editors/openoffice-1.0/files/patch-product+settings+settings.mk
View File

@ -1,26 +1,75 @@
--- ../product/settings/settings.mk.orig Wed May 29 00:16:16 2002
+++ ../product/settings/settings.mk Wed May 29 00:18:00 2002
@@ -83,9 +83,8 @@
--- ../product/settings/settings.mk.orig Sat Jan 18 18:23:17 2003
+++ ../product/settings/settings.mk Sat Jan 18 18:37:12 2003
@@ -225,3 +226,72 @@
OS=SOLARIS
PS=/
-CC=CC
-LINK=CC
-LIB=CC
endif
+ifeq "$(PLATFORM)" "FreeBSD"
+# Settings for Linux using gcc compiler
+
+OS=LINUX
+PLATFORM=linux
+PS=/
+LINK=$(CC)
+LIB=$(CC)
ECHO=@echo
MKDIR=mkdir -p
CAT=cat
@@ -136,9 +135,8 @@
OS=LINUX
PLATFORM=linux
PS=/
-CC=gcc
-LINK=gcc
-LIB=gcc
+LINK=$(CC)
+LIB=$(CC)
ECHO=@echo
MKDIR=mkdir -p
CAT=cat
+ECHO=@echo
+MKDIR=mkdir -p
+CAT=cat
+OBJ_EXT=o
+SHAREDLIB_EXT=so
+SHAREDLIB_PRE=lib
+SHAREDLIB_OUT=$(OUT_LIB)
+PACKAGE_LIB_DIR=linux_x86.plt
+
+GCC_VERSION=$(shell $(CC) -dumpversion)
+
+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3"
+COMID=gcc3
+CPPU_ENV=gcc3
+else
+COMID=GCC
+CPPU_ENV=gcc2
+endif
+
+OSEP=\<
+CSEP=\>
+
+DEL=rm -f
+DELRECURSIVE=rm -rf
+COPY=cp
+URLPREFIX=file://
+
+# Include UDK version numbers
+include $(PRJ)/include/udkversion.mk
+
+SALLIB=-lsal
+CPPULIB=-lcppu
+CPPUHELPERLIB=-lcppuhelper$(COMID)
+SALHELPERLIB=-lsalhelper$(COMID)
+STLPORTLIB=-lstlport_gcc
+
+EMPTYSTRING=
+PATH_SEPARATOR=:
+
+# -O is necessary for inlining (see gcc documentation)
+ifeq "$(DEBUG)" "yes"
+CC_FLAGS=-c -g
+else
+CC_FLAGS=-c -O
+endif
+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -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 -DLINUX -DCPPU_ENV=$(CPPU_ENV)
+
+# define for used compiler necessary for UNO
+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95
+#-DCPPU_ENV=gcc3 -- gcc3 3.0
+
+CC_OUTPUT_SWITCH=-o
+
+LIBRARY_LINK_FLAGS=-shared
+EXE_LINK_FLAGS=-Wl -export-dynamic
+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH)
+
+endif

30
editors/openoffice-1.0/files/patch-product+util+makefile.mk
View File

@ -1,34 +1,32 @@
--- ../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 @@
--- ../product/util/makefile.mk.orig Sat Jan 18 13:31:50 2003
+++ ../product/util/makefile.mk Sat Jan 18 13:30:54 2003
@@ -131,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3) \
- $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3)
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
@@ -498,6 +491,7 @@
#---------------------------------------------------------
# special targets for linux gcc3
@@ -491,6 +484,7 @@
# special targets for linux gcc3
.IF "$(COMID)"=="gcc3"
+.IF "$(OS)"=="LINUX"
.IF "$(CCNUMVER)">="000300010000"
+.IF "$(OS)"!="FREEBSD"
$(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) :
$(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT)
$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
@@ -526,6 +520,9 @@
@@ -514,6 +508,7 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
+ln -s libgcc_s.so.1 $@
+
+.ENDIF
+
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

21
editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch
View File

@ -1,25 +1,20 @@
--- ../sablot/Sablot-0.52.patch.orig Mon Mar 18 16:03:02 2002
+++ ../sablot/Sablot-0.52.patch Wed Apr 3 00:52:54 2002
--- ../sablot/Sablot-0.52.patch.orig Sun Jan 19 15:13:42 2003
+++ ../sablot/Sablot-0.52.patch Sun Jan 19 15:15:15 2003
@@ -3,7 +3,7 @@
***************
*** 1 ****
! dummy
---- 1,151 ----
+--- 1,156 ----
---- 1,159 ----
+--- 1,161 ----
! #*************************************************************************
! #
! # $RCSfile: makefile.mk,v $
@@ -90,8 +90,13 @@
! .ENDIF
!
@@ -96,6 +96,8 @@
! .IF "$(GUI)"=="UNX"
+! .IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
! .IF "$(OS)"=="NETBSD"
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
+! .ENDIF
+! .IF "$(OS)"=="FREEBSD"
+! .ELIF "$(OS)"=="FREEBSD"
+! CFLAGS+= -DHAVE_SYS_TIME_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
+! .ENDIF
! .ELSE
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE
! .ENDIF
! .IF "$(OS)"=="MACOSX"
! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_SYS_TIME_H -DHAVE_ISNAN -DHAVE_FINITE

13
editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+unx+jvmscan.cxx
View File

@ -1,13 +0,0 @@
--- ../setup2/source/custom/jvmsetup/unx/jvmscan.cxx.orig Wed Aug 14 00:19:33 2002
+++ ../setup2/source/custom/jvmsetup/unx/jvmscan.cxx Wed Aug 14 00:20:54 2002
@@ -117,7 +117,9 @@
/* some platforms have no hotspot yet even under jdk 1.3 */
/* so treat them like classic in JDK 1.2.x */
-#if defined(POWERPC) && defined(LINUX)
+#if defined(POWERPC) && defined(LINUX) || \
+ defined(INTEL) && defined(FREEBSD)
+
#define NO_HOTSPOT_USE_CLASSIC 1
#else
#undef NO_HOTSPOT_USE_CLASSIC

10
editors/openoffice-1.0/files/patch-solenv+bin+build.pl Normal file
View File

@ -0,0 +1,10 @@
--- ../solenv/bin/build.pl.orig Sun Jan 19 00:08:38 2003
+++ ../solenv/bin/build.pl Sun Jan 19 00:07:25 2003
@@ -292,7 +292,6 @@
cwd();
$! = 0;
system ("$dmake");
- &print_error("dmake - " . lc($!)) if ($!);
if ($? && ($? != -1) && (!$child)) {
&print_error("Error $? occurred while making $BuildDir");
};

44
editors/openoffice-1.0/files/patch-solenv+bin+getcompver.awk
View File

@ -1,44 +0,0 @@
--- ../solenv/bin/getcompver.awk.orig Tue May 28 13:09:01 2002
+++ ../solenv/bin/getcompver.awk Tue May 28 13:08:14 2002
@@ -61,9 +61,11 @@
#*************************************************************************
BEGIN {
CCversion = 0
+ compiler_matched = 0
}
# Sun c++ compiler
/Sun WorkShop/ {
+ compiler_matched = 1
# version number right after "C++"
x = match( $0, /C\+\+ .*/ )
btwn = substr( $0, RSTART, RLENGTH)
@@ -73,12 +75,28 @@
}
# Microsoft c++ compiler
/Microsoft.*..\...\...../ {
+ compiler_matched = 1
# match on the format of the ms versions ( dd.dd.dddd )
x = match( $0, /..\...\...../ )
CCversion = substr( $0, RSTART, RLENGTH)
}
+# Java
+/java version/ {
+ compiler_matched = 1
+ # match on the format of the java versions ( d[d].d[d].d[d] )
+ x = match( $0, /".*\..*\..*"/ )
+ CCversion = substr( $0, RSTART+1, RLENGTH-2)
+}
+/^[0-9]*[.][0-9]*$/ {
+ if ( compiler_matched == 0 ) {
+# need to blow to x.xx.xx for comparing
+ CCversion = $0 ".0"
+ }
+}
/^[0-9]*[.][0-9]*[.][0-9]*$/ {
- CCversion = $0
+ if ( compiler_matched == 0 ) {
+ CCversion = $0
+ }
}
END {
if ( num == "true" ) {

282
editors/openoffice-1.0/files/patch-solenv+inc+_tg_shl.mk
View File

@ -1,282 +0,0 @@
--- ../solenv/inc/_tg_shl.mk.orig Wed Jan 2 12:23:22 2002
+++ ../solenv/inc/_tg_shl.mk Tue May 28 12:02:12 2002
@@ -345,22 +345,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -770,22 +770,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -1195,22 +1195,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -1620,22 +1620,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -2045,22 +2045,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -2470,22 +2470,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -2895,22 +2895,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -3320,22 +3320,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -3745,22 +3745,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -4170,22 +4170,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"

141
editors/openoffice-1.0/files/patch-solenv+inc+pstrules.mk
View File

@ -1,141 +0,0 @@
--- ../solenv/inc/pstrules.mk.orig Thu Mar 14 17:40:59 2002
+++ ../solenv/inc/pstrules.mk Thu Mar 14 17:41:44 2002
@@ -80,15 +80,15 @@
.ENDIF
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
.IF "$(COM)"=="BLC"
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ENDIF
.ENDIF
@@ -108,15 +108,15 @@
.ENDIF
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
.IF "$(COM)"=="BLC"
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ENDIF
.ENDIF
@@ -142,15 +142,15 @@
.ENDIF
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
.IF "$(COM)"=="BLC"
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ENDIF
.ENDIF
@@ -159,23 +159,23 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF
.ELSE
.IF "$(GUI)"=="MAC"
@$(RM) $@
- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
.ELSE
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
@+echo.
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c
+ $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c
.ELSE
- $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
+ $(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
.ENDIF
$(SEMADEBUG)
.ENDIF
@@ -195,15 +195,15 @@
.ENDIF
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
.IF "$(COM)"=="BLC"
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ENDIF
.ENDIF
@@ -212,19 +212,19 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c
+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
.IF "$(GUI)"=="MAC"
@$(RM) $@
- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c
+ $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c
.ELSE
+$(TYPE) $(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c )
- $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c )
+ $(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c )
.ENDIF
.ENDIF
.ENDIF
@@ -246,7 +246,7 @@
@echo Making: $@
@+-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV)
.IF "$(GUI)"=="OS2"
- $(CC) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
+ $(CXX) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
.ENDIF
.IF "$(GUI)"=="WNT"
cpplcc -+ -P $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre

212
editors/openoffice-1.0/files/patch-solenv+inc+rules.mk
View File

@ -1,212 +0,0 @@
--- ../solenv/inc/rules.mk.orig Thu Mar 14 17:31:43 2002
+++ ../solenv/inc/rules.mk Thu Mar 14 17:38:38 2002
@@ -78,16 +78,16 @@
.ENDIF
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
@+echo.
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ELSE
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
.ENDIF
.ENDIF
@@ -98,16 +98,16 @@
.ENDIF
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
@+echo.
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp
.ELSE
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
.ENDIF
.ENDIF
@@ -122,17 +122,17 @@
.ENDIF
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF
.ELSE # "$(GUI)"=="UNX"
@+if exist $@ $(RM) /q $@ >& nul
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
@+echo.
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
.ENDIF # "$(GUI)"=="UNX"
$(SLO)$/%.obj : %.cpp
@@ -140,17 +140,17 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
@+echo.
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
.ENDIF
$(SLO)$/%.obj : $(MISC)$/%.cxx
@@ -158,16 +158,16 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF
.ELSE
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
@+echo.
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
.ENDIF
$(OBJ)$/%.obj : $(MISC)$/%.cxx
@@ -175,16 +175,16 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF
.ELSE
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
@+echo.
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
.ENDIF
$(OBJ)$/%.obj : %.c
@@ -192,20 +192,20 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF
.ELSE
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
@+echo.
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c
+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c
.ELSE
+-@echo Cflags: $(CFLAGS)
- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
.ENDIF
$(SEMADEBUG)
.ENDIF
@@ -215,13 +215,13 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c
+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
@+echo.
- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
$(SEMADEBUG)
.ENDIF
@@ -230,16 +230,16 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c
+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
@+echo.
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c
+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c
.ELSE
- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
.ENDIF
$(SEMADEBUG)
.ENDIF
@@ -249,14 +249,14 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c
+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c
+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c
.ELSE
- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c )
+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c )
.ENDIF
.ENDIF

19
editors/openoffice-1.0/files/patch-solenv+inc+settings.mk
View File

@ -1,19 +0,0 @@
--- ../solenv/inc/settings.mk.orig Fri Mar 8 10:23:21 2002
+++ ../solenv/inc/settings.mk Tue May 28 12:56:27 2002
@@ -166,7 +166,6 @@
CDEFSOPT=
HDEFS=
-CC=
.IF "$(add_cflags)"!=""
ENVCFLAGS+=$(add_cflags)
.ENDIF
@@ -264,8 +263,6 @@
AS=
BC=
COBOL=
-CPP=
-CXX=
FOR=
PASCAL=

20
editors/openoffice-1.0/files/patch-solenv+inc+target.mk
View File

@ -1,20 +0,0 @@
--- ../solenv/inc/target.mk.orig Mon Aug 26 01:29:21 2002
+++ ../solenv/inc/target.mk Mon Aug 26 01:28:23 2002
@@ -2139,7 +2139,7 @@
.IF "$(COMPVERMK)"!=""
.IF "$(UPDATER)"!=""
-"$(COMPVERMK)" : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg
+"$(COMPVERMK)" :
@echo COMNAME:=$(COMNAME) > $@
@echo COMID:=$(COMID) >> $@
@echo CCNUMVER:=$(CCNUMVER) >> $@
@@ -2778,7 +2778,7 @@
$(MISC)$/$(TARGET).dpz : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGETN) $(ZIP4TARGETN) $(ZIP5TARGETN) $(ZIP6TARGETN) $(ZIP7TARGETN) $(ZIP8TARGETN) $(ZIP9TARGETN)
.ENDIF
-$(INCCOM)$/_version.h : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg
+$(INCCOM)$/_version.h :
.IF "$(GUI)"=="UNX"
@+echo "#define" _BUILD \"$(BUILD)\" > $@
@+echo "#define" _UPD \"$(UPD)\" >> $@

15
editors/openoffice-1.0/files/patch-solenv+inc+tg_shl.mk
View File

@ -1,14 +1,11 @@
--- ../solenv/inc/tg_shl.mk.orig Wed Mar 13 20:40:10 2002
+++ ../solenv/inc/tg_shl.mk Wed Mar 13 20:41:10 2002
@@ -319,9 +319,9 @@
--- ../solenv/inc/tg_shl.mk.orig Tue Jan 7 16:22:13 2003
+++ ../solenv/inc/tg_shl.mk Sat Jan 18 12:51:58 2003
@@ -319,7 +319,7 @@
.IF "$(GUI)" == "WNT"
.IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC"
- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+ ${CC} -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ELSE
- cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(UPDATER)"=="YES"
.IF "$(SHL$(TNR)DEFAULTRES)"!=""

8
editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,5 +1,5 @@
--- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001
+++ ../solenv/inc/unxfbsdi.mk Sun Jun 2 11:20:10 2002
--- ../solenv/inc/unxfbsdi.mk.orig Tue Jan 7 16:22:18 2003
+++ ../solenv/inc/unxfbsdi.mk Sat Jan 18 13:04:17 2003
@@ -1,84 +1,139 @@
-
# mak file fuer unxfbsdi
@ -56,8 +56,8 @@
+# environment with graphical user interface
+CFLAGSOBJGUIMT=-fPIC
-cc= gcc
-CC= g++
-CC= gcc
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
-CFLAGS+= -w -c $(INCLUDE)

40
editors/openoffice-1.0/files/patch-stlport+makefile.mk
View File

@ -1,32 +1,36 @@
--- ../stlport/makefile.mk.orig Tue Mar 19 15:49:17 2002
+++ ../stlport/makefile.mk Tue May 28 23:03:45 2002
@@ -106,11 +106,29 @@
--- ../stlport/makefile.mk.orig Tue Jan 7 13:13:37 2003
+++ ../stlport/makefile.mk Sat Jan 18 13:01:53 2003
@@ -98,16 +98,28 @@
.IF "$(COM)"=="GCC"
.IF "$(COMID)"=="gcc3"
+
+.IF "$(OS)"=="FREEBSD"
+BUILD_FLAGS=-f gcc-3.0-freebsd.mak
-BUILD_FLAGS=-f gcc-3.0.mak
+.IF # "$(OS)"=="FREEBSD"
+ BUILD_FLAGS=-f gcc-3.0-freebsd.mak
+.ELSE
BUILD_FLAGS=-f gcc-3.0.mak
+ BUILD_FLAGS=-f gcc-3.0.mak
+.ENDIF
+
.ELSE # "$(COMID)"=="gcc3"
+
+.IF "$(OS)"=="FREEBSD"
+BUILD_FLAGS=-f gcc-freebsd.mak
-# MacOS X/Darwin need a special makefile
+# FreeBSD / MacOS X/Darwin need a special makefile
.IF "$(OS)"=="MACOSX"
BUILD_FLAGS=-f gcc-apple-macosx.mak
-.ELSE # "$(OS)"=="MACOSX"
+.ELSIF # "$(OS)"=="FREEBSD"
+ BUILD_FLAGS=-f gcc-freebsd.mak
+.ELSE
BUILD_FLAGS=-f gcc.mak
+.ENDIF
+
BUILD_FLAGS=-f gcc.mak
-.ENDIF # "$(OS)"=="MACOSX"
+.ENDIF # "$(OS)"=="MACOSX || $(OS)"=="FREEBSD"
.ENDIF # "$(COMID)"=="gcc3"
-BUILD_ACTION=make
+
+.IF "$(OS)"=="FREEBSD"
+BUILD_ACTION=gmake
+ BUILD_ACTION=gmake
+.ELSE
BUILD_ACTION=make
+ BUILD_ACTION=make
+.ENDIF
+
# build in parallel
BUILD_FLAGS+= -j$(MAXPROCESS)
.ENDIF
.IF "$(COM)"=="C52"

13
editors/openoffice-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx
View File

@ -1,12 +1,11 @@
--- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed May 1 23:45:49 2002
+++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Wed May 1 23:48:17 2002
@@ -62,7 +62,9 @@
--- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Fri Aug 16 18:56:19 2002
+++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Sat Jan 18 13:06:16 2003
@@ -62,7 +62,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <dlfcn.h>
+#if !(defined NETBSD || defined FREEBSD)
-#ifndef MACOSX
+#if !(defined NETBSD || defined FREEBSD || defined MACOSX)
#include <alloca.h>
+#endif
#endif
#include <string.h>
/*

2490
editors/openoffice-1.0/files/patch-translation-ru
View File

File diff suppressed because it is too large Load Diff

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

@ -6,8 +6,7 @@
#
PORTNAME= openoffice
PORTVERSION= 1.0.1
PORTREVISION= 4
PORTVERSION= 1.0.2
CATEGORIES+= editors
MASTER_SITES+= http://ny1.mirror.openoffice.org/%SUBDIR%/ \
http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \
@ -31,12 +30,14 @@ GREP?= /usr/bin/grep
MOUNT?= /sbin/mount
ZIP?= ${PREFIX}/bin/zip
UNZIP?= ${PREFIX}/bin/unzip
ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
PASTE?= /usr/bin/paste
.include <bsd.port.pre.mk>
INSTALLATION_BASEDIR= OpenOffice.org1.0
BUILD_NR= 641
DIST_SUBDIR= openoffice
DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
@ -104,11 +105,12 @@ CXX= g++32
EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
.if !defined(USE_GCC)
BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
.endif
#.if !defined(USE_GCC)
#BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
#.endif
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/jakarta-ant
BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
.if !defined(DISPLAY)
@ -133,7 +135,7 @@ USE_AUTOCONF= yes
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/
LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
.if defined(WITH_DEBUG)
CFLAGS+= -g
.if ${WITH_DEBUG} == 2
@ -153,11 +155,12 @@ CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
PTHREAD_LIBS=${PTHREAD_LIBS}
CONFIGURE_ARGS+= --with-jdk-home=${JDK13DIR} \
--with-os-version=${OSVERSION}
--with-os-version=${OSVERSION} \
--with-ant-home=${LOCALBASE}/
.if !defined(USE_GCC)
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX}
.endif
#.if !defined(USE_GCC)
#CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX}
#.endif
.if defined(WITH_DEBUG)
.if ${WITH_DEBUG} == 2
@ -464,8 +467,8 @@ do-build:
.endif
@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
.if defined(L10NHELP)
@${MKDIR} ${WRKSRC}/../solver/641/unxfbsd.pro/pck
@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/641/unxfbsd.pro/pck
@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
.endif
.if !defined(DISPLAY)
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \

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

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

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

@ -1,82 +1,132 @@
--- ../berkeleydb/db-3.2.9.patch.orig Mon Mar 18 15:53:40 2002
+++ ../berkeleydb/db-3.2.9.patch Mon Apr 15 18:43:43 2002
@@ -47,17 +47,27 @@
--- build/unxsols3.pro/db-3.2.9/dist/configure Tue Jan 8 13:56:05 2002
***************
*** 1795,1800 ****
---- 1795,1802 ----
+--- 1795,1803 ----
case "$host_os" in
solaris*) JINCSUBDIRS="solaris";;
linux*) JINCSUBDIRS="linux genunix";;
+ irix*) JINCSUBDIRS="irix";;
+ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";;
++ freebsd*) JINCSUBDIRS="freebsd genunix";;
*) JINCSUBDIRS="genunix";;
esac
--- misc/build/db-3.2.9/dist/configure.orig Sat Nov 24 14:56:48 2001
+++ misc/build/db-3.2.9/dist/configure Sat Nov 24 14:57:32 2001
+@@ -984,7 +984,7 @@
--- ../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";;
-+ 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*) 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="-D_THREAD_SAFE $CPPFLAGS"
+ LIBS="-pthread";;
++ CPPFLAGS="$PTHREAD_CFLAGS $CPPFLAGS"
++ LIBS="$PTHREAD_LIBS";;
+ hpux*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
@@ -995,6 +995,7 @@
CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
@@ -68,13 +78,22 @@
#define HAVE_QNX 1
--- misc/build/db-3.2.9/dist/ltconfig.orig Sat Nov 24 14:56:10 2001
+++ misc/build/db-3.2.9/dist/ltconfig Sat Nov 24 14:56:34 2001
-@@ -1194,11 +1194,12 @@
+@@ -1194,11 +1194,23 @@
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'
++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
++ # can we support soname and/or expsyms with a.out? -oliva
+ 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 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
-***************
-*** 1194,1204 ****
-
- 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
- fi
- ;;
-
---- 1194,1205 ----
-
- netbsd*)
- 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
- ;;
-
+@@ -1194,11 +1194,12 @@
+
+ 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
++ 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'
- 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
++ ;;
++
++ 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
@@ -84,3 +103,24 @@
fi
;;
+@@ -2019,6 +2031,20 @@
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
+ 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 @@
+ soname_spec='${libname}${release}.so$major'
+ dynamic_linker='NetBSD ld.elf_so'
++ fi
+ fi
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
++
++freebsd*)
++ version_type=sunos
++ 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
++ 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'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+

217
editors/openoffice.org-1.0/files/patch-config_office+configure.in
View File

@ -1,187 +1,46 @@
--- 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
],,)
+AC_ARG_ENABLE(debug,
+[ --enable-debug if you like to build with debug symbols
+
+ Usage: --enable-debug
+],,)
AC_ARG_WITH(stlport4-home,
[ --with-stlport4-home The location that STLport4 is installed in. The STL
header files are assumed to be in stlport4-home/stlport
@@ -103,6 +108,12 @@
Usage: --with-asm-home=<path to ml.exe directory>
],,)
+AC_ARG_WITH(os-version,
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
+ with the correct OSVERSION.
+
+ Usage: --with-os-version=<OSVERSION>
+],,)
AC_ARG_WITH(unzip-home,
[ --with-unzip-home For Windows users, please supply the path for
unzip.exe.
@@ -241,7 +252,7 @@
if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then
AC_PROG_CC
fi
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then
+if test "$_os" = "Linux" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then
dnl ******************************************
dnl Testing for GNU compiler and version...
dnl ******************************************
@@ -366,8 +377,9 @@
_gcc_include_path="NO_GCC_INCLUDE"
fi
else
- if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
- _gcc_include_path="/usr/include/g++"
+ if test "$_os" = "NetBSD" ; then
+ _gcc_include_path="/usr"
+ _gxx_include_path="/usr/include/g++"
else
AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler])
AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn
@@ -408,6 +420,71 @@
fi
--- configure.in.orig Thu Jan 16 13:42:46 2003
+++ configure.in Tue Jan 21 23:09:35 2003
@@ -352,10 +352,7 @@
if test "$COMPATH" != "NO_GCC"; then
AC_MSG_RESULT([checked (gcc $_gcc_version)])
fi
fi
+if test "$_os" = "FreeBSD"; then
+ dnl ******************************************
+ dnl Testing for GNU compiler and version...
+ dnl Adapted to the FreeBSD ports system
+ dnl ******************************************
+ dnl parametrise the various gcc pathnames so we can reuse for gcc2.95 and gcc3
+ if test -n "$enable_gcc3"; then
+ _gccincname1="g++-v3"
+ else
+ _gccincname1="g++-3"
+ fi
+ if test -z "$CC"; then
+ CC="cc";
+ fi
+ if test -z "$CXX"; then
+ CXX="c++";
+ fi
+ if which $CC; then
+ _gcc_releasetype=`echo $CC | $SED -e 's|[[:digit:]]\{1,\}||'`
+ _gcc_version=`$CC -dumpversion`
+ _gcc_major=`$CC -dumpversion | $AWK -F"." '{ print \$1 }'`
+ _gcc_machine=`$CC -dumpmachine`
+ else
+ COMPATH="NO_GCC"
+ fi
+ if test -n "$enable_gcc3"; then
+ if test "$_gcc_major" != "3"; then
+ AC_MSG_ERROR([found version "$_gcc_version", but use of gcc 3.x requested])
+ COMPATH="NO_GCC"
+ fi
+ else
+ if test "$_gcc_major" != "2"; 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_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=`$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
+ COMPATH="NO_GCC"
+ fi
+ fi
+ fi
+ fi
+ if test "$COMPATH" != "NO_GCC"; then
+ if test $CC != "gcc" -o $CC != "cc"; then
+ _gcc_include_path="$PREFIX/lib/gcc-lib/$_gcc_machine/$_gcc_version/include"
+ _gxx_include_path="$_gcc_include_path/g++"
+ else
+ _gcc_include_path="$PREFIX"
+ _gxx_include_path="$_gcc_include_path/g++"
+ fi
+ else
+ AC_MSG_WARN([no gcc compiler found])
+ AC_MSG_WARN([no gcc compiler found]) >> warn
+ fi
-
-dnl Set the include paths
- _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
-fi
+fi
+
if test "$_os" = "Darwin"; then
if test "$CC" = "cc"; then
AC_PATH_PROGS(_cc, cc)
@@ -589,6 +666,26 @@
fi
dnl ===================================================================
dnl Search all the common names for GNU make
@@ -553,14 +550,27 @@
fi
+dnl *************************************************************
+dnl Testing for exception handling - dwarf2 or sjlj exceptions...
+dnl *************************************************************
+AC_MSG_CHECKING([try to compile exception code])
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+AC_CACHE_VAL(exceptions_type, [AC_TRY_LINK(
+ [#include <iostream>
+
+extern "C" void __sjthrow(void) __attribute__ ((__noreturn__));
+
+ ],
+ [__sjthrow() ],
+ [exceptions_type="sjlj"],
+ [exceptions_type="dwarf2"])
+])
+
+AC_MSG_RESULT(Exceptions type: $exceptions_type)
+AC_LANG_RESTORE
+
dnl **************************************************************
dnl Testing for required Solaris and workshop compiler patches...
dnl **************************************************************
@@ -815,6 +912,10 @@
fi
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
+ _jdk_minor="true"
+ fi
fi
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
@@ -1170,6 +1271,12 @@
USE_GCC3="FALSE"
fi
+if test -n "$enable_debug"; then
+ ENABLE_DEBUG="TRUE"
dnl ===================================================================
-dnl Set the gxx include directories
+dnl Set the gcc/gxx include directories
dnl ===================================================================
+if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then
if test "$GXX" = "yes"; then
- _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1`
+ if test -n "$enable_gcc3"; then
+ _gccincname1="g++-v3"
+ else
+ _gccincname1="g++-3"
+ fi
+ _gcc_include_path=".."
+ _gxx_include_path="$_gcc_include_path/$_gccincname1"
+fi
+else
+ ENABLE_DEBUG="FALSE"
+if test "$GXX" = "yes"; then
+ _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
+ _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - \
+ | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1`
dnl This is the original code...
-dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
+dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
+fi
+
# Print args passed to set_soenv.
if test 1 = 1; then
echo
@@ -1197,12 +1304,14 @@
echo "\$MINGWIN32="$WITH_MINGWIN
echo "\$with_use_shell="$with_use_shell
echo "\$USE_GCC3="$USE_GCC3
+echo "\$EXCEPTIONS="$exceptions_type
+echo "\$ENABLE_DEBUG="$ENABLE_DEBUG
echo
fi
-
# Executing the set_soenv script to setup the environment variables.
if test -z "$enable_check_only"; then
- './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3
+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG
else
echo
echo Test Complete
dnl ===================================================================
dnl Extra checking for the SUN OS compiler

242
editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1
View File

@ -1,242 +0,0 @@
--- set_soenv.1.orig Sun Jun 30 21:51:05 2002
+++ set_soenv.1 Mon Oct 28 15:01:58 2002
@@ -40,7 +40,7 @@
#
# Set this value equal to the corresponding amount of
# command line arguments.
-my $numArgs = 20;
+my $numArgs = 27;
# Determining the amount of arguments in the call.
my $numEnter = $#ARGV + 1;
if ( $numEnter != $numArgs )
@@ -66,14 +66,15 @@
my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $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,
- $TF_CFGDATA, $TF_SVDATA,
+ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX,
$USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC,
$USE_XPRINT, $BUILD_SOSL_RELEASE );
#
# Platform dependent constant values.
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, $JRETOOLKITDIR, $JRETHREADDIR );
+ $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);
#
#-------------------------------------------
# IIc. Declaring the environment variables.
@@ -96,7 +97,7 @@
$SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL,
$COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME,
$BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3 );
+ $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG);
#
#-------------------------------------------
# IId. Declaring the aliases.
@@ -145,7 +146,11 @@
$STLPORT4 = $ARGV [ 12 ]; # Location of STLport4
$MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32
$USE_SHELL = $ARGV [ 18 ]; # preferred shell
-$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 at the moment)
+$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment)
+$CC = $ARGV [ 23 ]; # get cc from environment
+$CXX = $ARGV [ 24 ]; # use c++ from environment
+$EXCEPTIONS = $ARGV [ 25 ]; # Exception handling type
+$ENABLE_DEBUG = $ARGV [ 26 ]; # Enable a debug build
#
#---------------------------------------------------------------
# IIIb. Initialising the variables for the system commands, etc.
@@ -335,7 +340,14 @@
$COMPATH = $ARGV[ 0 ];
$CPU = "I";
$CPUNAME = "INTEL";
+if ($USE_GCC3 eq "TRUE")
+ {
+ $CVER = "C300";
+ }
+else
+ {
$CVER = "C295";
+}
$DLLSUFFIX = "fi";
$GUI = "UNX";
$GUIBASE = "unx";
@@ -348,6 +360,9 @@
$PATH_SEPERATOR = $ps;
$PROSWITCH = "-DPRODUCT";
$XPVERSION = "3";
+ $OSVERSION = $ARGV[ 20 ];
+ $PTHREAD_CFLAGS = $ARGV[ 21 ];
+ $PTHREAD_LIBS = $ARGV[ 22 ];
$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";
@@ -927,7 +942,7 @@
$ps_STLPORT_LIB.
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
}
-elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64"))
+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64"))
{ $LD_LIBRARY_PATH = $cur_dir.
$ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
$ps.$USR_LOCAL.$LIB.
@@ -935,6 +950,13 @@
$ps_STLPORT_LIB.
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
}
+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.
@@ -970,15 +992,16 @@
$D.$COM.
$D.$CVER.
$D.$GVER.
- $D."_PTHREADS".
$D.$OS.
$D.$CPUNAME;
if ($platform eq "$FreeBSD")
-{ $SOLARDEF .= $D."X86";
+{ $SOLARDEF .= $D."X86".
+ $D."OSVERSION=$OSVERSION".
+ " ".$PTHREAD_CFLAGS;
}
$SOLARDEF .= $D."_REENTRANT".
$D."_POSIX_PTHREAD_SEMANTICS";
-if (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64"))
+if (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64") && ( $platform ne "FreeBSD" ) && ( $platform ne "NetBSD" ))
{ $SOLARDEF .= $D."GLIBC=".$GLIBC;
}
$SOLARDEF .= $D."SUPD=$UPD".
@@ -995,7 +1018,7 @@
$L.$USR_DT.$LIB.
$L.$USR_OPENWIN.$LIB.'"';
}
-elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($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"))
{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
$L.$LIB.
$L.$USR.$LIB.
@@ -1005,6 +1028,11 @@
{ $SOLAREXTRALIB = '"'.$L.$LIB.
$L.$USR.$LIB.'"';
}
+elsif ($platform eq "$FreeBSD")
+{
+ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.'"';
+}
+
# Compiler include search directory paths.
if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64"))
{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
@@ -1076,7 +1104,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
}
-elsif (($platform eq "$Linux") or ($platform eq "$FreeBSD") or ($platform eq "$NetBSD") or ($platform eq "$Tru64") or ($platform eq "$Irix") or ($platform eq "$Irix64"))
+elsif (($platform eq "$Linux") or ($platform eq "$NetBSD") or ($platform eq "$Tru64") or ($platform eq "$Irix") or ($platform eq "$Irix64"))
{ $PATH = $cur_dir.
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
@@ -1095,6 +1123,22 @@
$ps.$USR.$ds."X11".$BIN.
$ps.$USR.$LIB;
}
+elsif ($platform eq "$FreeBSD")
+{ $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
+ $ps.'$SOLARENV'.$BIN.
+ $ps.'$JAVA_HOME'.$BIN.
+
+ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
+
+ $PATH .= $ps.$USR.$ds."sbin".
+ $ps.$USR.$ds."X11R6".$ds."bin".
+ $ps.$USR_LOCAL.$BIN.
+ $ps.$USR_LOCAL.$ds."sbin";
+ $ps.$USR.$LIB;
+}
+
elsif ($platform eq "$Winnt")
{
my ( $noldPATH );
@@ -1195,7 +1239,7 @@
$L_STLPORT_LIB.
$L.$XLIB.'"';
}
-elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($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"))
{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
@@ -1210,6 +1254,15 @@
$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.
@@ -1242,7 +1295,7 @@
$SOLARINC .= $I.$USR.$INCLUDE;
}
$SOLARINC .= $STLPORT_stlport;
-if ($platform eq "$Linux")
+if ($platform eq "$Linux" || $platform eq "$FreeBSD")
{
# This simply adds an include path, so even cases that break the FHS work
$SOLARINC .= $STLPORT_inc_stlport;
@@ -1256,11 +1309,6 @@
{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
}
-if ($platform eq "$Linux")
-{
-# This simply adds an include path, so even cases that break the FHS work
-$SOLARINC .= $STLPORT_inc_stlport;
-}
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
$I.'$JAVA_HOME'.$INCLUDE;
@@ -1428,6 +1476,9 @@
ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" );
ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" );
ToFile( "TF_FILTER", "TRUE", "e" );
+if ($ENABLE_DEBUG eq "TRUE") {
+ToFile( "debug", "true", "e" );
+}
if ( $platform ne "$Macosx" )
{ ToFile( "PSPRINT", "TRUE", "e" );
} elsif ( $GUIBASE eq "unx" ) {
@@ -1453,6 +1504,12 @@
ToFile( "GUIENV", $GUIENV, "e" );
ToFile( "GVER", $GVER, "e" );
ToFile( "OS", $OS, "e" );
+ToFile( "CC", $CC, "e" );
+ToFile( "CXX", $CXX, "e" );
+ToFile( "EXCEPTIONS", $EXCEPTIONS, "e" );
+ToFile( "OSVERSION", $OSVERSION, "e" );
+ToFile( "PTHREAD_CFLAGS", $PTHREAD_CFLAGS, "e" );
+ToFile( "PTHREAD_LIBS", $PTHREAD_LIBS, "e" );
ToFile( "OUTPATH", $OUTPATH, "e" );
ToFile( "INPATH", $INPATH, "e" );
ToFile( "GVERDIR", $GVERDIR, "e" );

98
editors/openoffice.org-1.0/files/patch-connectivity+source+parse+sqlbison.y
View File

@ -1,98 +0,0 @@
--- ../connectivity/source/parse/sqlbison.y.orig Fri May 31 15:21:42 2002
+++ ../connectivity/source/parse/sqlbison.y Thu Nov 7 00:06:38 2002
@@ -134,21 +134,6 @@
%token <pParseNode> SQL_TOKEN_STRING SQL_TOKEN_ACCESS_DATE SQL_TOKEN_INT SQL_TOKEN_REAL_NUM
%token <pParseNode> SQL_TOKEN_INTNUM SQL_TOKEN_APPROXNUM SQL_TOKEN_NOT SQL_TOKEN_NAME
- /* operators */
-%left <pParseNode> SQL_TOKEN_NAME
-%left <pParseNode> SQL_TOKEN_OR
-%left <pParseNode> SQL_TOKEN_AND
-
-%left <pParseNode> LESSEQ GREATEQ NOTEQUAL LESS GREAT EQUAL /* '<' '>' = <> < > <= >= != */
-%left <pParseNode> '+' '-'
-%left <pParseNode> '*' '/'
-%left <pParseNode> SQL_TOKEN_NATURAL SQL_TOKEN_CROSS SQL_TOKEN_FULL SQL_TOKEN_LEFT SQL_TOKEN_RIGHT
-%left <pParseNode> ')'
-%right <pParseNode> '='
-%right <pParseNode> '.'
-%right <pParseNode> '('
-
-
%nonassoc <pParseNode> SQL_TOKEN_UMINUS
@@ -157,31 +142,31 @@
%token <pParseNode> SQL_TOKEN_ALL SQL_TOKEN_ALTER SQL_TOKEN_AMMSC SQL_TOKEN_ANY SQL_TOKEN_AS SQL_TOKEN_ASC SQL_TOKEN_AT SQL_TOKEN_AUTHORIZATION SQL_TOKEN_AVG
-%token <pParseNode> SQL_TOKEN_BETWEEN SQL_TOKEN_BIT SQL_TOKEN_BIT_LENGTH SQL_TOKEN_BOTH SQL_TOKEN_BY
+%token <pParseNode> SQL_TOKEN_BETWEEN SQL_TOKEN_BIT SQL_TOKEN_BOTH SQL_TOKEN_BY
-%token <pParseNode> SQL_TOKEN_CAST SQL_TOKEN_CHARACTER SQL_TOKEN_CHAR_LENGTH SQL_TOKEN_CHECK SQL_TOKEN_COLLATE SQL_TOKEN_COMMIT SQL_TOKEN_CONTINUE SQL_TOKEN_CONVERT SQL_TOKEN_COUNT SQL_TOKEN_CREATE SQL_TOKEN_CROSS
-%token <pParseNode> SQL_TOKEN_CURRENT SQL_TOKEN_CURRENT_DATE SQL_TOKEN_CURRENT_TIME SQL_TOKEN_CURRENT_TIMESTAMP SQL_TOKEN_CURSOR
+%token <pParseNode> SQL_TOKEN_CAST SQL_TOKEN_CHARACTER SQL_TOKEN_CHECK SQL_TOKEN_COLLATE SQL_TOKEN_COMMIT SQL_TOKEN_CONTINUE SQL_TOKEN_CONVERT SQL_TOKEN_COUNT SQL_TOKEN_CREATE SQL_TOKEN_CROSS
+%token <pParseNode> SQL_TOKEN_CURRENT SQL_TOKEN_CURSOR
%token <pParseNode> SQL_TOKEN_DATE SQL_TOKEN_DAY SQL_TOKEN_DEC SQL_TOKEN_DECIMAL SQL_TOKEN_DECLARE SQL_TOKEN_DEFAULT SQL_TOKEN_DELETE SQL_TOKEN_DESC
%token <pParseNode> SQL_TOKEN_DISTINCT SQL_TOKEN_DOUBLE SQL_TOKEN_DROP
-%token <pParseNode> SQL_TOKEN_ESCAPE SQL_TOKEN_EXCEPT SQL_TOKEN_EXISTS SQL_TOKEN_EXTRACT SQL_TOKEN_FALSE SQL_TOKEN_FETCH SQL_TOKEN_FLOAT SQL_TOKEN_FOR SQL_TOKEN_FOREIGN SQL_TOKEN_FOUND SQL_TOKEN_FROM SQL_TOKEN_FULL
+%token <pParseNode> SQL_TOKEN_ESCAPE SQL_TOKEN_EXCEPT SQL_TOKEN_EXISTS SQL_TOKEN_FALSE SQL_TOKEN_FETCH SQL_TOKEN_FLOAT SQL_TOKEN_FOR SQL_TOKEN_FOREIGN SQL_TOKEN_FOUND SQL_TOKEN_FROM SQL_TOKEN_FULL
-%token <pParseNode> SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING SQL_TOKEN_HOUR SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INSERT SQL_TOKEN_INTEGER SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT
+%token <pParseNode> SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INTEGER SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT
-%token <pParseNode> SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LEFT SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER SQL_TOKEN_MINUTE SQL_TOKEN_MONTH
+%token <pParseNode> SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER
%token <pParseNode> SQL_TOKEN_MAX SQL_TOKEN_MIN SQL_TOKEN_NATURAL SQL_TOKEN_NCHAR SQL_TOKEN_NULL SQL_TOKEN_NUMERIC
%token <pParseNode> SQL_TOKEN_OCTECT_LENGTH SQL_TOKEN_OF SQL_TOKEN_ON SQL_TOKEN_OPTION SQL_TOKEN_ORDER SQL_TOKEN_OUTER
-%token <pParseNode> SQL_TOKEN_POSITION SQL_TOKEN_PRECISION SQL_TOKEN_PRIMARY SQL_TOKEN_PRIVILEGES SQL_TOKEN_PROCEDURE SQL_TOKEN_PUBLIC
-%token <pParseNode> SQL_TOKEN_REAL SQL_TOKEN_REFERENCES SQL_TOKEN_ROLLBACK SQL_TOKEN_RIGHT
+%token <pParseNode> SQL_TOKEN_PRECISION SQL_TOKEN_PRIMARY SQL_TOKEN_PRIVILEGES SQL_TOKEN_PROCEDURE SQL_TOKEN_PUBLIC
+%token <pParseNode> SQL_TOKEN_REAL SQL_TOKEN_REFERENCES SQL_TOKEN_ROLLBACK
-%token <pParseNode> SQL_TOKEN_SCHEMA SQL_TOKEN_SECOND SQL_TOKEN_SELECT SQL_TOKEN_SET SQL_TOKEN_SIZE SQL_TOKEN_SMALLINT SQL_TOKEN_SOME SQL_TOKEN_SQLCODE SQL_TOKEN_SQLERROR SQL_TOKEN_SUBSTRING SQL_TOKEN_SUM
+%token <pParseNode> SQL_TOKEN_SCHEMA SQL_TOKEN_SELECT SQL_TOKEN_SET SQL_TOKEN_SIZE SQL_TOKEN_SMALLINT SQL_TOKEN_SOME SQL_TOKEN_SQLCODE SQL_TOKEN_SQLERROR SQL_TOKEN_SUM
%token <pParseNode> SQL_TOKEN_TABLE SQL_TOKEN_TIME SQL_TOKEN_TIMESTAMP SQL_TOKEN_TIMEZONE_HOUR SQL_TOKEN_TIMEZONE_MINUTE SQL_TOKEN_TO SQL_TOKEN_TRAILING SQL_TOKEN_TRANSLATE SQL_TOKEN_TRIM SQL_TOKEN_TRUE SQL_TOKEN_UNION
%token <pParseNode> SQL_TOKEN_UNIQUE SQL_TOKEN_UNKNOWN SQL_TOKEN_UPDATE SQL_TOKEN_UPPER SQL_TOKEN_USAGE SQL_TOKEN_USER SQL_TOKEN_USING SQL_TOKEN_VALUES SQL_TOKEN_VIEW
-%token <pParseNode> SQL_TOKEN_WHERE SQL_TOKEN_WITH SQL_TOKEN_WORK SQL_TOKEN_YEAR SQL_TOKEN_ZONE
+%token <pParseNode> SQL_TOKEN_WHERE SQL_TOKEN_WITH SQL_TOKEN_WORK SQL_TOKEN_ZONE
/* ODBC KEYWORDS */
%token <pParseNode> SQL_TOKEN_CALL SQL_TOKEN_D SQL_TOKEN_FN SQL_TOKEN_T SQL_TOKEN_TS SQL_TOKEN_OJ
@@ -204,6 +189,22 @@
%token <pParseNode> SQL_TOKEN_LOG10 SQL_TOKEN_MOD SQL_TOKEN_PI SQL_TOKEN_POWER SQL_TOKEN_RADIANS SQL_TOKEN_RAND
%token <pParseNode> SQL_TOKEN_ROUND SQL_TOKEN_SIGN SQL_TOKEN_SIN SQL_TOKEN_SQRT SQL_TOKEN_TAN SQL_TOKEN_TRUNCATE
+
+ /* operators */
+%left SQL_TOKEN_NAME
+%left <pParseNode> SQL_TOKEN_OR
+%left <pParseNode> SQL_TOKEN_AND
+
+%left <pParseNode> LESSEQ GREATEQ NOTEQUAL LESS GREAT EQUAL /* '<' '>' = <> < > <= >= != */
+%left <pParseNode> '+' '-'
+%left <pParseNode> '*' '/'
+%left SQL_TOKEN_NATURAL SQL_TOKEN_CROSS SQL_TOKEN_FULL SQL_TOKEN_LEFT SQL_TOKEN_RIGHT
+%left ')'
+%right '='
+%right '.'
+%right '('
+
+
%token <pParseNode> SQL_TOKEN_INVALIDSYMBOL
/*%type <pParseNode> sql_single_statement */
@@ -3019,7 +3020,7 @@
}
else
YYERROR;
- }
+ };
%%

11
editors/openoffice.org-1.0/files/patch-cosv+source+strings+streamstr.cxx
View File

@ -1,11 +0,0 @@
--- ../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>

13
editors/openoffice.org-1.0/files/patch-desktop+source+pkgchk_packages.cxx Normal file
View File

@ -0,0 +1,13 @@
--- ../desktop/source/pkgchk/pkgchk_packages.cxx.orig Sun Jan 19 20:00:08 2003
+++ ../desktop/source/pkgchk/pkgchk_packages.cxx Sun Jan 19 20:01:51 2003
@@ -124,6 +124,10 @@
static char const s_platform_path [] = "/macosx_powerpc.plt";
#elif defined (NETBSD) && defined (SPARC)
static char const s_platform_path [] = "/netbsd_sparc.plt";
+#elif defined (FREEBSD) && defined (INTEL)
+static char const s_platform_path [] = "/freebsd_x86.plt";
+#elif defined (FREEBSD) && defined (SPARC)
+static char const s_platform_path [] = "/freebsd_sparc.plt";
#else
#error "unkonwn platform"
insert your platform identifier above; inserted for the case the preprocessor ignores error

34
editors/openoffice.org-1.0/files/patch-freetype+makefile.mk
View File

@ -1,24 +1,24 @@
--- ../freetype/makefile.mk.orig Tue Feb 26 12:21:37 2002
+++ ../freetype/makefile.mk Thu Aug 1 00:51:46 2002
@@ -79,7 +79,11 @@
--- ../freetype/makefile.mk.orig Fri Aug 16 17:28:36 2002
+++ ../freetype/makefile.mk Sat Jan 18 13:39:03 2003
@@ -86,7 +86,11 @@
.IF "$(GUI)"=="UNX"
#relative to CONFIGURE_DIR
CONFIGURE_ACTION=$(GNUMAKE)
.IF "$(GUI)"=="UNX"
-CONFIGURE_FLAGS=setup
+.IF "$(debug)"==""
+CONFIGURE_FLAGS=setup CFLAGS="-O"
+.ELSE # "$(debug)"==""
+.ELSE # "$(debug)"==""
+CONFIGURE_FLAGS=setup CFLAGS="-O -g -ggdb"
+.ENDIF # "$(debug)"==""
.ELSE # "$(GUI)"=="UNX"
CONFIGURE_FLAGS=setup visualc
.ENDIF # "$(GUI)"=="UNX"
@@ -90,7 +94,7 @@
.IF "$(GUI)"=="UNX"
OUT2LIB= \
objs$/.libs$/libfreetype.a \
- objs$/.libs$/libfreetype.so.6*
+ objs$/.libs$/libfreetype.so.7
.ENDIF # "$(GUI)"=="UNX"
+.ENDIF
BUILD_DIR=$(CONFIGURE_DIR)
BUILD_ACTION=$(GNUMAKE)
@@ -95,6 +99,8 @@
objs$/.libs$/libfreetype.a
.IF "$(OS)"=="MACOSX"
OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+.ELIF "$(OS)"=="FREEBSD"
+OUT2LIB+=objs$/.libs$/libfreetype.so.7*
.ELSE
OUT2LIB+=objs$/.libs$/libfreetype.so.6*
.ENDIF # "$(OS)"=="MACOSX"

11
editors/openoffice.org-1.0/files/patch-idl+util+makefile.mk
View File

@ -1,11 +0,0 @@
--- ../idl/util/makefile.mk.orig Sun Jul 21 00:02:37 2002
+++ ../idl/util/makefile.mk Sun Jul 21 00:02:39 2002
@@ -110,7 +110,7 @@
.ENDIF
.ENDIF
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
APP1STDLIBS+=-lcrypt
.ENDIF

73
editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch
View File

@ -1,11 +1,41 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
+++ ../nas/nas-1.4.1.patch Thu Oct 31 10:17:40 2002
@@ -120,26 +120,157 @@
--- ../nas/nas-1.4.1.patch.orig Wed Jan 8 02:52:13 2003
+++ ../nas/nas-1.4.1.patch Sat Jan 18 17:55:19 2003
@@ -1,5 +1,5 @@
-*** misc/nas-1.4.1/config/NetAudio.tmpl Sat Mar 4 21:40:50 2000
---- misc/build/nas-1.4.1/config/NetAudio.tmpl Tue Jan 7 19:30:41 2003
+*** misc/nas-1.4.1/config/NetAudio.tmpl Sun Mar 5 03:40:50 2000
+--- misc/build/nas-1.4.1/config/NetAudio.tmpl Thu Nov 1 13:08:21 2001
***************
*** 166,171 ****
--- 166,177 ----
@@ -15,8 +15,8 @@
INCLUDESRC = $(TOP)/include
INCDIR = $(INCROOT)/audio
WIDGET_DIR = $(TOP)/clients/audio/widgets
-*** misc/nas-1.4.1/lib/audio/Alibint.c Sun Oct 24 13:45:21 1999
---- misc/build/nas-1.4.1/lib/audio/Alibint.c Tue Jan 7 19:30:41 2003
+*** misc/nas-1.4.1/lib/audio/Alibint.c Sun Oct 24 19:45:21 1999
+--- misc/build/nas-1.4.1/lib/audio/Alibint.c Thu Nov 1 13:11:51 2001
***************
*** 1336,1348 ****
static char *_SysErrorMsg (n)
@@ -40,8 +40,8 @@
}
#endif /* USL sharedlibs in don't define for AUD3.2 */
-*** misc/nas-1.4.1/lib/audio/Astreams.c Sat May 8 21:10:05 1999
---- misc/build/nas-1.4.1/lib/audio/Astreams.c Tue Jan 7 19:30:41 2003
+*** misc/nas-1.4.1/lib/audio/Astreams.c Sun May 9 03:10:05 1999
+--- misc/build/nas-1.4.1/lib/audio/Astreams.c Thu Nov 1 13:05:48 2001
***************
*** 51,59 ****
#include <errno.h>
@@ -120,59 +120,157 @@
return(-1);
}
-*** misc/nas-1.4.1/lib/audio/Imakefile Sat Jan 1 10:28:13 2000
---- misc/build/nas-1.4.1/lib/audio/Imakefile Thu Nov 1 13:12:56 2001
-*** misc/nas-1.4.1/lib/audio/Imakefile Sat Jan 1 04:28:13 2000
---- misc/build/nas-1.4.1/lib/audio/Imakefile Tue Jan 7 19:30:41 2003
-***************
-*** 25,30 ****
---- 25,32 ----
@ -27,6 +57,39 @@
- InstallMultiple($(HEADERS),$(INCDIR))
- #if ProjectX >= 5
- InstallNonExecFile(AuErrorDB,$(LIBDIR))
-*** misc/nas-1.4.1/server/dia/gram.y Sat Jan 1 22:35:49 2000
---- misc/build/nas-1.4.1/server/dia/gram.y Tue Jan 7 19:42:40 2003
-***************
-*** 119,132 ****
- }
- | MAXRATE number
- { ddaSetConfig(MAXRATE, (void *)$2); }
-! | MINRATE number
-! { ddaSetConfig(MINRATE, (void *)$2); }
-
- string : STRING { ptr = (char *)malloc(strlen($1)+1);
- strcpy(ptr, $1);
- RemoveDQuote(ptr);
- $$ = ptr;
-! }
- number : NUMBER { $$ = $1; }
- ;
-
---- 119,132 ----
- }
- | MAXRATE number
- { ddaSetConfig(MAXRATE, (void *)$2); }
-! | MINRATE number
-! { ddaSetConfig(MINRATE, (void *)$2); } ;
-
- string : STRING { ptr = (char *)malloc(strlen($1)+1);
- strcpy(ptr, $1);
- RemoveDQuote(ptr);
- $$ = ptr;
-! };
- number : NUMBER { $$ = $1; }
- ;
-
+--- misc/nas-1.4.1/Imakefile.orig Wed Mar 6 02:20:01 2002
++++ misc/build/nas-1.4.1/Imakefile Wed Mar 6 02:20:07 2002
+@@ -42,6 +42,8 @@

12
editors/openoffice.org-1.0/files/patch-product+inc+scp+udk_basefiles.scp
View File

@ -1,5 +1,5 @@
--- ../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
--- ../product/inc/scp/udk_basefiles.scp.orig Tue Jan 7 14:52:10 2003
+++ ../product/inc/scp/udk_basefiles.scp Sun Jan 19 22:37:05 2003
@@ -2,6 +2,7 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
@ -8,11 +8,11 @@
#if ( defined( _gcc3 ) && defined( C300 ) )
File gid_File_Lib_gcc
@@ -42,6 +43,7 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
@@ -34,6 +35,7 @@
End
+#endif
#endif
#endif
File gid_File_Lib_Sal

14
editors/openoffice.org-1.0/files/patch-product+settings+linux_gcc_settings.mk
View File

@ -1,14 +0,0 @@
--- ../product/settings/linux_gcc_settings.mk.orig Wed May 29 00:18:46 2002
+++ ../product/settings/linux_gcc_settings.mk Wed May 29 00:19:04 2002
@@ -3,9 +3,8 @@
OS=LINUX
PLATFORM=linux
PS=/
-CC=gcc
-LINK=gcc
-LIB=gcc
+LINK=$(CC)
+LIB=$(CC)
ECHO=@echo
MKDIR=mkdir -p
CAT=cat

95
editors/openoffice.org-1.0/files/patch-product+settings+settings.mk
View File

@ -1,26 +1,75 @@
--- ../product/settings/settings.mk.orig Wed May 29 00:16:16 2002
+++ ../product/settings/settings.mk Wed May 29 00:18:00 2002
@@ -83,9 +83,8 @@
--- ../product/settings/settings.mk.orig Sat Jan 18 18:23:17 2003
+++ ../product/settings/settings.mk Sat Jan 18 18:37:12 2003
@@ -225,3 +226,72 @@
OS=SOLARIS
PS=/
-CC=CC
-LINK=CC
-LIB=CC
endif
+ifeq "$(PLATFORM)" "FreeBSD"
+# Settings for Linux using gcc compiler
+
+OS=LINUX
+PLATFORM=linux
+PS=/
+LINK=$(CC)
+LIB=$(CC)
ECHO=@echo
MKDIR=mkdir -p
CAT=cat
@@ -136,9 +135,8 @@
OS=LINUX
PLATFORM=linux
PS=/
-CC=gcc
-LINK=gcc
-LIB=gcc
+LINK=$(CC)
+LIB=$(CC)
ECHO=@echo
MKDIR=mkdir -p
CAT=cat
+ECHO=@echo
+MKDIR=mkdir -p
+CAT=cat
+OBJ_EXT=o
+SHAREDLIB_EXT=so
+SHAREDLIB_PRE=lib
+SHAREDLIB_OUT=$(OUT_LIB)
+PACKAGE_LIB_DIR=linux_x86.plt
+
+GCC_VERSION=$(shell $(CC) -dumpversion)
+
+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3"
+COMID=gcc3
+CPPU_ENV=gcc3
+else
+COMID=GCC
+CPPU_ENV=gcc2
+endif
+
+OSEP=\<
+CSEP=\>
+
+DEL=rm -f
+DELRECURSIVE=rm -rf
+COPY=cp
+URLPREFIX=file://
+
+# Include UDK version numbers
+include $(PRJ)/include/udkversion.mk
+
+SALLIB=-lsal
+CPPULIB=-lcppu
+CPPUHELPERLIB=-lcppuhelper$(COMID)
+SALHELPERLIB=-lsalhelper$(COMID)
+STLPORTLIB=-lstlport_gcc
+
+EMPTYSTRING=
+PATH_SEPARATOR=:
+
+# -O is necessary for inlining (see gcc documentation)
+ifeq "$(DEBUG)" "yes"
+CC_FLAGS=-c -g
+else
+CC_FLAGS=-c -O
+endif
+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -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 -DLINUX -DCPPU_ENV=$(CPPU_ENV)
+
+# define for used compiler necessary for UNO
+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95
+#-DCPPU_ENV=gcc3 -- gcc3 3.0
+
+CC_OUTPUT_SWITCH=-o
+
+LIBRARY_LINK_FLAGS=-shared
+EXE_LINK_FLAGS=-Wl -export-dynamic
+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH)
+
+endif

30
editors/openoffice.org-1.0/files/patch-product+util+makefile.mk
View File

@ -1,34 +1,32 @@
--- ../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 @@
--- ../product/util/makefile.mk.orig Sat Jan 18 13:31:50 2003
+++ ../product/util/makefile.mk Sat Jan 18 13:30:54 2003
@@ -131,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3) \
- $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3)
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
@@ -498,6 +491,7 @@
#---------------------------------------------------------
# special targets for linux gcc3
@@ -491,6 +484,7 @@
# special targets for linux gcc3
.IF "$(COMID)"=="gcc3"
+.IF "$(OS)"=="LINUX"
.IF "$(CCNUMVER)">="000300010000"
+.IF "$(OS)"!="FREEBSD"
$(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) :
$(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT)
$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
@@ -526,6 +520,9 @@
@@ -514,6 +508,7 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
+ln -s libgcc_s.so.1 $@
+
+.ENDIF
+
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

21
editors/openoffice.org-1.0/files/patch-sablot+Sablot-0.52.patch
View File

@ -1,25 +1,20 @@
--- ../sablot/Sablot-0.52.patch.orig Mon Mar 18 16:03:02 2002
+++ ../sablot/Sablot-0.52.patch Wed Apr 3 00:52:54 2002
--- ../sablot/Sablot-0.52.patch.orig Sun Jan 19 15:13:42 2003
+++ ../sablot/Sablot-0.52.patch Sun Jan 19 15:15:15 2003
@@ -3,7 +3,7 @@
***************
*** 1 ****
! dummy
---- 1,151 ----
+--- 1,156 ----
---- 1,159 ----
+--- 1,161 ----
! #*************************************************************************
! #
! # $RCSfile: makefile.mk,v $
@@ -90,8 +90,13 @@
! .ENDIF
!
@@ -96,6 +96,8 @@
! .IF "$(GUI)"=="UNX"
+! .IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
! .IF "$(OS)"=="NETBSD"
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
+! .ENDIF
+! .IF "$(OS)"=="FREEBSD"
+! .ELIF "$(OS)"=="FREEBSD"
+! CFLAGS+= -DHAVE_SYS_TIME_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
+! .ENDIF
! .ELSE
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE
! .ENDIF
! .IF "$(OS)"=="MACOSX"
! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_SYS_TIME_H -DHAVE_ISNAN -DHAVE_FINITE

13
editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+unx+jvmscan.cxx
View File

@ -1,13 +0,0 @@
--- ../setup2/source/custom/jvmsetup/unx/jvmscan.cxx.orig Wed Aug 14 00:19:33 2002
+++ ../setup2/source/custom/jvmsetup/unx/jvmscan.cxx Wed Aug 14 00:20:54 2002
@@ -117,7 +117,9 @@
/* some platforms have no hotspot yet even under jdk 1.3 */
/* so treat them like classic in JDK 1.2.x */
-#if defined(POWERPC) && defined(LINUX)
+#if defined(POWERPC) && defined(LINUX) || \
+ defined(INTEL) && defined(FREEBSD)
+
#define NO_HOTSPOT_USE_CLASSIC 1
#else
#undef NO_HOTSPOT_USE_CLASSIC

10
editors/openoffice.org-1.0/files/patch-solenv+bin+build.pl Normal file
View File

@ -0,0 +1,10 @@
--- ../solenv/bin/build.pl.orig Sun Jan 19 00:08:38 2003
+++ ../solenv/bin/build.pl Sun Jan 19 00:07:25 2003
@@ -292,7 +292,6 @@
cwd();
$! = 0;
system ("$dmake");
- &print_error("dmake - " . lc($!)) if ($!);
if ($? && ($? != -1) && (!$child)) {
&print_error("Error $? occurred while making $BuildDir");
};

44
editors/openoffice.org-1.0/files/patch-solenv+bin+getcompver.awk
View File

@ -1,44 +0,0 @@
--- ../solenv/bin/getcompver.awk.orig Tue May 28 13:09:01 2002
+++ ../solenv/bin/getcompver.awk Tue May 28 13:08:14 2002
@@ -61,9 +61,11 @@
#*************************************************************************
BEGIN {
CCversion = 0
+ compiler_matched = 0
}
# Sun c++ compiler
/Sun WorkShop/ {
+ compiler_matched = 1
# version number right after "C++"
x = match( $0, /C\+\+ .*/ )
btwn = substr( $0, RSTART, RLENGTH)
@@ -73,12 +75,28 @@
}
# Microsoft c++ compiler
/Microsoft.*..\...\...../ {
+ compiler_matched = 1
# match on the format of the ms versions ( dd.dd.dddd )
x = match( $0, /..\...\...../ )
CCversion = substr( $0, RSTART, RLENGTH)
}
+# Java
+/java version/ {
+ compiler_matched = 1
+ # match on the format of the java versions ( d[d].d[d].d[d] )
+ x = match( $0, /".*\..*\..*"/ )
+ CCversion = substr( $0, RSTART+1, RLENGTH-2)
+}
+/^[0-9]*[.][0-9]*$/ {
+ if ( compiler_matched == 0 ) {
+# need to blow to x.xx.xx for comparing
+ CCversion = $0 ".0"
+ }
+}
/^[0-9]*[.][0-9]*[.][0-9]*$/ {
- CCversion = $0
+ if ( compiler_matched == 0 ) {
+ CCversion = $0
+ }
}
END {
if ( num == "true" ) {

282
editors/openoffice.org-1.0/files/patch-solenv+inc+_tg_shl.mk
View File

@ -1,282 +0,0 @@
--- ../solenv/inc/_tg_shl.mk.orig Wed Jan 2 12:23:22 2002
+++ ../solenv/inc/_tg_shl.mk Tue May 28 12:02:12 2002
@@ -345,22 +345,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -770,22 +770,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -1195,22 +1195,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -1620,22 +1620,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -2045,22 +2045,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -2470,22 +2470,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -2895,22 +2895,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -3320,22 +3320,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -3745,22 +3745,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -4170,22 +4170,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"

141
editors/openoffice.org-1.0/files/patch-solenv+inc+pstrules.mk
View File

@ -1,141 +0,0 @@
--- ../solenv/inc/pstrules.mk.orig Thu Mar 14 17:40:59 2002
+++ ../solenv/inc/pstrules.mk Thu Mar 14 17:41:44 2002
@@ -80,15 +80,15 @@
.ENDIF
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
.IF "$(COM)"=="BLC"
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ENDIF
.ENDIF
@@ -108,15 +108,15 @@
.ENDIF
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
.IF "$(COM)"=="BLC"
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ENDIF
.ENDIF
@@ -142,15 +142,15 @@
.ENDIF
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
.IF "$(COM)"=="BLC"
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ENDIF
.ENDIF
@@ -159,23 +159,23 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF
.ELSE
.IF "$(GUI)"=="MAC"
@$(RM) $@
- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
.ELSE
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
@+echo.
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c
+ $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c
.ELSE
- $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
+ $(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
.ENDIF
$(SEMADEBUG)
.ENDIF
@@ -195,15 +195,15 @@
.ENDIF
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
.IF "$(COM)"=="BLC"
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ENDIF
.ENDIF
@@ -212,19 +212,19 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c
+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
.IF "$(GUI)"=="MAC"
@$(RM) $@
- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c
+ $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c
.ELSE
+$(TYPE) $(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c )
- $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c )
+ $(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c )
.ENDIF
.ENDIF
.ENDIF
@@ -246,7 +246,7 @@
@echo Making: $@
@+-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV)
.IF "$(GUI)"=="OS2"
- $(CC) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
+ $(CXX) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
.ENDIF
.IF "$(GUI)"=="WNT"
cpplcc -+ -P $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre

212
editors/openoffice.org-1.0/files/patch-solenv+inc+rules.mk
View File

@ -1,212 +0,0 @@
--- ../solenv/inc/rules.mk.orig Thu Mar 14 17:31:43 2002
+++ ../solenv/inc/rules.mk Thu Mar 14 17:38:38 2002
@@ -78,16 +78,16 @@
.ENDIF
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
@+echo.
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ELSE
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
.ENDIF
.ENDIF
@@ -98,16 +98,16 @@
.ENDIF
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
@+echo.
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp
.ELSE
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
.ENDIF
.ENDIF
@@ -122,17 +122,17 @@
.ENDIF
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF
.ELSE # "$(GUI)"=="UNX"
@+if exist $@ $(RM) /q $@ >& nul
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
@+echo.
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
.ENDIF # "$(GUI)"=="UNX"
$(SLO)$/%.obj : %.cpp
@@ -140,17 +140,17 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
@+echo.
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
.ENDIF
$(SLO)$/%.obj : $(MISC)$/%.cxx
@@ -158,16 +158,16 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF
.ELSE
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
@+echo.
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
.ENDIF
$(OBJ)$/%.obj : $(MISC)$/%.cxx
@@ -175,16 +175,16 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF
.ELSE
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
@+echo.
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
.ENDIF
$(OBJ)$/%.obj : %.c
@@ -192,20 +192,20 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF
.ELSE
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
@+echo.
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c
+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c
.ELSE
+-@echo Cflags: $(CFLAGS)
- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
.ENDIF
$(SEMADEBUG)
.ENDIF
@@ -215,13 +215,13 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c
+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
@+echo.
- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
$(SEMADEBUG)
.ENDIF
@@ -230,16 +230,16 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c
+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
@+echo.
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c
+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c
.ELSE
- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
.ENDIF
$(SEMADEBUG)
.ENDIF
@@ -249,14 +249,14 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c
+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c
+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c
.ELSE
- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c )
+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c )
.ENDIF
.ENDIF

19
editors/openoffice.org-1.0/files/patch-solenv+inc+settings.mk
View File

@ -1,19 +0,0 @@
--- ../solenv/inc/settings.mk.orig Fri Mar 8 10:23:21 2002
+++ ../solenv/inc/settings.mk Tue May 28 12:56:27 2002
@@ -166,7 +166,6 @@
CDEFSOPT=
HDEFS=
-CC=
.IF "$(add_cflags)"!=""
ENVCFLAGS+=$(add_cflags)
.ENDIF
@@ -264,8 +263,6 @@
AS=
BC=
COBOL=
-CPP=
-CXX=
FOR=
PASCAL=

20
editors/openoffice.org-1.0/files/patch-solenv+inc+target.mk
View File

@ -1,20 +0,0 @@
--- ../solenv/inc/target.mk.orig Mon Aug 26 01:29:21 2002
+++ ../solenv/inc/target.mk Mon Aug 26 01:28:23 2002
@@ -2139,7 +2139,7 @@
.IF "$(COMPVERMK)"!=""
.IF "$(UPDATER)"!=""
-"$(COMPVERMK)" : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg
+"$(COMPVERMK)" :
@echo COMNAME:=$(COMNAME) > $@
@echo COMID:=$(COMID) >> $@
@echo CCNUMVER:=$(CCNUMVER) >> $@
@@ -2778,7 +2778,7 @@
$(MISC)$/$(TARGET).dpz : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGETN) $(ZIP4TARGETN) $(ZIP5TARGETN) $(ZIP6TARGETN) $(ZIP7TARGETN) $(ZIP8TARGETN) $(ZIP9TARGETN)
.ENDIF
-$(INCCOM)$/_version.h : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg
+$(INCCOM)$/_version.h :
.IF "$(GUI)"=="UNX"
@+echo "#define" _BUILD \"$(BUILD)\" > $@
@+echo "#define" _UPD \"$(UPD)\" >> $@

15
editors/openoffice.org-1.0/files/patch-solenv+inc+tg_shl.mk
View File

@ -1,14 +1,11 @@
--- ../solenv/inc/tg_shl.mk.orig Wed Mar 13 20:40:10 2002
+++ ../solenv/inc/tg_shl.mk Wed Mar 13 20:41:10 2002
@@ -319,9 +319,9 @@
--- ../solenv/inc/tg_shl.mk.orig Tue Jan 7 16:22:13 2003
+++ ../solenv/inc/tg_shl.mk Sat Jan 18 12:51:58 2003
@@ -319,7 +319,7 @@
.IF "$(GUI)" == "WNT"
.IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC"
- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+ ${CC} -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ELSE
- cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(UPDATER)"=="YES"
.IF "$(SHL$(TNR)DEFAULTRES)"!=""

8
editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,5 +1,5 @@
--- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001
+++ ../solenv/inc/unxfbsdi.mk Sun Jun 2 11:20:10 2002
--- ../solenv/inc/unxfbsdi.mk.orig Tue Jan 7 16:22:18 2003
+++ ../solenv/inc/unxfbsdi.mk Sat Jan 18 13:04:17 2003
@@ -1,84 +1,139 @@
-
# mak file fuer unxfbsdi
@ -56,8 +56,8 @@
+# environment with graphical user interface
+CFLAGSOBJGUIMT=-fPIC
-cc= gcc
-CC= g++
-CC= gcc
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
-CFLAGS+= -w -c $(INCLUDE)

40
editors/openoffice.org-1.0/files/patch-stlport+makefile.mk
View File

@ -1,32 +1,36 @@
--- ../stlport/makefile.mk.orig Tue Mar 19 15:49:17 2002
+++ ../stlport/makefile.mk Tue May 28 23:03:45 2002
@@ -106,11 +106,29 @@
--- ../stlport/makefile.mk.orig Tue Jan 7 13:13:37 2003
+++ ../stlport/makefile.mk Sat Jan 18 13:01:53 2003
@@ -98,16 +98,28 @@
.IF "$(COM)"=="GCC"
.IF "$(COMID)"=="gcc3"
+
+.IF "$(OS)"=="FREEBSD"
+BUILD_FLAGS=-f gcc-3.0-freebsd.mak
-BUILD_FLAGS=-f gcc-3.0.mak
+.IF # "$(OS)"=="FREEBSD"
+ BUILD_FLAGS=-f gcc-3.0-freebsd.mak
+.ELSE
BUILD_FLAGS=-f gcc-3.0.mak
+ BUILD_FLAGS=-f gcc-3.0.mak
+.ENDIF
+
.ELSE # "$(COMID)"=="gcc3"
+
+.IF "$(OS)"=="FREEBSD"
+BUILD_FLAGS=-f gcc-freebsd.mak
-# MacOS X/Darwin need a special makefile
+# FreeBSD / MacOS X/Darwin need a special makefile
.IF "$(OS)"=="MACOSX"
BUILD_FLAGS=-f gcc-apple-macosx.mak
-.ELSE # "$(OS)"=="MACOSX"
+.ELSIF # "$(OS)"=="FREEBSD"
+ BUILD_FLAGS=-f gcc-freebsd.mak
+.ELSE
BUILD_FLAGS=-f gcc.mak
+.ENDIF
+
BUILD_FLAGS=-f gcc.mak
-.ENDIF # "$(OS)"=="MACOSX"
+.ENDIF # "$(OS)"=="MACOSX || $(OS)"=="FREEBSD"
.ENDIF # "$(COMID)"=="gcc3"
-BUILD_ACTION=make
+
+.IF "$(OS)"=="FREEBSD"
+BUILD_ACTION=gmake
+ BUILD_ACTION=gmake
+.ELSE
BUILD_ACTION=make
+ BUILD_ACTION=make
+.ENDIF
+
# build in parallel
BUILD_FLAGS+= -j$(MAXPROCESS)
.ENDIF
.IF "$(COM)"=="C52"

13
editors/openoffice.org-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx
View File

@ -1,12 +1,11 @@
--- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed May 1 23:45:49 2002
+++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Wed May 1 23:48:17 2002
@@ -62,7 +62,9 @@
--- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Fri Aug 16 18:56:19 2002
+++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Sat Jan 18 13:06:16 2003
@@ -62,7 +62,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <dlfcn.h>
+#if !(defined NETBSD || defined FREEBSD)
-#ifndef MACOSX
+#if !(defined NETBSD || defined FREEBSD || defined MACOSX)
#include <alloca.h>
+#endif
#endif
#include <string.h>
/*

2490
editors/openoffice.org-1.0/files/patch-translation-ru
View File

File diff suppressed because it is too large Load Diff

27
editors/openoffice/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= openoffice
PORTVERSION= 1.0.1
PORTREVISION= 4
PORTVERSION= 1.0.2
CATEGORIES+= editors
MASTER_SITES+= http://ny1.mirror.openoffice.org/%SUBDIR%/ \
http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \
@ -31,12 +30,14 @@ GREP?= /usr/bin/grep
MOUNT?= /sbin/mount
ZIP?= ${PREFIX}/bin/zip
UNZIP?= ${PREFIX}/bin/unzip
ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
PASTE?= /usr/bin/paste
.include <bsd.port.pre.mk>
INSTALLATION_BASEDIR= OpenOffice.org1.0
BUILD_NR= 641
DIST_SUBDIR= openoffice
DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
@ -104,11 +105,12 @@ CXX= g++32
EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
.if !defined(USE_GCC)
BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
.endif
#.if !defined(USE_GCC)
#BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
#.endif
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/jakarta-ant
BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
.if !defined(DISPLAY)
@ -133,7 +135,7 @@ USE_AUTOCONF= yes
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/
LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
.if defined(WITH_DEBUG)
CFLAGS+= -g
.if ${WITH_DEBUG} == 2
@ -153,11 +155,12 @@ CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
PTHREAD_LIBS=${PTHREAD_LIBS}
CONFIGURE_ARGS+= --with-jdk-home=${JDK13DIR} \
--with-os-version=${OSVERSION}
--with-os-version=${OSVERSION} \
--with-ant-home=${LOCALBASE}/
.if !defined(USE_GCC)
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX}
.endif
#.if !defined(USE_GCC)
#CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX}
#.endif
.if defined(WITH_DEBUG)
.if ${WITH_DEBUG} == 2
@ -464,8 +467,8 @@ do-build:
.endif
@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
.if defined(L10NHELP)
@${MKDIR} ${WRKSRC}/../solver/641/unxfbsd.pro/pck
@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/641/unxfbsd.pro/pck
@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
.endif
.if !defined(DISPLAY)
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \

2
editors/openoffice/distinfo
View File

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

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

@ -1,82 +1,132 @@
--- ../berkeleydb/db-3.2.9.patch.orig Mon Mar 18 15:53:40 2002
+++ ../berkeleydb/db-3.2.9.patch Mon Apr 15 18:43:43 2002
@@ -47,17 +47,27 @@
--- build/unxsols3.pro/db-3.2.9/dist/configure Tue Jan 8 13:56:05 2002
***************
*** 1795,1800 ****
---- 1795,1802 ----
+--- 1795,1803 ----
case "$host_os" in
solaris*) JINCSUBDIRS="solaris";;
linux*) JINCSUBDIRS="linux genunix";;
+ irix*) JINCSUBDIRS="irix";;
+ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";;
++ freebsd*) JINCSUBDIRS="freebsd genunix";;
*) JINCSUBDIRS="genunix";;
esac
--- misc/build/db-3.2.9/dist/configure.orig Sat Nov 24 14:56:48 2001
+++ misc/build/db-3.2.9/dist/configure Sat Nov 24 14:57:32 2001
+@@ -984,7 +984,7 @@
--- ../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";;
-+ 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*) 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="-D_THREAD_SAFE $CPPFLAGS"
+ LIBS="-pthread";;
++ CPPFLAGS="$PTHREAD_CFLAGS $CPPFLAGS"
++ LIBS="$PTHREAD_LIBS";;
+ hpux*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
@@ -995,6 +995,7 @@
CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
@@ -68,13 +78,22 @@
#define HAVE_QNX 1
--- misc/build/db-3.2.9/dist/ltconfig.orig Sat Nov 24 14:56:10 2001
+++ misc/build/db-3.2.9/dist/ltconfig Sat Nov 24 14:56:34 2001
-@@ -1194,11 +1194,12 @@
+@@ -1194,11 +1194,23 @@
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'
++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
++ # can we support soname and/or expsyms with a.out? -oliva
+ 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 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
-***************
-*** 1194,1204 ****
-
- 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
- fi
- ;;
-
---- 1194,1205 ----
-
- netbsd*)
- 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
- ;;
-
+@@ -1194,11 +1194,12 @@
+
+ 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
++ 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'
- 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
++ ;;
++
++ 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
@@ -84,3 +103,24 @@
fi
;;
+@@ -2019,6 +2031,20 @@
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
+ 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 @@
+ soname_spec='${libname}${release}.so$major'
+ dynamic_linker='NetBSD ld.elf_so'
++ fi
+ fi
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
++
++freebsd*)
++ version_type=sunos
++ 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
++ 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'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+

217
editors/openoffice/files/patch-config_office+configure.in
View File

@ -1,187 +1,46 @@
--- 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
],,)
+AC_ARG_ENABLE(debug,
+[ --enable-debug if you like to build with debug symbols
+
+ Usage: --enable-debug
+],,)
AC_ARG_WITH(stlport4-home,
[ --with-stlport4-home The location that STLport4 is installed in. The STL
header files are assumed to be in stlport4-home/stlport
@@ -103,6 +108,12 @@
Usage: --with-asm-home=<path to ml.exe directory>
],,)
+AC_ARG_WITH(os-version,
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
+ with the correct OSVERSION.
+
+ Usage: --with-os-version=<OSVERSION>
+],,)
AC_ARG_WITH(unzip-home,
[ --with-unzip-home For Windows users, please supply the path for
unzip.exe.
@@ -241,7 +252,7 @@
if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then
AC_PROG_CC
fi
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then
+if test "$_os" = "Linux" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then
dnl ******************************************
dnl Testing for GNU compiler and version...
dnl ******************************************
@@ -366,8 +377,9 @@
_gcc_include_path="NO_GCC_INCLUDE"
fi
else
- if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
- _gcc_include_path="/usr/include/g++"
+ if test "$_os" = "NetBSD" ; then
+ _gcc_include_path="/usr"
+ _gxx_include_path="/usr/include/g++"
else
AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler])
AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn
@@ -408,6 +420,71 @@
fi
--- configure.in.orig Thu Jan 16 13:42:46 2003
+++ configure.in Tue Jan 21 23:09:35 2003
@@ -352,10 +352,7 @@
if test "$COMPATH" != "NO_GCC"; then
AC_MSG_RESULT([checked (gcc $_gcc_version)])
fi
fi
+if test "$_os" = "FreeBSD"; then
+ dnl ******************************************
+ dnl Testing for GNU compiler and version...
+ dnl Adapted to the FreeBSD ports system
+ dnl ******************************************
+ dnl parametrise the various gcc pathnames so we can reuse for gcc2.95 and gcc3
+ if test -n "$enable_gcc3"; then
+ _gccincname1="g++-v3"
+ else
+ _gccincname1="g++-3"
+ fi
+ if test -z "$CC"; then
+ CC="cc";
+ fi
+ if test -z "$CXX"; then
+ CXX="c++";
+ fi
+ if which $CC; then
+ _gcc_releasetype=`echo $CC | $SED -e 's|[[:digit:]]\{1,\}||'`
+ _gcc_version=`$CC -dumpversion`
+ _gcc_major=`$CC -dumpversion | $AWK -F"." '{ print \$1 }'`
+ _gcc_machine=`$CC -dumpmachine`
+ else
+ COMPATH="NO_GCC"
+ fi
+ if test -n "$enable_gcc3"; then
+ if test "$_gcc_major" != "3"; then
+ AC_MSG_ERROR([found version "$_gcc_version", but use of gcc 3.x requested])
+ COMPATH="NO_GCC"
+ fi
+ else
+ if test "$_gcc_major" != "2"; 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_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=`$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
+ COMPATH="NO_GCC"
+ fi
+ fi
+ fi
+ fi
+ if test "$COMPATH" != "NO_GCC"; then
+ if test $CC != "gcc" -o $CC != "cc"; then
+ _gcc_include_path="$PREFIX/lib/gcc-lib/$_gcc_machine/$_gcc_version/include"
+ _gxx_include_path="$_gcc_include_path/g++"
+ else
+ _gcc_include_path="$PREFIX"
+ _gxx_include_path="$_gcc_include_path/g++"
+ fi
+ else
+ AC_MSG_WARN([no gcc compiler found])
+ AC_MSG_WARN([no gcc compiler found]) >> warn
+ fi
-
-dnl Set the include paths
- _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
-fi
+fi
+
if test "$_os" = "Darwin"; then
if test "$CC" = "cc"; then
AC_PATH_PROGS(_cc, cc)
@@ -589,6 +666,26 @@
fi
dnl ===================================================================
dnl Search all the common names for GNU make
@@ -553,14 +550,27 @@
fi
+dnl *************************************************************
+dnl Testing for exception handling - dwarf2 or sjlj exceptions...
+dnl *************************************************************
+AC_MSG_CHECKING([try to compile exception code])
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+AC_CACHE_VAL(exceptions_type, [AC_TRY_LINK(
+ [#include <iostream>
+
+extern "C" void __sjthrow(void) __attribute__ ((__noreturn__));
+
+ ],
+ [__sjthrow() ],
+ [exceptions_type="sjlj"],
+ [exceptions_type="dwarf2"])
+])
+
+AC_MSG_RESULT(Exceptions type: $exceptions_type)
+AC_LANG_RESTORE
+
dnl **************************************************************
dnl Testing for required Solaris and workshop compiler patches...
dnl **************************************************************
@@ -815,6 +912,10 @@
fi
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
+ _jdk_minor="true"
+ fi
fi
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
@@ -1170,6 +1271,12 @@
USE_GCC3="FALSE"
fi
+if test -n "$enable_debug"; then
+ ENABLE_DEBUG="TRUE"
dnl ===================================================================
-dnl Set the gxx include directories
+dnl Set the gcc/gxx include directories
dnl ===================================================================
+if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then
if test "$GXX" = "yes"; then
- _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1`
+ if test -n "$enable_gcc3"; then
+ _gccincname1="g++-v3"
+ else
+ _gccincname1="g++-3"
+ fi
+ _gcc_include_path=".."
+ _gxx_include_path="$_gcc_include_path/$_gccincname1"
+fi
+else
+ ENABLE_DEBUG="FALSE"
+if test "$GXX" = "yes"; then
+ _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
+ _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - \
+ | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1`
dnl This is the original code...
-dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
+dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
+fi
+
# Print args passed to set_soenv.
if test 1 = 1; then
echo
@@ -1197,12 +1304,14 @@
echo "\$MINGWIN32="$WITH_MINGWIN
echo "\$with_use_shell="$with_use_shell
echo "\$USE_GCC3="$USE_GCC3
+echo "\$EXCEPTIONS="$exceptions_type
+echo "\$ENABLE_DEBUG="$ENABLE_DEBUG
echo
fi
-
# Executing the set_soenv script to setup the environment variables.
if test -z "$enable_check_only"; then
- './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3
+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG
else
echo
echo Test Complete
dnl ===================================================================
dnl Extra checking for the SUN OS compiler

242
editors/openoffice/files/patch-config_office+set_soenv.1
View File

@ -1,242 +0,0 @@
--- set_soenv.1.orig Sun Jun 30 21:51:05 2002
+++ set_soenv.1 Mon Oct 28 15:01:58 2002
@@ -40,7 +40,7 @@
#
# Set this value equal to the corresponding amount of
# command line arguments.
-my $numArgs = 20;
+my $numArgs = 27;
# Determining the amount of arguments in the call.
my $numEnter = $#ARGV + 1;
if ( $numEnter != $numArgs )
@@ -66,14 +66,15 @@
my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $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,
- $TF_CFGDATA, $TF_SVDATA,
+ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX,
$USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC,
$USE_XPRINT, $BUILD_SOSL_RELEASE );
#
# Platform dependent constant values.
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, $JRETOOLKITDIR, $JRETHREADDIR );
+ $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);
#
#-------------------------------------------
# IIc. Declaring the environment variables.
@@ -96,7 +97,7 @@
$SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL,
$COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME,
$BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3 );
+ $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG);
#
#-------------------------------------------
# IId. Declaring the aliases.
@@ -145,7 +146,11 @@
$STLPORT4 = $ARGV [ 12 ]; # Location of STLport4
$MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32
$USE_SHELL = $ARGV [ 18 ]; # preferred shell
-$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 at the moment)
+$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment)
+$CC = $ARGV [ 23 ]; # get cc from environment
+$CXX = $ARGV [ 24 ]; # use c++ from environment
+$EXCEPTIONS = $ARGV [ 25 ]; # Exception handling type
+$ENABLE_DEBUG = $ARGV [ 26 ]; # Enable a debug build
#
#---------------------------------------------------------------
# IIIb. Initialising the variables for the system commands, etc.
@@ -335,7 +340,14 @@
$COMPATH = $ARGV[ 0 ];
$CPU = "I";
$CPUNAME = "INTEL";
+if ($USE_GCC3 eq "TRUE")
+ {
+ $CVER = "C300";
+ }
+else
+ {
$CVER = "C295";
+}
$DLLSUFFIX = "fi";
$GUI = "UNX";
$GUIBASE = "unx";
@@ -348,6 +360,9 @@
$PATH_SEPERATOR = $ps;
$PROSWITCH = "-DPRODUCT";
$XPVERSION = "3";
+ $OSVERSION = $ARGV[ 20 ];
+ $PTHREAD_CFLAGS = $ARGV[ 21 ];
+ $PTHREAD_LIBS = $ARGV[ 22 ];
$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";
@@ -927,7 +942,7 @@
$ps_STLPORT_LIB.
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
}
-elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64"))
+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64"))
{ $LD_LIBRARY_PATH = $cur_dir.
$ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
$ps.$USR_LOCAL.$LIB.
@@ -935,6 +950,13 @@
$ps_STLPORT_LIB.
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
}
+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.
@@ -970,15 +992,16 @@
$D.$COM.
$D.$CVER.
$D.$GVER.
- $D."_PTHREADS".
$D.$OS.
$D.$CPUNAME;
if ($platform eq "$FreeBSD")
-{ $SOLARDEF .= $D."X86";
+{ $SOLARDEF .= $D."X86".
+ $D."OSVERSION=$OSVERSION".
+ " ".$PTHREAD_CFLAGS;
}
$SOLARDEF .= $D."_REENTRANT".
$D."_POSIX_PTHREAD_SEMANTICS";
-if (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64"))
+if (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64") && ( $platform ne "FreeBSD" ) && ( $platform ne "NetBSD" ))
{ $SOLARDEF .= $D."GLIBC=".$GLIBC;
}
$SOLARDEF .= $D."SUPD=$UPD".
@@ -995,7 +1018,7 @@
$L.$USR_DT.$LIB.
$L.$USR_OPENWIN.$LIB.'"';
}
-elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($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"))
{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
$L.$LIB.
$L.$USR.$LIB.
@@ -1005,6 +1028,11 @@
{ $SOLAREXTRALIB = '"'.$L.$LIB.
$L.$USR.$LIB.'"';
}
+elsif ($platform eq "$FreeBSD")
+{
+ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.'"';
+}
+
# Compiler include search directory paths.
if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64"))
{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
@@ -1076,7 +1104,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
}
-elsif (($platform eq "$Linux") or ($platform eq "$FreeBSD") or ($platform eq "$NetBSD") or ($platform eq "$Tru64") or ($platform eq "$Irix") or ($platform eq "$Irix64"))
+elsif (($platform eq "$Linux") or ($platform eq "$NetBSD") or ($platform eq "$Tru64") or ($platform eq "$Irix") or ($platform eq "$Irix64"))
{ $PATH = $cur_dir.
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
@@ -1095,6 +1123,22 @@
$ps.$USR.$ds."X11".$BIN.
$ps.$USR.$LIB;
}
+elsif ($platform eq "$FreeBSD")
+{ $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
+ $ps.'$SOLARENV'.$BIN.
+ $ps.'$JAVA_HOME'.$BIN.
+
+ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
+
+ $PATH .= $ps.$USR.$ds."sbin".
+ $ps.$USR.$ds."X11R6".$ds."bin".
+ $ps.$USR_LOCAL.$BIN.
+ $ps.$USR_LOCAL.$ds."sbin";
+ $ps.$USR.$LIB;
+}
+
elsif ($platform eq "$Winnt")
{
my ( $noldPATH );
@@ -1195,7 +1239,7 @@
$L_STLPORT_LIB.
$L.$XLIB.'"';
}
-elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($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"))
{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
@@ -1210,6 +1254,15 @@
$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.
@@ -1242,7 +1295,7 @@
$SOLARINC .= $I.$USR.$INCLUDE;
}
$SOLARINC .= $STLPORT_stlport;
-if ($platform eq "$Linux")
+if ($platform eq "$Linux" || $platform eq "$FreeBSD")
{
# This simply adds an include path, so even cases that break the FHS work
$SOLARINC .= $STLPORT_inc_stlport;
@@ -1256,11 +1309,6 @@
{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
}
-if ($platform eq "$Linux")
-{
-# This simply adds an include path, so even cases that break the FHS work
-$SOLARINC .= $STLPORT_inc_stlport;
-}
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
$I.'$JAVA_HOME'.$INCLUDE;
@@ -1428,6 +1476,9 @@
ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" );
ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" );
ToFile( "TF_FILTER", "TRUE", "e" );
+if ($ENABLE_DEBUG eq "TRUE") {
+ToFile( "debug", "true", "e" );
+}
if ( $platform ne "$Macosx" )
{ ToFile( "PSPRINT", "TRUE", "e" );
} elsif ( $GUIBASE eq "unx" ) {
@@ -1453,6 +1504,12 @@
ToFile( "GUIENV", $GUIENV, "e" );
ToFile( "GVER", $GVER, "e" );
ToFile( "OS", $OS, "e" );
+ToFile( "CC", $CC, "e" );
+ToFile( "CXX", $CXX, "e" );
+ToFile( "EXCEPTIONS", $EXCEPTIONS, "e" );
+ToFile( "OSVERSION", $OSVERSION, "e" );
+ToFile( "PTHREAD_CFLAGS", $PTHREAD_CFLAGS, "e" );
+ToFile( "PTHREAD_LIBS", $PTHREAD_LIBS, "e" );
ToFile( "OUTPATH", $OUTPATH, "e" );
ToFile( "INPATH", $INPATH, "e" );
ToFile( "GVERDIR", $GVERDIR, "e" );

98
editors/openoffice/files/patch-connectivity+source+parse+sqlbison.y
View File

@ -1,98 +0,0 @@
--- ../connectivity/source/parse/sqlbison.y.orig Fri May 31 15:21:42 2002
+++ ../connectivity/source/parse/sqlbison.y Thu Nov 7 00:06:38 2002
@@ -134,21 +134,6 @@
%token <pParseNode> SQL_TOKEN_STRING SQL_TOKEN_ACCESS_DATE SQL_TOKEN_INT SQL_TOKEN_REAL_NUM
%token <pParseNode> SQL_TOKEN_INTNUM SQL_TOKEN_APPROXNUM SQL_TOKEN_NOT SQL_TOKEN_NAME
- /* operators */
-%left <pParseNode> SQL_TOKEN_NAME
-%left <pParseNode> SQL_TOKEN_OR
-%left <pParseNode> SQL_TOKEN_AND
-
-%left <pParseNode> LESSEQ GREATEQ NOTEQUAL LESS GREAT EQUAL /* '<' '>' = <> < > <= >= != */
-%left <pParseNode> '+' '-'
-%left <pParseNode> '*' '/'
-%left <pParseNode> SQL_TOKEN_NATURAL SQL_TOKEN_CROSS SQL_TOKEN_FULL SQL_TOKEN_LEFT SQL_TOKEN_RIGHT
-%left <pParseNode> ')'
-%right <pParseNode> '='
-%right <pParseNode> '.'
-%right <pParseNode> '('
-
-
%nonassoc <pParseNode> SQL_TOKEN_UMINUS
@@ -157,31 +142,31 @@
%token <pParseNode> SQL_TOKEN_ALL SQL_TOKEN_ALTER SQL_TOKEN_AMMSC SQL_TOKEN_ANY SQL_TOKEN_AS SQL_TOKEN_ASC SQL_TOKEN_AT SQL_TOKEN_AUTHORIZATION SQL_TOKEN_AVG
-%token <pParseNode> SQL_TOKEN_BETWEEN SQL_TOKEN_BIT SQL_TOKEN_BIT_LENGTH SQL_TOKEN_BOTH SQL_TOKEN_BY
+%token <pParseNode> SQL_TOKEN_BETWEEN SQL_TOKEN_BIT SQL_TOKEN_BOTH SQL_TOKEN_BY
-%token <pParseNode> SQL_TOKEN_CAST SQL_TOKEN_CHARACTER SQL_TOKEN_CHAR_LENGTH SQL_TOKEN_CHECK SQL_TOKEN_COLLATE SQL_TOKEN_COMMIT SQL_TOKEN_CONTINUE SQL_TOKEN_CONVERT SQL_TOKEN_COUNT SQL_TOKEN_CREATE SQL_TOKEN_CROSS
-%token <pParseNode> SQL_TOKEN_CURRENT SQL_TOKEN_CURRENT_DATE SQL_TOKEN_CURRENT_TIME SQL_TOKEN_CURRENT_TIMESTAMP SQL_TOKEN_CURSOR
+%token <pParseNode> SQL_TOKEN_CAST SQL_TOKEN_CHARACTER SQL_TOKEN_CHECK SQL_TOKEN_COLLATE SQL_TOKEN_COMMIT SQL_TOKEN_CONTINUE SQL_TOKEN_CONVERT SQL_TOKEN_COUNT SQL_TOKEN_CREATE SQL_TOKEN_CROSS
+%token <pParseNode> SQL_TOKEN_CURRENT SQL_TOKEN_CURSOR
%token <pParseNode> SQL_TOKEN_DATE SQL_TOKEN_DAY SQL_TOKEN_DEC SQL_TOKEN_DECIMAL SQL_TOKEN_DECLARE SQL_TOKEN_DEFAULT SQL_TOKEN_DELETE SQL_TOKEN_DESC
%token <pParseNode> SQL_TOKEN_DISTINCT SQL_TOKEN_DOUBLE SQL_TOKEN_DROP
-%token <pParseNode> SQL_TOKEN_ESCAPE SQL_TOKEN_EXCEPT SQL_TOKEN_EXISTS SQL_TOKEN_EXTRACT SQL_TOKEN_FALSE SQL_TOKEN_FETCH SQL_TOKEN_FLOAT SQL_TOKEN_FOR SQL_TOKEN_FOREIGN SQL_TOKEN_FOUND SQL_TOKEN_FROM SQL_TOKEN_FULL
+%token <pParseNode> SQL_TOKEN_ESCAPE SQL_TOKEN_EXCEPT SQL_TOKEN_EXISTS SQL_TOKEN_FALSE SQL_TOKEN_FETCH SQL_TOKEN_FLOAT SQL_TOKEN_FOR SQL_TOKEN_FOREIGN SQL_TOKEN_FOUND SQL_TOKEN_FROM SQL_TOKEN_FULL
-%token <pParseNode> SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING SQL_TOKEN_HOUR SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INSERT SQL_TOKEN_INTEGER SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT
+%token <pParseNode> SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INTEGER SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT
-%token <pParseNode> SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LEFT SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER SQL_TOKEN_MINUTE SQL_TOKEN_MONTH
+%token <pParseNode> SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER
%token <pParseNode> SQL_TOKEN_MAX SQL_TOKEN_MIN SQL_TOKEN_NATURAL SQL_TOKEN_NCHAR SQL_TOKEN_NULL SQL_TOKEN_NUMERIC
%token <pParseNode> SQL_TOKEN_OCTECT_LENGTH SQL_TOKEN_OF SQL_TOKEN_ON SQL_TOKEN_OPTION SQL_TOKEN_ORDER SQL_TOKEN_OUTER
-%token <pParseNode> SQL_TOKEN_POSITION SQL_TOKEN_PRECISION SQL_TOKEN_PRIMARY SQL_TOKEN_PRIVILEGES SQL_TOKEN_PROCEDURE SQL_TOKEN_PUBLIC
-%token <pParseNode> SQL_TOKEN_REAL SQL_TOKEN_REFERENCES SQL_TOKEN_ROLLBACK SQL_TOKEN_RIGHT
+%token <pParseNode> SQL_TOKEN_PRECISION SQL_TOKEN_PRIMARY SQL_TOKEN_PRIVILEGES SQL_TOKEN_PROCEDURE SQL_TOKEN_PUBLIC
+%token <pParseNode> SQL_TOKEN_REAL SQL_TOKEN_REFERENCES SQL_TOKEN_ROLLBACK
-%token <pParseNode> SQL_TOKEN_SCHEMA SQL_TOKEN_SECOND SQL_TOKEN_SELECT SQL_TOKEN_SET SQL_TOKEN_SIZE SQL_TOKEN_SMALLINT SQL_TOKEN_SOME SQL_TOKEN_SQLCODE SQL_TOKEN_SQLERROR SQL_TOKEN_SUBSTRING SQL_TOKEN_SUM
+%token <pParseNode> SQL_TOKEN_SCHEMA SQL_TOKEN_SELECT SQL_TOKEN_SET SQL_TOKEN_SIZE SQL_TOKEN_SMALLINT SQL_TOKEN_SOME SQL_TOKEN_SQLCODE SQL_TOKEN_SQLERROR SQL_TOKEN_SUM
%token <pParseNode> SQL_TOKEN_TABLE SQL_TOKEN_TIME SQL_TOKEN_TIMESTAMP SQL_TOKEN_TIMEZONE_HOUR SQL_TOKEN_TIMEZONE_MINUTE SQL_TOKEN_TO SQL_TOKEN_TRAILING SQL_TOKEN_TRANSLATE SQL_TOKEN_TRIM SQL_TOKEN_TRUE SQL_TOKEN_UNION
%token <pParseNode> SQL_TOKEN_UNIQUE SQL_TOKEN_UNKNOWN SQL_TOKEN_UPDATE SQL_TOKEN_UPPER SQL_TOKEN_USAGE SQL_TOKEN_USER SQL_TOKEN_USING SQL_TOKEN_VALUES SQL_TOKEN_VIEW
-%token <pParseNode> SQL_TOKEN_WHERE SQL_TOKEN_WITH SQL_TOKEN_WORK SQL_TOKEN_YEAR SQL_TOKEN_ZONE
+%token <pParseNode> SQL_TOKEN_WHERE SQL_TOKEN_WITH SQL_TOKEN_WORK SQL_TOKEN_ZONE
/* ODBC KEYWORDS */
%token <pParseNode> SQL_TOKEN_CALL SQL_TOKEN_D SQL_TOKEN_FN SQL_TOKEN_T SQL_TOKEN_TS SQL_TOKEN_OJ
@@ -204,6 +189,22 @@
%token <pParseNode> SQL_TOKEN_LOG10 SQL_TOKEN_MOD SQL_TOKEN_PI SQL_TOKEN_POWER SQL_TOKEN_RADIANS SQL_TOKEN_RAND
%token <pParseNode> SQL_TOKEN_ROUND SQL_TOKEN_SIGN SQL_TOKEN_SIN SQL_TOKEN_SQRT SQL_TOKEN_TAN SQL_TOKEN_TRUNCATE
+
+ /* operators */
+%left SQL_TOKEN_NAME
+%left <pParseNode> SQL_TOKEN_OR
+%left <pParseNode> SQL_TOKEN_AND
+
+%left <pParseNode> LESSEQ GREATEQ NOTEQUAL LESS GREAT EQUAL /* '<' '>' = <> < > <= >= != */
+%left <pParseNode> '+' '-'
+%left <pParseNode> '*' '/'
+%left SQL_TOKEN_NATURAL SQL_TOKEN_CROSS SQL_TOKEN_FULL SQL_TOKEN_LEFT SQL_TOKEN_RIGHT
+%left ')'
+%right '='
+%right '.'
+%right '('
+
+
%token <pParseNode> SQL_TOKEN_INVALIDSYMBOL
/*%type <pParseNode> sql_single_statement */
@@ -3019,7 +3020,7 @@
}
else
YYERROR;
- }
+ };
%%

11
editors/openoffice/files/patch-cosv+source+strings+streamstr.cxx
View File

@ -1,11 +0,0 @@
--- ../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>

13
editors/openoffice/files/patch-desktop+source+pkgchk_packages.cxx Normal file
View File

@ -0,0 +1,13 @@
--- ../desktop/source/pkgchk/pkgchk_packages.cxx.orig Sun Jan 19 20:00:08 2003
+++ ../desktop/source/pkgchk/pkgchk_packages.cxx Sun Jan 19 20:01:51 2003
@@ -124,6 +124,10 @@
static char const s_platform_path [] = "/macosx_powerpc.plt";
#elif defined (NETBSD) && defined (SPARC)
static char const s_platform_path [] = "/netbsd_sparc.plt";
+#elif defined (FREEBSD) && defined (INTEL)
+static char const s_platform_path [] = "/freebsd_x86.plt";
+#elif defined (FREEBSD) && defined (SPARC)
+static char const s_platform_path [] = "/freebsd_sparc.plt";
#else
#error "unkonwn platform"
insert your platform identifier above; inserted for the case the preprocessor ignores error

34
editors/openoffice/files/patch-freetype+makefile.mk
View File

@ -1,24 +1,24 @@
--- ../freetype/makefile.mk.orig Tue Feb 26 12:21:37 2002
+++ ../freetype/makefile.mk Thu Aug 1 00:51:46 2002
@@ -79,7 +79,11 @@
--- ../freetype/makefile.mk.orig Fri Aug 16 17:28:36 2002
+++ ../freetype/makefile.mk Sat Jan 18 13:39:03 2003
@@ -86,7 +86,11 @@
.IF "$(GUI)"=="UNX"
#relative to CONFIGURE_DIR
CONFIGURE_ACTION=$(GNUMAKE)
.IF "$(GUI)"=="UNX"
-CONFIGURE_FLAGS=setup
+.IF "$(debug)"==""
+CONFIGURE_FLAGS=setup CFLAGS="-O"
+.ELSE # "$(debug)"==""
+.ELSE # "$(debug)"==""
+CONFIGURE_FLAGS=setup CFLAGS="-O -g -ggdb"
+.ENDIF # "$(debug)"==""
.ELSE # "$(GUI)"=="UNX"
CONFIGURE_FLAGS=setup visualc
.ENDIF # "$(GUI)"=="UNX"
@@ -90,7 +94,7 @@
.IF "$(GUI)"=="UNX"
OUT2LIB= \
objs$/.libs$/libfreetype.a \
- objs$/.libs$/libfreetype.so.6*
+ objs$/.libs$/libfreetype.so.7
.ENDIF # "$(GUI)"=="UNX"
+.ENDIF
BUILD_DIR=$(CONFIGURE_DIR)
BUILD_ACTION=$(GNUMAKE)
@@ -95,6 +99,8 @@
objs$/.libs$/libfreetype.a
.IF "$(OS)"=="MACOSX"
OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
+.ELIF "$(OS)"=="FREEBSD"
+OUT2LIB+=objs$/.libs$/libfreetype.so.7*
.ELSE
OUT2LIB+=objs$/.libs$/libfreetype.so.6*
.ENDIF # "$(OS)"=="MACOSX"

11
editors/openoffice/files/patch-idl+util+makefile.mk
View File

@ -1,11 +0,0 @@
--- ../idl/util/makefile.mk.orig Sun Jul 21 00:02:37 2002
+++ ../idl/util/makefile.mk Sun Jul 21 00:02:39 2002
@@ -110,7 +110,7 @@
.ENDIF
.ENDIF
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
APP1STDLIBS+=-lcrypt
.ENDIF

73
editors/openoffice/files/patch-nas+nas-1.4.1.patch
View File

@ -1,11 +1,41 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
+++ ../nas/nas-1.4.1.patch Thu Oct 31 10:17:40 2002
@@ -120,26 +120,157 @@
--- ../nas/nas-1.4.1.patch.orig Wed Jan 8 02:52:13 2003
+++ ../nas/nas-1.4.1.patch Sat Jan 18 17:55:19 2003
@@ -1,5 +1,5 @@
-*** misc/nas-1.4.1/config/NetAudio.tmpl Sat Mar 4 21:40:50 2000
---- misc/build/nas-1.4.1/config/NetAudio.tmpl Tue Jan 7 19:30:41 2003
+*** misc/nas-1.4.1/config/NetAudio.tmpl Sun Mar 5 03:40:50 2000
+--- misc/build/nas-1.4.1/config/NetAudio.tmpl Thu Nov 1 13:08:21 2001
***************
*** 166,171 ****
--- 166,177 ----
@@ -15,8 +15,8 @@
INCLUDESRC = $(TOP)/include
INCDIR = $(INCROOT)/audio
WIDGET_DIR = $(TOP)/clients/audio/widgets
-*** misc/nas-1.4.1/lib/audio/Alibint.c Sun Oct 24 13:45:21 1999
---- misc/build/nas-1.4.1/lib/audio/Alibint.c Tue Jan 7 19:30:41 2003
+*** misc/nas-1.4.1/lib/audio/Alibint.c Sun Oct 24 19:45:21 1999
+--- misc/build/nas-1.4.1/lib/audio/Alibint.c Thu Nov 1 13:11:51 2001
***************
*** 1336,1348 ****
static char *_SysErrorMsg (n)
@@ -40,8 +40,8 @@
}
#endif /* USL sharedlibs in don't define for AUD3.2 */
-*** misc/nas-1.4.1/lib/audio/Astreams.c Sat May 8 21:10:05 1999
---- misc/build/nas-1.4.1/lib/audio/Astreams.c Tue Jan 7 19:30:41 2003
+*** misc/nas-1.4.1/lib/audio/Astreams.c Sun May 9 03:10:05 1999
+--- misc/build/nas-1.4.1/lib/audio/Astreams.c Thu Nov 1 13:05:48 2001
***************
*** 51,59 ****
#include <errno.h>
@@ -120,59 +120,157 @@
return(-1);
}
-*** misc/nas-1.4.1/lib/audio/Imakefile Sat Jan 1 10:28:13 2000
---- misc/build/nas-1.4.1/lib/audio/Imakefile Thu Nov 1 13:12:56 2001
-*** misc/nas-1.4.1/lib/audio/Imakefile Sat Jan 1 04:28:13 2000
---- misc/build/nas-1.4.1/lib/audio/Imakefile Tue Jan 7 19:30:41 2003
-***************
-*** 25,30 ****
---- 25,32 ----
@ -27,6 +57,39 @@
- InstallMultiple($(HEADERS),$(INCDIR))
- #if ProjectX >= 5
- InstallNonExecFile(AuErrorDB,$(LIBDIR))
-*** misc/nas-1.4.1/server/dia/gram.y Sat Jan 1 22:35:49 2000
---- misc/build/nas-1.4.1/server/dia/gram.y Tue Jan 7 19:42:40 2003
-***************
-*** 119,132 ****
- }
- | MAXRATE number
- { ddaSetConfig(MAXRATE, (void *)$2); }
-! | MINRATE number
-! { ddaSetConfig(MINRATE, (void *)$2); }
-
- string : STRING { ptr = (char *)malloc(strlen($1)+1);
- strcpy(ptr, $1);
- RemoveDQuote(ptr);
- $$ = ptr;
-! }
- number : NUMBER { $$ = $1; }
- ;
-
---- 119,132 ----
- }
- | MAXRATE number
- { ddaSetConfig(MAXRATE, (void *)$2); }
-! | MINRATE number
-! { ddaSetConfig(MINRATE, (void *)$2); } ;
-
- string : STRING { ptr = (char *)malloc(strlen($1)+1);
- strcpy(ptr, $1);
- RemoveDQuote(ptr);
- $$ = ptr;
-! };
- number : NUMBER { $$ = $1; }
- ;
-
+--- misc/nas-1.4.1/Imakefile.orig Wed Mar 6 02:20:01 2002
++++ misc/build/nas-1.4.1/Imakefile Wed Mar 6 02:20:07 2002
+@@ -42,6 +42,8 @@

12
editors/openoffice/files/patch-product+inc+scp+udk_basefiles.scp
View File

@ -1,5 +1,5 @@
--- ../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
--- ../product/inc/scp/udk_basefiles.scp.orig Tue Jan 7 14:52:10 2003
+++ ../product/inc/scp/udk_basefiles.scp Sun Jan 19 22:37:05 2003
@@ -2,6 +2,7 @@
// Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment
@ -8,11 +8,11 @@
#if ( defined( _gcc3 ) && defined( C300 ) )
File gid_File_Lib_gcc
@@ -42,6 +43,7 @@
Name = STRING(libstdc++.so.3);
Styles = (NETWORK,RELATIVE);
@@ -34,6 +35,7 @@
End
+#endif
#endif
#endif
File gid_File_Lib_Sal

14
editors/openoffice/files/patch-product+settings+linux_gcc_settings.mk
View File

@ -1,14 +0,0 @@
--- ../product/settings/linux_gcc_settings.mk.orig Wed May 29 00:18:46 2002
+++ ../product/settings/linux_gcc_settings.mk Wed May 29 00:19:04 2002
@@ -3,9 +3,8 @@
OS=LINUX
PLATFORM=linux
PS=/
-CC=gcc
-LINK=gcc
-LIB=gcc
+LINK=$(CC)
+LIB=$(CC)
ECHO=@echo
MKDIR=mkdir -p
CAT=cat

95
editors/openoffice/files/patch-product+settings+settings.mk
View File

@ -1,26 +1,75 @@
--- ../product/settings/settings.mk.orig Wed May 29 00:16:16 2002
+++ ../product/settings/settings.mk Wed May 29 00:18:00 2002
@@ -83,9 +83,8 @@
--- ../product/settings/settings.mk.orig Sat Jan 18 18:23:17 2003
+++ ../product/settings/settings.mk Sat Jan 18 18:37:12 2003
@@ -225,3 +226,72 @@
OS=SOLARIS
PS=/
-CC=CC
-LINK=CC
-LIB=CC
endif
+ifeq "$(PLATFORM)" "FreeBSD"
+# Settings for Linux using gcc compiler
+
+OS=LINUX
+PLATFORM=linux
+PS=/
+LINK=$(CC)
+LIB=$(CC)
ECHO=@echo
MKDIR=mkdir -p
CAT=cat
@@ -136,9 +135,8 @@
OS=LINUX
PLATFORM=linux
PS=/
-CC=gcc
-LINK=gcc
-LIB=gcc
+LINK=$(CC)
+LIB=$(CC)
ECHO=@echo
MKDIR=mkdir -p
CAT=cat
+ECHO=@echo
+MKDIR=mkdir -p
+CAT=cat
+OBJ_EXT=o
+SHAREDLIB_EXT=so
+SHAREDLIB_PRE=lib
+SHAREDLIB_OUT=$(OUT_LIB)
+PACKAGE_LIB_DIR=linux_x86.plt
+
+GCC_VERSION=$(shell $(CC) -dumpversion)
+
+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3"
+COMID=gcc3
+CPPU_ENV=gcc3
+else
+COMID=GCC
+CPPU_ENV=gcc2
+endif
+
+OSEP=\<
+CSEP=\>
+
+DEL=rm -f
+DELRECURSIVE=rm -rf
+COPY=cp
+URLPREFIX=file://
+
+# Include UDK version numbers
+include $(PRJ)/include/udkversion.mk
+
+SALLIB=-lsal
+CPPULIB=-lcppu
+CPPUHELPERLIB=-lcppuhelper$(COMID)
+SALHELPERLIB=-lsalhelper$(COMID)
+STLPORTLIB=-lstlport_gcc
+
+EMPTYSTRING=
+PATH_SEPARATOR=:
+
+# -O is necessary for inlining (see gcc documentation)
+ifeq "$(DEBUG)" "yes"
+CC_FLAGS=-c -g
+else
+CC_FLAGS=-c -O
+endif
+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -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 -DLINUX -DCPPU_ENV=$(CPPU_ENV)
+
+# define for used compiler necessary for UNO
+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95
+#-DCPPU_ENV=gcc3 -- gcc3 3.0
+
+CC_OUTPUT_SWITCH=-o
+
+LIBRARY_LINK_FLAGS=-shared
+EXE_LINK_FLAGS=-Wl -export-dynamic
+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH)
+
+endif

30
editors/openoffice/files/patch-product+util+makefile.mk
View File

@ -1,34 +1,32 @@
--- ../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 @@
--- ../product/util/makefile.mk.orig Sat Jan 18 13:31:50 2003
+++ ../product/util/makefile.mk Sat Jan 18 13:30:54 2003
@@ -131,13 +131,6 @@
DESTDIRDLL=$(DESTDIRLIB)
STLPORTLIBNAME=libstlport_gcc.so
BINDINGDLL=$(COMNAME)_uno
-.IF "$(COMID)"=="gcc3"
-ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.3 \
- $(DESTDIRDLL)$/libstdc++.so.3.0.1
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3) \
- $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3)
-.ENDIF
.ELIF "$(OS)"=="NETBSD"
###########
@@ -498,6 +491,7 @@
#---------------------------------------------------------
# special targets for linux gcc3
@@ -491,6 +484,7 @@
# special targets for linux gcc3
.IF "$(COMID)"=="gcc3"
+.IF "$(OS)"=="LINUX"
.IF "$(CCNUMVER)">="000300010000"
+.IF "$(OS)"!="FREEBSD"
$(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) :
$(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT)
$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
@@ -526,6 +520,9 @@
@@ -514,6 +508,7 @@
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
-rm -f $@
+ln -s libgcc_s.so.1 $@
+
+.ENDIF
+
#-------------------------------------------------------------
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)

21
editors/openoffice/files/patch-sablot+Sablot-0.52.patch
View File

@ -1,25 +1,20 @@
--- ../sablot/Sablot-0.52.patch.orig Mon Mar 18 16:03:02 2002
+++ ../sablot/Sablot-0.52.patch Wed Apr 3 00:52:54 2002
--- ../sablot/Sablot-0.52.patch.orig Sun Jan 19 15:13:42 2003
+++ ../sablot/Sablot-0.52.patch Sun Jan 19 15:15:15 2003
@@ -3,7 +3,7 @@
***************
*** 1 ****
! dummy
---- 1,151 ----
+--- 1,156 ----
---- 1,159 ----
+--- 1,161 ----
! #*************************************************************************
! #
! # $RCSfile: makefile.mk,v $
@@ -90,8 +90,13 @@
! .ENDIF
!
@@ -96,6 +96,8 @@
! .IF "$(GUI)"=="UNX"
+! .IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
! .IF "$(OS)"=="NETBSD"
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
+! .ENDIF
+! .IF "$(OS)"=="FREEBSD"
+! .ELIF "$(OS)"=="FREEBSD"
+! CFLAGS+= -DHAVE_SYS_TIME_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
+! .ENDIF
! .ELSE
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE
! .ENDIF
! .IF "$(OS)"=="MACOSX"
! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_SYS_TIME_H -DHAVE_ISNAN -DHAVE_FINITE

13
editors/openoffice/files/patch-setup2+source+custom+jvmsetup+unx+jvmscan.cxx
View File

@ -1,13 +0,0 @@
--- ../setup2/source/custom/jvmsetup/unx/jvmscan.cxx.orig Wed Aug 14 00:19:33 2002
+++ ../setup2/source/custom/jvmsetup/unx/jvmscan.cxx Wed Aug 14 00:20:54 2002
@@ -117,7 +117,9 @@
/* some platforms have no hotspot yet even under jdk 1.3 */
/* so treat them like classic in JDK 1.2.x */
-#if defined(POWERPC) && defined(LINUX)
+#if defined(POWERPC) && defined(LINUX) || \
+ defined(INTEL) && defined(FREEBSD)
+
#define NO_HOTSPOT_USE_CLASSIC 1
#else
#undef NO_HOTSPOT_USE_CLASSIC

10
editors/openoffice/files/patch-solenv+bin+build.pl Normal file
View File

@ -0,0 +1,10 @@
--- ../solenv/bin/build.pl.orig Sun Jan 19 00:08:38 2003
+++ ../solenv/bin/build.pl Sun Jan 19 00:07:25 2003
@@ -292,7 +292,6 @@
cwd();
$! = 0;
system ("$dmake");
- &print_error("dmake - " . lc($!)) if ($!);
if ($? && ($? != -1) && (!$child)) {
&print_error("Error $? occurred while making $BuildDir");
};

44
editors/openoffice/files/patch-solenv+bin+getcompver.awk
View File

@ -1,44 +0,0 @@
--- ../solenv/bin/getcompver.awk.orig Tue May 28 13:09:01 2002
+++ ../solenv/bin/getcompver.awk Tue May 28 13:08:14 2002
@@ -61,9 +61,11 @@
#*************************************************************************
BEGIN {
CCversion = 0
+ compiler_matched = 0
}
# Sun c++ compiler
/Sun WorkShop/ {
+ compiler_matched = 1
# version number right after "C++"
x = match( $0, /C\+\+ .*/ )
btwn = substr( $0, RSTART, RLENGTH)
@@ -73,12 +75,28 @@
}
# Microsoft c++ compiler
/Microsoft.*..\...\...../ {
+ compiler_matched = 1
# match on the format of the ms versions ( dd.dd.dddd )
x = match( $0, /..\...\...../ )
CCversion = substr( $0, RSTART, RLENGTH)
}
+# Java
+/java version/ {
+ compiler_matched = 1
+ # match on the format of the java versions ( d[d].d[d].d[d] )
+ x = match( $0, /".*\..*\..*"/ )
+ CCversion = substr( $0, RSTART+1, RLENGTH-2)
+}
+/^[0-9]*[.][0-9]*$/ {
+ if ( compiler_matched == 0 ) {
+# need to blow to x.xx.xx for comparing
+ CCversion = $0 ".0"
+ }
+}
/^[0-9]*[.][0-9]*[.][0-9]*$/ {
- CCversion = $0
+ if ( compiler_matched == 0 ) {
+ CCversion = $0
+ }
}
END {
if ( num == "true" ) {

282
editors/openoffice/files/patch-solenv+inc+_tg_shl.mk
View File

@ -1,282 +0,0 @@
--- ../solenv/inc/_tg_shl.mk.orig Wed Jan 2 12:23:22 2002
+++ ../solenv/inc/_tg_shl.mk Tue May 28 12:02:12 2002
@@ -345,22 +345,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -770,22 +770,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -1195,22 +1195,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -1620,22 +1620,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -2045,22 +2045,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -2470,22 +2470,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -2895,22 +2895,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -3320,22 +3320,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -3745,22 +3745,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
@@ -4170,22 +4170,22 @@
.IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE
- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.ENDIF
.IF "$(OS)"=="MACOSX"
- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="IRIX"
- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"

141
editors/openoffice/files/patch-solenv+inc+pstrules.mk
View File

@ -1,141 +0,0 @@
--- ../solenv/inc/pstrules.mk.orig Thu Mar 14 17:40:59 2002
+++ ../solenv/inc/pstrules.mk Thu Mar 14 17:41:44 2002
@@ -80,15 +80,15 @@
.ENDIF
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
.IF "$(COM)"=="BLC"
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ENDIF
.ENDIF
@@ -108,15 +108,15 @@
.ENDIF
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
.IF "$(COM)"=="BLC"
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ENDIF
.ENDIF
@@ -142,15 +142,15 @@
.ENDIF
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
.IF "$(COM)"=="BLC"
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ENDIF
.ENDIF
@@ -159,23 +159,23 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF
.ELSE
.IF "$(GUI)"=="MAC"
@$(RM) $@
- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
.ELSE
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
@+echo.
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c
+ $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c
.ELSE
- $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
+ $(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
.ENDIF
$(SEMADEBUG)
.ENDIF
@@ -195,15 +195,15 @@
.ENDIF
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
.IF "$(COM)"=="BLC"
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ENDIF
.ENDIF
@@ -212,19 +212,19 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c
+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
.IF "$(GUI)"=="MAC"
@$(RM) $@
- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c
+ $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c
.ELSE
+$(TYPE) $(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c )
- $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c )
+ $(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c )
.ENDIF
.ENDIF
.ENDIF
@@ -246,7 +246,7 @@
@echo Making: $@
@+-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV)
.IF "$(GUI)"=="OS2"
- $(CC) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
+ $(CXX) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
.ENDIF
.IF "$(GUI)"=="WNT"
cpplcc -+ -P $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre

212
editors/openoffice/files/patch-solenv+inc+rules.mk
View File

@ -1,212 +0,0 @@
--- ../solenv/inc/rules.mk.orig Thu Mar 14 17:31:43 2002
+++ ../solenv/inc/rules.mk Thu Mar 14 17:38:38 2002
@@ -78,16 +78,16 @@
.ENDIF
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
@+echo.
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ELSE
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
.ENDIF
.ENDIF
@@ -98,16 +98,16 @@
.ENDIF
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
@+echo.
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp
.ELSE
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
.ENDIF
.ENDIF
@@ -122,17 +122,17 @@
.ENDIF
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF
.ELSE # "$(GUI)"=="UNX"
@+if exist $@ $(RM) /q $@ >& nul
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
@+echo.
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
.ENDIF # "$(GUI)"=="UNX"
$(SLO)$/%.obj : %.cpp
@@ -140,17 +140,17 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
@+echo.
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
.ENDIF
$(SLO)$/%.obj : $(MISC)$/%.cxx
@@ -158,16 +158,16 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF
.ELSE
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
@+echo.
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
.ENDIF
$(OBJ)$/%.obj : $(MISC)$/%.cxx
@@ -175,16 +175,16 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF
.ELSE
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
@+echo.
- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
.ENDIF
$(OBJ)$/%.obj : %.c
@@ -192,20 +192,20 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF
.ELSE
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
@+echo.
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c
+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c
.ELSE
+-@echo Cflags: $(CFLAGS)
- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
.ENDIF
$(SEMADEBUG)
.ENDIF
@@ -215,13 +215,13 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c
+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
@+echo.
- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
$(SEMADEBUG)
.ENDIF
@@ -230,16 +230,16 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c
+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
@+echo.
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c
+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c
.ELSE
- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
.ENDIF
$(SEMADEBUG)
.ENDIF
@@ -249,14 +249,14 @@
@echo Making: $@
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c
+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
@+if exist $@ $(RM) /q $@ >& nul
.IF "$(COM)"=="GCC"
- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c
+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c
.ELSE
- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c )
+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c )
.ENDIF
.ENDIF

19
editors/openoffice/files/patch-solenv+inc+settings.mk
View File

@ -1,19 +0,0 @@
--- ../solenv/inc/settings.mk.orig Fri Mar 8 10:23:21 2002
+++ ../solenv/inc/settings.mk Tue May 28 12:56:27 2002
@@ -166,7 +166,6 @@
CDEFSOPT=
HDEFS=
-CC=
.IF "$(add_cflags)"!=""
ENVCFLAGS+=$(add_cflags)
.ENDIF
@@ -264,8 +263,6 @@
AS=
BC=
COBOL=
-CPP=
-CXX=
FOR=
PASCAL=

20
editors/openoffice/files/patch-solenv+inc+target.mk
View File

@ -1,20 +0,0 @@
--- ../solenv/inc/target.mk.orig Mon Aug 26 01:29:21 2002
+++ ../solenv/inc/target.mk Mon Aug 26 01:28:23 2002
@@ -2139,7 +2139,7 @@
.IF "$(COMPVERMK)"!=""
.IF "$(UPDATER)"!=""
-"$(COMPVERMK)" : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg
+"$(COMPVERMK)" :
@echo COMNAME:=$(COMNAME) > $@
@echo COMID:=$(COMID) >> $@
@echo CCNUMVER:=$(CCNUMVER) >> $@
@@ -2778,7 +2778,7 @@
$(MISC)$/$(TARGET).dpz : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGETN) $(ZIP4TARGETN) $(ZIP5TARGETN) $(ZIP6TARGETN) $(ZIP7TARGETN) $(ZIP8TARGETN) $(ZIP9TARGETN)
.ENDIF
-$(INCCOM)$/_version.h : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg
+$(INCCOM)$/_version.h :
.IF "$(GUI)"=="UNX"
@+echo "#define" _BUILD \"$(BUILD)\" > $@
@+echo "#define" _UPD \"$(UPD)\" >> $@

15
editors/openoffice/files/patch-solenv+inc+tg_shl.mk
View File

@ -1,14 +1,11 @@
--- ../solenv/inc/tg_shl.mk.orig Wed Mar 13 20:40:10 2002
+++ ../solenv/inc/tg_shl.mk Wed Mar 13 20:41:10 2002
@@ -319,9 +319,9 @@
--- ../solenv/inc/tg_shl.mk.orig Tue Jan 7 16:22:13 2003
+++ ../solenv/inc/tg_shl.mk Sat Jan 18 12:51:58 2003
@@ -319,7 +319,7 @@
.IF "$(GUI)" == "WNT"
.IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC"
- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+ ${CC} -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ELSE
- cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
+ $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(UPDATER)"=="YES"
.IF "$(SHL$(TNR)DEFAULTRES)"!=""

8
editors/openoffice/files/patch-solenv+inc+unxfbsdi.mk
View File

@ -1,5 +1,5 @@
--- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001
+++ ../solenv/inc/unxfbsdi.mk Sun Jun 2 11:20:10 2002
--- ../solenv/inc/unxfbsdi.mk.orig Tue Jan 7 16:22:18 2003
+++ ../solenv/inc/unxfbsdi.mk Sat Jan 18 13:04:17 2003
@@ -1,84 +1,139 @@
-
# mak file fuer unxfbsdi
@ -56,8 +56,8 @@
+# environment with graphical user interface
+CFLAGSOBJGUIMT=-fPIC
-cc= gcc
-CC= g++
-CC= gcc
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
-CFLAGS+= -w -c $(INCLUDE)

40
editors/openoffice/files/patch-stlport+makefile.mk
View File

@ -1,32 +1,36 @@
--- ../stlport/makefile.mk.orig Tue Mar 19 15:49:17 2002
+++ ../stlport/makefile.mk Tue May 28 23:03:45 2002
@@ -106,11 +106,29 @@
--- ../stlport/makefile.mk.orig Tue Jan 7 13:13:37 2003
+++ ../stlport/makefile.mk Sat Jan 18 13:01:53 2003
@@ -98,16 +98,28 @@
.IF "$(COM)"=="GCC"
.IF "$(COMID)"=="gcc3"
+
+.IF "$(OS)"=="FREEBSD"
+BUILD_FLAGS=-f gcc-3.0-freebsd.mak
-BUILD_FLAGS=-f gcc-3.0.mak
+.IF # "$(OS)"=="FREEBSD"
+ BUILD_FLAGS=-f gcc-3.0-freebsd.mak
+.ELSE
BUILD_FLAGS=-f gcc-3.0.mak
+ BUILD_FLAGS=-f gcc-3.0.mak
+.ENDIF
+
.ELSE # "$(COMID)"=="gcc3"
+
+.IF "$(OS)"=="FREEBSD"
+BUILD_FLAGS=-f gcc-freebsd.mak
-# MacOS X/Darwin need a special makefile
+# FreeBSD / MacOS X/Darwin need a special makefile
.IF "$(OS)"=="MACOSX"
BUILD_FLAGS=-f gcc-apple-macosx.mak
-.ELSE # "$(OS)"=="MACOSX"
+.ELSIF # "$(OS)"=="FREEBSD"
+ BUILD_FLAGS=-f gcc-freebsd.mak
+.ELSE
BUILD_FLAGS=-f gcc.mak
+.ENDIF
+
BUILD_FLAGS=-f gcc.mak
-.ENDIF # "$(OS)"=="MACOSX"
+.ENDIF # "$(OS)"=="MACOSX || $(OS)"=="FREEBSD"
.ENDIF # "$(COMID)"=="gcc3"
-BUILD_ACTION=make
+
+.IF "$(OS)"=="FREEBSD"
+BUILD_ACTION=gmake
+ BUILD_ACTION=gmake
+.ELSE
BUILD_ACTION=make
+ BUILD_ACTION=make
+.ENDIF
+
# build in parallel
BUILD_FLAGS+= -j$(MAXPROCESS)
.ENDIF
.IF "$(COM)"=="C52"

13
editors/openoffice/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx
View File

@ -1,12 +1,11 @@
--- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed May 1 23:45:49 2002
+++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Wed May 1 23:48:17 2002
@@ -62,7 +62,9 @@
--- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Fri Aug 16 18:56:19 2002
+++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Sat Jan 18 13:06:16 2003
@@ -62,7 +62,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <dlfcn.h>
+#if !(defined NETBSD || defined FREEBSD)
-#ifndef MACOSX
+#if !(defined NETBSD || defined FREEBSD || defined MACOSX)
#include <alloca.h>
+#endif
#endif
#include <string.h>
/*

2490
editors/openoffice/files/patch-translation-ru
View File

File diff suppressed because it is too large Load Diff