Re-add previously deleted files.
This commit is contained in:
parent
5f6e7f6949
commit
a0ccee8b33
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=68300
1071 changed files with 90491 additions and 0 deletions
|
@ -0,0 +1,68 @@
|
|||
--- ../berkeleydb/db-3.2.9.patch.orig Fri Oct 18 22:02:26 2002
|
||||
+++ ../berkeleydb/db-3.2.9.patch Fri Oct 18 22:05:40 2002
|
||||
@@ -1,3 +1,13 @@
|
||||
+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig Fri Oct 18 21:46:44 2002
|
||||
++++ build/unxsols3.pro/db-3.2.9/dist/configure Fri Oct 18 21:48:47 2002
|
||||
+@@ -1795,6 +1795,7 @@
|
||||
+ case "$host_os" in
|
||||
+ solaris*) JINCSUBDIRS="solaris";;
|
||||
+ linux*) JINCSUBDIRS="linux genunix";;
|
||||
++ freebsd*) JINCSUBDIRS="freebsd genunix";;
|
||||
+ *) JINCSUBDIRS="genunix";;
|
||||
+ esac
|
||||
+
|
||||
*** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp Thu Jan 11 19:28:22 2001
|
||||
--- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp Mon Jun 11 15:50:55 2001
|
||||
***************
|
||||
@@ -43,3 +53,51 @@
|
||||
|
||||
CC= @MAKEFILE_CC@
|
||||
CCLINK= @MAKEFILE_CCLINK@
|
||||
+--- 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,23 @@
|
||||
+
|
||||
+ 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'
|
||||
+- else
|
||||
++ 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
|
||||
++ 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
|
||||
+ ;;
|
||||
+
|
||||
+@@ -2019,6 +2031,20 @@
|
||||
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
|
||||
+ soname_spec='${libname}${release}.so$major'
|
||||
+ dynamic_linker='NetBSD ld.elf_so'
|
||||
++ fi
|
||||
++ 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
|
||||
+ shlibpath_var=LD_LIBRARY_PATH
|
||||
+ ;;
|
|
@ -0,0 +1,10 @@
|
|||
--- ../bridges/prj/build.lst.orig Tue Oct 30 17:28:35 2001
|
||||
+++ ../bridges/prj/build.lst Fri Oct 18 22:13:04 2002
|
||||
@@ -13,5 +13,7 @@
|
||||
br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL
|
||||
br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes NULL
|
||||
br bridges\source\cpp_uno\gcc2_solaris_sparc nmake - u br_gccsols br_unotypes NULL
|
||||
+br bridges\source\cpp_uno\gcc2_freebsd_intel-sjlj nmake - u br_gccfi br_unotypes NULL
|
||||
+br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL
|
||||
br bridges\source\prot_uno nmake - all br_pruno br_unotypes NULL
|
||||
br bridges\source\java_uno nmake - all br_java_uno br_rcon NULL
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -0,0 +1,13 @@
|
|||
--- ../bridges/source/prot_uno/makefile.mk.orig Fri Oct 26 09:22:57 2001
|
||||
+++ ../bridges/source/prot_uno/makefile.mk Wed Mar 6 15:45:09 2002
|
||||
@@ -88,8 +88,8 @@
|
||||
SHL1VERSIONMAP=..$/bridge_exports.map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
- $(CPPULIB) \
|
||||
- $(SALLIB)
|
||||
+ $(SALLIB) \
|
||||
+ $(CPPULIB)
|
||||
|
||||
DEF1NAME=$(SHL1TARGET)
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
--- ../comphelper/util/makefile.mk.orig Tue Feb 19 13:26:37 2002
|
||||
+++ ../comphelper/util/makefile.mk Wed Apr 3 00:16:43 2002
|
||||
@@ -85,11 +85,11 @@
|
||||
|
||||
SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)
|
||||
SHL1STDLIBS=\
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
$(VOSLIB) \
|
||||
$(OSLLIB) \
|
||||
- $(SALLIB) \
|
||||
$(CPPRTLLIB)
|
||||
|
||||
.IF "$(OS)$(CPU)"=="SOLARISS"
|
|
@ -0,0 +1,48 @@
|
|||
--- configure.in.orig Wed Oct 2 21:22:53 2002
|
||||
+++ configure.in Sat Oct 19 00:09:27 2002
|
||||
@@ -356,6 +356,9 @@
|
||||
|
||||
dnl Set the include paths
|
||||
_gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
|
||||
+ if test "$_gcc_include_path" = "/usr/libexec/(null)/include"; then
|
||||
+ _gcc_include_path="/usr/include"
|
||||
+ fi
|
||||
fi
|
||||
|
||||
dnl ===================================================================
|
||||
@@ -374,20 +377,20 @@
|
||||
if test -z "$GNUMAKE"; then
|
||||
AC_MSG_WARN([not found build may fail]) >> warn
|
||||
else
|
||||
- _make_version=`make --version | grep GNU | $SED -e "s@^[[^0-9]]*@@" -e "s@ .*\\$@@" -e "s@,@@"`;
|
||||
+ _make_version=`gmake --version | grep GNU | $SED -e "s@^[[^0-9]]*@@" -e "s@ .*\\$@@" -e "s@,@@"`;
|
||||
_make_major=`echo $_make_version | $AWK -F. '{print $1;}'`
|
||||
_make_middle=`echo $_make_version | $AWK -F. '{ print $2; }'`
|
||||
_make_minor=`echo $_make_version | $AWK -F. '{ print $3; }'`
|
||||
if test "$_make_major" -gt "3" ; then
|
||||
- AC_MSG_RESULT([checked (make $_make_version)])
|
||||
+ AC_MSG_RESULT([checked (gmake $_make_version)])
|
||||
else
|
||||
if test "$_make_middle" -gt "79" ; then
|
||||
- AC_MSG_RESULT([checked (make $_make_version)])
|
||||
+ AC_MSG_RESULT([checked (gmake $_make_version)])
|
||||
else
|
||||
if test "$_make_minor" -ge "1" ; then
|
||||
- AC_MSG_RESULT([checked (make $_make_version)])
|
||||
+ AC_MSG_RESULT([checked (gmake $_make_version)])
|
||||
else
|
||||
- AC_MSG_ERROR([failed (make $_make_version need 3.79.1+)])
|
||||
+ AC_MSG_ERROR([failed (gmake $_make_version need 3.79.1+)])
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
@@ -551,6 +554,9 @@
|
||||
dnl ===================================================================
|
||||
if test "$GXX" = "yes"; then
|
||||
_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
|
||||
+ if test "$_gxx_include_path" = "/usr/libexec/(null)/include"; then
|
||||
+ _gxx_include_path="/usr/include"
|
||||
+ fi
|
||||
fi
|
||||
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Aug 19 19:23:47 2002
|
||||
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Oct 16 00:01:36 2002
|
||||
@@ -167,7 +167,9 @@
|
||||
|
||||
# --- MOZAB BASE Library -----------------------------------
|
||||
|
||||
+.IF "$(OS)"!="FREEBSD"
|
||||
SHL2VERSIONMAP= $(TARGET2).map
|
||||
+.ENDIF
|
||||
SHL2TARGET= $(TARGET2)$(MOZAB_MAJOR)
|
||||
SHL2OBJS=$(SLO2FILES)
|
||||
SHL2STDLIBS=\
|
|
@ -0,0 +1,8 @@
|
|||
--- ../cppu/prj/build.lst.orig Mon Mar 11 14:13:47 2002
|
||||
+++ ../cppu/prj/build.lst Mon Mar 11 14:14:30 2002
|
||||
@@ -1,4 +1,4 @@
|
||||
-cu cppu : codemaker udkapi NULL
|
||||
+cu cppu : codemaker udkapi offuh NULL
|
||||
cu cppu usr1 - all cu_mkout NULL
|
||||
cu cppu\source nmake - all cu_source NULL
|
||||
cu cppu\source\uno nmake - all cu_uno cu_source NULL
|
|
@ -0,0 +1,24 @@
|
|||
--- ../cppuhelper/source/makefile.mk.orig Mon Mar 11 22:17:52 2002
|
||||
+++ ../cppuhelper/source/makefile.mk Wed Apr 3 00:31:19 2002
|
||||
@@ -149,8 +149,8 @@
|
||||
SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
- $(CPPULIB) \
|
||||
- $(SALLIB)
|
||||
+ $(SALLIB) \
|
||||
+ $(CPPULIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB=i$(TARGET)
|
||||
@@ -175,6 +175,10 @@
|
||||
#SHL1VERSIONMAP=gcc2_freebsd_intel.map
|
||||
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
|
||||
SHL1VERSIONMAP=gcc3_linux_intel.map
|
||||
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
|
||||
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
|
||||
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
|
||||
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
|
||||
.ENDIF
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
|
@ -0,0 +1,244 @@
|
|||
--- ../dmake/unix/linux/gnu/make.sh.orig Wed Mar 13 20:32:53 2002
|
||||
+++ ../dmake/unix/linux/gnu/make.sh Wed Mar 13 20:33:00 2002
|
||||
@@ -3,188 +3,188 @@
|
||||
mkdir objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
|
||||
fi
|
||||
mv infer.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
|
||||
fi
|
||||
mv make.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
|
||||
fi
|
||||
mv stat.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
|
||||
fi
|
||||
mv expand.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
|
||||
fi
|
||||
mv dmstring.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
|
||||
fi
|
||||
mv hash.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
|
||||
fi
|
||||
mv dag.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
|
||||
fi
|
||||
mv dmake.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
|
||||
fi
|
||||
mv path.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
|
||||
fi
|
||||
mv imacs.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
|
||||
fi
|
||||
mv sysintf.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
|
||||
fi
|
||||
mv parse.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
|
||||
fi
|
||||
mv getinp.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
|
||||
fi
|
||||
mv quit.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
|
||||
fi
|
||||
mv state.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
|
||||
fi
|
||||
mv dmdump.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
|
||||
fi
|
||||
mv macparse.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
|
||||
fi
|
||||
mv rulparse.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
|
||||
fi
|
||||
mv percent.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
|
||||
fi
|
||||
mv function.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
|
||||
fi
|
||||
mv arlib.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
|
||||
fi
|
||||
mv dirbrk.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
|
||||
fi
|
||||
mv rmprq.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
|
||||
fi
|
||||
mv ruletab.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
|
||||
fi
|
||||
mv runargv.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
|
||||
fi
|
||||
mv dcache.o objects
|
||||
|
||||
-gcc -O -o dmake objects/infer.o objects/make.o objects/stat.o objects/expand.o \
|
||||
+${CC} ${CFLAGS} -O -o dmake objects/infer.o objects/make.o objects/stat.o objects/expand.o \
|
||||
objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
|
||||
objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
|
||||
objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
|
|
@ -0,0 +1,12 @@
|
|||
--- ../dtrans/source/X11/makefile.mk.orig Tue Dec 11 18:48:36 2001
|
||||
+++ ../dtrans/source/X11/makefile.mk Wed Apr 3 00:31:56 2002
|
||||
@@ -116,7 +116,8 @@
|
||||
APP1STDLIBS=\
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(SALLIB) \
|
||||
+ -lX11
|
||||
|
||||
.ENDIF # "$(OS)"=="MACOSX"
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
--- ../eventattacher/source/makefile.mk.orig Tue Jan 1 14:09:28 2002
|
||||
+++ ../eventattacher/source/makefile.mk
|
||||
@@ -110,10 +110,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(VOSLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(VOSLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
|
@ -0,0 +1,11 @@
|
|||
--- ../external/dt/dtpatch.sh.orig Wed Mar 13 17:09:43 2002
|
||||
+++ ../external/dt/dtpatch.sh Wed Mar 13 17:09:47 2002
|
||||
@@ -96,7 +96,7 @@
|
||||
done
|
||||
|
||||
chmod -R +w rtufiles/*.h
|
||||
- patch -i pat/editor.h.pat rtufiles/editor.h 2> newpatch
|
||||
+ patch < pat/editor.h.pat rtufiles/editor.h 2> newpatch
|
||||
|
||||
if test -s "patcherror"; then
|
||||
echo "Please install the SUNWdtinc Version 1.2 package on your Solaris machine" >> patcherror
|
|
@ -0,0 +1,11 @@
|
|||
--- ../external/npsdk/npsdkpatch.sh.orig Wed Mar 13 16:49:19 2002
|
||||
+++ ../external/npsdk/npsdkpatch.sh Wed Mar 13 16:49:39 2002
|
||||
@@ -121,7 +121,7 @@
|
||||
|
||||
for PNAME in `cat flist.pat`
|
||||
do
|
||||
- patch -i pat/$PNAME.pat rtufiles/$PNAME
|
||||
+ patch < pat/$PNAME.pat rtufiles/$PNAME
|
||||
done
|
||||
|
||||
#
|
|
@ -0,0 +1,15 @@
|
|||
--- ../freetype/makefile.mk.orig Fri Aug 16 17:28:36 2002
|
||||
+++ ../freetype/makefile.mk Fri Oct 18 20:06:42 2002
|
||||
@@ -95,9 +95,11 @@
|
||||
objs$/.libs$/libfreetype.a
|
||||
.IF "$(OS)"=="MACOSX"
|
||||
OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
|
||||
+.ELSEIF "$(OS)"=="FREEBSD"
|
||||
+OUT2LIB+=objs$/.libs$/libfreetype.so.7*
|
||||
.ELSE
|
||||
OUT2LIB+=objs$/.libs$/libfreetype.so.6*
|
||||
-.ENDIF # "$(OS)"=="MACOSX"
|
||||
+.ENDIF # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
|
||||
|
||||
.ELSE # "$(GUI)"=="UNX"
|
||||
.IF "$(USE_SHELL)"=="4nt"
|
|
@ -0,0 +1,14 @@
|
|||
--- ../javaunohelper/source/makefile.mk.orig Tue Jan 1 14:10:20 2002
|
||||
+++ ../javaunohelper/source/makefile.mk
|
||||
@@ -110,9 +110,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
176
editors/openoffice-1.1-devel/files/patch-nas:nas-1.4.1.patch
Normal file
176
editors/openoffice-1.1-devel/files/patch-nas:nas-1.4.1.patch
Normal file
|
@ -0,0 +1,176 @@
|
|||
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
|
||||
+++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
|
||||
@@ -120,26 +120,139 @@
|
||||
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
|
||||
-***************
|
||||
-*** 25,30 ****
|
||||
---- 25,32 ----
|
||||
-
|
||||
- #include "../../config/NetAudio.tmpl"
|
||||
-
|
||||
-+ CCOPTIONS += $(EXTRA_CCOPTIONS)
|
||||
-+
|
||||
- #if ProjectX < 5
|
||||
- /* Pre-X11R5 compatability */
|
||||
- #ifndef NormalLibX
|
||||
-***************
|
||||
-*** 119,124 ****
|
||||
---- 121,127 ----
|
||||
-
|
||||
- #endif
|
||||
- BuildIncludes($(HEADERS),audio,..)
|
||||
-+ BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.))
|
||||
- InstallMultiple($(HEADERS),$(INCDIR))
|
||||
- #if ProjectX >= 5
|
||||
- InstallNonExecFile(AuErrorDB,$(LIBDIR))
|
||||
+--- 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 @@
|
||||
+ @echo ""
|
||||
+ Date
|
||||
+ @echo ""
|
||||
++ @find . | egrep "\.(cxx|h|c)$$" | xargs \
|
||||
++ ${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
|
||||
+ $(MAKE) $(MFLAGS) Makefiles
|
||||
+ $(MAKE) $(MFLAGS) clean
|
||||
+ $(MAKE) $(MFLAGS) includes
|
||||
+--- misc/nas-1.4.1/clients/audio/audial/audial.c.orig Wed Nov 5 18:50:21 1997
|
||||
++++ misc/build/nas-1.4.1/clients/audio/audial/audial.c Wed Nov 5 18:56:33 1997
|
||||
+@@ -133,6 +133,7 @@
|
||||
+ signal(SIGALRM, SIG_DFL);
|
||||
+ }
|
||||
+
|
||||
++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
|
||||
+ static void
|
||||
+ usleep(usecs)
|
||||
+ unsigned int usecs;
|
||||
+@@ -149,7 +150,7 @@
|
||||
+ setitimer(ITIMER_REAL, &ntval, &otval);
|
||||
+ pause();
|
||||
+ }
|
||||
+-
|
||||
++#endif
|
||||
+ #endif /* SYSV else not */
|
||||
+ #endif /* VMS else not */
|
||||
+ #endif /* NEEDUSLEEP */
|
||||
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
|
||||
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
|
||||
+@@ -155,8 +155,10 @@
|
||||
+ #include <assert.h>
|
||||
+
|
||||
+ #ifdef __FreeBSD__
|
||||
+-# include <machine/soundcard.h>
|
||||
+-# include <machine/pcaudioio.h>
|
||||
++# include <sys/soundcard.h>
|
||||
++# ifdef __i386__
|
||||
++# include <machine/pcaudioio.h>
|
||||
++# endif
|
||||
+ #else
|
||||
+ # ifdef __NetBSD__
|
||||
+ # include <sys/ioctl.h>
|
||||
+@@ -610,7 +612,11 @@
|
||||
+
|
||||
+ if(sndStatOut.fd == -1)
|
||||
+ {
|
||||
++#ifdef __FreeBSD__
|
||||
++ while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR)) == -1 && wait)
|
||||
++#else
|
||||
+ while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR|O_SYNC)) == -1 && wait)
|
||||
++#endif
|
||||
+ {
|
||||
+ osLogMsg("openDevice: waiting on output device\n");
|
||||
+ sleep(1);
|
||||
+@@ -1230,6 +1236,11 @@
|
||||
+ /*
|
||||
+ * Setup soundcard at maximum audio quality.
|
||||
+ */
|
||||
++
|
||||
++#ifdef __FreeBSD__
|
||||
++#define NO_16_BIT_SAMPLING
|
||||
++#endif
|
||||
++
|
||||
+ static void setupSoundcard(sndStatPtr)
|
||||
+ SndStat* sndStatPtr;
|
||||
+ {
|
||||
+@@ -1380,7 +1391,11 @@
|
||||
+
|
||||
+ AL_initialized = AuTrue;
|
||||
+
|
||||
++#ifdef __FreeBSD__
|
||||
++ if ((fd = open(sndStatOut.device, O_RDWR, 0)) == -1) {
|
||||
++#else
|
||||
+ if ((fd = open(sndStatOut.device, O_RDWR|O_SYNC, 0)) == -1) {
|
||||
++#endif
|
||||
+ UNIDENTMSG;
|
||||
+ return AuFalse;
|
||||
+ }
|
||||
+--- misc/nas-1.4.1/clients/audio/auedit/Graph.c.orig Mon Oct 25 02:24:08 1999
|
||||
++++ misc/build/nas-1.4.1/clients/audio/auedit/Graph.c Sat Mar 25 14:56:23 2000
|
||||
+@@ -28,7 +28,7 @@
|
||||
+ */
|
||||
+
|
||||
+ #ifndef WIN32
|
||||
+-# ifdef __NetBSD__
|
||||
++# if defined(__NetBSD__) || defined(__FreeBSD__)
|
||||
+ # include <limits.h>
|
||||
+ # define MAXSHORT SHRT_MAX
|
||||
+ # define MINSHORT SHRT_MIN
|
||||
+--- misc/nas-1.4.1/lib/audio/Imakefile.orig Sun May 19 14:52:20 2002
|
||||
++++ misc/build/nas-1.4.1/lib/audio/Imakefile Sun May 19 14:54:25 2002
|
||||
+@@ -25,6 +25,8 @@
|
||||
+
|
||||
+ #include "../../config/NetAudio.tmpl"
|
||||
+
|
||||
++CCOPTIONS += $(EXTRA_CCOPTIONS)
|
||||
++
|
||||
+ #if ProjectX < 5
|
||||
+ /* Pre-X11R5 compatability */
|
||||
+ #ifndef NormalLibX
|
||||
+@@ -64,10 +66,14 @@
|
||||
+ COMPAT_OBJS = AuGetBest.o
|
||||
+ #endif /* ProjectX < 5 */
|
||||
+
|
||||
++#if HasBSD44Sockets
|
||||
++ SOCK_DEFINES = -DBSD44SOCKETS
|
||||
++#endif
|
||||
++
|
||||
+ EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
|
||||
+
|
||||
+ DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
|
||||
+- CONN_DEFINES = ConnectionFlags
|
||||
++ CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
|
||||
+
|
||||
+ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h \
|
||||
+ voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
|
||||
+@@ -119,6 +125,7 @@
|
||||
+
|
||||
+ #endif
|
||||
+ BuildIncludes($(HEADERS),audio,..)
|
||||
++BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.))
|
||||
+ InstallMultiple($(HEADERS),$(INCDIR))
|
||||
+ #if ProjectX >= 5
|
||||
+ InstallNonExecFile(AuErrorDB,$(LIBDIR))
|
||||
+--- misc/nas-1.4.1/config/NetAudio.def.orig Sun Feb 13 05:31:14 2000
|
||||
++++ misc/build/nas-1.4.1/config/NetAudio.def Fri Mar 24 04:55:49 2000
|
||||
+@@ -8,5 +8,5 @@
|
||||
+
|
||||
+ XCOMM Directory where NAS will look for it's config file(s)
|
||||
+ #ifndef NasConfigSearchPath
|
||||
+-#define NasConfigSearchPath /etc/nas/
|
||||
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
|
||||
+ #endif
|
||||
+--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
|
||||
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
|
||||
+@@ -120,7 +120,7 @@
|
||||
+
|
||||
+ void ddxUseMsg(void);
|
||||
+
|
||||
+-#if !defined(SVR4) && !defined(hpux) && !defined(linux) && !defined(AMOEBA) && !defined(_MINIX)
|
||||
++#if !defined(SVR4) && !defined(hpux) && !defined(linux) && !defined(AMOEBA) && !defined(_MINIX) && !defined(__FreeBSD__)
|
||||
+ extern char *sbrk();
|
||||
+ #endif
|
||||
+
|
|
@ -0,0 +1,18 @@
|
|||
--- ../odk/pack/unzip_udk/makefile.mk.orig Thu Aug 8 09:28:10 2002
|
||||
+++ ../odk/pack/unzip_udk/makefile.mk Fri Oct 18 20:14:46 2002
|
||||
@@ -44,9 +44,15 @@
|
||||
.ELSE
|
||||
$(GNUCOPY) -p $(UDKPATH) .
|
||||
$(GNUCOPY) -p $(ODKDOCPATH) .
|
||||
+.IF "$(OS)"=="FREEBSD"
|
||||
+ tar -xzf $(UDKZIPPREFIX).tar.gz
|
||||
+ +-$(RENAME) $(UDKNAME) $(ODKNAME)
|
||||
+ tar -xzf $(ODKDOCNAME).tar.gz
|
||||
+.ELSE
|
||||
gzip -df < $(UDKZIPPREFIX).tar.gz | tar -xvf -
|
||||
+-$(RENAME) $(UDKNAME) $(ODKNAME)
|
||||
gzip -df < $(ODKDOCNAME).tar.gz | tar -xvf -
|
||||
+.ENDIF
|
||||
.ENDIF
|
||||
.IF "$(BUILD_SOSL)"!=""
|
||||
# for OpenOffice build rename to PRODUCT_NAME
|
|
@ -0,0 +1,11 @@
|
|||
--- ../offapi/util/makefile.pmk.orig Mon Mar 11 01:37:55 2002
|
||||
+++ ../offapi/util/makefile.pmk Mon Mar 11 01:37:57 2002
|
||||
@@ -85,7 +85,7 @@
|
||||
|
||||
URDDOC=TRUE
|
||||
|
||||
-.IF "$(OS)"=="SOLARIS"
|
||||
+.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
|
||||
.IF "$(CPU)"=="I"
|
||||
UNOIDL=unoidl
|
||||
.ENDIF
|
|
@ -0,0 +1,11 @@
|
|||
--- ../product/util/makefile.mk.orig Wed Oct 2 21:24:25 2002
|
||||
+++ ../product/util/makefile.mk Wed Oct 16 00:02:13 2002
|
||||
@@ -521,7 +521,7 @@
|
||||
|
||||
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
|
||||
-rm -f $@
|
||||
- +ln -s libgcc_s.so.1 $@
|
||||
+ +ln -fs libgcc_s.so.1 $@
|
||||
#-------------------------------------------------------------
|
||||
|
||||
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
|
|
@ -0,0 +1,12 @@
|
|||
--- ../registry/source/regkey.cxx.orig Mon Mar 11 01:27:56 2002
|
||||
+++ ../registry/source/regkey.cxx Mon Mar 11 01:28:51 2002
|
||||
@@ -228,6 +228,9 @@
|
||||
{
|
||||
RegError _ret = REG_NO_ERROR;
|
||||
|
||||
+ if (!nSubKeys)
|
||||
+ return REG_NO_ERROR;
|
||||
+
|
||||
if (phSubKeys)
|
||||
{
|
||||
ORegistry* pReg = NULL;
|
|
@ -0,0 +1,14 @@
|
|||
--- ../remotebridges/source/unourl_resolver/makefile.mk.orig Tue Jan 1 14:11:01 2002
|
||||
+++ ../remotebridges/source/unourl_resolver/makefile.mk
|
||||
@@ -102,9 +102,9 @@
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
|
@ -0,0 +1,12 @@
|
|||
--- ../rsc/source/rscpp/cpp.h.orig Fri Mar 1 00:14:38 2002
|
||||
+++ ../rsc/source/rscpp/cpp.h Fri Mar 1 00:15:03 2002
|
||||
@@ -462,7 +462,9 @@
|
||||
extern char *strrchr();
|
||||
extern char *strchr();
|
||||
#if ! ( defined UNX && defined ALPHA )
|
||||
+#if ! ( defined FREEBSD )
|
||||
extern long time();
|
||||
+#endif
|
||||
#endif
|
||||
/* extern char *sprintf(); */ /* Lint needs this */
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
--- ../sablot/Sablot-0.52.patch.orig Mon Aug 19 17:09:12 2002
|
||||
+++ ../sablot/Sablot-0.52.patch Fri Oct 18 21:28:48 2002
|
||||
@@ -97,7 +97,7 @@
|
||||
! .IF "$(OS)"=="NETBSD"
|
||||
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
|
||||
! .ELSE
|
||||
-! .IF "$(OS)"=="MACOSX"
|
||||
+! .IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
|
||||
! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_SYS_TIME_H -DHAVE_ISNAN -DHAVE_FINITE
|
||||
! .ELSE
|
||||
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE
|
|
@ -0,0 +1,131 @@
|
|||
--- ../sal/osl/unx/nlsupport.c.orig Wed Apr 10 18:11:58 2002
|
||||
+++ ../sal/osl/unx/nlsupport.c Fri Oct 18 23:31:19 2002
|
||||
@@ -63,7 +63,7 @@
|
||||
#include <osl/diagnose.h>
|
||||
#include <osl/process.h>
|
||||
|
||||
-#if defined(LINUX) || defined(SOLARIS)
|
||||
+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(IRIX)
|
||||
#include <pthread.h>
|
||||
#include <locale.h>
|
||||
#include <langinfo.h>
|
||||
@@ -114,8 +114,7 @@
|
||||
comparison = _pair_compare( key, base + current );
|
||||
if (comparison < 0)
|
||||
upper = current;
|
||||
- else
|
||||
- if (comparison > 0)
|
||||
+ else if (comparison > 0)
|
||||
lower = current + 1;
|
||||
else
|
||||
return base + current;
|
||||
@@ -241,12 +240,13 @@
|
||||
return NULL;
|
||||
}
|
||||
|
||||
-#if defined(LINUX) || defined(SOLARIS)
|
||||
+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD)
|
||||
|
||||
/*
|
||||
* This implementation of osl_getTextEncodingFromLocale maps
|
||||
* from nl_langinfo(CODESET) to rtl_textencoding defines.
|
||||
- * nl_langinfo() is supported only on Linux and Solaris.
|
||||
+ * nl_langinfo() is supported only on Linux, Solaris and IRIX,
|
||||
+ * >= NetBSD 1.6 and >= FreeBSD 4.4
|
||||
*
|
||||
* This routine is SLOW because of the setlocale call, so
|
||||
* grab the result and cache it.
|
||||
@@ -260,6 +260,12 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+/*
|
||||
+ * _nl_language_list[] is an array list of supported encodings. Because
|
||||
+ * we are using a binary search, the list has to be in ascending order.
|
||||
+ * We are comparing the encodings case insensitiv, so the list has
|
||||
+ * to be completly upper- , or lowercase.
|
||||
+ */
|
||||
|
||||
#if defined(SOLARIS)
|
||||
|
||||
@@ -478,7 +484,79 @@
|
||||
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
|
||||
};
|
||||
|
||||
-#endif /* ifdef LINUX */
|
||||
+#elif defined(IRIX)
|
||||
+
|
||||
+const _pair _nl_language_list[] = {
|
||||
+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
|
||||
+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China */
|
||||
+ { "EUCGBK", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
|
||||
+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
|
||||
+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
|
||||
+ { "EUCTW", RTL_TEXTENCODING_EUC_TW }, /* Taiwan - Traditional Chinese */
|
||||
+ { "GBK", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
|
||||
+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
|
||||
+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
|
||||
+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
|
||||
+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
|
||||
+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
|
||||
+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
|
||||
+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS } /* Japan */
|
||||
+ };
|
||||
+
|
||||
+#elif defined(FREEBSD)
|
||||
+
|
||||
+const _pair _nl_language_list[] = {
|
||||
+ { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
|
||||
+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
|
||||
+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */
|
||||
+ { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */
|
||||
+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */
|
||||
+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
|
||||
+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
|
||||
+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
|
||||
+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
|
||||
+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
|
||||
+ { "ISO8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */
|
||||
+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
|
||||
+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
|
||||
+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
|
||||
+ { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */
|
||||
+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */
|
||||
+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */
|
||||
+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
|
||||
+ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */
|
||||
+ };
|
||||
+
|
||||
+#elif defined(NETBSD)
|
||||
+
|
||||
+const _pair _nl_language_list[] = {
|
||||
+ { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
|
||||
+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
|
||||
+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */
|
||||
+ { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */
|
||||
+ { "CTEXT", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
|
||||
+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */
|
||||
+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
|
||||
+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
|
||||
+ { "EUCTW", RTL_TEXTENCODING_EUC_TW }, /* China - Traditional Chinese */
|
||||
+ { "ISO-2022-JP", RTL_TEXTENCODING_DONTKNOW }, /* */
|
||||
+ { "ISO-2022-JP-2", RTL_TEXTENCODING_DONTKNOW }, /* */
|
||||
+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
|
||||
+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
|
||||
+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
|
||||
+ { "ISO8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */
|
||||
+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
|
||||
+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
|
||||
+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
|
||||
+ { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */
|
||||
+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */
|
||||
+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */
|
||||
+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
|
||||
+ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */
|
||||
+};
|
||||
+
|
||||
+#endif /* ifdef SOLARIS IRIX LINUX FREEBSD NETBSD */
|
||||
+
|
||||
|
||||
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
--- ../sal/osl/unx/pipe.c.orig Thu Jul 11 16:01:39 2002
|
||||
+++ ../sal/osl/unx/pipe.c Fri Oct 18 19:56:38 2002
|
||||
@@ -264,7 +264,11 @@
|
||||
|
||||
addr.sun_family = AF_UNIX;
|
||||
strncpy(addr.sun_path, name, sizeof(addr.sun_path));
|
||||
+#if defined(FREEBSD)
|
||||
+ len = SUN_LEN(&addr);
|
||||
+#else
|
||||
len = sizeof(addr);
|
||||
+#endif
|
||||
|
||||
if ( Options & osl_Pipe_CREATE )
|
||||
{
|
|
@ -0,0 +1,26 @@
|
|||
--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002
|
||||
+++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002
|
||||
@@ -82,12 +82,12 @@
|
||||
#undef HAVE_POLL_H
|
||||
#endif
|
||||
|
||||
-#if defined(LINUX) || defined (IRIX) || defined(NETBSD)
|
||||
+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD )
|
||||
#include <sys/poll.h>
|
||||
#define HAVE_POLL_H
|
||||
#endif /* HAVE_POLL_H */
|
||||
|
||||
-#if defined(SOLARIS) || defined ( FREEBSD )
|
||||
+#if defined(SOLARIS)
|
||||
#include <poll.h>
|
||||
#define HAVE_POLL_H
|
||||
#endif /* SOLARIS */
|
||||
@@ -1965,7 +1965,7 @@
|
||||
/*****************************************************************************/
|
||||
oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket)
|
||||
{
|
||||
-#ifdef LINUX
|
||||
+#ifdef LINUX || defined(FREEBSD)
|
||||
socklen_t AddrLen;
|
||||
#else
|
||||
/* mfe: Solaris 'cc +w' means Addrlen should be signed! */
|
127
editors/openoffice-1.1-devel/files/patch-sal::osl::unx::system.c
Normal file
127
editors/openoffice-1.1-devel/files/patch-sal::osl::unx::system.c
Normal file
|
@ -0,0 +1,127 @@
|
|||
--- ../sal/osl/unx/system.c.orig Sun Mar 17 12:34:13 2002
|
||||
+++ ../sal/osl/unx/system.c Wed Apr 3 01:03:36 2002
|
||||
@@ -195,6 +195,73 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
|
||||
+ size_t buflen, struct passwd **result)
|
||||
+{
|
||||
+ struct passwd* res;
|
||||
+
|
||||
+ pthread_mutex_lock(&getrtl_mutex);
|
||||
+
|
||||
+ if ( res = getpwuid(uid) )
|
||||
+ {
|
||||
+ size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
|
||||
+
|
||||
+ pw_name = strlen(res->pw_name)+1;
|
||||
+ pw_passwd = strlen(res->pw_passwd)+1;
|
||||
+ pw_class = strlen(res->pw_class)+1;
|
||||
+ pw_gecos = strlen(res->pw_gecos)+1;
|
||||
+ pw_dir = strlen(res->pw_dir)+1;
|
||||
+ pw_shell = strlen(res->pw_shell)+1;
|
||||
+
|
||||
+ if (pw_name+pw_passwd+pw_class+pw_gecos
|
||||
+ +pw_dir+pw_shell < buflen)
|
||||
+ {
|
||||
+ memcpy(pwd, res, sizeof(struct passwd));
|
||||
+
|
||||
+ strncpy(buffer, res->pw_name, pw_name);
|
||||
+ pwd->pw_name = buffer;
|
||||
+ buffer += pw_name;
|
||||
+
|
||||
+ strncpy(buffer, res->pw_passwd, pw_passwd);
|
||||
+ pwd->pw_passwd = buffer;
|
||||
+ buffer += pw_passwd;
|
||||
+
|
||||
+ strncpy(buffer, res->pw_class, pw_class);
|
||||
+ pwd->pw_class = buffer;
|
||||
+ buffer += pw_class;
|
||||
+
|
||||
+ strncpy(buffer, res->pw_gecos, pw_gecos);
|
||||
+ pwd->pw_gecos = buffer;
|
||||
+ buffer += pw_gecos;
|
||||
+
|
||||
+ strncpy(buffer, res->pw_dir, pw_dir);
|
||||
+ pwd->pw_dir = buffer;
|
||||
+ buffer += pw_dir;
|
||||
+
|
||||
+ strncpy(buffer, res->pw_shell, pw_shell);
|
||||
+ pwd->pw_shell = buffer;
|
||||
+ buffer += pw_shell;
|
||||
+
|
||||
+ *result = pwd ;
|
||||
+ res = 0 ;
|
||||
+
|
||||
+ } else {
|
||||
+
|
||||
+ res = ENOMEM ;
|
||||
+
|
||||
+ }
|
||||
+
|
||||
+ } else {
|
||||
+
|
||||
+ res = errno ;
|
||||
+
|
||||
+ }
|
||||
+
|
||||
+ pthread_mutex_unlock(&getrtl_mutex);
|
||||
+
|
||||
+ return res;
|
||||
+}
|
||||
+
|
||||
struct tm *localtime_r(const time_t *timep, struct tm *buffer)
|
||||
{
|
||||
struct tm* res;
|
||||
@@ -518,3 +585,50 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
+#if defined(NETBSD) || defined(FREEBSD)
|
||||
+char *fcvt(double value, int ndigit, int *decpt, int *sign)
|
||||
+{
|
||||
+ static char ret[256];
|
||||
+ char buf[256],zahl[256],format[256]="%";
|
||||
+ char *v1,*v2;
|
||||
+
|
||||
+ if (value==0.0) value=1e-30;
|
||||
+
|
||||
+ if (value<0.0) *sign=1; else *sign=0;
|
||||
+
|
||||
+ if (value<1.0)
|
||||
+ {
|
||||
+ *decpt=(int)log10(value);
|
||||
+ value*=pow(10.0,1-*decpt);
|
||||
+ ndigit+=*decpt-1;
|
||||
+ if (ndigit<0) ndigit=0;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ *decpt=(int)log10(value)+1;
|
||||
+ }
|
||||
+
|
||||
+ sprintf(zahl,"%d",ndigit);
|
||||
+ strcat(format,zahl);
|
||||
+ strcat(format,".");
|
||||
+ strcat(format,zahl);
|
||||
+ strcat(format,"f");
|
||||
+
|
||||
+ sprintf(buf,format,value);
|
||||
+
|
||||
+ if (ndigit!=0)
|
||||
+ {
|
||||
+ v1=strtok(buf,".");
|
||||
+ v2=strtok(NULL,".");
|
||||
+ strcpy(ret,v1);
|
||||
+ strcat(ret,v2);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ strcpy(ret,buf);
|
||||
+ }
|
||||
+
|
||||
+ return(ret);
|
||||
+}
|
||||
+
|
||||
+#endif
|
|
@ -0,0 +1,17 @@
|
|||
--- ../sal/osl/unx/system.h.orig Mon Mar 11 01:41:13 2002
|
||||
+++ ../sal/osl/unx/system.h Mon Mar 11 01:41:25 2002
|
||||
@@ -216,12 +216,9 @@
|
||||
# elif BYTE_ORDER == PDP_ENDIAN
|
||||
# define _PDP_ENDIAN
|
||||
# endif
|
||||
-# define sched_yield() pthread_yield()
|
||||
-# define pthread_testcancel()
|
||||
# define NO_PTHREAD_RTL
|
||||
-# define NO_PTHREAD_PRIORITY
|
||||
-# define CMD_ARG_PRG __progname
|
||||
-# define CMD_ARG_ENV environ
|
||||
+# define CMD_ARG_PROC_STREAM
|
||||
+# define CMD_ARG_PROC_NAME "/proc/%u/cmdline"
|
||||
#endif
|
||||
|
||||
#ifdef SCO
|
|
@ -0,0 +1,29 @@
|
|||
--- ../sal/workben/makefile.mk.orig Tue May 15 14:11:20 2001
|
||||
+++ ../sal/workben/makefile.mk Sun Mar 10 23:46:59 2002
|
||||
@@ -113,7 +113,7 @@
|
||||
|
||||
.IF "$(TESTAPP)" == "salstattest"
|
||||
|
||||
- CFLAGS+= /DUSE_SAL_STATIC
|
||||
+ CFLAGS+= -DUSE_SAL_STATIC
|
||||
|
||||
OBJFILES= $(OBJ)$/salstattest.obj
|
||||
|
||||
@@ -325,7 +325,7 @@
|
||||
# tgetpwnam
|
||||
#
|
||||
.IF "$(TESTAPP)" == "tgetpwnam"
|
||||
-.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
|
||||
+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
|
||||
|
||||
CXXFILES= tgetpwnam.cxx
|
||||
OBJFILES= $(OBJ)$/tgetpwnam.obj
|
||||
@@ -335,7 +335,7 @@
|
||||
APP5STDLIBS=$(SALLIB)
|
||||
APP5DEPN= $(SLB)$/sal.lib
|
||||
|
||||
-.ENDIF # (sco | netbsd)
|
||||
+.ENDIF # (sco | netbsd | freebsd)
|
||||
.ENDIF # tgetpwname
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
|
@ -0,0 +1,13 @@
|
|||
--- ../salhelper/source/makefile.mk.orig Wed Nov 14 14:19:21 2001
|
||||
+++ ../salhelper/source/makefile.mk Sun Mar 3 17:58:15 2002
|
||||
@@ -109,6 +109,10 @@
|
||||
SHL1VERSIONMAP=lngi.map
|
||||
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
|
||||
SHL1VERSIONMAP=gcc3_linux_intel.map
|
||||
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
|
||||
+SHL1VERSIONMAP=gcc2_freebsd_intel.map
|
||||
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
|
||||
+SHL1VERSIONMAP=gcc3_freebsd_intel.map
|
||||
.ENDIF
|
||||
|
||||
|
242
editors/openoffice-1.1-devel/files/patch-set_soenv.1
Normal file
242
editors/openoffice-1.1-devel/files/patch-set_soenv.1
Normal file
|
@ -0,0 +1,242 @@
|
|||
--- set_soenv.1.orig Fri Aug 16 12:21:58 2002
|
||||
+++ set_soenv.1 Fri Oct 18 22:56:36 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,16 @@
|
||||
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, $RSC_ONCE );
|
||||
#
|
||||
# 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 );
|
||||
+ $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 +98,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 +147,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.
|
||||
@@ -336,7 +342,14 @@
|
||||
$COMPATH = $ARGV[ 0 ];
|
||||
$CPU = "I";
|
||||
$CPUNAME = "INTEL";
|
||||
+if ($USE_GCC3 eq "TRUE")
|
||||
+ {
|
||||
+ $CVER = "C300";
|
||||
+ }
|
||||
+else
|
||||
+ {
|
||||
$CVER = "C295";
|
||||
+}
|
||||
$DLLSUFFIX = "fi";
|
||||
$GUI = "UNX";
|
||||
$GUIBASE = "unx";
|
||||
@@ -349,6 +362,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";
|
||||
@@ -934,7 +950,7 @@
|
||||
$ps.$JRETHREADDIR.
|
||||
$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.$JRELIBDIR.
|
||||
@@ -945,6 +961,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.
|
||||
@@ -986,15 +1009,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".
|
||||
@@ -1011,7 +1035,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.
|
||||
@@ -1021,6 +1045,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.'"';
|
||||
@@ -1099,7 +1128,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.
|
||||
@@ -1118,6 +1147,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.
|
||||
+ $ps.$USR_LOCAL.$BIN.
|
||||
+ $ps.$USR_LOCAL.$ds."sbin";
|
||||
+
|
||||
+ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
|
||||
+
|
||||
+ $PATH .= $ps.$USR.$ds."sbin".
|
||||
+ $ps.$USR.$ds."X11R6".$ds."bin".
|
||||
+ $ps.$USR.$LIB;
|
||||
+}
|
||||
+
|
||||
elsif ($platform eq "$Winnt")
|
||||
{
|
||||
my ( $noldPATH );
|
||||
@@ -1227,7 +1272,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.
|
||||
@@ -1242,6 +1287,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.
|
||||
@@ -1280,7 +1334,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;
|
||||
@@ -1294,11 +1348,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;
|
||||
|
||||
@@ -1501,6 +1550,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" );
|
||||
@@ -1515,6 +1570,9 @@
|
||||
ToFile( "SET_EXCEPTIONS", $SET_EXCEPTIONS, "e" );
|
||||
ToFile( "emergency", $emergency, "e" );
|
||||
ToFile( "use_shl_versions", $use_shl_versions, "e" );
|
||||
+if ($ENABLE_DEBUG eq "TRUE") {
|
||||
+ToFile( "debug", "true", "e" );
|
||||
+}
|
||||
#
|
||||
# Writing the variables to file.
|
||||
# (c = comment, e = environment variable, a = alias, n = newline )
|
|
@ -0,0 +1,17 @@
|
|||
--- ../setup2/mow/source/loader/loader.c.orig Thu Dec 13 17:44:58 2001
|
||||
+++ ../setup2/mow/source/loader/loader.c Wed Apr 3 01:07:58 2002
|
||||
@@ -615,6 +615,14 @@
|
||||
" LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
|
||||
" export LD_LIBRARY_PATH\n" \
|
||||
" ;;\n" \
|
||||
+" FreeBSD)\n" \
|
||||
+" LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
|
||||
+" export LD_LIBRARY_PATH\n" \
|
||||
+" ;;\n" \
|
||||
+" NetBSD)\n" \
|
||||
+" LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
|
||||
+" export LD_LIBRARY_PATH\n" \
|
||||
+" ;;\n" \
|
||||
" *)\n" \
|
||||
" ;;\n" \
|
||||
"esac\n" \
|
|
@ -0,0 +1,11 @@
|
|||
--- ../setup2/mow/source/loader/makefile.mk.orig Sun Mar 3 01:45:18 2002
|
||||
+++ ../setup2/mow/source/loader/makefile.mk Sun Mar 3 01:45:22 2002
|
||||
@@ -85,7 +85,7 @@
|
||||
APP1NOSAL=TRUE
|
||||
APP1TARGET= $(TARGET)
|
||||
APP1OBJS= $(OBJFILES)
|
||||
-APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB)
|
||||
+APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB) -lX11
|
||||
|
||||
.ENDIF # "$(OS)"=="MACOSX"
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
--- ../setup2/script/setupserver.orig Fri Nov 17 12:29:29 2000
|
||||
+++ ../setup2/script/setupserver Fri Oct 18 23:47:09 2002
|
||||
@@ -234,6 +234,7 @@
|
||||
sd_platform=`uname -s`
|
||||
case $sd_platform in
|
||||
SCO_SV) test=/bin/test ;;
|
||||
+ FreeBSD) test=/bin/test ;;
|
||||
*) test=/usr/bin/test ;;
|
||||
esac
|
||||
sd_cwd="`pwd`"
|
|
@ -0,0 +1,10 @@
|
|||
--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Fri Jun 14 15:36:11 2002
|
||||
+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Fri Oct 18 23:45:45 2002
|
||||
@@ -65,6 +65,7 @@
|
||||
sd_platform=`uname -s`
|
||||
case $sd_platform in
|
||||
SCO_SV) test=/bin/test ;;
|
||||
+ FreeBSD) test=/bin/test ;;
|
||||
*) test=/usr/bin/test ;;
|
||||
esac
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
--- ../shell/source/cmdmail/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/cmdmail/makefile.mk
|
||||
@@ -81,9 +81,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
--- ../shell/source/proxysettings/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/proxysettings/makefile.mk
|
||||
@@ -85,9 +85,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
--- ../shell/source/unix/exec/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/unix/exec/makefile.mk
|
||||
@@ -79,9 +79,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
--- ../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=
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
--- /dev/null Mon Mar 11 14:55:01 2002
|
||||
+++ ../solenv/inc/startup/FREEBSD/macros.mk Mon Mar 11 14:54:59 2002
|
||||
@@ -0,0 +1,2 @@
|
||||
+
|
||||
+.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
|
|
@ -0,0 +1,12 @@
|
|||
--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002
|
||||
+++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002
|
||||
@@ -81,7 +81,9 @@
|
||||
.ENDIF # "$(GUI)"=="WNT"
|
||||
|
||||
.IF "$(OS)"!="NETBSD"
|
||||
+.IF "$(OS)"!="FREEBSD"
|
||||
PATCHFLAGS=-b
|
||||
+.ENDIF # "$(OS)"=="FREEBSD"
|
||||
.ENDIF # "$(OS)"=="NETBSD"
|
||||
|
||||
#override
|
|
@ -0,0 +1,209 @@
|
|||
--- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001
|
||||
+++ ../solenv/inc/unxfbsdi.mk Sun Jun 2 11:20:10 2002
|
||||
@@ -1,84 +1,139 @@
|
||||
-
|
||||
# mak file fuer unxfbsdi
|
||||
|
||||
-ASM=
|
||||
-AFLAGS=
|
||||
+ASM=$(CC)
|
||||
+AFLAGS=-x assembler-with-cpp -c $(CDEFS)
|
||||
|
||||
SOLAR_JAVA=TRUE
|
||||
JAVAFLAGSDEBUG=-g
|
||||
|
||||
+# filter for supressing verbose messages from linker
|
||||
+# not needed at the moment
|
||||
LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
|
||||
|
||||
+# options for C and C++ Compiler
|
||||
+CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION)
|
||||
+CDEFS+=$(PTHREAD_CFLAGS)
|
||||
+
|
||||
+# this is a platform with JAVA support
|
||||
+.IF "$(SOLAR_JAVA)"!=""
|
||||
+JAVADEF=-DSOLAR_JAVA
|
||||
+.IF "$(debug)"==""
|
||||
+JAVA_RUNTIME=-ljava
|
||||
+.ELSE
|
||||
+JAVA_RUNTIME=-ljava_g
|
||||
+.ENDIF
|
||||
+.ENDIF
|
||||
+
|
||||
+# flags for C and C++ Compiler
|
||||
+CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
|
||||
+CFLAGS+=-I/usr/X11R6/include
|
||||
+
|
||||
+# flags for the C++ Compiler
|
||||
+CFLAGSCC=-pipe
|
||||
+CFLAGSCXX=-pipe -fno-for-scope -fpermissive
|
||||
+
|
||||
+# Flags for enabling exception handling
|
||||
+CFLAGSEXCEPTIONS=-fexceptions
|
||||
+
|
||||
+# Flags for disabling exception handling
|
||||
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
|
||||
+
|
||||
+# Compiler flags for compiling static object in single threaded
|
||||
+# environment with graphical user interface
|
||||
+CFLAGSOBJGUIST=-fPIC
|
||||
+
|
||||
+# Compiler flags for compiling static object in single threaded
|
||||
+# environment with character user interface
|
||||
+CFLAGSOBJCUIST=-fPIC
|
||||
+
|
||||
+# Compiler flags for compiling static object in multi threaded
|
||||
+# environment with graphical user interface
|
||||
+CFLAGSOBJGUIMT=-fPIC
|
||||
|
||||
-cc= gcc
|
||||
-CC= g++
|
||||
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
|
||||
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
|
||||
-CFLAGS+= -w -c $(INCLUDE)
|
||||
-CFLAGS+= -I/usr/X11R6/include
|
||||
-CFLAGSCC= -pipe
|
||||
-CFLAGSCXX= -pipe -fno-for-scope -fpermissive
|
||||
-CFLAGSEXCEPTIONS= -fexceptions
|
||||
-CFLAGS_NO_EXCEPTIONS= -fno-exceptions
|
||||
-CFLAGSOBJGUIST= -fPIC
|
||||
-CFLAGSOBJCUIST= -fPIC
|
||||
-CFLAGSOBJGUIMT= -fPIC
|
||||
-CFLAGSOBJCUIMT= -fPIC
|
||||
-CFLAGSSLOGUIMT= -fPIC
|
||||
-CFLAGSSLOCUIMT= -fPIC
|
||||
-CFLAGSPROF= -pg
|
||||
-CFLAGSDEBUG= -g
|
||||
+# Compiler flags for compiling static object in multi threaded
|
||||
+# environment with character user interface
|
||||
+CFLAGSOBJCUIMT=-fPIC
|
||||
+
|
||||
+# Compiler flags for compiling shared object in multi threaded
|
||||
+# environment with graphical user interface
|
||||
+CFLAGSSLOGUIMT=-fPIC
|
||||
+
|
||||
+# Compiler flags for compiling shared object in multi threaded
|
||||
+# environment with character user interface
|
||||
+CFLAGSSLOCUIMT=-fPIC
|
||||
+
|
||||
+# Compiler flags for profiling
|
||||
+CFLAGSPROF=-pg
|
||||
+
|
||||
+# Compiler flags for debugging
|
||||
+CFLAGSDEBUG=-g -ggdb
|
||||
CFLAGSDBGUTIL=
|
||||
-CFLAGSOPT= -O2
|
||||
-CFLAGSNOOPT= -O
|
||||
-CFLAGSOUTOBJ= -o
|
||||
-
|
||||
-STATIC= -Wl,-Bstatic
|
||||
-DYNAMIC= -Wl,-Bdynamic
|
||||
-
|
||||
-#THREADLIB= -pthread
|
||||
-LINK= gcc
|
||||
-# -v -nostdlib
|
||||
+
|
||||
+# Compiler flags to enable optimizations
|
||||
+# -02 is broken for FreeBSD
|
||||
+CFLAGSOPT=-O
|
||||
+
|
||||
+# Compiler flags to disable optimizations
|
||||
+# -0 is broken for STLport
|
||||
+CFLAGSNOOPT=-O0
|
||||
+
|
||||
+# Compiler flags for the output path
|
||||
+CFLAGSOUTOBJ=-o
|
||||
+
|
||||
+# switches for dynamic and static linking
|
||||
+STATIC=-Wl,-Bstatic
|
||||
+DYNAMIC=-Wl,-Bdynamic
|
||||
+
|
||||
+LINK=$(CXX)
|
||||
LINKFLAGS=
|
||||
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
|
||||
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
|
||||
+
|
||||
+# linker flags for linking applications
|
||||
+LINKFLAGSAPPGUI=
|
||||
+LINKFLAGSAPPCUI=
|
||||
+
|
||||
+# linker flags for linking shared libraries
|
||||
LINKFLAGSSHLGUI= -shared
|
||||
LINKFLAGSSHLCUI= -shared
|
||||
LINKFLAGSTACK=
|
||||
LINKFLAGSPROF=
|
||||
LINKFLAGSDEBUG=-g
|
||||
-LINKFLAGSOPT=
|
||||
+LINKFLAGSOPT=-O
|
||||
|
||||
.IF "$(NO_BSYMBOLIC)"==""
|
||||
.IF "$(PRJNAME)" != "envtest"
|
||||
-LINKFLAGSSHLGUI+= -Wl,-Bsymbolic
|
||||
-LINKFLAGSSHLCUI+= -Wl,-Bsymbolic
|
||||
+LINKFLAGSSHLGUI+=-Wl,-Bsymbolic
|
||||
+LINKFLAGSSHLCUI+=-Wl,-Bsymbolic
|
||||
.ENDIF
|
||||
.ENDIF
|
||||
|
||||
LINKVERSIONMAPFLAG=-Wl,--version-script
|
||||
|
||||
+# Sequence of libs does matter !
|
||||
STDLIBCPP=-lstdc++
|
||||
|
||||
-# _SYSLIBS= -L/usr/lib -lm
|
||||
-# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11
|
||||
-# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib
|
||||
+# libraries for linking applications
|
||||
+STDLIBCUIST=-lm
|
||||
+STDLIBGUIST=-lXaw -lXt -lX11 -lm
|
||||
+STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm -lstlport_gcc
|
||||
+STDLIBCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc
|
||||
+
|
||||
+# libraries for linking shared libraries
|
||||
+STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm -lstlport_gcc
|
||||
+STDSHLCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc
|
||||
+
|
||||
+# STLport always needs pthread.
|
||||
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS)
|
||||
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
|
||||
|
||||
+# default objectfilenames to lin
|
||||
STDOBJGUI=
|
||||
STDSLOGUI=
|
||||
STDOBJCUI=
|
||||
STDSLOCUI=
|
||||
|
||||
-STDLIBCUIST=-lm
|
||||
-STDLIBGUIST=-lX11 -lm
|
||||
-STDLIBGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc
|
||||
-STDLIBCUIMT=-pthread -lm -lstlport_gcc
|
||||
-STDSHLGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc
|
||||
-STDSHLCUIMT=-pthread -lm -lstlport_gcc
|
||||
-
|
||||
-LIBMGR= ar
|
||||
-LIBFLAGS= -r
|
||||
-LIBEXT= .a
|
||||
+LIBMGR=ar
|
||||
+LIBFLAGS=-r
|
||||
+LIBEXT=.a
|
||||
|
||||
IMPLIB=
|
||||
IMPLIBFLAGS=
|
||||
@@ -87,12 +142,12 @@
|
||||
MAPSYMFLAGS=
|
||||
|
||||
RC=irc
|
||||
-RCFLAGS= -fo$@ $(RCFILES)
|
||||
+RCFLAGS=-fo$@ $(RCFILES)
|
||||
RCLINK=
|
||||
RCLINKFLAGS=
|
||||
RCSETVERSION=
|
||||
|
||||
-DLLPOSTFIX= fi
|
||||
-DLLPRE= lib
|
||||
-DLLPOST= .so
|
||||
-LDUMP=
|
||||
+# platform specific identifier for shared libs
|
||||
+DLLPOSTFIX=fi
|
||||
+DLLPRE=lib
|
||||
+DLLPOST=.so
|
|
@ -0,0 +1,12 @@
|
|||
--- ../soltools/mkdepend/main.c.orig Mon Apr 15 15:55:43 2002
|
||||
+++ ../soltools/mkdepend/main.c Mon Apr 15 16:54:06 2002
|
||||
@@ -27,6 +27,9 @@
|
||||
|
||||
*/
|
||||
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/stat.h>
|
||||
+
|
||||
#include "def.h"
|
||||
#ifdef hpux
|
||||
#define sigvec sigvector
|
|
@ -0,0 +1,14 @@
|
|||
--- ../stoc/source/corereflection/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/corereflection/makefile.mk
|
||||
@@ -87,9 +87,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
|
@ -0,0 +1,14 @@
|
|||
--- ../stoc/source/defaultregistry/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/defaultregistry/makefile.mk
|
||||
@@ -84,9 +84,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
||||
SHL1DEPN=
|
|
@ -0,0 +1,11 @@
|
|||
--- ../stoc/source/implementationregistration/implreg.cxx.orig Tue Apr 16 19:54:58 2002
|
||||
+++ ../stoc/source/implementationregistration/implreg.cxx Tue Apr 16 19:55:26 2002
|
||||
@@ -60,6 +60,8 @@
|
||||
************************************************************************/
|
||||
#include <list>
|
||||
|
||||
+#include <unistd.h>
|
||||
+
|
||||
#ifndef _CPPUHELPER_QUERYINTERFACE_HXX_
|
||||
#include <cppuhelper/queryinterface.hxx>
|
||||
#endif
|
|
@ -0,0 +1,14 @@
|
|||
--- ../stoc/source/implementationregistration/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/implementationregistration/makefile.mk
|
||||
@@ -85,9 +85,9 @@
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
|
@ -0,0 +1,14 @@
|
|||
--- ../stoc/source/inspect/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/inspect/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
|
@ -0,0 +1,14 @@
|
|||
--- ../stoc/source/invocation/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/invocation/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1DEPN=
|
|
@ -0,0 +1,14 @@
|
|||
--- ../stoc/source/invocation_adapterfactory/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/invocation_adapterfactory/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
--- ../stoc/source/javaloader/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/javaloader/makefile.mk
|
||||
@@ -83,9 +83,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS=\
|
||||
+ $(SALLIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(CPPULIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPULIB)
|
||||
+
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
|
@ -0,0 +1,15 @@
|
|||
--- ../stoc/source/javavm/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/javavm/makefile.mk
|
||||
@@ -91,10 +91,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(UNOLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(UNOLIB)
|
||||
|
||||
.IF "$(GUI)"=="WNT"
|
||||
SHL1STDLIBS += advapi32.lib
|
|
@ -0,0 +1,14 @@
|
|||
--- ../stoc/source/loader/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/loader/makefile.mk
|
||||
@@ -83,9 +83,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1DEPN=
|
|
@ -0,0 +1,14 @@
|
|||
--- ../stoc/source/namingservice/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/namingservice/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
--- ../stoc/source/proxy_factory/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/proxy_factory/makefile.mk
|
||||
@@ -85,9 +85,9 @@
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB=i$(TARGET)
|
|
@ -0,0 +1,15 @@
|
|||
--- ../stoc/source/registry_tdprovider/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/registry_tdprovider/makefile.mk
|
||||
@@ -88,10 +88,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(SALHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(SALHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
|
@ -0,0 +1,14 @@
|
|||
--- ../stoc/source/servicemanager/makefile.mk.orig Tue Jan 1 14:12:03 2002
|
||||
+++ ../stoc/source/servicemanager/makefile.mk
|
||||
@@ -84,9 +84,9 @@
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
|
@ -0,0 +1,15 @@
|
|||
--- ../stoc/source/tdmanager/makefile.mk.orig Tue Jan 1 14:12:03 2002
|
||||
+++ ../stoc/source/tdmanager/makefile.mk
|
||||
@@ -83,9 +83,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
+
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1DEPN=
|
|
@ -0,0 +1,14 @@
|
|||
--- ../stoc/source/typeconv/makefile.mk.orig Tue Jan 1 14:12:03 2002
|
||||
+++ ../stoc/source/typeconv/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
|
@ -0,0 +1,23 @@
|
|||
--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002
|
||||
+++ ../tools/bootstrp/makefile.mk
|
||||
@@ -83,6 +83,15 @@
|
||||
@echo No bootstrp for Mac OS
|
||||
.ELSE # "$(OS)"=="MACOS"
|
||||
|
||||
+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
|
||||
+ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR
|
||||
+ @echo ""
|
||||
+$(LB)$/libgcc_pic.a:
|
||||
+ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc_pic.a $(LB)$/libgcc_pic.a
|
||||
+$(LB)$/libgcc.a:
|
||||
+ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a
|
||||
+.ENDIF
|
||||
+
|
||||
OBJFILES= \
|
||||
$(OBJ)$/sstring.obj \
|
||||
$(OBJ)$/appdef.obj \
|
||||
@@ -172,3 +181,4 @@
|
||||
# --- Targets ------------------------------------------------------
|
||||
|
||||
.INCLUDE : target.mk
|
||||
+
|
|
@ -0,0 +1,11 @@
|
|||
--- ../unzip/source/misc.c.orig Wed May 2 03:13:26 2001
|
||||
+++ ../unzip/source/misc.c Fri Oct 18 23:37:13 2002
|
||||
@@ -300,7 +300,7 @@
|
||||
static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
|
||||
int yr, mo, dy, hh, mm, ss, leap;
|
||||
long m_time, days=0;
|
||||
-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__))
|
||||
+#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(FREEBSD))
|
||||
#if (defined(BSD) || defined(MTS))
|
||||
#ifndef __386BSD__
|
||||
static struct timeb tbp;
|
|
@ -0,0 +1,68 @@
|
|||
--- ../berkeleydb/db-3.2.9.patch.orig Fri Oct 18 22:02:26 2002
|
||||
+++ ../berkeleydb/db-3.2.9.patch Fri Oct 18 22:05:40 2002
|
||||
@@ -1,3 +1,13 @@
|
||||
+--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig Fri Oct 18 21:46:44 2002
|
||||
++++ build/unxsols3.pro/db-3.2.9/dist/configure Fri Oct 18 21:48:47 2002
|
||||
+@@ -1795,6 +1795,7 @@
|
||||
+ case "$host_os" in
|
||||
+ solaris*) JINCSUBDIRS="solaris";;
|
||||
+ linux*) JINCSUBDIRS="linux genunix";;
|
||||
++ freebsd*) JINCSUBDIRS="freebsd genunix";;
|
||||
+ *) JINCSUBDIRS="genunix";;
|
||||
+ esac
|
||||
+
|
||||
*** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp Thu Jan 11 19:28:22 2001
|
||||
--- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp Mon Jun 11 15:50:55 2001
|
||||
***************
|
||||
@@ -43,3 +53,51 @@
|
||||
|
||||
CC= @MAKEFILE_CC@
|
||||
CCLINK= @MAKEFILE_CCLINK@
|
||||
+--- 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,23 @@
|
||||
+
|
||||
+ 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'
|
||||
+- else
|
||||
++ 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
|
||||
++ 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
|
||||
+ ;;
|
||||
+
|
||||
+@@ -2019,6 +2031,20 @@
|
||||
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
|
||||
+ soname_spec='${libname}${release}.so$major'
|
||||
+ dynamic_linker='NetBSD ld.elf_so'
|
||||
++ fi
|
||||
++ 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
|
||||
+ shlibpath_var=LD_LIBRARY_PATH
|
||||
+ ;;
|
10
editors/openoffice-1.1/files/patch-bridges::prj::build.lst
Normal file
10
editors/openoffice-1.1/files/patch-bridges::prj::build.lst
Normal file
|
@ -0,0 +1,10 @@
|
|||
--- ../bridges/prj/build.lst.orig Tue Oct 30 17:28:35 2001
|
||||
+++ ../bridges/prj/build.lst Fri Oct 18 22:13:04 2002
|
||||
@@ -13,5 +13,7 @@
|
||||
br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL
|
||||
br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes NULL
|
||||
br bridges\source\cpp_uno\gcc2_solaris_sparc nmake - u br_gccsols br_unotypes NULL
|
||||
+br bridges\source\cpp_uno\gcc2_freebsd_intel-sjlj nmake - u br_gccfi br_unotypes NULL
|
||||
+br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL
|
||||
br bridges\source\prot_uno nmake - all br_pruno br_unotypes NULL
|
||||
br bridges\source\java_uno nmake - all br_java_uno br_rcon NULL
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -0,0 +1,13 @@
|
|||
--- ../bridges/source/prot_uno/makefile.mk.orig Fri Oct 26 09:22:57 2001
|
||||
+++ ../bridges/source/prot_uno/makefile.mk Wed Mar 6 15:45:09 2002
|
||||
@@ -88,8 +88,8 @@
|
||||
SHL1VERSIONMAP=..$/bridge_exports.map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
- $(CPPULIB) \
|
||||
- $(SALLIB)
|
||||
+ $(SALLIB) \
|
||||
+ $(CPPULIB)
|
||||
|
||||
DEF1NAME=$(SHL1TARGET)
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
--- ../comphelper/util/makefile.mk.orig Tue Feb 19 13:26:37 2002
|
||||
+++ ../comphelper/util/makefile.mk Wed Apr 3 00:16:43 2002
|
||||
@@ -85,11 +85,11 @@
|
||||
|
||||
SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)
|
||||
SHL1STDLIBS=\
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
$(VOSLIB) \
|
||||
$(OSLLIB) \
|
||||
- $(SALLIB) \
|
||||
$(CPPRTLLIB)
|
||||
|
||||
.IF "$(OS)$(CPU)"=="SOLARISS"
|
|
@ -0,0 +1,48 @@
|
|||
--- configure.in.orig Wed Oct 2 21:22:53 2002
|
||||
+++ configure.in Sat Oct 19 00:09:27 2002
|
||||
@@ -356,6 +356,9 @@
|
||||
|
||||
dnl Set the include paths
|
||||
_gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
|
||||
+ if test "$_gcc_include_path" = "/usr/libexec/(null)/include"; then
|
||||
+ _gcc_include_path="/usr/include"
|
||||
+ fi
|
||||
fi
|
||||
|
||||
dnl ===================================================================
|
||||
@@ -374,20 +377,20 @@
|
||||
if test -z "$GNUMAKE"; then
|
||||
AC_MSG_WARN([not found build may fail]) >> warn
|
||||
else
|
||||
- _make_version=`make --version | grep GNU | $SED -e "s@^[[^0-9]]*@@" -e "s@ .*\\$@@" -e "s@,@@"`;
|
||||
+ _make_version=`gmake --version | grep GNU | $SED -e "s@^[[^0-9]]*@@" -e "s@ .*\\$@@" -e "s@,@@"`;
|
||||
_make_major=`echo $_make_version | $AWK -F. '{print $1;}'`
|
||||
_make_middle=`echo $_make_version | $AWK -F. '{ print $2; }'`
|
||||
_make_minor=`echo $_make_version | $AWK -F. '{ print $3; }'`
|
||||
if test "$_make_major" -gt "3" ; then
|
||||
- AC_MSG_RESULT([checked (make $_make_version)])
|
||||
+ AC_MSG_RESULT([checked (gmake $_make_version)])
|
||||
else
|
||||
if test "$_make_middle" -gt "79" ; then
|
||||
- AC_MSG_RESULT([checked (make $_make_version)])
|
||||
+ AC_MSG_RESULT([checked (gmake $_make_version)])
|
||||
else
|
||||
if test "$_make_minor" -ge "1" ; then
|
||||
- AC_MSG_RESULT([checked (make $_make_version)])
|
||||
+ AC_MSG_RESULT([checked (gmake $_make_version)])
|
||||
else
|
||||
- AC_MSG_ERROR([failed (make $_make_version need 3.79.1+)])
|
||||
+ AC_MSG_ERROR([failed (gmake $_make_version need 3.79.1+)])
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
@@ -551,6 +554,9 @@
|
||||
dnl ===================================================================
|
||||
if test "$GXX" = "yes"; then
|
||||
_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
|
||||
+ if test "$_gxx_include_path" = "/usr/libexec/(null)/include"; then
|
||||
+ _gxx_include_path="/usr/include"
|
||||
+ fi
|
||||
fi
|
||||
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Aug 19 19:23:47 2002
|
||||
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Oct 16 00:01:36 2002
|
||||
@@ -167,7 +167,9 @@
|
||||
|
||||
# --- MOZAB BASE Library -----------------------------------
|
||||
|
||||
+.IF "$(OS)"!="FREEBSD"
|
||||
SHL2VERSIONMAP= $(TARGET2).map
|
||||
+.ENDIF
|
||||
SHL2TARGET= $(TARGET2)$(MOZAB_MAJOR)
|
||||
SHL2OBJS=$(SLO2FILES)
|
||||
SHL2STDLIBS=\
|
8
editors/openoffice-1.1/files/patch-cppu::prj::build.lst
Normal file
8
editors/openoffice-1.1/files/patch-cppu::prj::build.lst
Normal file
|
@ -0,0 +1,8 @@
|
|||
--- ../cppu/prj/build.lst.orig Mon Mar 11 14:13:47 2002
|
||||
+++ ../cppu/prj/build.lst Mon Mar 11 14:14:30 2002
|
||||
@@ -1,4 +1,4 @@
|
||||
-cu cppu : codemaker udkapi NULL
|
||||
+cu cppu : codemaker udkapi offuh NULL
|
||||
cu cppu usr1 - all cu_mkout NULL
|
||||
cu cppu\source nmake - all cu_source NULL
|
||||
cu cppu\source\uno nmake - all cu_uno cu_source NULL
|
|
@ -0,0 +1,24 @@
|
|||
--- ../cppuhelper/source/makefile.mk.orig Mon Mar 11 22:17:52 2002
|
||||
+++ ../cppuhelper/source/makefile.mk Wed Apr 3 00:31:19 2002
|
||||
@@ -149,8 +149,8 @@
|
||||
SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
- $(CPPULIB) \
|
||||
- $(SALLIB)
|
||||
+ $(SALLIB) \
|
||||
+ $(CPPULIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB=i$(TARGET)
|
||||
@@ -175,6 +175,10 @@
|
||||
#SHL1VERSIONMAP=gcc2_freebsd_intel.map
|
||||
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
|
||||
SHL1VERSIONMAP=gcc3_linux_intel.map
|
||||
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
|
||||
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
|
||||
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
|
||||
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
|
||||
.ENDIF
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
|
@ -0,0 +1,244 @@
|
|||
--- ../dmake/unix/linux/gnu/make.sh.orig Wed Mar 13 20:32:53 2002
|
||||
+++ ../dmake/unix/linux/gnu/make.sh Wed Mar 13 20:33:00 2002
|
||||
@@ -3,188 +3,188 @@
|
||||
mkdir objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
|
||||
fi
|
||||
mv infer.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
|
||||
fi
|
||||
mv make.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
|
||||
fi
|
||||
mv stat.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
|
||||
fi
|
||||
mv expand.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
|
||||
fi
|
||||
mv dmstring.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
|
||||
fi
|
||||
mv hash.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
|
||||
fi
|
||||
mv dag.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
|
||||
fi
|
||||
mv dmake.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
|
||||
fi
|
||||
mv path.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
|
||||
fi
|
||||
mv imacs.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
|
||||
fi
|
||||
mv sysintf.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
|
||||
fi
|
||||
mv parse.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
|
||||
fi
|
||||
mv getinp.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
|
||||
fi
|
||||
mv quit.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
|
||||
fi
|
||||
mv state.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
|
||||
fi
|
||||
mv dmdump.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
|
||||
fi
|
||||
mv macparse.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
|
||||
fi
|
||||
mv rulparse.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
|
||||
fi
|
||||
mv percent.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
|
||||
fi
|
||||
mv function.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
|
||||
fi
|
||||
mv arlib.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
|
||||
fi
|
||||
mv dirbrk.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
|
||||
fi
|
||||
mv rmprq.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
|
||||
fi
|
||||
mv ruletab.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
|
||||
fi
|
||||
mv runargv.o objects
|
||||
|
||||
if test $platform = sparc -o $platform = sparc64; then
|
||||
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
|
||||
+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
|
||||
else
|
||||
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
|
||||
+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
|
||||
fi
|
||||
mv dcache.o objects
|
||||
|
||||
-gcc -O -o dmake objects/infer.o objects/make.o objects/stat.o objects/expand.o \
|
||||
+${CC} ${CFLAGS} -O -o dmake objects/infer.o objects/make.o objects/stat.o objects/expand.o \
|
||||
objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
|
||||
objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
|
||||
objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
|
|
@ -0,0 +1,12 @@
|
|||
--- ../dtrans/source/X11/makefile.mk.orig Tue Dec 11 18:48:36 2001
|
||||
+++ ../dtrans/source/X11/makefile.mk Wed Apr 3 00:31:56 2002
|
||||
@@ -116,7 +116,8 @@
|
||||
APP1STDLIBS=\
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(SALLIB) \
|
||||
+ -lX11
|
||||
|
||||
.ENDIF # "$(OS)"=="MACOSX"
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
--- ../eventattacher/source/makefile.mk.orig Tue Jan 1 14:09:28 2002
|
||||
+++ ../eventattacher/source/makefile.mk
|
||||
@@ -110,10 +110,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(VOSLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(VOSLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
11
editors/openoffice-1.1/files/patch-external::dt::dtpatch.sh
Normal file
11
editors/openoffice-1.1/files/patch-external::dt::dtpatch.sh
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- ../external/dt/dtpatch.sh.orig Wed Mar 13 17:09:43 2002
|
||||
+++ ../external/dt/dtpatch.sh Wed Mar 13 17:09:47 2002
|
||||
@@ -96,7 +96,7 @@
|
||||
done
|
||||
|
||||
chmod -R +w rtufiles/*.h
|
||||
- patch -i pat/editor.h.pat rtufiles/editor.h 2> newpatch
|
||||
+ patch < pat/editor.h.pat rtufiles/editor.h 2> newpatch
|
||||
|
||||
if test -s "patcherror"; then
|
||||
echo "Please install the SUNWdtinc Version 1.2 package on your Solaris machine" >> patcherror
|
|
@ -0,0 +1,11 @@
|
|||
--- ../external/npsdk/npsdkpatch.sh.orig Wed Mar 13 16:49:19 2002
|
||||
+++ ../external/npsdk/npsdkpatch.sh Wed Mar 13 16:49:39 2002
|
||||
@@ -121,7 +121,7 @@
|
||||
|
||||
for PNAME in `cat flist.pat`
|
||||
do
|
||||
- patch -i pat/$PNAME.pat rtufiles/$PNAME
|
||||
+ patch < pat/$PNAME.pat rtufiles/$PNAME
|
||||
done
|
||||
|
||||
#
|
15
editors/openoffice-1.1/files/patch-freetype::makefile.mk
Normal file
15
editors/openoffice-1.1/files/patch-freetype::makefile.mk
Normal file
|
@ -0,0 +1,15 @@
|
|||
--- ../freetype/makefile.mk.orig Fri Aug 16 17:28:36 2002
|
||||
+++ ../freetype/makefile.mk Fri Oct 18 20:06:42 2002
|
||||
@@ -95,9 +95,11 @@
|
||||
objs$/.libs$/libfreetype.a
|
||||
.IF "$(OS)"=="MACOSX"
|
||||
OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
|
||||
+.ELSEIF "$(OS)"=="FREEBSD"
|
||||
+OUT2LIB+=objs$/.libs$/libfreetype.so.7*
|
||||
.ELSE
|
||||
OUT2LIB+=objs$/.libs$/libfreetype.so.6*
|
||||
-.ENDIF # "$(OS)"=="MACOSX"
|
||||
+.ENDIF # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
|
||||
|
||||
.ELSE # "$(GUI)"=="UNX"
|
||||
.IF "$(USE_SHELL)"=="4nt"
|
|
@ -0,0 +1,14 @@
|
|||
--- ../javaunohelper/source/makefile.mk.orig Tue Jan 1 14:10:20 2002
|
||||
+++ ../javaunohelper/source/makefile.mk
|
||||
@@ -110,9 +110,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
176
editors/openoffice-1.1/files/patch-nas:nas-1.4.1.patch
Normal file
176
editors/openoffice-1.1/files/patch-nas:nas-1.4.1.patch
Normal file
|
@ -0,0 +1,176 @@
|
|||
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
|
||||
+++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
|
||||
@@ -120,26 +120,139 @@
|
||||
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
|
||||
-***************
|
||||
-*** 25,30 ****
|
||||
---- 25,32 ----
|
||||
-
|
||||
- #include "../../config/NetAudio.tmpl"
|
||||
-
|
||||
-+ CCOPTIONS += $(EXTRA_CCOPTIONS)
|
||||
-+
|
||||
- #if ProjectX < 5
|
||||
- /* Pre-X11R5 compatability */
|
||||
- #ifndef NormalLibX
|
||||
-***************
|
||||
-*** 119,124 ****
|
||||
---- 121,127 ----
|
||||
-
|
||||
- #endif
|
||||
- BuildIncludes($(HEADERS),audio,..)
|
||||
-+ BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.))
|
||||
- InstallMultiple($(HEADERS),$(INCDIR))
|
||||
- #if ProjectX >= 5
|
||||
- InstallNonExecFile(AuErrorDB,$(LIBDIR))
|
||||
+--- 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 @@
|
||||
+ @echo ""
|
||||
+ Date
|
||||
+ @echo ""
|
||||
++ @find . | egrep "\.(cxx|h|c)$$" | xargs \
|
||||
++ ${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
|
||||
+ $(MAKE) $(MFLAGS) Makefiles
|
||||
+ $(MAKE) $(MFLAGS) clean
|
||||
+ $(MAKE) $(MFLAGS) includes
|
||||
+--- misc/nas-1.4.1/clients/audio/audial/audial.c.orig Wed Nov 5 18:50:21 1997
|
||||
++++ misc/build/nas-1.4.1/clients/audio/audial/audial.c Wed Nov 5 18:56:33 1997
|
||||
+@@ -133,6 +133,7 @@
|
||||
+ signal(SIGALRM, SIG_DFL);
|
||||
+ }
|
||||
+
|
||||
++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
|
||||
+ static void
|
||||
+ usleep(usecs)
|
||||
+ unsigned int usecs;
|
||||
+@@ -149,7 +150,7 @@
|
||||
+ setitimer(ITIMER_REAL, &ntval, &otval);
|
||||
+ pause();
|
||||
+ }
|
||||
+-
|
||||
++#endif
|
||||
+ #endif /* SYSV else not */
|
||||
+ #endif /* VMS else not */
|
||||
+ #endif /* NEEDUSLEEP */
|
||||
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
|
||||
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
|
||||
+@@ -155,8 +155,10 @@
|
||||
+ #include <assert.h>
|
||||
+
|
||||
+ #ifdef __FreeBSD__
|
||||
+-# include <machine/soundcard.h>
|
||||
+-# include <machine/pcaudioio.h>
|
||||
++# include <sys/soundcard.h>
|
||||
++# ifdef __i386__
|
||||
++# include <machine/pcaudioio.h>
|
||||
++# endif
|
||||
+ #else
|
||||
+ # ifdef __NetBSD__
|
||||
+ # include <sys/ioctl.h>
|
||||
+@@ -610,7 +612,11 @@
|
||||
+
|
||||
+ if(sndStatOut.fd == -1)
|
||||
+ {
|
||||
++#ifdef __FreeBSD__
|
||||
++ while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR)) == -1 && wait)
|
||||
++#else
|
||||
+ while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR|O_SYNC)) == -1 && wait)
|
||||
++#endif
|
||||
+ {
|
||||
+ osLogMsg("openDevice: waiting on output device\n");
|
||||
+ sleep(1);
|
||||
+@@ -1230,6 +1236,11 @@
|
||||
+ /*
|
||||
+ * Setup soundcard at maximum audio quality.
|
||||
+ */
|
||||
++
|
||||
++#ifdef __FreeBSD__
|
||||
++#define NO_16_BIT_SAMPLING
|
||||
++#endif
|
||||
++
|
||||
+ static void setupSoundcard(sndStatPtr)
|
||||
+ SndStat* sndStatPtr;
|
||||
+ {
|
||||
+@@ -1380,7 +1391,11 @@
|
||||
+
|
||||
+ AL_initialized = AuTrue;
|
||||
+
|
||||
++#ifdef __FreeBSD__
|
||||
++ if ((fd = open(sndStatOut.device, O_RDWR, 0)) == -1) {
|
||||
++#else
|
||||
+ if ((fd = open(sndStatOut.device, O_RDWR|O_SYNC, 0)) == -1) {
|
||||
++#endif
|
||||
+ UNIDENTMSG;
|
||||
+ return AuFalse;
|
||||
+ }
|
||||
+--- misc/nas-1.4.1/clients/audio/auedit/Graph.c.orig Mon Oct 25 02:24:08 1999
|
||||
++++ misc/build/nas-1.4.1/clients/audio/auedit/Graph.c Sat Mar 25 14:56:23 2000
|
||||
+@@ -28,7 +28,7 @@
|
||||
+ */
|
||||
+
|
||||
+ #ifndef WIN32
|
||||
+-# ifdef __NetBSD__
|
||||
++# if defined(__NetBSD__) || defined(__FreeBSD__)
|
||||
+ # include <limits.h>
|
||||
+ # define MAXSHORT SHRT_MAX
|
||||
+ # define MINSHORT SHRT_MIN
|
||||
+--- misc/nas-1.4.1/lib/audio/Imakefile.orig Sun May 19 14:52:20 2002
|
||||
++++ misc/build/nas-1.4.1/lib/audio/Imakefile Sun May 19 14:54:25 2002
|
||||
+@@ -25,6 +25,8 @@
|
||||
+
|
||||
+ #include "../../config/NetAudio.tmpl"
|
||||
+
|
||||
++CCOPTIONS += $(EXTRA_CCOPTIONS)
|
||||
++
|
||||
+ #if ProjectX < 5
|
||||
+ /* Pre-X11R5 compatability */
|
||||
+ #ifndef NormalLibX
|
||||
+@@ -64,10 +66,14 @@
|
||||
+ COMPAT_OBJS = AuGetBest.o
|
||||
+ #endif /* ProjectX < 5 */
|
||||
+
|
||||
++#if HasBSD44Sockets
|
||||
++ SOCK_DEFINES = -DBSD44SOCKETS
|
||||
++#endif
|
||||
++
|
||||
+ EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
|
||||
+
|
||||
+ DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
|
||||
+- CONN_DEFINES = ConnectionFlags
|
||||
++ CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
|
||||
+
|
||||
+ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h \
|
||||
+ voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
|
||||
+@@ -119,6 +125,7 @@
|
||||
+
|
||||
+ #endif
|
||||
+ BuildIncludes($(HEADERS),audio,..)
|
||||
++BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.))
|
||||
+ InstallMultiple($(HEADERS),$(INCDIR))
|
||||
+ #if ProjectX >= 5
|
||||
+ InstallNonExecFile(AuErrorDB,$(LIBDIR))
|
||||
+--- misc/nas-1.4.1/config/NetAudio.def.orig Sun Feb 13 05:31:14 2000
|
||||
++++ misc/build/nas-1.4.1/config/NetAudio.def Fri Mar 24 04:55:49 2000
|
||||
+@@ -8,5 +8,5 @@
|
||||
+
|
||||
+ XCOMM Directory where NAS will look for it's config file(s)
|
||||
+ #ifndef NasConfigSearchPath
|
||||
+-#define NasConfigSearchPath /etc/nas/
|
||||
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
|
||||
+ #endif
|
||||
+--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
|
||||
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
|
||||
+@@ -120,7 +120,7 @@
|
||||
+
|
||||
+ void ddxUseMsg(void);
|
||||
+
|
||||
+-#if !defined(SVR4) && !defined(hpux) && !defined(linux) && !defined(AMOEBA) && !defined(_MINIX)
|
||||
++#if !defined(SVR4) && !defined(hpux) && !defined(linux) && !defined(AMOEBA) && !defined(_MINIX) && !defined(__FreeBSD__)
|
||||
+ extern char *sbrk();
|
||||
+ #endif
|
||||
+
|
|
@ -0,0 +1,18 @@
|
|||
--- ../odk/pack/unzip_udk/makefile.mk.orig Thu Aug 8 09:28:10 2002
|
||||
+++ ../odk/pack/unzip_udk/makefile.mk Fri Oct 18 20:14:46 2002
|
||||
@@ -44,9 +44,15 @@
|
||||
.ELSE
|
||||
$(GNUCOPY) -p $(UDKPATH) .
|
||||
$(GNUCOPY) -p $(ODKDOCPATH) .
|
||||
+.IF "$(OS)"=="FREEBSD"
|
||||
+ tar -xzf $(UDKZIPPREFIX).tar.gz
|
||||
+ +-$(RENAME) $(UDKNAME) $(ODKNAME)
|
||||
+ tar -xzf $(ODKDOCNAME).tar.gz
|
||||
+.ELSE
|
||||
gzip -df < $(UDKZIPPREFIX).tar.gz | tar -xvf -
|
||||
+-$(RENAME) $(UDKNAME) $(ODKNAME)
|
||||
gzip -df < $(ODKDOCNAME).tar.gz | tar -xvf -
|
||||
+.ENDIF
|
||||
.ENDIF
|
||||
.IF "$(BUILD_SOSL)"!=""
|
||||
# for OpenOffice build rename to PRODUCT_NAME
|
|
@ -0,0 +1,11 @@
|
|||
--- ../offapi/util/makefile.pmk.orig Mon Mar 11 01:37:55 2002
|
||||
+++ ../offapi/util/makefile.pmk Mon Mar 11 01:37:57 2002
|
||||
@@ -85,7 +85,7 @@
|
||||
|
||||
URDDOC=TRUE
|
||||
|
||||
-.IF "$(OS)"=="SOLARIS"
|
||||
+.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
|
||||
.IF "$(CPU)"=="I"
|
||||
UNOIDL=unoidl
|
||||
.ENDIF
|
|
@ -0,0 +1,11 @@
|
|||
--- ../product/util/makefile.mk.orig Wed Oct 2 21:24:25 2002
|
||||
+++ ../product/util/makefile.mk Wed Oct 16 00:02:13 2002
|
||||
@@ -521,7 +521,7 @@
|
||||
|
||||
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
|
||||
-rm -f $@
|
||||
- +ln -s libgcc_s.so.1 $@
|
||||
+ +ln -fs libgcc_s.so.1 $@
|
||||
#-------------------------------------------------------------
|
||||
|
||||
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
|
|
@ -0,0 +1,12 @@
|
|||
--- ../registry/source/regkey.cxx.orig Mon Mar 11 01:27:56 2002
|
||||
+++ ../registry/source/regkey.cxx Mon Mar 11 01:28:51 2002
|
||||
@@ -228,6 +228,9 @@
|
||||
{
|
||||
RegError _ret = REG_NO_ERROR;
|
||||
|
||||
+ if (!nSubKeys)
|
||||
+ return REG_NO_ERROR;
|
||||
+
|
||||
if (phSubKeys)
|
||||
{
|
||||
ORegistry* pReg = NULL;
|
|
@ -0,0 +1,14 @@
|
|||
--- ../remotebridges/source/unourl_resolver/makefile.mk.orig Tue Jan 1 14:11:01 2002
|
||||
+++ ../remotebridges/source/unourl_resolver/makefile.mk
|
||||
@@ -102,9 +102,9 @@
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
12
editors/openoffice-1.1/files/patch-rsc::source::rscpp::cpp.h
Normal file
12
editors/openoffice-1.1/files/patch-rsc::source::rscpp::cpp.h
Normal file
|
@ -0,0 +1,12 @@
|
|||
--- ../rsc/source/rscpp/cpp.h.orig Fri Mar 1 00:14:38 2002
|
||||
+++ ../rsc/source/rscpp/cpp.h Fri Mar 1 00:15:03 2002
|
||||
@@ -462,7 +462,9 @@
|
||||
extern char *strrchr();
|
||||
extern char *strchr();
|
||||
#if ! ( defined UNX && defined ALPHA )
|
||||
+#if ! ( defined FREEBSD )
|
||||
extern long time();
|
||||
+#endif
|
||||
#endif
|
||||
/* extern char *sprintf(); */ /* Lint needs this */
|
||||
|
11
editors/openoffice-1.1/files/patch-sablot::Sablot-0.52.patch
Normal file
11
editors/openoffice-1.1/files/patch-sablot::Sablot-0.52.patch
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- ../sablot/Sablot-0.52.patch.orig Mon Aug 19 17:09:12 2002
|
||||
+++ ../sablot/Sablot-0.52.patch Fri Oct 18 21:28:48 2002
|
||||
@@ -97,7 +97,7 @@
|
||||
! .IF "$(OS)"=="NETBSD"
|
||||
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
|
||||
! .ELSE
|
||||
-! .IF "$(OS)"=="MACOSX"
|
||||
+! .IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
|
||||
! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_SYS_TIME_H -DHAVE_ISNAN -DHAVE_FINITE
|
||||
! .ELSE
|
||||
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE
|
131
editors/openoffice-1.1/files/patch-sal::osl::unx::nlsupport.c
Normal file
131
editors/openoffice-1.1/files/patch-sal::osl::unx::nlsupport.c
Normal file
|
@ -0,0 +1,131 @@
|
|||
--- ../sal/osl/unx/nlsupport.c.orig Wed Apr 10 18:11:58 2002
|
||||
+++ ../sal/osl/unx/nlsupport.c Fri Oct 18 23:31:19 2002
|
||||
@@ -63,7 +63,7 @@
|
||||
#include <osl/diagnose.h>
|
||||
#include <osl/process.h>
|
||||
|
||||
-#if defined(LINUX) || defined(SOLARIS)
|
||||
+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(IRIX)
|
||||
#include <pthread.h>
|
||||
#include <locale.h>
|
||||
#include <langinfo.h>
|
||||
@@ -114,8 +114,7 @@
|
||||
comparison = _pair_compare( key, base + current );
|
||||
if (comparison < 0)
|
||||
upper = current;
|
||||
- else
|
||||
- if (comparison > 0)
|
||||
+ else if (comparison > 0)
|
||||
lower = current + 1;
|
||||
else
|
||||
return base + current;
|
||||
@@ -241,12 +240,13 @@
|
||||
return NULL;
|
||||
}
|
||||
|
||||
-#if defined(LINUX) || defined(SOLARIS)
|
||||
+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD)
|
||||
|
||||
/*
|
||||
* This implementation of osl_getTextEncodingFromLocale maps
|
||||
* from nl_langinfo(CODESET) to rtl_textencoding defines.
|
||||
- * nl_langinfo() is supported only on Linux and Solaris.
|
||||
+ * nl_langinfo() is supported only on Linux, Solaris and IRIX,
|
||||
+ * >= NetBSD 1.6 and >= FreeBSD 4.4
|
||||
*
|
||||
* This routine is SLOW because of the setlocale call, so
|
||||
* grab the result and cache it.
|
||||
@@ -260,6 +260,12 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+/*
|
||||
+ * _nl_language_list[] is an array list of supported encodings. Because
|
||||
+ * we are using a binary search, the list has to be in ascending order.
|
||||
+ * We are comparing the encodings case insensitiv, so the list has
|
||||
+ * to be completly upper- , or lowercase.
|
||||
+ */
|
||||
|
||||
#if defined(SOLARIS)
|
||||
|
||||
@@ -478,7 +484,79 @@
|
||||
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
|
||||
};
|
||||
|
||||
-#endif /* ifdef LINUX */
|
||||
+#elif defined(IRIX)
|
||||
+
|
||||
+const _pair _nl_language_list[] = {
|
||||
+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
|
||||
+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China */
|
||||
+ { "EUCGBK", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
|
||||
+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
|
||||
+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
|
||||
+ { "EUCTW", RTL_TEXTENCODING_EUC_TW }, /* Taiwan - Traditional Chinese */
|
||||
+ { "GBK", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
|
||||
+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
|
||||
+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
|
||||
+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
|
||||
+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
|
||||
+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
|
||||
+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
|
||||
+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS } /* Japan */
|
||||
+ };
|
||||
+
|
||||
+#elif defined(FREEBSD)
|
||||
+
|
||||
+const _pair _nl_language_list[] = {
|
||||
+ { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
|
||||
+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
|
||||
+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */
|
||||
+ { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */
|
||||
+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */
|
||||
+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
|
||||
+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
|
||||
+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
|
||||
+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
|
||||
+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
|
||||
+ { "ISO8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */
|
||||
+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
|
||||
+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
|
||||
+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
|
||||
+ { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */
|
||||
+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */
|
||||
+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */
|
||||
+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
|
||||
+ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */
|
||||
+ };
|
||||
+
|
||||
+#elif defined(NETBSD)
|
||||
+
|
||||
+const _pair _nl_language_list[] = {
|
||||
+ { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
|
||||
+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
|
||||
+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */
|
||||
+ { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */
|
||||
+ { "CTEXT", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
|
||||
+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */
|
||||
+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
|
||||
+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
|
||||
+ { "EUCTW", RTL_TEXTENCODING_EUC_TW }, /* China - Traditional Chinese */
|
||||
+ { "ISO-2022-JP", RTL_TEXTENCODING_DONTKNOW }, /* */
|
||||
+ { "ISO-2022-JP-2", RTL_TEXTENCODING_DONTKNOW }, /* */
|
||||
+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
|
||||
+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
|
||||
+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
|
||||
+ { "ISO8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */
|
||||
+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
|
||||
+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
|
||||
+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
|
||||
+ { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */
|
||||
+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */
|
||||
+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */
|
||||
+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
|
||||
+ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */
|
||||
+};
|
||||
+
|
||||
+#endif /* ifdef SOLARIS IRIX LINUX FREEBSD NETBSD */
|
||||
+
|
||||
|
||||
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
|
14
editors/openoffice-1.1/files/patch-sal::osl::unx::pipe.c
Normal file
14
editors/openoffice-1.1/files/patch-sal::osl::unx::pipe.c
Normal file
|
@ -0,0 +1,14 @@
|
|||
--- ../sal/osl/unx/pipe.c.orig Thu Jul 11 16:01:39 2002
|
||||
+++ ../sal/osl/unx/pipe.c Fri Oct 18 19:56:38 2002
|
||||
@@ -264,7 +264,11 @@
|
||||
|
||||
addr.sun_family = AF_UNIX;
|
||||
strncpy(addr.sun_path, name, sizeof(addr.sun_path));
|
||||
+#if defined(FREEBSD)
|
||||
+ len = SUN_LEN(&addr);
|
||||
+#else
|
||||
len = sizeof(addr);
|
||||
+#endif
|
||||
|
||||
if ( Options & osl_Pipe_CREATE )
|
||||
{
|
26
editors/openoffice-1.1/files/patch-sal::osl::unx::socket.c
Normal file
26
editors/openoffice-1.1/files/patch-sal::osl::unx::socket.c
Normal file
|
@ -0,0 +1,26 @@
|
|||
--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002
|
||||
+++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002
|
||||
@@ -82,12 +82,12 @@
|
||||
#undef HAVE_POLL_H
|
||||
#endif
|
||||
|
||||
-#if defined(LINUX) || defined (IRIX) || defined(NETBSD)
|
||||
+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD )
|
||||
#include <sys/poll.h>
|
||||
#define HAVE_POLL_H
|
||||
#endif /* HAVE_POLL_H */
|
||||
|
||||
-#if defined(SOLARIS) || defined ( FREEBSD )
|
||||
+#if defined(SOLARIS)
|
||||
#include <poll.h>
|
||||
#define HAVE_POLL_H
|
||||
#endif /* SOLARIS */
|
||||
@@ -1965,7 +1965,7 @@
|
||||
/*****************************************************************************/
|
||||
oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket)
|
||||
{
|
||||
-#ifdef LINUX
|
||||
+#ifdef LINUX || defined(FREEBSD)
|
||||
socklen_t AddrLen;
|
||||
#else
|
||||
/* mfe: Solaris 'cc +w' means Addrlen should be signed! */
|
127
editors/openoffice-1.1/files/patch-sal::osl::unx::system.c
Normal file
127
editors/openoffice-1.1/files/patch-sal::osl::unx::system.c
Normal file
|
@ -0,0 +1,127 @@
|
|||
--- ../sal/osl/unx/system.c.orig Sun Mar 17 12:34:13 2002
|
||||
+++ ../sal/osl/unx/system.c Wed Apr 3 01:03:36 2002
|
||||
@@ -195,6 +195,73 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
|
||||
+ size_t buflen, struct passwd **result)
|
||||
+{
|
||||
+ struct passwd* res;
|
||||
+
|
||||
+ pthread_mutex_lock(&getrtl_mutex);
|
||||
+
|
||||
+ if ( res = getpwuid(uid) )
|
||||
+ {
|
||||
+ size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
|
||||
+
|
||||
+ pw_name = strlen(res->pw_name)+1;
|
||||
+ pw_passwd = strlen(res->pw_passwd)+1;
|
||||
+ pw_class = strlen(res->pw_class)+1;
|
||||
+ pw_gecos = strlen(res->pw_gecos)+1;
|
||||
+ pw_dir = strlen(res->pw_dir)+1;
|
||||
+ pw_shell = strlen(res->pw_shell)+1;
|
||||
+
|
||||
+ if (pw_name+pw_passwd+pw_class+pw_gecos
|
||||
+ +pw_dir+pw_shell < buflen)
|
||||
+ {
|
||||
+ memcpy(pwd, res, sizeof(struct passwd));
|
||||
+
|
||||
+ strncpy(buffer, res->pw_name, pw_name);
|
||||
+ pwd->pw_name = buffer;
|
||||
+ buffer += pw_name;
|
||||
+
|
||||
+ strncpy(buffer, res->pw_passwd, pw_passwd);
|
||||
+ pwd->pw_passwd = buffer;
|
||||
+ buffer += pw_passwd;
|
||||
+
|
||||
+ strncpy(buffer, res->pw_class, pw_class);
|
||||
+ pwd->pw_class = buffer;
|
||||
+ buffer += pw_class;
|
||||
+
|
||||
+ strncpy(buffer, res->pw_gecos, pw_gecos);
|
||||
+ pwd->pw_gecos = buffer;
|
||||
+ buffer += pw_gecos;
|
||||
+
|
||||
+ strncpy(buffer, res->pw_dir, pw_dir);
|
||||
+ pwd->pw_dir = buffer;
|
||||
+ buffer += pw_dir;
|
||||
+
|
||||
+ strncpy(buffer, res->pw_shell, pw_shell);
|
||||
+ pwd->pw_shell = buffer;
|
||||
+ buffer += pw_shell;
|
||||
+
|
||||
+ *result = pwd ;
|
||||
+ res = 0 ;
|
||||
+
|
||||
+ } else {
|
||||
+
|
||||
+ res = ENOMEM ;
|
||||
+
|
||||
+ }
|
||||
+
|
||||
+ } else {
|
||||
+
|
||||
+ res = errno ;
|
||||
+
|
||||
+ }
|
||||
+
|
||||
+ pthread_mutex_unlock(&getrtl_mutex);
|
||||
+
|
||||
+ return res;
|
||||
+}
|
||||
+
|
||||
struct tm *localtime_r(const time_t *timep, struct tm *buffer)
|
||||
{
|
||||
struct tm* res;
|
||||
@@ -518,3 +585,50 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
+#if defined(NETBSD) || defined(FREEBSD)
|
||||
+char *fcvt(double value, int ndigit, int *decpt, int *sign)
|
||||
+{
|
||||
+ static char ret[256];
|
||||
+ char buf[256],zahl[256],format[256]="%";
|
||||
+ char *v1,*v2;
|
||||
+
|
||||
+ if (value==0.0) value=1e-30;
|
||||
+
|
||||
+ if (value<0.0) *sign=1; else *sign=0;
|
||||
+
|
||||
+ if (value<1.0)
|
||||
+ {
|
||||
+ *decpt=(int)log10(value);
|
||||
+ value*=pow(10.0,1-*decpt);
|
||||
+ ndigit+=*decpt-1;
|
||||
+ if (ndigit<0) ndigit=0;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ *decpt=(int)log10(value)+1;
|
||||
+ }
|
||||
+
|
||||
+ sprintf(zahl,"%d",ndigit);
|
||||
+ strcat(format,zahl);
|
||||
+ strcat(format,".");
|
||||
+ strcat(format,zahl);
|
||||
+ strcat(format,"f");
|
||||
+
|
||||
+ sprintf(buf,format,value);
|
||||
+
|
||||
+ if (ndigit!=0)
|
||||
+ {
|
||||
+ v1=strtok(buf,".");
|
||||
+ v2=strtok(NULL,".");
|
||||
+ strcpy(ret,v1);
|
||||
+ strcat(ret,v2);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ strcpy(ret,buf);
|
||||
+ }
|
||||
+
|
||||
+ return(ret);
|
||||
+}
|
||||
+
|
||||
+#endif
|
17
editors/openoffice-1.1/files/patch-sal::osl::unx::system.h
Normal file
17
editors/openoffice-1.1/files/patch-sal::osl::unx::system.h
Normal file
|
@ -0,0 +1,17 @@
|
|||
--- ../sal/osl/unx/system.h.orig Mon Mar 11 01:41:13 2002
|
||||
+++ ../sal/osl/unx/system.h Mon Mar 11 01:41:25 2002
|
||||
@@ -216,12 +216,9 @@
|
||||
# elif BYTE_ORDER == PDP_ENDIAN
|
||||
# define _PDP_ENDIAN
|
||||
# endif
|
||||
-# define sched_yield() pthread_yield()
|
||||
-# define pthread_testcancel()
|
||||
# define NO_PTHREAD_RTL
|
||||
-# define NO_PTHREAD_PRIORITY
|
||||
-# define CMD_ARG_PRG __progname
|
||||
-# define CMD_ARG_ENV environ
|
||||
+# define CMD_ARG_PROC_STREAM
|
||||
+# define CMD_ARG_PROC_NAME "/proc/%u/cmdline"
|
||||
#endif
|
||||
|
||||
#ifdef SCO
|
29
editors/openoffice-1.1/files/patch-sal::workben::makefile.mk
Normal file
29
editors/openoffice-1.1/files/patch-sal::workben::makefile.mk
Normal file
|
@ -0,0 +1,29 @@
|
|||
--- ../sal/workben/makefile.mk.orig Tue May 15 14:11:20 2001
|
||||
+++ ../sal/workben/makefile.mk Sun Mar 10 23:46:59 2002
|
||||
@@ -113,7 +113,7 @@
|
||||
|
||||
.IF "$(TESTAPP)" == "salstattest"
|
||||
|
||||
- CFLAGS+= /DUSE_SAL_STATIC
|
||||
+ CFLAGS+= -DUSE_SAL_STATIC
|
||||
|
||||
OBJFILES= $(OBJ)$/salstattest.obj
|
||||
|
||||
@@ -325,7 +325,7 @@
|
||||
# tgetpwnam
|
||||
#
|
||||
.IF "$(TESTAPP)" == "tgetpwnam"
|
||||
-.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
|
||||
+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
|
||||
|
||||
CXXFILES= tgetpwnam.cxx
|
||||
OBJFILES= $(OBJ)$/tgetpwnam.obj
|
||||
@@ -335,7 +335,7 @@
|
||||
APP5STDLIBS=$(SALLIB)
|
||||
APP5DEPN= $(SLB)$/sal.lib
|
||||
|
||||
-.ENDIF # (sco | netbsd)
|
||||
+.ENDIF # (sco | netbsd | freebsd)
|
||||
.ENDIF # tgetpwname
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
|
@ -0,0 +1,13 @@
|
|||
--- ../salhelper/source/makefile.mk.orig Wed Nov 14 14:19:21 2001
|
||||
+++ ../salhelper/source/makefile.mk Sun Mar 3 17:58:15 2002
|
||||
@@ -109,6 +109,10 @@
|
||||
SHL1VERSIONMAP=lngi.map
|
||||
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
|
||||
SHL1VERSIONMAP=gcc3_linux_intel.map
|
||||
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
|
||||
+SHL1VERSIONMAP=gcc2_freebsd_intel.map
|
||||
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
|
||||
+SHL1VERSIONMAP=gcc3_freebsd_intel.map
|
||||
.ENDIF
|
||||
|
||||
|
242
editors/openoffice-1.1/files/patch-set_soenv.1
Normal file
242
editors/openoffice-1.1/files/patch-set_soenv.1
Normal file
|
@ -0,0 +1,242 @@
|
|||
--- set_soenv.1.orig Fri Aug 16 12:21:58 2002
|
||||
+++ set_soenv.1 Fri Oct 18 22:56:36 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,16 @@
|
||||
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, $RSC_ONCE );
|
||||
#
|
||||
# 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 );
|
||||
+ $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 +98,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 +147,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.
|
||||
@@ -336,7 +342,14 @@
|
||||
$COMPATH = $ARGV[ 0 ];
|
||||
$CPU = "I";
|
||||
$CPUNAME = "INTEL";
|
||||
+if ($USE_GCC3 eq "TRUE")
|
||||
+ {
|
||||
+ $CVER = "C300";
|
||||
+ }
|
||||
+else
|
||||
+ {
|
||||
$CVER = "C295";
|
||||
+}
|
||||
$DLLSUFFIX = "fi";
|
||||
$GUI = "UNX";
|
||||
$GUIBASE = "unx";
|
||||
@@ -349,6 +362,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";
|
||||
@@ -934,7 +950,7 @@
|
||||
$ps.$JRETHREADDIR.
|
||||
$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.$JRELIBDIR.
|
||||
@@ -945,6 +961,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.
|
||||
@@ -986,15 +1009,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".
|
||||
@@ -1011,7 +1035,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.
|
||||
@@ -1021,6 +1045,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.'"';
|
||||
@@ -1099,7 +1128,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.
|
||||
@@ -1118,6 +1147,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.
|
||||
+ $ps.$USR_LOCAL.$BIN.
|
||||
+ $ps.$USR_LOCAL.$ds."sbin";
|
||||
+
|
||||
+ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
|
||||
+
|
||||
+ $PATH .= $ps.$USR.$ds."sbin".
|
||||
+ $ps.$USR.$ds."X11R6".$ds."bin".
|
||||
+ $ps.$USR.$LIB;
|
||||
+}
|
||||
+
|
||||
elsif ($platform eq "$Winnt")
|
||||
{
|
||||
my ( $noldPATH );
|
||||
@@ -1227,7 +1272,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.
|
||||
@@ -1242,6 +1287,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.
|
||||
@@ -1280,7 +1334,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;
|
||||
@@ -1294,11 +1348,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;
|
||||
|
||||
@@ -1501,6 +1550,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" );
|
||||
@@ -1515,6 +1570,9 @@
|
||||
ToFile( "SET_EXCEPTIONS", $SET_EXCEPTIONS, "e" );
|
||||
ToFile( "emergency", $emergency, "e" );
|
||||
ToFile( "use_shl_versions", $use_shl_versions, "e" );
|
||||
+if ($ENABLE_DEBUG eq "TRUE") {
|
||||
+ToFile( "debug", "true", "e" );
|
||||
+}
|
||||
#
|
||||
# Writing the variables to file.
|
||||
# (c = comment, e = environment variable, a = alias, n = newline )
|
|
@ -0,0 +1,17 @@
|
|||
--- ../setup2/mow/source/loader/loader.c.orig Thu Dec 13 17:44:58 2001
|
||||
+++ ../setup2/mow/source/loader/loader.c Wed Apr 3 01:07:58 2002
|
||||
@@ -615,6 +615,14 @@
|
||||
" LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
|
||||
" export LD_LIBRARY_PATH\n" \
|
||||
" ;;\n" \
|
||||
+" FreeBSD)\n" \
|
||||
+" LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
|
||||
+" export LD_LIBRARY_PATH\n" \
|
||||
+" ;;\n" \
|
||||
+" NetBSD)\n" \
|
||||
+" LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
|
||||
+" export LD_LIBRARY_PATH\n" \
|
||||
+" ;;\n" \
|
||||
" *)\n" \
|
||||
" ;;\n" \
|
||||
"esac\n" \
|
|
@ -0,0 +1,11 @@
|
|||
--- ../setup2/mow/source/loader/makefile.mk.orig Sun Mar 3 01:45:18 2002
|
||||
+++ ../setup2/mow/source/loader/makefile.mk Sun Mar 3 01:45:22 2002
|
||||
@@ -85,7 +85,7 @@
|
||||
APP1NOSAL=TRUE
|
||||
APP1TARGET= $(TARGET)
|
||||
APP1OBJS= $(OBJFILES)
|
||||
-APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB)
|
||||
+APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB) -lX11
|
||||
|
||||
.ENDIF # "$(OS)"=="MACOSX"
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
--- ../setup2/script/setupserver.orig Fri Nov 17 12:29:29 2000
|
||||
+++ ../setup2/script/setupserver Fri Oct 18 23:47:09 2002
|
||||
@@ -234,6 +234,7 @@
|
||||
sd_platform=`uname -s`
|
||||
case $sd_platform in
|
||||
SCO_SV) test=/bin/test ;;
|
||||
+ FreeBSD) test=/bin/test ;;
|
||||
*) test=/usr/bin/test ;;
|
||||
esac
|
||||
sd_cwd="`pwd`"
|
|
@ -0,0 +1,10 @@
|
|||
--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Fri Jun 14 15:36:11 2002
|
||||
+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Fri Oct 18 23:45:45 2002
|
||||
@@ -65,6 +65,7 @@
|
||||
sd_platform=`uname -s`
|
||||
case $sd_platform in
|
||||
SCO_SV) test=/bin/test ;;
|
||||
+ FreeBSD) test=/bin/test ;;
|
||||
*) test=/usr/bin/test ;;
|
||||
esac
|
||||
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue