mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-20 08:27:15 +00:00
Code Issues Releases Activity

Repocopy has been done for openoffice,

Browse Source 
so rename from:
editors/openoffice
editors/openoffice-devel
to
editors/openoffice-1.0
editors/openoffice-1.1

Acknowledgment to: nork
This commit is contained in:
Maho Nakata 2003-11-08 01:47:26 +00:00
parent 40a88b1207
commit 462cfc7caa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=93344
217 changed files with 4 additions and 12102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MOVED
View File

@ -656,3 +656,5 @@ sysutils/prune|sysutils/fileprune|2003-11-06|renamed because of conflict with gr
graphics/Mesa3|graphics/libglut|2003-11-06|split into graphics/mesagl and graphics/libglut
japanese/openoffice|japanese/openoffice-1.0|2003-01-07|renamed
japanese/openoffice-devel|japanese/openoffice-1.1|2003-01-07|renamed
editors/openoffice|editors/openoffice-1.0|2003-01-07|renamed
editors/openoffice-devel|editors/openoffice-1.1|2003-01-07|renamed

4
editors/Makefile
View File

@ -116,9 +116,9 @@
SUBDIR += ooodict-nl_NL
SUBDIR += ooodict-sk_SK
SUBDIR += ooodict-sv_SE
SUBDIR += openoffice
SUBDIR += openoffice-1.0
SUBDIR += openoffice-1.1
SUBDIR += openoffice-ar
SUBDIR += openoffice-devel
SUBDIR += openoffice-dk
SUBDIR += openoffice-es
SUBDIR += openoffice-gr

580
editors/openoffice-devel/Makefile
View File

@ -1,580 +0,0 @@
# New ports collection makefile for: OpenOffice
# Date created: 28 Februar 2002
# Whom: Martin Blapp
#
# $FreeBSD$
#
PORTNAME= openoffice
PORTVERSION= 1.1.0
PORTREVISION= 1
CATEGORIES+= editors
MASTER_SITES+= ftp://openofficeorg.secsup.org/pub/software/openoffice/stable/%SUBDIR%/ \
ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/stable/%SUBDIR%/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,} \
http://www.binarycode.org/openoffice/stable/%SUBDIR%/ \
http://ftp.gwdg.de/pub/misc/openoffice/stable/%SUBDIR%/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
http://people.freebsd.org/~mbr/ooo/:moz
MASTER_SITE_SUBDIR= ${PORTVERSION}
DISTFILES+= OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z:gpc \
patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
.if defined(L10NHELP)
DISTFILES+= ${L10NHELP:S/$/:help/}
.endif
SORT?= /usr/bin/sort
FIND?= /usr/bin/find
CUT?= /usr/bin/cut
AWK?= /usr/bin/awk
GREP?= /usr/bin/grep
ZIP?= ${PREFIX}/bin/zip
UNZIP?= ${PREFIX}/bin/unzip
ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
PASTE?= /usr/bin/paste
.include <bsd.port.pre.mk>
BUILD_NR= 645
RELEASE_NR= 1.1
FRELEASE_NR= 1.1.0
INSTALLATION_BASEDIR= OpenOffice.org${FRELEASE_NR}
DIST_SUBDIR= openoffice1.1
DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
#
# configuration for language specific slave ports
#
.if !defined(LANG_EXT)
LANG_EXT=01
.else
#
# Add pkg-descr and pkg-message if available
#
.if exists(${.CURDIR}/pkg-descr)
DESCR= ${.CURDIR}/pkg-descr
.endif
.if exists(${.CURDIR}/pkg-message)
PKGMESSAGE= ${.CURDIR}/pkg-message
.endif
#
# Set prefix and suffix
#
.if defined(LANG_PKGNAME)
PKGNAMEPREFIX= ${LANG_PKGNAME}-
.if defined(LANG_SUFFIX)
PKGNAMESUFFIX= -${LANG_SUFFIX}
.endif
.endif # if defined(LANG_PKGNAME)
#
# LANG_CONFIGURE_ARG is missing for the german port
#
.if defined(LANG_EXT)
CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG},ENUS
.endif
.endif
.if !defined (LANG) && !defined(USE_LANG)
USE_LANG= en_US.ISO8859-15
LANG_LIST= en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
.else
.if !defined(USE_LANG)
USE_LANG= ${LANG}
.endif
.endif
LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
.if ${OSVERSION} < 500000
# OOo requires gcc 3.3 (not systems's gcc)
BUILD_DEPENDS+= gcc33:${PORTSDIR}/lang/gcc33
USE_GCC=3.3 # make no sense yet
CC= gcc33
CXX= g++33
.endif
EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
.if !defined(COMMENT)
COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
.endif
#
# The JDK dependency needs to be at the first place, so all
# following dependencies use the same JDK.
#
BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
BUILD_DEPENDS+= ${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
.if !defined(DISPLAY)
BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
.endif
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
mng.1:${PORTSDIR}/graphics/libmng \
freetype.9:${PORTSDIR}/print/freetype2
USE_PERL5= yes
USE_BZIP2= yes
USE_BISON= yes
USE_GMAKE= yes
USE_GNOME= orbit gtk12
EXTRACT_BEFORE_ARGS_R= -dc
EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
EXTRACT_CMD_R= ${GZIP_CMD}
EXTRACT_REST= gpc231.tar.Z
JDKDIR?= ${LOCALBASE}/jdk1.4.1
JAVAVM= ${JDKDIR}/bin/java
GNU_CONFIGURE= yes
USE_AUTOCONF= yes
WANT_AUTOCONF_VER= 253
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office
LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
.if defined(WITH_DEBUG)
CFLAGS+= -g
.if ${WITH_DEBUG} == 2
BUILD= dmake debug="true"
.else
BUILD= dmake
.endif
.else
BUILD= dmake strip="true"
.endif
.if !defined(DISPLAY)
DISPLAYHACK=localhost:1001
.endif
CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
PTHREAD_LIBS=${PTHREAD_LIBS}
CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR}
.if defined(WITH_DEBUG)
.if ${WITH_DEBUG} == 2
CONFIGURE_ARGS+= --enable-debug
.endif
.endif
pre-fetch:
@${ECHO}
.if !defined(LANG)
@${ECHO} "REQUIREMENTS:"
@${ECHO}
@${ECHO} "OO requires that the ENV variable LANG"
@${ECHO} "is set to a proper value. Dependent on"
@${ECHO} "which language port you use, OO does"
@${ECHO} "automatically set LANG to a suitable"
@${ECHO} "value. You can change this with:"
@${ECHO}
@${ECHO} "USE_LANG=\"preferred language\""
@${ECHO}
@${ECHO} "and set a different language"
@${ECHO} "like:"
@${ECHO}
@${ECHO} "${LANG_SORTED}"
@${ECHO}
@${ECHO} "Your current setting is:"
@${ECHO}
@${ECHO} "USE_LANG=${USE_LANG}"
@${ECHO}
@${ECHO}
.endif
@${ECHO} "OPTIONS:"
.if !defined(USE_GCC)
@${ECHO}
@${ECHO} "You can compile OO with different"
@${ECHO} "gcc compiler versions:"
@${ECHO}
@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
@${ECHO} "to compile openoffice with your"
@${ECHO} "preferred compiler."
.endif
.if !defined(WITH_DEBUG)
@${ECHO}
@${ECHO} "You can compile OO with debug symbols"
@${ECHO} "if you call make with WITH_DEBUG=1"
@${ECHO}
@${ECHO} "If you set WITH_DEBUG=2, you add internal"
@${ECHO} "OO.org debug support."
@${ECHO}
.endif
.if !defined(WITH_TTF_BYTECODE_ENABLED)
@${ECHO}
@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
@${ECHO} "if you like to use the Freetype library to"
@${ECHO} "render TTF fonts. Normally the TTF lib is"
@${ECHO} "not used to render fonts."
@${ECHO}
@${ECHO} "If you have licensed the Apple patents"
@${ECHO} "US05155805 US05159668 and US05325479"
@${ECHO} "you can enable this option to get better"
@${ECHO} "quality of glyphs at small bitmap sizes."
@${ECHO}
.endif
.if !defined(WITH_GIF_LZW_COMPRESSION)
@${ECHO}
@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
@${ECHO} "If you want to make compressed gif images"
@${ECHO}
@${ECHO} "If must have license from the Unisys and IBM patents"
@${ECHO} "to enable this option to get compressed GIF images."
@${ECHO}
.endif
.if ${OSVERSION} < 450002
@${ECHO}
@${ECHO} "OS-VERSION ${OSVERSION} too low"
@${ECHO}
@${ECHO} "OO need some important libc_r and"
@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
@${ECHO} "RELEASE or 4.6 STABLE."
@${FALSE}
.endif
@${ECHO}
@${ECHO} "NOTICE:"
@${ECHO}
@${ECHO} "To build Openoffice, you should have a lot"
.if defined(WITH_DEBUG)
@${ECHO} "of free diskspace (~ 8GB)."
.else
@${ECHO} "of free diskspace (~ 4GB)."
.endif
@${ECHO}
.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
(${OSVERSION} < 500000 && !defined(USE_GCC))
@${ECHO} "KERNEL CONFIGURATION:"
@${ECHO}
@${ECHO} "Openoffice needs a larger stack- and"
@${ECHO} "datasize to build. Check your limit"
@${ECHO} "settings and and put this in /boot/loader.conf"
@${ECHO} "if neccessary:"
@${ECHO}
@${ECHO} "kern.maxdsiz=\"1073741824\""
@${ECHO} "kern.maxssiz=\"268435456\""
.endif
@${ECHO}
.if ${OSVERSION} < 460002
@${ECHO} "REQUIRED SYSTEM PATCHES:"
@${ECHO}
.endif
.if ${OSVERSION} < 500000
@${ECHO} "OO.org can crash if you enter a non existing path"
@${ECHO} "or URL in the location bar. To fix these crashes"
@${ECHO} "you need a uncommitted system patch for rtld:"
@${ECHO}
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
@${ECHO}
.endif
.if ${OSVERSION} < 460001
@${ECHO}
@${ECHO} "OO setup is broken on STABLE < 4.6"
@${ECHO} "including 4.6 RELEASE."
@${ECHO} "You'll need a system patch to solve"
@${ECHO} "this problem:"
@${ECHO}
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
@${ECHO}
.endif
.if ${OSVERSION} < 460002
@${ECHO}
@${ECHO} "OO.org soffice binary can deadlock. You can work around"
@${ECHO} "this problem with this patch:"
@${ECHO}
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
@${ECHO}
.endif
.if ${OSVERSION} < 500000
@${ECHO}
@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
@${ECHO} "this problem with this patch:"
@${ECHO}
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
@${ECHO}
.endif
.if !exists(/usr/include/langinfo.h)
@${ECHO}
@${ECHO} "langinfo.h is missing !"
@${ECHO}
@${ECHO} "Please upgrade to 4.6 RELEASE or"
@${ECHO} "4.6 STABLE."
@${ECHO}
@${FALSE}
.endif
post-extract:
@for file in ${EXTRACT_REST}; do \
if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
${EXTRACT_BEFORE_ARGS_R} \
${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
then \
exit 1; \
fi \
done
@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
@${MAKE} extract-mozilla
@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
.if defined(L10NHELP)
@${ECHO_MSG} "===> Extracting L10NHELP sub project"
@${MKDIR} ${WRKDIR}/L10NHELP
@cd ${WRKDIR}/L10NHELP && \
${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
.endif
post-patch:
@${MAKE} patch-mozilla
@${MAKE} fix-kdewrappers
@${MAKE} fix-gnomewrappers
.if defined(WITH_TTF_BYTECODE_ENABLED)
@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
${ECHO_MSG} "===> Applying additional TTF bytecode patches for ${PKGNAME}" ; \
if [ ${PATCH_DEBUG_TMP} = yes ]; then \
${ECHO_MSG} "===> Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
fi; \
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
fi
.endif
.if !defined(WITH_GIF_LZW_COMPRESSION)
@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
${ECHO_MSG} "===> Removing GIF LZW compression for ${PKGNAME}" ; \
if [ ${PATCH_DEBUG_TMP} = yes ]; then \
${ECHO_MSG} "===> Applying GIF LZW compression ${OPSYS} patch" ; \
fi; \
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
fi
.endif
.if defined(WITH_DEBUG)
@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
${ECHO_MSG} "===> Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
PATCHES_APPLIED="" ; \
for i in ${PATCHDIR}/debugpatch-*; do \
case $$i in \
*.orig|*.rej|*~) \
${ECHO_MSG} "===> Ignoring patchfile $$i" ; \
;; \
*) \
if [ ${PATCH_DEBUG_TMP} = yes ]; then \
${ECHO_MSG} "===> Applying ${OPSYS} patch $$i" ; \
fi; \
if ${PATCH} ${PATCH_ARGS} < $$i ; then \
PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
else \
${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
if [ x"$$PATCHES_APPLIED" != x"" ]; then \
${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
fi; \
${FALSE} ; \
fi; \
;; \
esac; \
done; \
fi;
.endif
@${ECHO_MSG} "===> Find old malloc.h defines and fix them in ${PKGNAME} source"
@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
fix-kdewrappers:
# @${PERL} -pi -e 's|"Exec", "\\"\<progpath\>/program/|"Exec", "\\"${PREFIX}/bin/openoffice_${RELEASE_NR}-|' \
# ${WRKSRC}/../sysui/oounix/office/kde2/kdeint
fix-gnomewrappers:
# @${PERL} -pi -e 's|"Exec", "<progpath>/program/|"Exec", "${PREFIX}/bin/openoffice_${RELEASE_NR}-|' \
# ${WRKSRC}/../sysui/oounix/office/gnome/gnomeint
extract-mozilla:
.if ! exists(${WRKDIR}/mozilla/Makefile)
@${ECHO_MSG} "===> Extracting mozilla sub project"
@cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2a.tgz
.endif
@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
patch-mozilla:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
${WRKDIR}/mozilla/files/
@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
build-mozilla:
.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
@${ECHO_MSG} "===> Building mozilla sub project"
.if defined(WITH_DEBUG)
@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
@${SED} -e 's|--disable-debug||' \
-e 's|--disable-cpp-rtti||' \
-e 's|--enable-strip||' \
< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
.endif
.if defined(USE_GCC)
@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
.else
@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
.endif
@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
.endif
install-mozilla:
@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
register-mozilla:
.if exists(${WRKDIR}/mozilla-runtime)
@${RM} -rf ${WRKDIR}/mozilla-runtime
.endif
@${MKDIR} ${WRKDIR}/mozilla-runtime
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom
@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
${WRKDIR}/mozilla-runtime/components/xptitemp.dat
@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
mozilla:
@${MAKE} extract-mozilla
@${MAKE} patch-mozilla
@${MAKE} build-mozilla
@${MAKE} register-mozilla
@${MAKE} install-mozilla
do-build:
.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
@${MAKE} mozilla
.endif
.endif
.endif
.if exists(${WRKDIR}/.Xvfb.pid)
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
@${RM} -f ${WRKDIR}/.Xvfb.pid
.endif
.if !defined(DISPLAY)
#
# This is a UGLY hack to not have to specify a X-Display.
#
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
@sleep 5
.endif
@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
.if defined(L10NHELP)
@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
.endif
.if !defined(DISPLAY)
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
@${RM} -f ${WRKDIR}/.Xvfb.pid
.else
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
.endif
.if defined(LANG_PKGNAME)
@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
.endif
pre-install:
@${CP} ${FILESDIR}/oo_setup.resp \
${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/
@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
@${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
do-install:
.if !defined(DISPLAY)
#
# UGLY hack to not have to specify a X-Display.
#
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
@sleep 5
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
@${RM} -f ${WRKDIR}/.Xvfb.pid
.else
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
.endif
install-user:
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
post-install:
@${ECHO_MSG} "===> Add wrapper scripts";
@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
@${CP} ${FILESDIR}/freebsd-local.sh ${WRKDIR}/
@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
-e 's#%%LANG%%#${USE_LANG}#g' \
-e 's#%%BUILD_NR%%#${BUILD_NR}#g' \
-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
${WRKDIR}/openoffice-wrapper \
${WRKDIR}/freebsd-local.sh
@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
${PREFIX}/bin/openoffice-${RELEASE_NR}
@${INSTALL_SCRIPT} ${WRKDIR}/freebsd-local.sh \
${PREFIX}/${INSTALLATION_BASEDIR}/program/freebsd-local.sh
@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda
@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc
@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw
@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup
@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax
@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath
@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress
@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin
@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb
@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter
@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST}
@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
package-rename:
@${ECHO_MSG} "===> Rename package for OO.org mirror upload";
.if defined(LANG_SUFFIX)
@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
.else
@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
.endif
update:
@${MAKE} fetch
@${MAKE} extract
@cd ${WRKSRC}/.. && for dir in *; do \
if [ -d $$dir ]; then \
cd $$dir; cvs update -d; cd ..; \
fi \
done
.include <bsd.port.post.mk>

13
editors/openoffice-devel/distinfo
View File

@ -1,13 +0,0 @@
MD5 (openoffice1.1/OOo_1.1.0_source.tar.bz2) = bec8b41089ebdad2831f3c456973ad4e
MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 58e641de57c888c2e93b5d52b65f1f3c
MD5 (openoffice1.1/helpcontent_34_unix.tgz) = 4525930fc5dbccbbe1a520afb498a975
MD5 (openoffice1.1/helpcontent_39_unix.tgz) = 29e91a77b14758dd045ebfa629d010c4
MD5 (openoffice1.1/helpcontent_46_unix.tgz) = 70bf56e7bcc44cc5d2747311289e831f
MD5 (openoffice1.1/helpcontent_49_unix.tgz) = 7e75feae2492399edc40060c652975f5
MD5 (openoffice1.1/helpcontent_81_unix.tgz) = 585261173da99f15bec73c75b61c36fb
MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 7c80861601519945c5863ad1b4dd9f54
MD5 (openoffice1.1/helpcontent_86_unix.tgz) = 9b80b3466293faa292b8dec57ccb2534
MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 7d67c19acfa447d4e7a603a2feeb1f2b

21
editors/openoffice-devel/files/debugpatch-setup2+mow+source+loader+loader.c
View File

@ -1,21 +0,0 @@
--- ../setup2/mow/source/loader/loader.c.orig Mon Jun 2 08:25:13 2003
+++ ../setup2/mow/source/loader/loader.c Tue Jun 3 07:58:22 2003
@@ -1069,6 +1069,7 @@
void KillSetupDir()
{
+#if 0
DIR* pDir;
struct dirent* pFile;
@@ -1088,6 +1089,10 @@
closedir( pDir );
chdir( strInitPath );
rmdir( strTmpPath );
+#else
+ fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
+ strTmpPath);
+#endif
}
void makeSymLink( char* s )

18
editors/openoffice-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
View File

@ -1,18 +0,0 @@
--- ../solenv/inc/unxfbsdi.mk.orig Thu Jun 5 08:44:59 2003
+++ ../solenv/inc/unxfbsdi.mk Tue Jun 10 17:30:40 2003
@@ -92,12 +92,12 @@
CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
# flags for C and C++ Compile
-CFLAGS+= -w -c $(INCLUDE)
+CFLAGS+= -g -ggdb -w -c $(INCLUDE)
CFLAGS+= -I/usr/X11R6/include
# flags for the C++ Compiler
-CFLAGSCC= -pipe -fno-rtti
-CFLAGSCXX= -pipe -fno-for-scope -fpermissive -fno-rtti
+CFLAGSCC= -g -ggdb -pipe -fno-rtti
+CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive -fno-rtti
# Flags for enabling exception handling
CFLAGSEXCEPTIONS= -fexceptions

76
editors/openoffice-devel/files/freebsd-local.sh
View File

@ -1,76 +0,0 @@
#!/bin/sh
#
# $FreeBSD $
if [ -e $HOME/.sversionrc ]; then
OOHOME=`grep %%FRELEASE_NR%% $HOME/.sversionrc \
| sed -e 's/.*file:\/\///'`
fi
save_common_xcu() {
sed 's/^X//' > $OOHOME/tmp/Common.xcu << 'END-of-Common.xcu'
X<?xml version="1.0" encoding="UTF-8"?>
X<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Common" oor:package="org.openoffice.Office">
X <node oor:name="Internal">
X <prop oor:name="CurrentTempURL" oor:type="xs:string">
X <value/>
X </prop>
X </node>
X <node oor:name="Misc">
X <prop oor:name="FirstRun" oor:type="xs:boolean">
X <value>true</value>
X </prop>
X </node>
X <node oor:name="ExternalApps">
X <prop oor:name="file" oor:type="xs:string">
X <value/>
X </prop>
X <prop oor:name="ftp" oor:type="xs:string">
X <value/>
X </prop>
X <prop oor:name="http" oor:type="xs:string">
X <value>%%mozilla%%</value>
X </prop>
X <prop oor:name="https" oor:type="xs:string">
X <value/>
X </prop>
X <prop oor:name="mailto" oor:type="xs:string">
X <value/>
X </prop>
X </node>
X</oor:component-data>
END-of-Common.xcu
mozilla=`which mozilla`;
if [ $? -eq 0 ]; then
sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' $OOHOME/tmp/Common.xcu
fi
mozilla=`which linux-mozilla`;
if [ $? -eq 0 ]; then
sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' $OOHOME/tmp/Common.xcu
fi
mv $OOHOME/tmp/Common.xcu $OOHOME/user/registry/data/org/openoffice/Office
}
#
# Set default lang to en_US.ISO8859-15
#
if [ ! $LANG ]; then
export LANG=en_US.ISO8859-15
fi
#
# Create soffice.cfg if it does not exist.
#
if [ ! -z $OOHOME ] && [ -e $OOHOME/setup ]; then
if [ ! -e $OOHOME/user/config/soffice.cfg ]; then
touch $OOHOME/user/config/soffice.cfg
fi
fi
#
# Detect installed mozilla
#
if [ ! -z $OOHOME ] && [ ! -e $OOHOME/user/registry/data/org/openoffice/Office/Common.xcu ]; then
mkdir -p $OOHOME/tmp;
save_common_xcu;
fi

290
editors/openoffice-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
View File

@ -1,290 +0,0 @@
--- ../goodies/source/filter.vcl/egif/giflzwc.cxx Sun Apr 13 14:33:24 2003
+++ /dev/null Mon Apr 14 06:10:35 2003
@@ -1,287 +0,0 @@
-/*************************************************************************
- *
- * $RCSfile: giflzwc.cxx,v $
- *
- * $Revision: 1.1.1.1 $
- *
- * last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- * Sun Microsystems Inc., October, 2000
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- *
- * Sun Industry Standards Source License Version 1.1
- * =================================================
- * The contents of this file are subject to the Sun Industry Standards
- * Source License Version 1.1 (the "License"); You may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at http://www.openoffice.org/license.html.
- *
- * Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- * See the License for the specific provisions governing your rights and
- * obligations concerning the Software.
- *
- * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- * Copyright: 2000 by Sun Microsystems, Inc.
- *
- * All Rights Reserved.
- *
- * Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-
-#include <tools/stream.hxx>
-#include "giflzwc.hxx"
-
-// ----------------------------
-// - GIFImageDataOutputStream -
-// ----------------------------
-
-class GIFImageDataOutputStream
-{
-private:
-
- void FlushBlockBuf();
- inline void FlushBitsBufsFullBytes();
-
- SvStream& rStream;
- BYTE* pBlockBuf;
- BYTE nBlockBufSize;
- ULONG nBitsBuf;
- USHORT nBitsBufSize;
-
-public:
-
- GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
- ~GIFImageDataOutputStream();
-
- inline void WriteBits( USHORT nCode, USHORT nCodeLen );
-};
-
-// ------------------------------------------------------------------------
-
-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
-{
- while (nBitsBufSize>=8)
- {
- if( nBlockBufSize==255 )
- FlushBlockBuf();
-
- pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
- nBitsBuf >>= 8;
- nBitsBufSize -= 8;
- }
-}
-
-// ------------------------------------------------------------------------
-
-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
-{
- if( nBitsBufSize+nCodeLen>32 )
- FlushBitsBufsFullBytes();
-
- nBitsBuf |= (ULONG) nCode << nBitsBufSize;
- nBitsBufSize += nCodeLen;
-}
-
-// ------------------------------------------------------------------------
-
-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
- rStream(rGIF)
-{
- pBlockBuf = new BYTE[ 255 ];
- nBlockBufSize = 0;
- nBitsBufSize = 0;
- nBitsBuf = 0;
- rStream << nLZWDataSize;
-}
-
-// ------------------------------------------------------------------------
-
-
-GIFImageDataOutputStream::~GIFImageDataOutputStream()
-{
- WriteBits(0,7);
- FlushBitsBufsFullBytes();
- FlushBlockBuf();
- rStream << (BYTE)0;
- delete[] pBlockBuf;
-}
-
-// ------------------------------------------------------------------------
-
-void GIFImageDataOutputStream::FlushBlockBuf()
-{
- if( nBlockBufSize )
- {
- rStream << (BYTE) nBlockBufSize;
- rStream.Write( pBlockBuf,nBlockBufSize );
- nBlockBufSize = 0;
- }
-}
-
-// -------------------
-// - GIFLZWCTreeNode -
-// -------------------
-
-struct GIFLZWCTreeNode
-{
-
- GIFLZWCTreeNode* pBrother; // naechster Knoten, der den selben Vater hat
- GIFLZWCTreeNode* pFirstChild; // erster Sohn
- USHORT nCode; // Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
- USHORT nValue; // Der Pixelwert
-};
-
-// --------------------
-// - GIFLZWCompressor -
-// --------------------
-
-GIFLZWCompressor::GIFLZWCompressor()
-{
- pIDOS=NULL;
-}
-
-// ------------------------------------------------------------------------
-
-GIFLZWCompressor::~GIFLZWCompressor()
-{
- if (pIDOS!=NULL) EndCompression();
-}
-
-// ------------------------------------------------------------------------
-
-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
-{
- if( !pIDOS )
- {
- USHORT i;
-
- nDataSize = nPixelSize;
-
- if( nDataSize < 2 )
- nDataSize=2;
-
- nClearCode=1<<nDataSize;
- nEOICode=nClearCode+1;
- nTableSize=nEOICode+1;
- nCodeSize=nDataSize+1;
-
- pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
- pTable=new GIFLZWCTreeNode[4096];
-
- for (i=0; i<4096; i++)
- {
- pTable[i].pBrother = pTable[i].pFirstChild = NULL;
- pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
- }
-
- pPrefix = NULL;
- pIDOS->WriteBits( nClearCode,nCodeSize );
- }
-}
-
-// ------------------------------------------------------------------------
-
-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
-{
- if( pIDOS )
- {
- GIFLZWCTreeNode* p;
- USHORT i;
- BYTE nV;
-
- if( !pPrefix && nSize )
- {
- pPrefix=pTable+(*pSrc++);
- nSize--;
- }
-
- while( nSize )
- {
- nSize--;
- nV=*pSrc++;
- for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
- {
- if (p->nValue==nV)
- break;
- }
-
- if( p)
- pPrefix=p;
- else
- {
- pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
-
- if (nTableSize==4096)
- {
- pIDOS->WriteBits(nClearCode,nCodeSize);
-
- for (i=0; i<nClearCode; i++)
- pTable[i].pFirstChild=NULL;
-
- nCodeSize=nDataSize+1;
- nTableSize=nEOICode+1;
- }
- else
- {
- if(nTableSize==(USHORT)(1<<nCodeSize))
- nCodeSize++;
-
- p=pTable+(nTableSize++);
- p->pBrother=pPrefix->pFirstChild;
- pPrefix->pFirstChild=p;
- p->nValue=nV;
- p->pFirstChild=NULL;
- }
-
- pPrefix=pTable+nV;
- }
- }
- }
-}
-
-// ------------------------------------------------------------------------
-
-void GIFLZWCompressor::EndCompression()
-{
- if( pIDOS )
- {
- if( pPrefix )
- pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
-
- pIDOS->WriteBits( nEOICode,nCodeSize );
- delete[] pTable;
- delete pIDOS;
- pIDOS=NULL;
- }
-}

45
editors/openoffice-devel/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
View File

@ -1,45 +0,0 @@
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
+++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx 2002-08-15 15:09:47.000000000 +0200
@@ -0,0 +1,42 @@
+/**********************************
+ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
+ **********************************/
+
+//#include <tools/stream.hxx>
+#include "giflzwc.hxx"
+
+// --------------------
+// - GIFLZWCompressor -
+// --------------------
+
+GIFLZWCompressor::GIFLZWCompressor()
+{
+ pIDOS=NULL;
+}
+
+// ------------------------------------------------------------------------
+
+GIFLZWCompressor::~GIFLZWCompressor()
+{
+}
+
+// ------------------------------------------------------------------------
+
+void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+{
+ /********************** DISABLED *************************/
+}
+
+// ------------------------------------------------------------------------
+
+void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+{
+ /********************** DISABLED *************************/
+}
+
+// ------------------------------------------------------------------------
+
+void GIFLZWCompressor::EndCompression()
+{
+ /********************** DISABLED *************************/
+}

11
editors/openoffice-devel/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
View File

@ -1,11 +0,0 @@
--- ../goodies/source/filter.vcl/egif/makefile.mk.orig Tue Aug 14 23:22:54 2001
+++ ../goodies/source/filter.vcl/egif/makefile.mk Mon Apr 14 06:04:55 2003
@@ -89,7 +89,7 @@
SLOFILES= $(SLO)$/egif.obj \
$(SLO)$/dlgegif.obj \
- $(SLO)$/giflzwc.obj
+ $(SLO)$/giflzwc_disabled.obj
# ==========================================================================

17
editors/openoffice-devel/files/moz-connectivity+prj+build.lst
View File

@ -1,17 +0,0 @@
--- ../connectivity/prj/build.lst 2 Jun 2003 07:53:47 -0000 1.18
+++ ../connectivity/prj/build.lst 8 Aug 2003 07:21:31 -0000
@@ -1,4 +1,4 @@
-cn connectivity : comphelper moz svtools unixODBC NULL
+cn connectivity : comphelper svtools unixODBC NULL
cn connectivity usr1 - all cn_mkout NULL
cn connectivity\source\types nmake - all cn_types NULL
cn connectivity\source\commontools nmake - all cn_cmtools cn_parse cn_types NULL
@@ -7,8 +7,6 @@
cn connectivity\source\resource nmake - all cn_res NULL
cn connectivity\source\sdbcx nmake - all cn_sdbcx cn_types NULL
cn connectivity\source\drivers\ado nmake - w cn_ado cn_dbtools NULL
-cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_mozillasrc cn_file NULL
-cn connectivity\source\drivers\mozab nmake - all cn_mozab cn_mozab_mozillasrc cn_dbtools NULL
cn connectivity\source\drivers\evoab nmake - all cn_evoab cn_dbtools cn_file NULL
cn connectivity\source\drivers\calc nmake - all cn_calc cn_file NULL
cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_dbtools NULL

34
editors/openoffice-devel/files/moz-scp+source+office+files.scp
View File

@ -1,34 +0,0 @@
Index: scp/source/office/files.scp
===================================================================
RCS file: /cvs/installation/scp/source/office/files.scp,v
retrieving revision 1.369.10.1
diff -u -r1.369.10.1 files.scp
--- scp/source/office/files.scp 1 Aug 2003 12:14:45 -0000 1.369.10.1
+++ scp/source/office/files.scp 20 Aug 2003 11:45:05 -0000
@@ -388,7 +388,7 @@
Styles = (PACKED);
End
-#ifndef MACOSX
+#if !(defined(MACOSX) || defined(FREEBSD))
File GID_FILE_LIB_MOZABDRV
TXT_FILE_BODY;
#ifdef UNX
@@ -750,7 +750,7 @@
#endif
End
-#ifndef MACOSX
+#if !(defined(MACOSX) || defined(FREEBSD))
File GID_FILE_LIB_MOZAB_2
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
@@ -3184,7 +3184,7 @@
#endif
// of #ifdef SOLAR_JAVA
-#ifndef MACOSX
+#if !(defined(MACOSX) || defined(FREEBSD))
File GID_FILE_MOZILLA_RUNTIME
TXT_FILE_BODY;
Styles = (ARCHIVE);

7
editors/openoffice-devel/files/oo_setup.resp
View File

@ -1,7 +0,0 @@
[Environment]
InstallationMode = INSTALL_NETWORK
InstallationType = STANDARD
DestinationPath = %%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%
[Java]
JavaSupport = preinstalled_or_none

15
editors/openoffice-devel/files/openoffice-wrapper
View File

@ -1,15 +0,0 @@
#!/bin/sh
#
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-devel/files/Attic/openoffice-wrapper,v 1.12 2003-09-25 22:43:58 mbr Exp $
oopath=%%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%/program/
program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
case $program in
$0)
$oopath/soffice "$@"
;;
*)
$oopath/$program "$@"
;;
esac

208
editors/openoffice-devel/files/optpatch-freetype+patch
View File

@ -1,208 +0,0 @@
Index: files/patch-freetype::patch
===================================================================
RCS file: files/patch-freetype::patch
diff -N files/patch-freetype::patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-freetype::patch 4 Aug 2002 15:27:42 -0000
@@ -0,0 +1,201 @@
+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
+--- ../freetype/freetype-2.0.5.patch Fri Apr 5 21:07:34 2002
++++ ../freetype/freetype-2.0.5.patch Sat Mar 9 18:04:17 2002
+@@ -1,118 +1,79 @@
+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 14 00:44:33 2000
+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk Wed Nov 7 16:11:47 2001
+-***************
+-*** 63,69 ****
+- # ANSI compliance.
+- #
+- ifndef CFLAGS
+-! CFLAGS := /nologo /c /Ox /G5 /W3 /WX
+- endif
+-
+- # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
+---- 63,69 ----
+- # ANSI compliance.
+- #
+- ifndef CFLAGS
+-! CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
+- endif
+-
+- # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh Thu Jun 7 19:36:17 2001
+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh Wed Nov 7 16:11:47 2001
+-***************
+-*** 631,637 ****
+- if test "$build_old_libs" = yes; then
+- if test "$pic_mode" != yes; then
+- # Don't build PIC code
+-! command="$base_compile $srcfile"
+- else
+- # All platforms use -DPIC, to notify preprocessed assembler code.
+- command="$base_compile $srcfile $pic_flag -DPIC"
+---- 631,637 ----
+- if test "$build_old_libs" = yes; then
+- if test "$pic_mode" != yes; then
+- # Don't build PIC code
+-! command="$base_compile $srcfile -DPIC $pic_flag"
+- else
+- # All platforms use -DPIC, to notify preprocessed assembler code.
+- command="$base_compile $srcfile $pic_flag -DPIC"
+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h Mon Jan 1 18:25:21 2001
+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h Wed Nov 7 16:11:47 2001
+-***************
+-*** 1,7 ****
+---- 1,9 ----
+- FT_USE_MODULE(autohint_module_class)
+- FT_USE_MODULE(cff_driver_class)
+- FT_USE_MODULE(t1cid_driver_class)
+-+ /*
+- FT_USE_MODULE(pcf_driver_class)
+-+ */
+- FT_USE_MODULE(psaux_module_class)
+- FT_USE_MODULE(psnames_module_class)
+- FT_USE_MODULE(ft_raster1_renderer_class)
+-***************
+-*** 9,12 ****
+---- 11,16 ----
+- FT_USE_MODULE(ft_smooth_renderer_class)
+- FT_USE_MODULE(tt_driver_class)
+- FT_USE_MODULE(t1_driver_class)
+-+ /*
+- FT_USE_MODULE(winfnt_driver_class)
+-+ */
+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h Tue Aug 21 10:50:45 2001
+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h Wed Nov 7 16:11:47 2001
+-***************
+-*** 70,76 ****
+---- 70,79 ----
+- /* All convenience functions are declared as such in their */
+- /* documentation. */
+- /* */
+-+ /*
+- #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
+-+ */
+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
+-
+-
+- /*************************************************************************/
+-***************
+-*** 108,116 ****
+- /* use a vector `plotter' format that isn't supported when this */
+- /* macro is undefined. */
+- /* */
+- #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
+-
+--
+- /*************************************************************************/
+- /* */
+- /* Glyph Postscript Names handling */
+---- 111,121 ----
+- /* use a vector `plotter' format that isn't supported when this */
+- /* macro is undefined. */
+- /* */
+-+ /*
+- #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
+-+ */
+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
+-
+- /*************************************************************************/
+- /* */
+- /* Glyph Postscript Names handling */
+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig Mon Jan 7 14:21:35 2002
+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh Mon Jan 7 14:21:40 2002
+-***************
+-*** 2251,2257 ****
+- ;;
+-
+- irix)
+-! major=`expr $current - $age + 1`
+- verstring="sgi$major.$revision"
+-
+- # Add in all the interfaces that we are compatible with.
+---- 2251,2257 ----
+- ;;
+-
+- irix)
+-! major=`expr $current - $age`
+- verstring="sgi$major.$revision"
+-
+- # Add in all the interfaces that we are compatible with.
++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
++--- misc/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 27 14:47:57 2001
+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 27 14:49:17 2001
++@@ -63,7 +63,7 @@
++ # ANSI compliance.
++ #
++ ifndef CFLAGS
++- CFLAGS := /nologo /c /Ox /G5 /W3 /WX
+++ CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
++ endif
++
++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
++--- misc/freetype-2.0.5/builds/unix/ltmain.sh Thu Dec 27 14:47:56 2001
+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh Thu Dec 27 14:49:17 2001
++@@ -631,7 +631,7 @@
++ if test "$build_old_libs" = yes; then
++ if test "$pic_mode" != yes; then
++ # Don't build PIC code
++- command="$base_compile $srcfile"
+++ command="$base_compile $srcfile -DPIC $pic_flag"
++ else
++ # All platforms use -DPIC, to notify preprocessed assembler code.
++ command="$base_compile $srcfile $pic_flag -DPIC"
++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h Thu Dec 27 14:47:57 2001
+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h Thu Dec 27 14:49:17 2001
++@@ -1,7 +1,9 @@
++ FT_USE_MODULE(autohint_module_class)
++ FT_USE_MODULE(cff_driver_class)
++ FT_USE_MODULE(t1cid_driver_class)
+++/*
++ FT_USE_MODULE(pcf_driver_class)
+++*/
++ FT_USE_MODULE(psaux_module_class)
++ FT_USE_MODULE(psnames_module_class)
++ FT_USE_MODULE(ft_raster1_renderer_class)
++@@ -9,4 +11,6 @@
++ FT_USE_MODULE(ft_smooth_renderer_class)
++ FT_USE_MODULE(tt_driver_class)
++ FT_USE_MODULE(t1_driver_class)
+++/*
++ FT_USE_MODULE(winfnt_driver_class)
+++*/
++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h Thu Dec 27 14:47:57 2001
+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h Thu Dec 27 14:51:15 2001
++@@ -70,7 +70,10 @@
++ /* All convenience functions are declared as such in their */
++ /* documentation. */
++ /* */
+++/*
++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
+++*/
+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
++
++
++ /*************************************************************************/
++@@ -108,8 +111,10 @@
++ /* use a vector `plotter' format that isn't supported when this */
++ /* macro is undefined. */
++ /* */
+++/*
++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
++-
+++*/
+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
++
++ /*************************************************************************/
++ /* */
++@@ -338,7 +343,7 @@
++ /* By undefining this, you will only compile the code necessary to load */
++ /* TrueType glyphs without hinting. */
++ /* */
++-#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+++#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
++
++
++ /*************************************************************************/

11
editors/openoffice-devel/files/optpatch-vcl+util+makefile.pmk
View File

@ -1,11 +0,0 @@
--- ../vcl/util/makefile.pmk.orig Mon Aug 5 01:39:41 2002
+++ ../vcl/util/makefile.pmk Mon Aug 5 01:40:03 2002
@@ -64,7 +64,7 @@
PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
PDBTARGET=vcl
-.IF "$(OS)" != "MACOSX"
+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
.IF "$(remote)" != ""
USE_BUILTIN_RASTERIZER=true
.ENDIF

103
editors/openoffice-devel/files/patch-config_office
View File

@ -1,103 +0,0 @@
--- ../config_office/configure.in 5 Aug 2003 16:21:41 -0000 1.55.2.9
+++ ../config_office/configure.in 9 Aug 2003 05:20:19 -0000
@@ -77,6 +77,11 @@
Usage: --with-jdk-home=<absolute path to JDK 1.3 home>
],,)
+AC_ARG_WITH(gxx_include_path,
+[ --with-gxx-include-path if you want to override the autodetected g++ include path.
+
+ Usage: --with-gxx-include-path=<absolute path to g++ include dir>
+],,)
AC_ARG_ENABLE(java,
[ --disable-java Build without Java support. Use if there is no supported JDK
for your platform. The build will have no support for Java
@@ -191,8 +196,8 @@
Usage: --with-asm-home=<path to ml.exe directory>
],,)
AC_ARG_WITH(os-version,
-[ --with-os-version For FreeBSD users, use this option option to build
- OpenOffice.org with the correct OSVERSION.
+[ --with-os-version For FreeBSD users, use this option option to override
+ the detected OSVERSION.
Usage: --with-os-version=<OSVERSION>
],,)
@@ -301,6 +306,19 @@
"FreeBSD")
test_x=yes
test_gtk=yes
+ AC_MSG_CHECKING([the FreeBSD operating system release])
+ if test -n "$with_os_version"; then
+ OSVERSION="$with_os_version"
+ else
+ OSVERSION=`/sbin/sysctl -n kern.osreldate`
+ fi
+ AC_MSG_RESULT([found OSVERSION=$OSVERSION])
+ PTHREAD_CFLAGS="-D_THREAD_SAFE"
+ if test "$OSVERSION" -lt "500016"; then
+ PTHREAD_LIBS="-pthread"
+ else
+ PTHREAD_LIBS="-lc_r"
+ fi
;;
"OSF1")
test_x=dontknow
@@ -326,6 +345,7 @@
AC_MSG_RESULT([checked ($_os)])
+AC_SUBST(OSVERSION)
AC_SUBST(PTHREAD_CFLAGS)
AC_SUBST(PTHREAD_LIBS)
@@ -812,30 +832,20 @@
dnl ===================================================================
dnl Set the gcc/gxx include directories
dnl ===================================================================
-if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then
-if test "$GXX" = "yes"; then
- if test -n "$enable_gcc3"; then
- _gccincname1="g++-v3"
- else
- _gccincname1="g++-3"
- fi
- _gcc_include_path=".."
- _gxx_include_path="$_gcc_include_path/$_gccincname1"
-fi
-else
-if test "$GXX" = "yes"; then
- _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- if test "$_gxx_include_path" = "/usr/libexec/(null)/include"; then
- _gxx_include_path="/usr/include"
+# Removed the special FreeBSD treatment. The problem was that with_gxx_include_path
+# often contains an i386 which is expanded as a macro. Solved in stlport.
+if test "$GXX" = "yes" -a -z "$with_gxx_include_path"; then
+ with_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
+ if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then
+ with_gxx_include_path="/usr/include"
fi
dnl This is the original code...
-dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
-fi
+dnl with_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
fi
-if test -z "$_gxx_include_path"; then
- _gxx_include_path="NO_GXX_INCLUDE"
+if test -z "$with_gxx_include_path"; then
+ with_gxx_include_path="NO_GXX_INCLUDE"
fi
-GXX_INCLUDE_PATH="$_gxx_include_path"
+GXX_INCLUDE_PATH="$with_gxx_include_path"
AC_SUBST(GXX_INCLUDE_PATH)
dnl ===================================================================
@@ -1677,8 +1687,6 @@
AC_SUBST(GCC_HOME)
AC_SUBST(WITH_MINGWIN)
-OSVERSION="$with_os_version"
-AC_SUBST(OSVERSION)
AC_OUTPUT([set_soenv])

45
editors/openoffice-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
View File

@ -1,45 +0,0 @@
--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Tue Apr 15 19:39:14 2003
+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Sat May 31 22:34:31 2003
@@ -64,8 +64,8 @@
#mozilla specific stuff.
MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
#End of mozilla specific stuff.
PRJ=..$/..$/..$/..
@@ -132,7 +132,7 @@
-I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
-I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
-I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap
+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \
-DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
@@ -150,7 +150,7 @@
-I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
-I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
-I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap
+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
CDEFS+= -DMOZILLA_CLIENT \
-DOSTYPE=\"Linux2.2.14-5\" -DOJI
.IF "$(OS)" == "LINUX"
@@ -166,6 +166,13 @@
-fno-rtti -Wall -Wconversion -Wpointer-arith \
-Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-Wno-long-long
+CDEFS += -DTRACING
+.ELIF "$(OS)" == "FREEBSD"
+CFLAGS += -fPIC
+CFLAGSCXX += \
+ -fno-rtti -Wall -Wconversion -Wpointer-arith \
+ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+ -Wno-long-long -pthread
CDEFS += -DTRACING
.ENDIF
.ENDIF

10
editors/openoffice-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map
View File

@ -1,10 +0,0 @@
--- ../cppuhelper/source/gcc3_linux_intel.map.orig Sat Sep 13 22:15:22 2003
+++ ../cppuhelper/source/gcc3_linux_intel.map Sat Sep 13 22:16:01 2003
@@ -299,6 +299,7 @@
_ZNK4cppu6UnoUrl11getProtocolEv;
_ZNK4cppu6UnoUrl13getConnectionEv;
_ZNK4cppu6UnoUrl13getObjectNameEv;
+_end;
local:
*;

11
editors/openoffice-devel/files/patch-crashrep+source+unx+makefile.mk
View File

@ -1,11 +0,0 @@
--- ../crashrep/source/unx/makefile.mk.orig Tue Jul 22 19:37:38 2003
+++ ../crashrep/source/unx/makefile.mk Thu Aug 14 18:44:09 2003
@@ -123,7 +123,7 @@
APP2STDLIBS+=-lsocket
.ENDIF
.IF "$(OS)" == "FREEBSD"
-APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
+APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
.ENDIF
.ENDIF

11
editors/openoffice-devel/files/patch-desktop+scripts+soffice.sh
View File

@ -1,11 +0,0 @@
--- ../desktop/scripts/soffice.sh.orig Wed Sep 17 05:21:54 2003
+++ ../desktop/scripts/soffice.sh Wed Sep 17 05:24:59 2003
@@ -233,6 +233,8 @@
PATH="$sd_prog":$PATH
export PATH
+. $sd_prog/freebsd-local.sh
+
# execute soffice binary
exec "$sd_prog/$sd_binary" "$@"

25
editors/openoffice-devel/files/patch-jvmaccess+source+sunversion.cxx
View File

@ -1,25 +0,0 @@
--- ../jvmaccess/source/sunversion.cxx.orig Thu May 22 18:41:23 2003
+++ ../jvmaccess/source/sunversion.cxx Tue Sep 2 21:31:04 2003
@@ -244,6 +244,22 @@
m_preRelease = Rel_RC1;
else if (! strcmp(pCur, "rc2"))
m_preRelease = Rel_RC2;
+ else if (! strcmp(pCur, "p8"))
+ m_preRelease = Rel_BETA;
+ else if (! strcmp(pCur, "p7"))
+ m_preRelease = Rel_BETA;
+ else if (! strcmp(pCur, "p6"))
+ m_preRelease = Rel_BETA;
+ else if (! strcmp(pCur, "p5"))
+ m_preRelease = Rel_BETA;
+ else if (! strcmp(pCur, "p4"))
+ m_preRelease = Rel_BETA;
+ else if (! strcmp(pCur, "p3"))
+ m_preRelease = Rel_BETA;
+ else if (! strcmp(pCur, "p2"))
+ m_preRelease = Rel_BETA;
+ else if (! strcmp(pCur, "p1"))
+ m_preRelease = Rel_BETA;
else
return false;
}

11
editors/openoffice-devel/files/patch-python-makefile.mk
View File

@ -1,11 +0,0 @@
--- ../python/makefile.mk 31 Jul 2003 12:15:14 -0000 1.5.2.2
+++ ../python/makefile.mk 8 Aug 2003 15:28:45 -0000
@@ -187,7 +187,7 @@
ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
.ELSE
.IF "$(OS)" == "FREEBSD"
- ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR) -lm -lutil ${PTHREAD_LIBS}
+ $(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR) -lm -lutil ${PTHREAD_LIBS}
.ELSE
.IF "$(OS)" == "IRIX"
ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread

8
editors/openoffice-devel/files/patch-readlicense_oo+prj+d.lst
View File

@ -1,8 +0,0 @@
--- ../readlicense_oo/prj/d.lst~ Thu Jul 17 03:00:51 2003
+++ ../readlicense_oo/prj/d.lst Sun Jul 27 17:23:26 2003
@@ -206,4 +206,4 @@
..\%__SRC%\misc\99\readme99.txt %_DEST%\bin%_EXT%\99\osl\README99
..\%__SRC%\misc\99\readme99.html %_DEST%\bin%_EXT%\99\osl\README99.html
-..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html
+..\%__SRC%\html\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html

214
editors/openoffice-devel/files/patch-rtfcjk
View File

@ -1,214 +0,0 @@
--- ../svx/source/svrtf/rtfitem.cxx 24 Jun 2003 07:48:56 -0000 1.18
+++ ../svx/source/svrtf/rtfitem.cxx 25 Jul 2003 22:54:24 -0000
@@ -285,11 +285,20 @@
}
else
{
- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType )
+// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK
+ if( LOW_CHARTYPE == eType )
{
if( *pNormal )
{
rItem.SetWhich( *pNormal );
+ rSet.Put( rItem );
+ }
+ }
+ else if( HIGH_CHARTYPE == eType )
+ {
+ if( *pCTL )
+ {
+ rItem.SetWhich( *pCTL );
rSet.Put( rItem );
}
}
--- ../svx/source/svrtf/svxrtf.cxx 19 May 2003 12:30:59 -0000 1.15
+++ ../svx/source/svrtf/svxrtf.cxx 25 Jul 2003 22:54:29 -0000
@@ -583,8 +583,14 @@
case RTF_FCHARSET:
if( -1 != nTokenValue )
- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset(
- (BYTE)nTokenValue ) );
+ {
+// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset(
+// (BYTE)nTokenValue ) );
+ CharSet nCharSet =
+ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue );
+ pFont->SetCharSet( nCharSet );
+ SetEncoding( nCharSet ); //Takashi Ono
+ }
break;
case RTF_FPRQ:
--- ../sw/source/filter/rtf/swparrtf.cxx 4 Jun 2003 10:19:09 -0000 1.28
+++ ../sw/source/filter/rtf/swparrtf.cxx 25 Jul 2003 22:54:37 -0000
@@ -3231,10 +3231,156 @@
SetSwgValues( rCollSet );
}
+//Takashi Ono for CJK
+String SwRTFParser::XlateFmtColName( const String &rName )
+{
+#define RES_NONE RES_POOLCOLL_DOC_END
+
+ static const RES_POOL_COLLFMT_TYPE aArr[]={
+ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2,
+ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5,
+ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8,
+ RES_POOLCOLL_HEADLINE9,
+
+ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3,
+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
+ RES_POOLCOLL_TOX_CNTNT1,
+
+ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4,
+ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7,
+ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9,
+ RES_NONE, RES_POOLCOLL_FOOTNOTE,
+
+ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH,
+ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS,
+ RES_NONE, RES_NONE,
+
+ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE,
+ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE,
+
+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
+
+ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE,
+ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE,
+
+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL };
+ static const sal_Char *stiName[] = {
+ "Normal",
+ "heading 1",
+ "heading 2",
+ "heading 3",
+ "heading 4",
+ "heading 5",
+ "heading 6",
+ "heading 7",
+ "heading 8",
+ "heading 9",
+ "index 1",
+ "index 2",
+ "index 3",
+ "index 4",
+ "index 5",
+ "index 6",
+ "index 7",
+ "index 8",
+ "index 9",
+ "toc 1",
+ "toc 2",
+ "toc 3",
+ "toc 4",
+ "toc 5",
+ "toc 6",
+ "toc 7",
+ "toc 8",
+ "toc 9",
+ "Normal Indent",
+ "footnote text",
+ "annotation text",
+ "header",
+ "footer",
+ "index heading",
+ "caption",
+ "table of figures",
+ "envelope address",
+ "envelope return",
+ "footnote reference",
+ "annotation reference",
+ "line number",
+ "page number",
+ "endnote reference",
+ "endnote text",
+ "table of authorities",
+ "macro",
+ "toa heading",
+ "List",
+ "List Bullet",
+ "List Number",
+ "List 2",
+ "List 3",
+ "List 4",
+ "List 5",
+ "List Bullet 2",
+ "List Bullet 3",
+ "List Bullet 4",
+ "List Bullet 5",
+ "List Number 2",
+ "List Number 3",
+ "List Number 4",
+ "List Number 5",
+ "Title",
+ "Closing",
+ "Signature",
+ "Default Paragraph Font",
+ "Body Text",
+ "Body Text Indent",
+ "List Continue",
+ "List Continue 2",
+ "List Continue 3",
+ "List Continue 4",
+ "List Continue 5",
+ "Message Header",
+ "Subtitle",
+ };
+
+
+ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ),
+ "Style-UEbersetzungstabelle hat falsche Groesse" );
+ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ),
+ "Style-UEbersetzungstabelle hat falsche Groesse" );
+
+ RES_POOL_COLLFMT_TYPE nId = RES_NONE;
+
+ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++)
+ {
+ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) )
+ {
+ nId = aArr[i];
+ break;
+ }
+ }
+ USHORT nResId;
+ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END )
+ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN;
+ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END)
+ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN;
+ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END)
+ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN;
+ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END)
+ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN;
+ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END)
+ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN;
+ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END)
+ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN;
+ return String( ResId( nResId + nId, pSwResMgr ) );
+}
+
SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle )
{
- int bCollExist;
- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo),
+ int bCollExist;
+// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK
+ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ),
+ USHORT(nNo),
rStyle.nOutlineNo, bCollExist );
aTxtCollTbl.Insert( nNo, pColl );
--- ../sw/source/filter/rtf/swparrtf.hxx 19 May 2003 12:25:34 -0000 1.10
+++ ../sw/source/filter/rtf/swparrtf.hxx 25 Jul 2003 22:54:44 -0000
@@ -364,6 +364,7 @@
void SetStyleAttr( SfxItemSet& rCollSet,
const SfxItemSet& rStyleSet,
const SfxItemSet& rDerivedSet );
+ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK
SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle );
SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle );
void MakeStyleTab();

13
editors/openoffice-devel/files/patch-sal+textenc+tencinfo.c
View File

@ -1,13 +0,0 @@
--- ../sal/textenc/tencinfo.c.orig Fri Apr 11 16:25:01 2003
+++ ../sal/textenc/tencinfo.c Sat May 31 23:33:43 2003
@@ -668,6 +668,10 @@
/* characters. The function search for the first equal string in */
/* the table. In this table are only the most used mime types. */
/* Sort order: important */
+
+ if (pMimeCharset == NULL)
+ pMimeCharset = "usascii";
+
static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
{
{ "usascii", RTL_TEXTENCODING_ASCII_US },

13
editors/openoffice-devel/files/patch-setup2+script+setup.sh
View File

@ -1,13 +0,0 @@
--- ../setup2/script/setup.sh.orig Thu Jul 17 02:59:43 2003
+++ ../setup2/script/setup.sh Thu Sep 4 07:27:59 2003
@@ -118,6 +118,10 @@
LD_LIBRARY_PATH=${sd_archive_path}:.
export LD_LIBRARY_PATH
;;
+ FreeBSD)
+ LD_LIBRARY_PATH=${sd_archive_path}:.
+ export LD_LIBRARY_PATH
+ ;;
Darwin)
DYLD_LIBRARY_PATH=${sd_archive_path}:.
export DYLD_LIBRARY_PATH

16
editors/openoffice-devel/files/patch-solenv+bin+addsym.awk
View File

@ -1,16 +0,0 @@
--- ../solenv/bin/addsym.awk.orig Tue Mar 11 15:11:44 2003
+++ ../solenv/bin/addsym.awk Tue Mar 11 15:13:19 2003
@@ -72,11 +72,11 @@
END {
if (state == 0) {
print "# Weak RTTI symbols for C++ exceptions:"
- print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
+ print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
}
}
state == 2 {
- print " _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
+ print " _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
state = 3
}
/^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }

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

@ -1,19 +0,0 @@
--- ../solenv/inc/unxfbsdi.mk.org Thu Aug 28 07:35:37 2003
+++ ../solenv/inc/unxfbsdi.mk Fri Aug 29 22:42:08 2003
@@ -200,12 +200,12 @@
# 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
+STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm
+STDLIBCUIMT=$(PTHREAD_LIBS) -lm
# libraries for linking shared libraries
-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm -lstlport_gcc
-STDSHLCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc
+STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLCUIMT=$(PTHREAD_LIBS) -lm
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive

25
editors/openoffice-devel/files/patch-stlport::STLport-4.5.patch
View File

@ -1,25 +0,0 @@
--- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
@@ -254,11 +254,12 @@
# elif (__GNUC_MINOR__ < 8)
---- 244,253 ----
+--- 244,254 ----
# if (__GNUC__ >= 3)
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #undef i386
! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
! GXX_INCLUDE_PATH/backward
@@ -274,7 +275,7 @@
# endif
+ #ifdef __FreeBSD__
-+ # include <../wchar.h>
++ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
# include <stl/_cwchar.h>

11
editors/openoffice-devel/files/patch-sw+source+filter+ww8+ww8scan.cxx
View File

@ -1,11 +0,0 @@
--- ../sw/source/filter/ww8/ww8scan.cxx.orig Wed Sep 3 04:12:28 2003
+++ ../sw/source/filter/ww8/ww8scan.cxx Wed Sep 3 04:12:49 2003
@@ -163,7 +163,7 @@
{
ASSERT(mnNoElems && pWwSprmTab, "WW8: empty Array: Don't do that");
std::sort(mpWwSprmTab, mpWwSprmTab + mnNoElems);
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 10 // XXX pass compilation with WITH_DEBUG=2
bool bBroken=false;
rtl::OUString sError;
const C *pIter = mpWwSprmTab;

22
editors/openoffice-devel/files/patch-tools+source+string+tstring.cxx
View File

@ -1,22 +0,0 @@
--- ../tools/source/string/tstring.cxx.orig Thu Mar 27 18:04:53 2003
+++ ../tools/source/string/tstring.cxx Sat May 31 23:04:05 2003
@@ -103,6 +103,9 @@
xub_StrLen ImplStringLen( const sal_Char* pStr )
{
const sal_Char* pTempStr = pStr;
+
+ if (pStr == NULL)
+ return(0);
while( *pTempStr )
++pTempStr;
return (xub_StrLen)(pTempStr-pStr);
@@ -113,6 +116,9 @@
xub_StrLen ImplStringLen( const sal_Unicode* pStr )
{
const sal_Unicode* pTempStr = pStr;
+
+ if (pStr == NULL)
+ return(0);
while( *pTempStr )
++pTempStr;
return (xub_StrLen)(pTempStr-pStr);

21
editors/openoffice-devel/files/patch-topsection
View File

@ -1,21 +0,0 @@
--- ../sw/source/filter/ww8/ww8par.cxx 9 Jul 2003 11:06:44 -0000 1.114
+++ ../sw/source/filter/ww8/ww8par.cxx 25 Jul 2003 22:55:23 -0000
@@ -2015,7 +2015,7 @@
bool bStartAttr = pPlcxMan->Get(&aRes); // hole Attribut-Pos
aRes.nAktCp = rTxtPos; // Akt. Cp-Pos
- if (aRes.nFlags & MAN_MASK_NEW_SEP) // neue Section
+ if ((aRes.nFlags & MAN_MASK_NEW_SEP) || maSectionManager.empty()) // neue Section
{
ASSERT(pPaM->GetNode()->GetTxtNode(), "Missing txtnode");
// PageDesc erzeugen und fuellen
--- ../sw/source/filter/ww8/ww8par.hxx 30 Jun 2003 15:54:37 -0000 1.115
+++ ../sw/source/filter/ww8/ww8par.hxx 25 Jul 2003 22:55:28 -0000
@@ -720,6 +720,7 @@
short GetPageLeft() const;
short GetPageRight() const;
short GetPageWidth() const;
+ bool empty() const { return maSegments.empty(); }
};
class wwFrameNamer

13
editors/openoffice-devel/files/patch-unoil+makefile.pmk
View File

@ -1,13 +0,0 @@
--- ../unoil/makefile.pmk.orig Fri Aug 31 18:04:43 2001
+++ ../unoil/makefile.pmk Thu Sep 12 12:17:50 2002
@@ -74,8 +74,8 @@
JAVAFILESLIST := $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
.ENDIF # "$(L10N_framework)"==""
-GENJAVAFILES := $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-GENCLASSFILES := $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
+GENJAVAFILES += $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
+GENCLASSFILES += $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
# --- Targets ------------------------------------------------------

11
editors/openoffice-devel/files/patch-vcl+unx+source+app+salmain.cxx
View File

@ -1,11 +0,0 @@
--- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1
+++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000
@@ -62,7 +62,7 @@
#define _SV_SALMAIN_CXX
// -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#ifdef MACOSX
+#if defined(MACOSX) || defined(FREEBSD)
// rlimit needs sys/types.h
#include <sys/types.h>
#include <sys/time.h>

63
editors/openoffice-devel/files/patch-word6+95-cjkhandling
View File

@ -1,63 +0,0 @@
--- ../sw/source/filter/ww8/ww8par.cxx 9 Jul 2003 11:06:44 -0000 1.114
+++ ../sw/source/filter/ww8/ww8par.cxx 25 Jul 2003 22:54:52 -0000
@@ -1683,11 +1683,20 @@
if (bVer67)
{
sal_Char aTest[2];
- aTest[0] = (nUCode & 0xFF00) >> 8;
- aTest[1] = (nUCode & 0x00FF);
- String aTemp(aTest, 2, eSrcCharSet);
- ASSERT(aTemp.Len() == 1, "so much for that theory");
- *pWork = aTemp.GetChar(0);
+ if (nUCode >= 0x3000)
+ {
+ aTest[0] = (nUCode & 0xFF00) >> 8;
+ aTest[1] = (nUCode & 0x00FF);
+ String aTemp(aTest, 2, eSrcCharSet);
+ ASSERT(aTemp.Len() == 1, "so much for that theory");
+ *pWork = aTemp.GetChar(0);
+ }
+ else
+ {
+ aTest[0] = (nUCode & 0x00FF);
+ String aTemp(aTest, 1, eSrcCharSet);
+ *pWork = aTemp.GetChar(0);
+ }
}
else
*pWork = nUCode;
@@ -3188,7 +3197,8 @@
{
case 6:
case 7:
- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) )
+ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono
+ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) )
{
//JP 06.05.99: teste auf eigenen 97-Fake!
if (pStg && 0xa5ec == nMagic)
--- ../sw/source/filter/ww8/ww8par6.cxx 20 Jun 2003 09:38:07 -0000 1.138
+++ ../sw/source/filter/ww8/ww8par6.cxx 25 Jul 2003 22:55:05 -0000
@@ -3373,9 +3373,11 @@
nId = RES_CHRATR_CTL_FONT;
break;
case 93:
+ case 111:
case 0x4a4f:
nId = RES_CHRATR_FONT;
break;
+ case 112:
case 0x4a50:
nId = RES_CHRATR_CJK_FONT;
break;
@@ -4984,8 +4986,8 @@
//percentage to grow hps short
{110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri
//ysri short
- {111, (FNReadRecord)0}, //"??111",
- {112, (FNReadRecord)0}, //"??112",
+ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font
+ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font
{113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font
{114, (FNReadRecord)0}, //"??114",
{115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ?

312
editors/openoffice-devel/files/patch-wrtrtf
View File

@ -1,312 +0,0 @@
--- ../svtools/source/svrtf/rtfout.cxx.orig 2000-10-16 18:13:46.000000000 +0900
+++ ../svtools/source/svrtf/rtfout.cxx 2003-09-23 12:41:00.000000000 +0900
@@ -124,8 +124,9 @@
default:
{
sal_Unicode cCh = c;
- c = (BYTE)ByteString::ConvertFromUnicode( c, eDestEnc, FALSE );
- if( !c )
+ rtl::OString buff( &c, 1, eDestEnc, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_IGNORE|RTL_UNICODETOTEXT_FLAGS_INVALID_IGNORE );
+// c = (BYTE)ByteString::ConvertFromUnicode( c, eDestEnc, FALSE );
+ if( !buff.getLength() )
{
// then write as unicode - character
if( 0xFF < cCh )
@@ -141,8 +142,8 @@
break;
}
- if( !bWriteHelpFile )
- switch( c )
+ if( !bWriteHelpFile && buff.getLength() == 1 )
+ switch( BYTE(buff[0]) )
{
#ifdef MAC
case 0xa5: pStr = sRTF_BULLET; break;
@@ -164,6 +165,9 @@
// MAC
}
if( !pStr )
+ for (int i = 0; i < buff.getLength(); ++i)
+ {
+ c = BYTE(buff[i]);
switch ( c )
{
case '\\':
@@ -186,6 +190,7 @@
}
break;
}
+ }
}
break;
}
--- ../sw/source/filter/rtf/wrtrtf.cxx.orig 2003-04-18 00:00:28.000000000 +0900
+++ ../sw/source/filter/rtf/wrtrtf.cxx 2003-09-23 23:33:08.000000000 +0900
@@ -184,6 +184,12 @@
#ifndef _CHARFMT_HXX
#include <charfmt.hxx>
#endif
+#ifndef _POOLFMT_HXX
+#include <poolfmt.hxx>
+#endif
+#ifndef _SWSTYLENAMEMAPPER_HXX
+#include <SwStyleNameMapper.hxx>
+#endif
#ifndef _SECTION_HXX //autogen
#include <section.hxx>
#endif
@@ -215,7 +221,7 @@
SV_IMPL_VARARR( RTFColorTbl, Color )
-SwRTFWriter::SwRTFWriter( const String& rFltName )
+SwRTFWriter::SwRTFWriter( const String& rFltName ) : eCurrentCharSet(DEF_ENCODING)
{
// schreibe Win-RTF-HelpFileFmt
bWriteHelpFmt = 'W' == rFltName.GetChar( 0 );
@@ -893,14 +899,14 @@
// as alternative name. Because WinWord can't match each
// font to a UniCode font. So the CJK texts are shown as
// empty rectangles ;-(.
- RTFOutFuncs::Out_String( rWrt.Strm(), sFntNm, DEF_ENCODING,
+ RTFOutFuncs::Out_String( rWrt.Strm(), sFntNm, eChrSet,
rWrt.bWriteHelpFmt );
OutComment( rWrt, sRTF_FALT) << ' ';
- RTFOutFuncs::Out_String( rWrt.Strm(), sAltNm, DEF_ENCODING,
+ RTFOutFuncs::Out_String( rWrt.Strm(), sAltNm, eChrSet,
rWrt.bWriteHelpFmt ) << '}';
}
else
- RTFOutFuncs::Out_String( rWrt.Strm(), sFntNm, DEF_ENCODING,
+ RTFOutFuncs::Out_String( rWrt.Strm(), sFntNm, eChrSet,
rWrt.bWriteHelpFmt );
rWrt.Strm() << ";}";
}
@@ -932,6 +938,139 @@
+//Takashi Ono for CJK
+const rtl::OUString SwRTFWriter::XlateFmtName( const rtl::OUString &rName, SwGetPoolIdFromName eFlags )
+{
+#define RES_NONE RES_POOLCOLL_DOC_END
+
+ static const RES_POOL_COLLFMT_TYPE aArr[]={
+ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2,
+ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5,
+ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8,
+ RES_POOLCOLL_HEADLINE9,
+
+ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3,
+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
+ RES_POOLCOLL_TOX_CNTNT1,
+
+ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4,
+ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7,
+ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9,
+ RES_POOLCOLL_TEXT_IDENT, RES_POOLCOLL_FOOTNOTE,
+
+ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH,
+ RES_POOLCOLL_LABEL, RES_POOLCOLL_TOX_ILLUSH, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS,
+ RES_NONE, RES_NONE,
+
+ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_POOLCOLL_TOX_AUTHORITIESH, RES_NONE, RES_NONE,
+ RES_POOLCOLL_BUL_LEVEL1, RES_POOLCOLL_BUL_LEVEL1, RES_POOLCOLL_NUM_LEVEL1,
+
+ RES_POOLCOLL_BUL_LEVEL2, RES_POOLCOLL_BUL_LEVEL3, RES_POOLCOLL_BUL_LEVEL4, RES_POOLCOLL_BUL_LEVEL5,
+ RES_POOLCOLL_BUL_LEVEL2, RES_POOLCOLL_BUL_LEVEL3, RES_POOLCOLL_BUL_LEVEL4, RES_POOLCOLL_BUL_LEVEL5,
+ RES_POOLCOLL_NUM_LEVEL2, RES_POOLCOLL_NUM_LEVEL3, RES_POOLCOLL_NUM_LEVEL4, RES_POOLCOLL_NUM_LEVEL5,
+
+ RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE,
+ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE,
+
+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL };
+ static const sal_Char *stiName[] = {
+ "Normal",
+ "heading 1",
+ "heading 2",
+ "heading 3",
+ "heading 4",
+ "heading 5",
+ "heading 6",
+ "heading 7",
+ "heading 8",
+ "heading 9",
+ "index 1",
+ "index 2",
+ "index 3",
+ "index 4",
+ "index 5",
+ "index 6",
+ "index 7",
+ "index 8",
+ "index 9",
+ "toc 1",
+ "toc 2",
+ "toc 3",
+ "toc 4",
+ "toc 5",
+ "toc 6",
+ "toc 7",
+ "toc 8",
+ "toc 9",
+ "Normal Indent",
+ "footnote text",
+ "annotation text",
+ "header",
+ "footer",
+ "index heading",
+ "caption",
+ "table of figures",
+ "envelope address",
+ "envelope return",
+ "footnote reference",
+ "annotation reference",
+ "line number",
+ "page number",
+ "endnote reference",
+ "endnote text",
+ "table of authorities",
+ "macro",
+ "toa heading",
+ "List",
+ "List Bullet",
+ "List Number",
+ "List 2",
+ "List 3",
+ "List 4",
+ "List 5",
+ "List Bullet 2",
+ "List Bullet 3",
+ "List Bullet 4",
+ "List Bullet 5",
+ "List Number 2",
+ "List Number 3",
+ "List Number 4",
+ "List Number 5",
+ "Title",
+ "Closing",
+ "Signature",
+ "Default Paragraph Font",
+ "Body Text",
+ "Body Text Indent",
+ "List Continue",
+ "List Continue 2",
+ "List Continue 3",
+ "List Continue 4",
+ "List Continue 5",
+ "Message Header",
+ "Subtitle",
+ };
+
+
+ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ),
+ "Style-UEbersetzungstabelle hat falsche Groesse" );
+ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ),
+ "Style-UEbersetzungstabelle hat falsche Groesse" );
+
+ sal_uInt16 idcol = ::SwStyleNameMapper::GetPoolIdFromUIName( rName, eFlags );
+
+ for (int i = 0; i < sizeof( aArr ) / sizeof( *aArr ); i++)
+ {
+ if ( idcol == aArr[i] )
+ {
+ return rtl::OUString::createFromAscii(stiName[i]);
+ }
+ }
+ return ::SwStyleNameMapper::GetProgName( idcol, String() );
+}
+
+
+
void SwRTFWriter::OutRTFStyleTab()
{
// das 0-Style ist das Default, wird nie ausgegeben !!
@@ -988,7 +1127,7 @@
}
Strm() << ' ';
- RTFOutFuncs::Out_String( Strm(), pColl->GetName(), DEF_ENCODING,
+ RTFOutFuncs::Out_String( Strm(), XlateFmtName( pColl->GetName(), GET_POOLID_TXTCOLL ), DEF_ENCODING,
bWriteHelpFmt ) << ";}" << SwRTFWriter::sNewLine;
}
@@ -1015,8 +1154,8 @@
}
Strm() << ' ';
- RTFOutFuncs::Out_String( Strm(), pFmt->GetName(), DEF_ENCODING,
- bWriteHelpFmt ) << ";}" << SwRTFWriter::sNewLine;
+ RTFOutFuncs::Out_String( Strm(), XlateFmtName( pFmt->GetName(), GET_POOLID_CHRFMT ), DEF_ENCODING,
+ bWriteHelpFmt ) << ";}" << SwRTFWriter::sNewLine;
}
Strm() << '}';
@@ -1217,8 +1356,8 @@
break;
Strm() << sRTF_PGDSCNXT;
OutULong( i ) << ' ';
- RTFOutFuncs::Out_String( Strm(), rPageDesc.GetName(),
- DEF_ENCODING, bWriteHelpFmt ) << ";}";
+ RTFOutFuncs::Out_String( Strm(), XlateFmtName( rPageDesc.GetName(), GET_POOLID_PAGEDESC ), DEF_ENCODING,
+ bWriteHelpFmt ) << ";}";
}
Strm() << '}' << SwRTFWriter::sNewLine;
bOutPageDesc = bOutPageDescTbl = FALSE;
--- ../sw/source/filter/rtf/wrtrtf.hxx.orig 2002-07-31 19:18:50.000000000 +0900
+++ ../sw/source/filter/rtf/wrtrtf.hxx 2003-09-23 23:37:50.000000000 +0900
@@ -117,6 +117,7 @@
USHORT nAktFlyPos; // Index auf das naechste "FlyFrmFmt"
void OutRTFColorTab();
void OutRTFFontTab();
+ const rtl::OUString XlateFmtName( const rtl::OUString &rName, SwGetPoolIdFromName eFlags );
void OutRTFStyleTab();
void OutRTFListTab();
@@ -136,6 +137,8 @@
USHORT nBkmkTabPos; // akt. Position in der Bookmark-Tabelle
USHORT nCurScript; // actual scripttype
+ rtl_TextEncoding eCurrentCharSet;
+
#if defined(MAC) || defined(UNX)
static const sal_Char sNewLine; // nur \012 oder \015
#else
--- ../sw/source/filter/rtf/rtfatr.cxx.orig 2003-05-19 21:24:46.000000000 +0900
+++ ../sw/source/filter/rtf/rtfatr.cxx 2003-09-23 23:45:52.000000000 +0900
@@ -1319,7 +1319,7 @@
sURL = aTmp.GetFull();
}
*/ rWrt.Strm() << '\"';
- RTFOutFuncs::Out_String( rWrt.Strm(), sURL, DEF_ENCODING,
+ RTFOutFuncs::Out_String( rWrt.Strm(), sURL, rRTFWrt.eCurrentCharSet,
rRTFWrt.bWriteHelpFmt ) << "\" ";
sURL = aTmp.GetMark();
}
@@ -1328,7 +1328,7 @@
{
rWrt.Strm() << "\\\\l \"";
sURL.Erase( 0, 1 );
- RTFOutFuncs::Out_String( rWrt.Strm(), sURL, DEF_ENCODING,
+ RTFOutFuncs::Out_String( rWrt.Strm(), sURL, rRTFWrt.eCurrentCharSet,
rRTFWrt.bWriteHelpFmt ) << "\" ";
}
@@ -1609,7 +1609,7 @@
if( nStrPos != nEnde )
RTFOutFuncs::Out_Char( rWrt.Strm(), rStr.GetChar( nStrPos ),
- DEF_ENCODING, rRTFWrt.bWriteHelpFmt );
+ rRTFWrt.eCurrentCharSet, rRTFWrt.bWriteHelpFmt );
}
// noch eine schliesende Klammer da ??
@@ -2188,6 +2188,7 @@
const sal_Char* pCmd = bAssoc ? sRTF_AF : sRTF_F;
rWrt.Strm() << pCmd;
rWrt.OutULong(rRTFWrt.GetId(rFont));
+ rRTFWrt.eCurrentCharSet = rFont.GetCharSet();
}
return rWrt;
}

164
editors/openoffice-devel/files/zipmoz.sh
View File

@ -1,164 +0,0 @@
#!/bin/sh -f
RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
components/libmork.so components/libmozldap.so \
components/libnecko.so components/libprofile.so \
components/librdf.so components/libstrres.so \
components/libunicharutil.so components/libuconv.so \
components/libucvcn.so components/libucvibm.so \
components/libucvja.so components/libucvko.so \
components/libucvlatin.so components/libucvtw.so \
components/libucvtw2.so components/liburiloader.so \
components/libvcard.so components/libxpconnect.so \
components/libpref.so components/libchrome.so libmozjs.so \
libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
libplds4.so libxpcom.so libmozz.so component.reg \
components/necko_dns.xpt components/xpcom_xpti.xpt \
components/xpcom_threads.xpt components/xpcom_io.xpt \
components/xpcom_ds.xpt components/xpcom_components.xpt \
components/xpcom_base.xpt components/xpti.dat \
defaults/pref/all.js defaults/pref/config.js \
defaults/pref/editor.js defaults/pref/initpref.js \
defaults/pref/inspector.js defaults/pref/mailnews.js \
defaults/pref/security-prefs.js defaults/pref/unix.js \
defaults/pref/xpinstall.js"
LIB_FILES=" lib/libembed_base_s.a lib/libmozreg_s.a \
lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
INC_FILES="include/"
INC_FILES2="public/"
if [ $# -lt 2 -o $# -gt 3 ] ; then
echo
echo usage: $0 mozilla_dist target [target_dir]
echo
echo where:
echo
echo "mozilla_dist points to the mozilla distribution"
echo "target concatenates OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
echo "target_dir is the directory to place the zips"
exit 1
fi
MOZ_DIST=$1
TARGET=$2
if [ "w$3" != "w" ]; then
TARGET_DIR=$3
else
if [ "w$TARGET_DIR" == "w" ]; then
TARGET_DIR=
fi
fi
ZIP_TARGET=$TARGET_DIR
if [ -z "$ZIP_TARGET" ] ; then
ZIP_TARGET=../
fi
# just to remember the current working directory
STARTING_DIR=`pwd`
echo
echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
# Create the directories
[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
# Copy the files
echo
echo --- copying files
echo
for i in $RUNTIME_FILES; do
if [ ! -f $MOZ_DIST/bin/$i ]; then
echo $MOZ_DIST/bin/$i does not exist, check your distribution
else
if [ `echo $i | grep component` ]; then
cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
elif [ `echo $i | grep defaults` ]; then
cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
else
cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
fi
fi
done
for i in $LIB_FILES; do
if [ ! -f $MOZ_DIST/$i ]; then
echo $MOZ_DIST/$i does not exist, check your distribution
else
cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
fi
done
for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
if [ ! -d $i ]; then
cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
fi
done
for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
if [ ! -d $i ]; then
cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
fi
done
for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
if [ ! -d $i ]; then
cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
fi
done
for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
if [ ! -d $i ]; then
cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
fi
done
# delete old zips
[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
# zip the runtime files
echo
echo --- creating ${TARGET}runtime.zip
echo
cd $TARGET_DIR/$TARGET/runtime
find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
# zip the lib files
echo
echo --- creating ${TARGET}lib.zip
echo
cd $TARGET_DIR/$TARGET/lib
find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
# zip the inc files
echo
echo --- creating ${TARGET}inc.zip
echo
cd $TARGET_DIR/$TARGET/inc
find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
# remove dirs
cd $STARTING_DIR
rm -rf $TARGET_DIR/$TARGET
echo
echo --- done
echo

14
editors/openoffice-devel/pkg-descr
View File

@ -1,14 +0,0 @@
OpenOffice.org is an Open Source, community-developed, multi-platform office
productivity suite. It includes the key desktop applications, such as a
word processor, spreadsheet, presentation manager, and drawing program,
with a user interface and feature set similar to other office suites.
Components include:
* A universal word processing application for creating business
letters, extensive text documents, professional layouts, and HTML
documents.
* A sophisticated application for performing advanced spreadsheet
functions, such as analyzing figures, creating lists, and viewing data.
* A tool for creating effective eye-catching presentations.
* A vector-oriented draw module that enables the creation of 3D
illustrations

82
editors/openoffice-devel/pkg-message
View File

@ -1,82 +0,0 @@
OpenOffice.org Build 1.1.0 Personal Install How-To
Written by: Martin Blapp <mbr@freebsd.org>
OpenOffice.org 1.1Beta will soon been installed in
${PREFIX}/OpenOffice.org-1.1.0
1 User installation
-------------------
Just type "openoffice" after you have successfully
installed the package. If there is no installed
OO.org dir in hour homedir, you'll be prompted to
install some files and choose a installed JDK.
The setup installs a "OpenOffice.org1.1.0" folder
in your homedir.
If the setup tells you there is already an installed
version, you may look at the file ".sversionrc" in
your homedir. In this file OpenOffice and StarOffice
have both a line for each version which is installed.
After removing the problematic line you should be able to
install again.
2 Start OO.org
--------------
There are some wrappers installed for fast startup.
Add "${PREFIX}/bin/" to your PATH and you will be able
to use them.
${PREFIX}/bin/openoffice-1.1
${PREFIX}/bin/openoffice-1.1-sagenda
${PREFIX}/bin/openoffice-1.1-scalc
${PREFIX}/bin/openoffice-1.1-sdraw
${PREFIX}/bin/openoffice-1.1-setup
${PREFIX}/bin/openoffice-1.1-sfax
${PREFIX}/bin/openoffice-1.1-simpress
${PREFIX}/bin/openoffice-1.1-spadmin
${PREFIX}/bin/openoffice-1.1-sweb
${PREFIX}/bin/openoffice-1.1-swriter
OO.org does need $LANG to be set to a suitable value.
If it is not already set, a default value is chosen.
Some old X-Servers before XFree86 4.2 do not like the
western locale with Euro symbol (ISO_8859-15).
You should ignore the warning message then or upgrade to
to a more recent X-server.
If you have chosen US-ASCII as locale, you cannot load
and save documents with special characters and these
characters are also not available in swriter and scalc.
3 Setup problems (FreeBSD < 4.7-RELEASE only)
---------------------------------------------
If the setup complains about a missing file "setup.ins",
it's time to upgrade your FreeBSD system to the latest
version. You will encounter this bug only if your OS is
older than FreeBSD 4.7-RELEASE.
4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only)
----------------------------------------------------------
OO.org can crash if you enter a non existing path
or URL in the location bar. To fix these crashes
you need the following patch. You will see this
bug only if your OS is older than FreeBSD 4.7-RELEASE.
http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
5 Crash at startup after using a localized version
--------------------------------------------------
If you had installed the english version, and then have
switched to a localized OO.org, it will crash instantly.
To solve this issue, please remove the already installed
OpenOffice.org1.1Beta dir in your homedir and remove the
appropriate entry from ".sversionrc". After you have done
this, redo the user installation and the problem will
go away.

1
editors/openoffice-devel/pkg-plist
View File

@ -1 +0,0 @@
# Dummy file, do not delete. Package list is generated automatically.

595
editors/openoffice/Makefile
View File

@ -1,595 +0,0 @@
# New ports collection makefile for: OpenOffice
# Date created: 28 Februar 2002
# Whom: Martin Blapp
#
# $FreeBSD$
#
PORTNAME= openoffice
PORTVERSION= 1.0.3
PORTREVISION= 2
CATEGORIES+= editors
MASTER_SITES+= http://openofficeorg.secsup.org/%SUBDIR%/ \
http://mirrors.sunsite.dk/openoffice/%SUBDIR%/ \
http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \
ftp://ftp.chg.ru/pub/OpenOffice/%SUBDIR%/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
ftp://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent-1.0/:help \
http://people.freebsd.org/~mbr/ooo/:moz
MASTER_SITE_SUBDIR= stable/${PORTVERSION}
DISTFILES+= OOo_${PORTVERSION}_source.tar.bz2 \
gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \
mozilla-vendor-1.0.2a.tgz:moz
.if defined(L10NHELP)
DISTFILES+= ${L10NHELP:S/$/:help/}
.endif
SORT?= /usr/bin/sort
FIND?= /usr/bin/find
CUT?= /usr/bin/cut
AWK?= /usr/bin/awk
GREP?= /usr/bin/grep
MOUNT?= /sbin/mount
ZIP?= ${PREFIX}/bin/zip
UNZIP?= ${PREFIX}/bin/unzip
ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
PASTE?= /usr/bin/paste
.include <bsd.port.pre.mk>
INSTALLATION_BASEDIR= OpenOffice.org1.0
BUILD_NR= 641
DIST_SUBDIR= openoffice1.0
DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
#
# configuration for language specific slave ports
#
.if !defined(LANG_EXT)
LANG_EXT=01
.else
#
# Add pkg-descr and pkg-message if available
#
.if exists(${.CURDIR}/pkg-descr)
DESCR= ${.CURDIR}/pkg-descr
.endif
.if exists(${.CURDIR}/pkg-message)
PKGMESSAGE= ${.CURDIR}/pkg-message
.endif
#
# Set prefix and suffix
#
.if defined(LANG_PKGNAME)
PKGNAMEPREFIX= ${LANG_PKGNAME}-
.if defined(LANG_SUFFIX)
PKGNAMESUFFIX= -${LANG_SUFFIX}
.endif
.endif # if defined(LANG_PKGNAME)
#
# LANG_CONFIGURE_ARG is missing for the german port
#
.if defined(LANG_EXT)
CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG},ENUS
.endif
.endif
.if !defined (LANG) && !defined(USE_LANG)
USE_LANG= en_US.ISO8859-15
LANG_LIST= en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
.else
.if !defined(USE_LANG)
USE_LANG= ${LANG}
.endif
.endif
LANG_SORTED= `${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
#
# OO build is broken with the system gcc on STABLE.
#
BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
CC= gcc32
CXX= g++32
USE_GCC=3.2
EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
#
# The JDK dependency needs to be at the first place, so all
# following dependencies use the same JDK.
#
.if !defined(WITH_BSD_JDK)
BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13
.else
BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
.endif
#.if !defined(USE_GCC)
#BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
#.endif
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
.if !defined(DISPLAY)
BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
.endif
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
mng.1:${PORTSDIR}/graphics/libmng \
freetype.9:${PORTSDIR}/print/freetype2
USE_PERL5= yes
USE_BZIP2= yes
USE_BISON= yes
USE_GMAKE= yes
USE_GNOME= orbit gtk12
EXTRACT_BEFORE_ARGS_R= -dc
EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
EXTRACT_CMD_R= ${GZIP_CMD}
EXTRACT_REST= gpc231.tar.Z
.if !defined(WITH_BSD_JDK)
JDK13DIR?= ${LOCALBASE}/linux-sun-jdk1.3.1
.else
JDK13DIR?= ${LOCALBASE}/jdk1.3.1
.endif
JAVAVM= ${JDK13DIR}/bin/java
GNU_CONFIGURE= yes
USE_AUTOCONF= yes
WANT_AUTOCONF_VER= 253
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
.if defined(WITH_DEBUG)
CFLAGS+= -g
.if ${WITH_DEBUG} == 2
BUILD= dmake debug="true"
.else
BUILD= dmake
.endif
.else
BUILD= dmake strip="true"
.endif
.if !defined(DISPLAY)
DISPLAYHACK=localhost:1001
.endif
CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
PTHREAD_LIBS=${PTHREAD_LIBS}
CONFIGURE_ARGS+= --with-jdk-home=${JDK13DIR} \
--with-os-version=${OSVERSION} \
--with-ant-home=${LOCALBASE}
#.if !defined(USE_GCC)
#CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX}
#.endif
.if !defined(WITH_BSD_JDK)
CONFIGURE_ARGS+= --enable-linuxjdk=yes
.endif
.if defined(WITH_DEBUG)
.if ${WITH_DEBUG} == 2
CONFIGURE_ARGS+= --enable-debug
.endif
.endif
.if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2)
CONFIGURE_ARGS+= --enable-gcc3
.endif
.if ${OSVERSION} > 500000 && !defined(USE_GCC)
CONFIGURE_ARGS+= --enable-gcc3
.endif
pre-fetch:
@${ECHO}
.if !defined(LANG)
@${ECHO} "REQUIREMENTS:"
@${ECHO}
@${ECHO} "OO requires that the ENV variable LANG"
@${ECHO} "is set to a proper value. Dependent on"
@${ECHO} "which language port you use, OO does"
@${ECHO} "automatically set LANG to a suitable"
@${ECHO} "value. You can change this with:"
@${ECHO}
@${ECHO} "USE_LANG=\"preferred language\""
@${ECHO}
@${ECHO} "and set a different language"
@${ECHO} "like:"
@${ECHO}
@${ECHO} "${LANG_SORTED}"
@${ECHO}
@${ECHO} "Your current setting is:"
@${ECHO}
@${ECHO} "USE_LANG=${USE_LANG}"
@${ECHO}
@${ECHO}
.endif
@${ECHO} "OPTIONS:"
.if !defined(USE_GCC)
@${ECHO}
@${ECHO} "You can compile OO with different"
@${ECHO} "gcc compiler versions:"
@${ECHO}
@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.1"
@${ECHO} "to compile openoffice with your"
@${ECHO} "preferred compiler."
.endif
.if !defined(WITH_BSD_JDK)
@${ECHO}
@${ECHO} "If you like to use the native BSD"
@${ECHO} "JDK for the build system, you can use"
@${ECHO} "WITH_BSD_JDK=TRUE to disable the"
@${ECHO} "usage of the linux-JDK and linux dependency."
@${ECHO}
.endif
.if !defined(WITH_DEBUG)
@${ECHO}
@${ECHO} "You can compile OO with debug symbols"
@${ECHO} "if you call make with WITH_DEBUG=1"
@${ECHO}
@${ECHO} "If you set WITH_DEBUG=2, you add internal"
@${ECHO} "OO.org debug support."
@${ECHO}
.endif
.if !defined(WITH_TTF_BYTECODE_ENABLED)
@${ECHO}
@${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES"
@${ECHO} "if you like to use the Freetype library to"
@${ECHO} "render TTF fonts. Normally the TTF lib is"
@${ECHO} "not used to render fonts."
@${ECHO}
@${ECHO} "If you have licensed the Apple patents"
@${ECHO} "US05155805 US05159668 and US05325479"
@${ECHO} "you can enable this option to get better"
@${ECHO} "quality of glyphs at small bitmap sizes."
@${ECHO}
.endif
.if !defined(WITH_GIF_LZW_COMPRESSION)
@${ECHO}
@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
@${ECHO} "If you want to make compressed gif images"
@${ECHO}
@${ECHO} "If must have license from the Unisys and IBM patents"
@${ECHO} "to enable this option to get compressed GIF images."
@${ECHO}
.endif
.if ${OSVERSION} < 450002
@${ECHO}
@${ECHO} "OS-VERSION ${OSVERSION} too low"
@${ECHO}
@${ECHO} "OO need some important libc_r and"
@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
@${ECHO} "RELEASE or 4.6 STABLE."
@${FALSE}
.endif
@${ECHO}
@${ECHO} "NOTICE:"
@${ECHO}
@${ECHO} "To build Openoffice, you should have a lot"
.if defined(WITH_DEBUG)
@${ECHO} "of free diskspace (~ 8GB)."
.else
@${ECHO} "of free diskspace (~ 4GB)."
.endif
@${ECHO}
.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
(${OSVERSION} < 500000 && !defined(USE_GCC))
@${ECHO} "KERNEL CONFIGURATION:"
@${ECHO}
@${ECHO} "Openoffice needs a larger stack- and"
@${ECHO} "datasize to build. Check your limit"
@${ECHO} "settings and and put this in /boot/loader.conf"
@${ECHO} "if neccessary:"
@${ECHO}
@${ECHO} "kern.maxdsiz=\"1073741824\""
@${ECHO} "kern.maxssiz=\"268435456\""
.endif
@${ECHO}
.if ${OSVERSION} < 460002
@${ECHO} "REQUIRED SYSTEM PATCHES:"
@${ECHO}
.endif
.if ${OSVERSION} < 480000
@${ECHO} "OO.org can crash if you enter a non existing path"
@${ECHO} "or URL in the location bar. To fix these crashes"
@${ECHO} "you need a uncommitted system patch for rtld:"
@${ECHO}
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
@${ECHO}
.endif
.if ${OSVERSION} < 460001
@${ECHO}
@${ECHO} "OO setup is broken on STABLE < 4.6"
@${ECHO} "including 4.6 RELEASE."
@${ECHO} "You'll need a system patch to solve"
@${ECHO} "this problem:"
@${ECHO}
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
@${ECHO}
.endif
.if ${OSVERSION} < 460002
@${ECHO}
@${ECHO} "OO.org soffice binary can deadlock. You can work around"
@${ECHO} "this problem with this patch:"
@${ECHO}
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
@${ECHO}
.endif
.if ${OSVERSION} < 480000
@${ECHO}
@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
@${ECHO} "this problem with this patch:"
@${ECHO}
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
@${ECHO}
.endif
.if !exists(/usr/include/langinfo.h)
@${ECHO}
@${ECHO} "langinfo.h is missing !"
@${ECHO}
@${ECHO} "Please upgrade to 4.6 RELEASE or"
@${ECHO} "4.6 STABLE."
@${ECHO}
@${FALSE}
.endif
post-extract:
@for file in ${EXTRACT_REST}; do \
if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
${EXTRACT_BEFORE_ARGS_R} \
${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
then \
exit 1; \
fi \
done
@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
@${MAKE} extract-mozilla
@-${RM} ${WRKSRC}/../moz/zipped/*.zip
@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
@${MKDIR} -p ${WRKSRC}/../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj
@${MKDIR} -p ${WRKSRC}/../bridges/source/cpp_uno/gcc3_freebsd_intel
.if defined(L10NHELP)
@${ECHO_MSG} "===> Extracting L10NHELP sub project"
@${MKDIR} ${WRKDIR}/L10NHELP
@cd ${WRKDIR}/L10NHELP && \
${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP}
.endif
post-patch:
@${MAKE} patch-mozilla
@${MAKE} fix-kdewrappers
@${MAKE} fix-gnomewrappers
.if defined(WITH_TTF_BYTECODE_ENABLED)
@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
${ECHO_MSG} "===> Applying additional TTF bytecode patches for ${PKGNAME}" ; \
if [ ${PATCH_DEBUG_TMP} = yes ]; then \
${ECHO_MSG} "===> Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \
fi; \
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
fi
.endif
.if !defined(WITH_GIF_LZW_COMPRESSION)
@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
${ECHO_MSG} "===> Removing GIF LZW compression for ${PKGNAME}" ; \
if [ ${PATCH_DEBUG_TMP} = yes ]; then \
${ECHO_MSG} "===> Applying GIF LZW compression ${OPSYS} patch" ; \
fi; \
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
fi
.endif
.if defined(WITH_DEBUG)
@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
${ECHO_MSG} "===> Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
PATCHES_APPLIED="" ; \
for i in ${PATCHDIR}/debugpatch-*; do \
case $$i in \
*.orig|*.rej|*~) \
${ECHO_MSG} "===> Ignoring patchfile $$i" ; \
;; \
*) \
if [ ${PATCH_DEBUG_TMP} = yes ]; then \
${ECHO_MSG} "===> Applying ${OPSYS} patch $$i" ; \
fi; \
if ${PATCH} ${PATCH_ARGS} < $$i ; then \
PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
else \
${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
if [ x"$$PATCHES_APPLIED" != x"" ]; then \
${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
fi; \
${FALSE} ; \
fi; \
;; \
esac; \
done; \
fi;
.endif
@${ECHO_MSG} "===> Find old malloc.h defines and fix them in ${PKGNAME} source"
@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
fix-kdewrappers:
@${PERL} -pi -e 's|"Exec", "\\"\<progpath\>/program/|"Exec", "\\"${PREFIX}/bin/openoffice-|' \
${WRKSRC}/../sysui/oounix/office/kde2/kdeint
fix-gnomewrappers:
@${PERL} -pi -e 's|"Exec", "<progpath>/program/|"Exec", "${PREFIX}/bin/openoffice-|' \
${WRKSRC}/../sysui/oounix/office/gnome/gnomeint
extract-mozilla:
.if ! exists(${WRKDIR}/mozilla/Makefile)
@${ECHO_MSG} "===> Extracting mozilla sub project"
@cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2a.tgz
.endif
@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
patch-mozilla:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
${WRKDIR}/mozilla/files/
@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
build-mozilla:
.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
@${ECHO_MSG} "===> Building mozilla sub project"
.if defined(WITH_DEBUG)
@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
@${SED} -e 's|--disable-debug||' \
-e 's|--disable-cpp-rtti||' \
-e 's|--enable-strip||' \
< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
.endif
.if defined(USE_GCC)
@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
.else
@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
.endif
@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
.endif
install-mozilla:
@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
register-mozilla:
.if exists(${WRKDIR}/mozilla-runtime)
@${RM} -rf ${WRKDIR}/mozilla-runtime
.endif
@${MKDIR} ${WRKDIR}/mozilla-runtime
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom
@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
${WRKDIR}/mozilla-runtime/components/xptitemp.dat
@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
mozilla:
@${MAKE} extract-mozilla
@${MAKE} patch-mozilla
@${MAKE} build-mozilla
@${MAKE} register-mozilla
@${MAKE} install-mozilla
do-build:
.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
@${MAKE} mozilla
.endif
.endif
.endif
.if exists(${WRKDIR}/.Xvfb.pid)
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
@${RM} -f ${WRKDIR}/.Xvfb.pid
.endif
.if !defined(DISPLAY)
#
# This is a UGLY hack to not have to specify a X-Display.
#
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
@sleep 5
.endif
@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
.if defined(L10NHELP)
@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
.endif
.if !defined(DISPLAY)
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
@${RM} -f ${WRKDIR}/.Xvfb.pid
.else
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
.endif
.if defined(LANG_PKGNAME)
@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
.endif
pre-install:
@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \
> ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp
do-install:
.if !defined(DISPLAY)
#
# UGLY hack to not have to specify a X-Display.
#
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
@sleep 5
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
@${RM} -f ${WRKDIR}/.Xvfb.pid
.else
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
.endif
install-user:
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \
${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
post-install:
@${ECHO_MSG} "===> Add wrapper scripts";
@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/openoffice
@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice
@${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice
@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice
@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda
@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc
@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sdraw
@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-setup
@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sfax
@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-simpress
@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-smath
@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-spadmin
@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sweb
@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-swriter
@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice > ${TMPPLIST}
@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice >> ${TMPPLIST}
@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
@cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
package-rename:
@${ECHO_MSG} "===> Rename package for OO.org mirror upload";
.if defined(LANG_SUFFIX)
@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
.else
@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
.endif
.include <bsd.port.post.mk>

11
editors/openoffice/distinfo
View File

@ -1,11 +0,0 @@
MD5 (openoffice1.0/OOo_1.0.3_source.tar.bz2) = 984146931906a7d53300b29f58f6a899
MD5 (openoffice1.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice1.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
MD5 (openoffice1.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice1.0/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5
MD5 (openoffice1.0/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8
MD5 (openoffice1.0/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7
MD5 (openoffice1.0/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8
MD5 (openoffice1.0/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b
MD5 (openoffice1.0/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942
MD5 (openoffice1.0/patch-translation-ru-1.0.3.bz2) = 696b55641c353b995922fba7da160f14

21
editors/openoffice/files/debugpatch-setup2+mow+source+loader+loader.c
View File

@ -1,21 +0,0 @@
--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002
+++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002
@@ -902,6 +902,7 @@
void KillSetupDir()
{
+#if 0
DIR* pDir = opendir( strTmpPath );
struct dirent* pFile;
@@ -915,6 +916,10 @@
chdir( strInitPath );
rmdir( strTmpPath );
+#else
+ fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
+ strTmpPath);
+#endif
}
void makeSymLink( char* s )

18
editors/openoffice/files/debugpatch-solenv+inc+unxfbsdi.mk
View File

@ -1,18 +0,0 @@
--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002
+++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002
@@ -25,12 +25,12 @@
.ENDIF
# flags for C and C++ Compiler
-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
+CFLAGS+=-g -ggdb -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
+CFLAGSCC=-g -ggdb -pipe
+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
# Flags for enabling exception handling
CFLAGSEXCEPTIONS=-fexceptions

290
editors/openoffice/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx
View File

@ -1,290 +0,0 @@
--- ../goodies/source/filter.vcl/egif/giflzwc.cxx Sun Apr 13 14:33:24 2003
+++ /dev/null Mon Apr 14 06:10:35 2003
@@ -1,287 +0,0 @@
-/*************************************************************************
- *
- * $RCSfile: giflzwc.cxx,v $
- *
- * $Revision: 1.1.1.1 $
- *
- * last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- * Sun Microsystems Inc., October, 2000
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- *
- * Sun Industry Standards Source License Version 1.1
- * =================================================
- * The contents of this file are subject to the Sun Industry Standards
- * Source License Version 1.1 (the "License"); You may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at http://www.openoffice.org/license.html.
- *
- * Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- * See the License for the specific provisions governing your rights and
- * obligations concerning the Software.
- *
- * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- * Copyright: 2000 by Sun Microsystems, Inc.
- *
- * All Rights Reserved.
- *
- * Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-
-#include <tools/stream.hxx>
-#include "giflzwc.hxx"
-
-// ----------------------------
-// - GIFImageDataOutputStream -
-// ----------------------------
-
-class GIFImageDataOutputStream
-{
-private:
-
- void FlushBlockBuf();
- inline void FlushBitsBufsFullBytes();
-
- SvStream& rStream;
- BYTE* pBlockBuf;
- BYTE nBlockBufSize;
- ULONG nBitsBuf;
- USHORT nBitsBufSize;
-
-public:
-
- GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
- ~GIFImageDataOutputStream();
-
- inline void WriteBits( USHORT nCode, USHORT nCodeLen );
-};
-
-// ------------------------------------------------------------------------
-
-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
-{
- while (nBitsBufSize>=8)
- {
- if( nBlockBufSize==255 )
- FlushBlockBuf();
-
- pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
- nBitsBuf >>= 8;
- nBitsBufSize -= 8;
- }
-}
-
-// ------------------------------------------------------------------------
-
-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
-{
- if( nBitsBufSize+nCodeLen>32 )
- FlushBitsBufsFullBytes();
-
- nBitsBuf |= (ULONG) nCode << nBitsBufSize;
- nBitsBufSize += nCodeLen;
-}
-
-// ------------------------------------------------------------------------
-
-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
- rStream(rGIF)
-{
- pBlockBuf = new BYTE[ 255 ];
- nBlockBufSize = 0;
- nBitsBufSize = 0;
- nBitsBuf = 0;
- rStream << nLZWDataSize;
-}
-
-// ------------------------------------------------------------------------
-
-
-GIFImageDataOutputStream::~GIFImageDataOutputStream()
-{
- WriteBits(0,7);
- FlushBitsBufsFullBytes();
- FlushBlockBuf();
- rStream << (BYTE)0;
- delete[] pBlockBuf;
-}
-
-// ------------------------------------------------------------------------
-
-void GIFImageDataOutputStream::FlushBlockBuf()
-{
- if( nBlockBufSize )
- {
- rStream << (BYTE) nBlockBufSize;
- rStream.Write( pBlockBuf,nBlockBufSize );
- nBlockBufSize = 0;
- }
-}
-
-// -------------------
-// - GIFLZWCTreeNode -
-// -------------------
-
-struct GIFLZWCTreeNode
-{
-
- GIFLZWCTreeNode* pBrother; // naechster Knoten, der den selben Vater hat
- GIFLZWCTreeNode* pFirstChild; // erster Sohn
- USHORT nCode; // Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
- USHORT nValue; // Der Pixelwert
-};
-
-// --------------------
-// - GIFLZWCompressor -
-// --------------------
-
-GIFLZWCompressor::GIFLZWCompressor()
-{
- pIDOS=NULL;
-}
-
-// ------------------------------------------------------------------------
-
-GIFLZWCompressor::~GIFLZWCompressor()
-{
- if (pIDOS!=NULL) EndCompression();
-}
-
-// ------------------------------------------------------------------------
-
-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
-{
- if( !pIDOS )
- {
- USHORT i;
-
- nDataSize = nPixelSize;
-
- if( nDataSize < 2 )
- nDataSize=2;
-
- nClearCode=1<<nDataSize;
- nEOICode=nClearCode+1;
- nTableSize=nEOICode+1;
- nCodeSize=nDataSize+1;
-
- pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
- pTable=new GIFLZWCTreeNode[4096];
-
- for (i=0; i<4096; i++)
- {
- pTable[i].pBrother = pTable[i].pFirstChild = NULL;
- pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
- }
-
- pPrefix = NULL;
- pIDOS->WriteBits( nClearCode,nCodeSize );
- }
-}
-
-// ------------------------------------------------------------------------
-
-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
-{
- if( pIDOS )
- {
- GIFLZWCTreeNode* p;
- USHORT i;
- BYTE nV;
-
- if( !pPrefix && nSize )
- {
- pPrefix=pTable+(*pSrc++);
- nSize--;
- }
-
- while( nSize )
- {
- nSize--;
- nV=*pSrc++;
- for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
- {
- if (p->nValue==nV)
- break;
- }
-
- if( p)
- pPrefix=p;
- else
- {
- pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
-
- if (nTableSize==4096)
- {
- pIDOS->WriteBits(nClearCode,nCodeSize);
-
- for (i=0; i<nClearCode; i++)
- pTable[i].pFirstChild=NULL;
-
- nCodeSize=nDataSize+1;
- nTableSize=nEOICode+1;
- }
- else
- {
- if(nTableSize==(USHORT)(1<<nCodeSize))
- nCodeSize++;
-
- p=pTable+(nTableSize++);
- p->pBrother=pPrefix->pFirstChild;
- pPrefix->pFirstChild=p;
- p->nValue=nV;
- p->pFirstChild=NULL;
- }
-
- pPrefix=pTable+nV;
- }
- }
- }
-}
-
-// ------------------------------------------------------------------------
-
-void GIFLZWCompressor::EndCompression()
-{
- if( pIDOS )
- {
- if( pPrefix )
- pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
-
- pIDOS->WriteBits( nEOICode,nCodeSize );
- delete[] pTable;
- delete pIDOS;
- pIDOS=NULL;
- }
-}

45
editors/openoffice/files/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx
View File

@ -1,45 +0,0 @@
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
+++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx 2002-08-15 15:09:47.000000000 +0200
@@ -0,0 +1,42 @@
+/**********************************
+ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
+ **********************************/
+
+//#include <tools/stream.hxx>
+#include "giflzwc.hxx"
+
+// --------------------
+// - GIFLZWCompressor -
+// --------------------
+
+GIFLZWCompressor::GIFLZWCompressor()
+{
+ pIDOS=NULL;
+}
+
+// ------------------------------------------------------------------------
+
+GIFLZWCompressor::~GIFLZWCompressor()
+{
+}
+
+// ------------------------------------------------------------------------
+
+void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
+{
+ /********************** DISABLED *************************/
+}
+
+// ------------------------------------------------------------------------
+
+void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
+{
+ /********************** DISABLED *************************/
+}
+
+// ------------------------------------------------------------------------
+
+void GIFLZWCompressor::EndCompression()
+{
+ /********************** DISABLED *************************/
+}

11
editors/openoffice/files/gifpatch-goodies+source+filter.vcl+egif+makefile.mk
View File

@ -1,11 +0,0 @@
--- ../goodies/source/filter.vcl/egif/makefile.mk.orig Tue Aug 14 23:22:54 2001
+++ ../goodies/source/filter.vcl/egif/makefile.mk Mon Apr 14 06:04:55 2003
@@ -89,7 +89,7 @@
SLOFILES= $(SLO)$/egif.obj \
$(SLO)$/dlgegif.obj \
- $(SLO)$/giflzwc.obj
+ $(SLO)$/giflzwc_disabled.obj
# ==========================================================================

7
editors/openoffice/files/oo_setup.resp
View File

@ -1,7 +0,0 @@
[Environment]
InstallationMode = INSTALL_NETWORK
InstallationType = STANDARD
DestinationPath = %%PREFIX%%/OpenOffice.org1.0
[Java]
JavaSupport = preinstalled_or_none

19
editors/openoffice/files/openoffice-wrapper
View File

@ -1,19 +0,0 @@
#!/bin/sh
#
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice/files/Attic/openoffice-wrapper,v 1.3 2003-01-21 17:09:39 mbr Exp $
oopath=%%PREFIX%%/OpenOffice.org1.0/program/
program=`echo $0 | sed -e 's|.*-||'`
if [ ! $LANG ]; then
export LANG=%%LANG%%
fi
case $program in
$0)
exec $oopath/soffice "$@"
;;
*)
exec $oopath/$program "$@"
;;
esac

208
editors/openoffice/files/optpatch-freetype+patch
View File

@ -1,208 +0,0 @@
Index: files/patch-freetype::patch
===================================================================
RCS file: files/patch-freetype::patch
diff -N files/patch-freetype::patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-freetype::patch 4 Aug 2002 15:27:42 -0000
@@ -0,0 +1,201 @@
+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch
+--- ../freetype/freetype-2.0.5.patch Fri Apr 5 21:07:34 2002
++++ ../freetype/freetype-2.0.5.patch Sat Mar 9 18:04:17 2002
+@@ -1,118 +1,79 @@
+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 14 00:44:33 2000
+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk Wed Nov 7 16:11:47 2001
+-***************
+-*** 63,69 ****
+- # ANSI compliance.
+- #
+- ifndef CFLAGS
+-! CFLAGS := /nologo /c /Ox /G5 /W3 /WX
+- endif
+-
+- # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
+---- 63,69 ----
+- # ANSI compliance.
+- #
+- ifndef CFLAGS
+-! CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
+- endif
+-
+- # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh Thu Jun 7 19:36:17 2001
+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh Wed Nov 7 16:11:47 2001
+-***************
+-*** 631,637 ****
+- if test "$build_old_libs" = yes; then
+- if test "$pic_mode" != yes; then
+- # Don't build PIC code
+-! command="$base_compile $srcfile"
+- else
+- # All platforms use -DPIC, to notify preprocessed assembler code.
+- command="$base_compile $srcfile $pic_flag -DPIC"
+---- 631,637 ----
+- if test "$build_old_libs" = yes; then
+- if test "$pic_mode" != yes; then
+- # Don't build PIC code
+-! command="$base_compile $srcfile -DPIC $pic_flag"
+- else
+- # All platforms use -DPIC, to notify preprocessed assembler code.
+- command="$base_compile $srcfile $pic_flag -DPIC"
+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h Mon Jan 1 18:25:21 2001
+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h Wed Nov 7 16:11:47 2001
+-***************
+-*** 1,7 ****
+---- 1,9 ----
+- FT_USE_MODULE(autohint_module_class)
+- FT_USE_MODULE(cff_driver_class)
+- FT_USE_MODULE(t1cid_driver_class)
+-+ /*
+- FT_USE_MODULE(pcf_driver_class)
+-+ */
+- FT_USE_MODULE(psaux_module_class)
+- FT_USE_MODULE(psnames_module_class)
+- FT_USE_MODULE(ft_raster1_renderer_class)
+-***************
+-*** 9,12 ****
+---- 11,16 ----
+- FT_USE_MODULE(ft_smooth_renderer_class)
+- FT_USE_MODULE(tt_driver_class)
+- FT_USE_MODULE(t1_driver_class)
+-+ /*
+- FT_USE_MODULE(winfnt_driver_class)
+-+ */
+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h Tue Aug 21 10:50:45 2001
+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h Wed Nov 7 16:11:47 2001
+-***************
+-*** 70,76 ****
+---- 70,79 ----
+- /* All convenience functions are declared as such in their */
+- /* documentation. */
+- /* */
+-+ /*
+- #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
+-+ */
+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
+-
+-
+- /*************************************************************************/
+-***************
+-*** 108,116 ****
+- /* use a vector `plotter' format that isn't supported when this */
+- /* macro is undefined. */
+- /* */
+- #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
+-
+--
+- /*************************************************************************/
+- /* */
+- /* Glyph Postscript Names handling */
+---- 111,121 ----
+- /* use a vector `plotter' format that isn't supported when this */
+- /* macro is undefined. */
+- /* */
+-+ /*
+- #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
+-+ */
+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
+-
+- /*************************************************************************/
+- /* */
+- /* Glyph Postscript Names handling */
+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig Mon Jan 7 14:21:35 2002
+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh Mon Jan 7 14:21:40 2002
+-***************
+-*** 2251,2257 ****
+- ;;
+-
+- irix)
+-! major=`expr $current - $age + 1`
+- verstring="sgi$major.$revision"
+-
+- # Add in all the interfaces that we are compatible with.
+---- 2251,2257 ----
+- ;;
+-
+- irix)
+-! major=`expr $current - $age`
+- verstring="sgi$major.$revision"
+-
+- # Add in all the interfaces that we are compatible with.
++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk
++--- misc/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 27 14:47:57 2001
+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 27 14:49:17 2001
++@@ -63,7 +63,7 @@
++ # ANSI compliance.
++ #
++ ifndef CFLAGS
++- CFLAGS := /nologo /c /Ox /G5 /W3 /WX
+++ CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
++ endif
++
++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh
++--- misc/freetype-2.0.5/builds/unix/ltmain.sh Thu Dec 27 14:47:56 2001
+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh Thu Dec 27 14:49:17 2001
++@@ -631,7 +631,7 @@
++ if test "$build_old_libs" = yes; then
++ if test "$pic_mode" != yes; then
++ # Don't build PIC code
++- command="$base_compile $srcfile"
+++ command="$base_compile $srcfile -DPIC $pic_flag"
++ else
++ # All platforms use -DPIC, to notify preprocessed assembler code.
++ command="$base_compile $srcfile $pic_flag -DPIC"
++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h
++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h Thu Dec 27 14:47:57 2001
+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h Thu Dec 27 14:49:17 2001
++@@ -1,7 +1,9 @@
++ FT_USE_MODULE(autohint_module_class)
++ FT_USE_MODULE(cff_driver_class)
++ FT_USE_MODULE(t1cid_driver_class)
+++/*
++ FT_USE_MODULE(pcf_driver_class)
+++*/
++ FT_USE_MODULE(psaux_module_class)
++ FT_USE_MODULE(psnames_module_class)
++ FT_USE_MODULE(ft_raster1_renderer_class)
++@@ -9,4 +11,6 @@
++ FT_USE_MODULE(ft_smooth_renderer_class)
++ FT_USE_MODULE(tt_driver_class)
++ FT_USE_MODULE(t1_driver_class)
+++/*
++ FT_USE_MODULE(winfnt_driver_class)
+++*/
++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h
++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h Thu Dec 27 14:47:57 2001
+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h Thu Dec 27 14:51:15 2001
++@@ -70,7 +70,10 @@
++ /* All convenience functions are declared as such in their */
++ /* documentation. */
++ /* */
+++/*
++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
+++*/
+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
++
++
++ /*************************************************************************/
++@@ -108,8 +111,10 @@
++ /* use a vector `plotter' format that isn't supported when this */
++ /* macro is undefined. */
++ /* */
+++/*
++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
++-
+++*/
+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
++
++ /*************************************************************************/
++ /* */
++@@ -338,7 +343,7 @@
++ /* By undefining this, you will only compile the code necessary to load */
++ /* TrueType glyphs without hinting. */
++ /* */
++-#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+++#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
++
++
++ /*************************************************************************/

11
editors/openoffice/files/optpatch-vcl+util+makefile.pmk
View File

@ -1,11 +0,0 @@
--- ../vcl/util/makefile.pmk.orig Mon Apr 28 10:25:02 2003
+++ ../vcl/util/makefile.pmk Mon Apr 28 10:25:17 2003
@@ -67,7 +67,7 @@
.IF "$(remote)" != ""
USE_BUILTIN_RASTERIZER=true
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(GUI)" == "UNX" && "$(OS)" != "FREEBSD"
USE_BUILTIN_RASTERIZER=true
.ENDIF

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

@ -1,115 +0,0 @@
--- ../berkeleydb/db-3.2.9.patch.orig Sun Jan 19 14:58:19 2003
+++ ../berkeleydb/db-3.2.9.patch Sun Jan 19 15:00:02 2003
@@ -51,7 +51,7 @@
CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
LIBS="-lsocket -lsvipc $LIBS";;
-+ netbsd*) optimize_def="-O2";;
++ netbsd*) optimize_def="-O";;
osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
*qnx) cat >> confdefs.h <<\EOF
#define HAVE_QNX 1
@@ -62,54 +62,57 @@
solaris*) JINCSUBDIRS="solaris";;
linux*) JINCSUBDIRS="linux genunix";;
+ irix*) JINCSUBDIRS="irix";;
-+ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";;
++ freebsd*) JINCSUBDIRS="freebsd linux solaris genunix";;
*) JINCSUBDIRS="genunix";;
esac
*** misc/db-3.2.9/dist/ltconfig Fri Oct 13 16:23:00 2000
--- misc/build/db-3.2.9/dist/ltconfig Tue Jan 7 11:37:05 2003
-***************
-*** 1194,1204 ****
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-- else
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
- # can we support soname and/or expsyms with a.out? -oliva
- fi
- ;;
-
---- 1194,1205 ----
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
- # can we support soname and/or expsyms with a.out? -oliva
-+ else
-+ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ need_version=no
- fi
- ;;
-
-*** misc/db-3.2.9/dist/ltconfig Fri Oct 13 16:23:00 2000
---- misc/build/db-3.2.9/dist/ltconfig Tue Jan 7 11:37:05 2003
-***************
-*** 1955,1961 ****
- version_type=irix
- need_lib_prefix=no
- need_version=no
-! soname_spec='${libname}${release}.so.$major'
- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
- case "$host_os" in
- irix5*)
---- 1955,1961 ----
- version_type=irix
- need_lib_prefix=no
- need_version=no
-! soname_spec='${libname}${release}.so'
- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
- case "$host_os" in
- irix5*)
+@@ -1202,6 +1202,17 @@
+ fi
+ ;;
+
++ 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
++ ;;
++
+ solaris* | sysv5*)
+ if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs=no
+@@ -1955,7 +1966,7 @@
+ version_type=irix
+ need_lib_prefix=no
+ need_version=no
+- soname_spec='${libname}${release}.so.$major'
++ soname_spec='${libname}${release}.so'
+ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
+ case "$host_os" in
+ irix5*)
+@@ -2019,6 +2030,20 @@
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
+ soname_spec='${libname}${release}.so$major'
+ dynamic_linker='NetBSD ld.elf_so'
++ fi
++ 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
+ ;;

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

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

11
editors/openoffice/files/patch-bridges+prj+build.lst
View File

@ -1,11 +0,0 @@
--- ../bridges/prj/build.lst.orig Tue Mar 19 22:06:50 2002
+++ ../bridges/prj/build.lst Tue Jun 4 12:24:46 2002
@@ -9,6 +9,8 @@
br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL
br bridges\source\cpp_uno\gcc3_linux_intel nmake - u br_gcc3li br_unotypes NULL
br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi 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\cpp_uno\gcc2_linux_powerpc nmake - u br_gcclp br_unotypes NULL
br bridges\source\cpp_uno\gcc2_macosx_powerpc nmake - u br_gccmacoxp br_unotypes NULL
br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL

11
editors/openoffice/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk
View File

@ -1,11 +0,0 @@
--- ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk.orig Fri May 31 10:22:18 2002
+++ ../bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk Fri May 31 10:22:46 2002
@@ -76,7 +76,7 @@
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2"
CFLAGSNOOPT=-O0
NOOPTFILES=$(SLO)$/uno2cpp.obj

1735
editors/openoffice/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

13
editors/openoffice/files/patch-bridges+source+prot_uno+makefile.mk
View File

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

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

@ -1,11 +0,0 @@
--- ../chaos/util/makefile.mk.orig Wed Jun 12 01:16:35 2002
+++ ../chaos/util/makefile.mk Wed Jun 12 01:16:47 2002
@@ -100,7 +100,7 @@
SHL1TARGET= cnt$(UPD)$(DLLPOSTFIX)
SHL1IMPLIB= i$(TARGET)
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
+.IF "$(OS)"=="MACOSX"
#SHL1VERSIONMAP= exports.$(DLLPOSTFIX).map
.ELSE
SHL1VERSIONMAP= exports.map

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

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

15
editors/openoffice/files/patch-comphelper+util+makefile.mk
View File

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

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

@ -1,85 +0,0 @@
--- configure.in.orig Thu Jan 16 13:42:46 2003
+++ configure.in Sat Jan 25 18:24:08 2003
@@ -89,6 +89,12 @@
Usage: --enable-check-only=yes
],,)
+AC_ARG_ENABLE(linuxjdk,
+[ --enable-linuxjdk Use this option option if you like to use
+ the linux-jdk instead of the native jdk.
+
+ Usage: --enable-linuxjdk
+],,)
AC_ARG_ENABLE(macos9,
[ --enable-macos9 Use this option option if you want to generate a
macos9 environment on macosx.
@@ -352,10 +358,7 @@
if test "$COMPATH" != "NO_GCC"; then
AC_MSG_RESULT([checked (gcc $_gcc_version)])
fi
-
-dnl Set the include paths
- _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
-fi
+fi
dnl ===================================================================
dnl Search all the common names for GNU make
@@ -553,14 +556,27 @@
fi
dnl ===================================================================
-dnl Set the gxx include directories
+dnl Set the gcc/gxx include directories
dnl ===================================================================
+if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then
+if test "$GXX" = "yes"; then
+ if test -n "$enable_gcc3"; then
+ _gccincname1="g++-v3"
+ else
+ _gccincname1="g++-3"
+ fi
+ _gcc_include_path=".."
+ _gxx_include_path="$_gcc_include_path/$_gccincname1"
+fi
+else
if test "$GXX" = "yes"; then
- _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1`
+ _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
+ _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - \
+ | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1`
dnl This is the original code...
-dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
+dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
+fi
fi
-
dnl ===================================================================
dnl Extra checking for the SUN OS compiler
@@ -1222,12 +1238,16 @@
else
with_lang=","$with_lang","
fi
-
if test -n "$enable_debug"; then
ENABLE_DEBUG="TRUE"
else
ENABLE_DEBUG="FALSE"
fi
+if test -n "$enable_linuxjdk"; then
+ USE_LINUXJDK="TRUE"
+else
+ USE_LINUXJDK="FALSE"
+fi
dnl ===================================================================
dnl Bits to substitute into set_soenv.in
@@ -1272,6 +1292,7 @@
AC_SUBST(PTHREAD_CFLAGS)
AC_SUBST(PTHREAD_LIBS)
AC_SUBST(ENABLE_DEBUG)
+AC_SUBST(USE_LINUXJDK)
AC_OUTPUT([set_soenv])

44
editors/openoffice/files/patch-config_office+setsoenv.in
View File

@ -1,44 +0,0 @@
--- set_soenv.in.orig Thu Jan 9 14:41:31 2003
+++ set_soenv.in Sat Jan 25 18:27:08 2003
@@ -52,8 +52,8 @@
#-------------------------------------------------
#
# Platform independent constant values.
-my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "ITAL",
-"JAPN", "KOREAN", "POL", "PORT", "RUSS", "SPAN", "SWED", "TURK" );
+my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "GER",
+"ITAL", "JAPN", "KOREAN", "POL", "PORT", "RUSS", "SPAN", "SWED", "TURK" );
my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PRODUCT, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG,
$common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA,
$SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL,
@@ -88,7 +88,7 @@
$SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL,
$COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME,
$BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
+ $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK);
#
#-------------------------------------------
# IId. Declaring the aliases.
@@ -141,6 +141,7 @@
$CXX = '@CXX@'; # C++ compiler
$EXCEPTIONS = '@EXCEPTIONS@'; # Exception handling type
$ENABLE_DEBUG = '@ENABLE_DEBUG@'; # Enable a debug build
+$USE_LINUXJDK = '@USE_LINUXJDK@'; # Enable a debug build
$WRAPCMD = ""; # Wrapper (only for winnt)
#
@@ -1265,7 +1266,12 @@
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
}
elsif ($platform eq "$FreeBSD")
-{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
+{
+ if ($USE_LINUXJDK eq "TRUE") {
+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
+ } else {
+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
+ }
}
elsif ($platform eq "$NetBSD")
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";

11
editors/openoffice/files/patch-connectivity+source+drivers+adabas+makefile.mk
View File

@ -1,11 +0,0 @@
--- ../connectivity/source/drivers/adabas/makefile.mk.orig Wed Jun 12 01:06:20 2002
+++ ../connectivity/source/drivers/adabas/makefile.mk Wed Jun 12 01:06:34 2002
@@ -104,7 +104,7 @@
$(SLO)$/BResultSetMetaData.obj \
$(SLO)$/BResultSet.obj
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
+.IF "$(OS)"=="MACOSX"
#SHL1VERSIONMAP=$(ADABAS_TARGET).$(DLLPOSTFIX).map
.ELSE
SHL1VERSIONMAP=$(ADABAS_TARGET).map

12
editors/openoffice/files/patch-connectivity+source+drivers+calc+makefile.mk
View File

@ -1,12 +0,0 @@
--- ../connectivity/source/drivers/calc/makefile.mk.orig Wed Jun 12 01:36:16 2002
+++ ../connectivity/source/drivers/calc/makefile.mk Wed Jun 12 01:36:22 2002
@@ -92,9 +92,7 @@
$(SLO)$/CDriver.obj
.IF "$(OS)"!="MACOSX"
-.IF "$(OS)"!="FREEBSD"
SHL1VERSIONMAP= $(TARGET).map
-.ENDIF
.ENDIF
# --- Library -----------------------------------

11
editors/openoffice/files/patch-connectivity+source+drivers+dbase+makefile.mk
View File

@ -1,11 +0,0 @@
--- ../connectivity/source/drivers/dbase/makefile.mk.orig Wed Jun 12 01:26:39 2002
+++ ../connectivity/source/drivers/dbase/makefile.mk Wed Jun 12 01:26:48 2002
@@ -116,7 +116,7 @@
$(SLO)$/DDriver.obj
-.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD"
+.IF "$(OS)"=="MACOSX"
#SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
.ELSE
SHL1VERSIONMAP=$(TARGET).map

11
editors/openoffice/files/patch-connectivity+source+drivers+file+makefile.mk
View File

@ -1,11 +0,0 @@
--- ../connectivity/source/drivers/file/makefile.mk.orig Wed Jun 12 01:12:42 2002
+++ ../connectivity/source/drivers/file/makefile.mk Wed Jun 12 01:12:44 2002
@@ -112,7 +112,7 @@
$(SLO)$/fanalyzer.obj \
$(SLO)$/fcomp.obj
-.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD"
+.IF "$(OS)"=="MACOSX"
#SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
.ELSE
#SHL1VERSIONMAP=$(TARGET).map

11
editors/openoffice/files/patch-connectivity+source+drivers+flat+makefile.mk
View File

@ -1,11 +0,0 @@
--- ../connectivity/source/drivers/flat/makefile.mk.orig Wed Jun 12 01:14:43 2002
+++ ../connectivity/source/drivers/flat/makefile.mk Wed Jun 12 01:15:03 2002
@@ -104,7 +104,7 @@
$(SLO)$/EDriver.obj
-.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD"
+.IF "$(OS)"=="MACOSX"
#SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
.ELSE
SHL1VERSIONMAP=$(TARGET).map

11
editors/openoffice/files/patch-connectivity+source+drivers+jdbc+makefile.mk
View File

@ -1,11 +0,0 @@
--- ../connectivity/source/drivers/jdbc/makefile.mk.orig Wed Jun 12 00:57:12 2002
+++ ../connectivity/source/drivers/jdbc/makefile.mk Wed Jun 12 00:57:21 2002
@@ -111,7 +111,7 @@
$(SLO)$/tools.obj
-.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD"
+.IF "$(OS)"=="MACOSX"
#SHL1VERSIONMAP=$(JDBC_TARGET).$(DLLPOSTFIX).map
.ELSE
SHL1VERSIONMAP=$(JDBC_TARGET).map

12
editors/openoffice/files/patch-connectivity+source+drivers+mozab+makefile.mk
View File

@ -1,12 +0,0 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Wed Jun 12 01:37:30 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Jun 12 01:37:47 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \

54
editors/openoffice/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
View File

@ -1,54 +0,0 @@
--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Tue Mar 19 12:56:24 2002
+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Sat May 18 15:51:13 2002
@@ -64,8 +64,8 @@
#mozilla specific stuff.
MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
#End of mozilla specific stuff.
PRJ=..$/..$/..$/..
@@ -107,7 +107,7 @@
-I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
-I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
-I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap
+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \
-DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
@@ -123,7 +123,7 @@
-I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
-I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
-I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap
+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
CDEFS += -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \
-DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
@@ -141,7 +141,7 @@
-I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
-I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
-I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap
+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
CDEFS+= -DMOZILLA_CLIENT \
-DOSTYPE=\"Linux2.2.14-5\" -DOJI
.IF "$(OS)" == "LINUX"
@@ -157,6 +157,13 @@
-fno-rtti -Wall -Wconversion -Wpointer-arith \
-Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-Wno-long-long
+CDEFS += -DTRACING
+.ELIF "$(OS)" == "FREEBSD"
+CFLAGS += -fPIC
+CFLAGSCXX += \
+ -fno-rtti -Wall -Wconversion -Wpointer-arith \
+ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
+ -Wno-long-long -pthread
CDEFS += -DTRACING
.ENDIF
.ENDIF

12
editors/openoffice/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
View File

@ -1,12 +0,0 @@
--- ../connectivity/source/drivers/mozaddressbook/makefile.mk.orig Wed Jun 12 01:40:36 2002
+++ ../connectivity/source/drivers/mozaddressbook/makefile.mk Wed Jun 12 01:40:37 2002
@@ -134,9 +134,7 @@
SLOFILES+=$(SLO)$/staticmbmozab.obj
.ENDIF
-.IF "$(OS)"!="FREEBSD"
SHL1VERSIONMAP= $(TARGET).map
-.ENDIF
# --- Library -----------------------------------
SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX)

11
editors/openoffice/files/patch-cppu+inc+cppu+macros.hxx
View File

@ -1,11 +0,0 @@
--- ../cppu/inc/cppu/macros.hxx.kan Wed Jul 24 23:28:55 2002
+++ ../cppu/inc/cppu/macros.hxx Wed Jul 24 23:29:45 2002
@@ -76,7 +76,7 @@
the struct inherits from a base struct the first member is no double or [unsigned] long long.
@internal
*/
-#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3)
+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3)
#define CPPU_GCC3_ALIGN( base_struct ) __attribute__ ((aligned (__alignof__ (base_struct))))
#else
#define CPPU_GCC3_ALIGN( base_struct )

11
editors/openoffice/files/patch-cppu+inc+uno+lbnames.h
View File

@ -1,11 +0,0 @@
--- ../cppu/inc/uno/lbnames.h.orig Fri May 31 00:06:58 2002
+++ ../cppu/inc/uno/lbnames.h Fri May 31 00:07:22 2002
@@ -94,7 +94,7 @@
#define __CPPU_ENV gcc2
#elif (__GNUC__ == 2)
#error "Tested gcc 2 versions are 2.91 and 2.95. Patch uno/lbnames.h to try your gcc 2 version."
-#elif (__GNUC__ == 3 && __GNUC_MINOR__ == 0)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
#error "Tested gcc 3 version is 3.0. Patch uno/lbnames.h to try your gcc 3 version."

8
editors/openoffice/files/patch-cppu+prj+build.lst
View File

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

20
editors/openoffice/files/patch-cppu+source+uno+data.cxx
View File

@ -1,20 +0,0 @@
--- ../cppu/source/uno/data.cxx.kan Wed Jul 24 23:39:23 2002
+++ ../cppu/source/uno/data.cxx Wed Jul 24 23:38:49 2002
@@ -295,7 +295,7 @@
# pragma pack(8)
#endif
-#if defined(__GNUC__) && defined(LINUX) && defined(INTEL)
+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL)
#define MAX_ALIGNMENT_4
#endif
@@ -307,7 +307,7 @@
if (OFFSET_OF(s, m) != n) { fprintf( stderr, "### OFFSET_OF(" #s ", " #m ") = %d instead of expected %d!!!\n", OFFSET_OF(s, m), n ); abort(); }
#ifdef DEBUG
-#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC))
+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC))
#define BINTEST_VERIFYSIZE( s, n ) \
fprintf( stderr, "> sizeof(" #s ") = %d; __alignof__ (" #s ") = %d\n", sizeof(s), __alignof__ (s) ); \
if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); }

11
editors/openoffice/files/patch-cppu+test+alignment+diagnose.h
View File

@ -1,11 +0,0 @@
--- ../cppu/test/alignment/diagnose.h.orig Sat Jul 20 23:54:59 2002
+++ ../cppu/test/alignment/diagnose.h Sat Jul 20 23:55:06 2002
@@ -64,7 +64,7 @@
#include <sal/types.h>
#include <stdio.h>
-#if defined(__GNUC__) && defined(LINUX) && defined(INTEL)
+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL)
#define __ALIGNMENT__(s, n) __alignof__ (s)
#else
#define __ALIGNMENT__(s, n) n

12
editors/openoffice/files/patch-cppu+util+makefile.mk
View File

@ -1,12 +0,0 @@
--- ../cppu/util/makefile.mk.orig Wed Jun 12 01:39:28 2002
+++ ../cppu/util/makefile.mk Wed Jun 12 01:39:32 2002
@@ -87,9 +87,7 @@
SHL1DEPN=
SHL1IMPLIB=i$(TARGET)
-.IF "$(OS)"!="FREEBSD"
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-.ENDIF
SHL1VERSIONMAP=$(TARGET).map

24
editors/openoffice/files/patch-cppuhelper+source+makefile.mk
View File

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

10
editors/openoffice/files/patch-cpputools+source+registercomponent+makefile.mk
View File

@ -1,10 +0,0 @@
--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002
+++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002
@@ -104,6 +104,7 @@
APP1STDLIBS=\
$(SALLIB) \
+ $(TOOLSLIB) \
$(CPPULIB) \
$(CPPUHELPERLIB)

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

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

20
editors/openoffice/files/patch-desktop+util+makefile.mk
View File

@ -1,20 +0,0 @@
--- ../desktop/util/makefile.mk.orig Sun Jul 21 00:04:35 2002
+++ ../desktop/util/makefile.mk Sun Jul 21 00:04:38 2002
@@ -81,7 +81,7 @@
# --- Linken der Applikation ---------------------------------------
-.IF "$(OS)" == "LINUX"
+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
# #74158# linux needs sal/vos/tools at end of link list, solaris needs it first,
# winXX is handled like solaris for now
APP1_STDPRE=
@@ -111,7 +111,7 @@
$(SALHELPERLIB)
.IF "$(GUI)" == "UNX"
-.IF "$(OS)" == "LINUX"
+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
APP1STDLIBS+= -lXext -lSM -lICE

244
editors/openoffice/files/patch-dmake+unix+linux+gnu+make.sh
View File

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

19
editors/openoffice/files/patch-dtrans+source+X11+X11_selection.cxx
View File

@ -1,19 +0,0 @@
--- ../dtrans/source/X11/X11_selection.cxx.orig Sat Jul 20 23:18:03 2002
+++ ../dtrans/source/X11/X11_selection.cxx Sat Jul 20 23:18:05 2002
@@ -65,7 +65,7 @@
#include <X11/keysym.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
-#if defined(LINUX) || defined(NETBSD)
+#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD)
#include <sys/poll.h>
#else
#include <poll.h>
@@ -175,6 +175,7 @@
{ 0, "text/plain;charset=ksc5601.1992-0", "KSC5601.1992-0", 8 },
// eastern european encodings
{ 0, "text/plain;charset=koi8-r", "KOI8-R", 8 },
+ { 0, "text/plain;charset=koi8-u", "KOI8-U", 8 },
// String (== iso8859-1)
{ XA_STRING, "text/plain;charset=string", "STRING", 8 },
// special for compound text

12
editors/openoffice/files/patch-dtrans+source+X11+makefile.mk
View File

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

15
editors/openoffice/files/patch-eventattacher+source+makefile.mk
View File

@ -1,15 +0,0 @@
--- ../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/files/patch-external+dt+dtpatch.sh
View File

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

11
editors/openoffice/files/patch-external+expat+expatpatch.sh
View File

@ -1,11 +0,0 @@
--- ../external/expat/expatpatch.sh.orig Wed Mar 13 16:59:16 2002
+++ ../external/expat/expatpatch.sh Wed Mar 13 17:00:18 2002
@@ -87,7 +87,7 @@
for PNAME in `cat flist.pat`
do
- patch -i pat/$PNAME.pat rtufiles/$PNAME
+ patch < pat/$PNAME.pat rtufiles/$PNAME
done
for SDNAME in `cat flist.sd`

35
editors/openoffice/files/patch-external+glibc+glibcpatch
View File

@ -1,35 +0,0 @@
--- /dev/null Sun Jun 2 16:11:00 2002
+++ ../external/glibc/flist.pat Sun Jun 2 12:00:09 2002
@@ -0,0 +1 @@
+patch-getopt.h
--- /dev/null Sun Jun 2 16:11:00 2002
+++ ../external/glibc/patch-getopt.h Sun Jun 2 16:14:52 2002
@@ -0,0 +1,14 @@
+--- rtufiles/getopt.h.orig Fri May 31 16:46:21 2002
++++ rtufiles/getopt.h Fri May 31 17:07:19 2002
+@@ -133,7 +133,11 @@
+ errors, only prototype getopt for the GNU C library. */
+ extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
+ # else /* not __GNU_LIBRARY__ */
++#if (__GNUC__ == 3 && defined(FREEBSD))
++/* skip getopt() definition , it conflicts with std.h */
++#else
+ extern int getopt ();
++# endif /* FREEBSD */
+ # endif /* __GNU_LIBRARY__ */
+
+ # ifndef __need_getopt
--- ../external/glibc/glibcpatch.sh.orig Sun Jun 2 11:46:42 2002
+++ ../external/glibc/glibcpatch.sh Sun Jun 2 16:13:51 2002
@@ -113,7 +113,10 @@
# apply the patches
#
-# there is no need to apply patch here
+for PNAME in `cat flist.pat`
+ do
+ patch < $PNAME
+ done
#

11
editors/openoffice/files/patch-external+jpeg+jpegpatch.sh
View File

@ -1,11 +0,0 @@
--- ../external/jpeg/jpegpatch.sh.orig Wed Mar 13 17:04:35 2002
+++ ../external/jpeg/jpegpatch.sh Wed Mar 13 17:08:02 2002
@@ -112,7 +112,7 @@
for PNAME in `cat flist.pat`
do
- patch -i pat/$PNAME.pat $PNAME
+ patch < pat/$PNAME.pat $PNAME
done
cp -rf jpeg-6b/* rtufiles/

112
editors/openoffice/files/patch-external+neon+md5.c.pat
View File

@ -1,112 +0,0 @@
--- /dev/null Thu Aug 8 22:39:51 2002
+++ ../external/neon/md5.c.pat Thu Aug 8 22:35:33 2002
@@ -0,0 +1,109 @@
+*** ..\download\neon-0.14.0\src\md5.c Sun Apr 29 13:23:08 2001
+--- sub\md5.c Tue May 08 12:52:02 2001
+***************
+*** 278,290 ****
+ const void *buffer;
+ size_t len;
+ struct md5_ctx *ctx;
+ {
+ md5_uint32 correct_words[16];
+! const md5_uint32 *words = buffer;
+! size_t nwords = len / sizeof (md5_uint32);
+! const md5_uint32 *endp = words + nwords;
+ md5_uint32 A = ctx->A;
+ md5_uint32 B = ctx->B;
+ md5_uint32 C = ctx->C;
+ md5_uint32 D = ctx->D;
+
+--- 278,289 ----
+ const void *buffer;
+ size_t len;
+ struct md5_ctx *ctx;
+ {
+ md5_uint32 correct_words[16];
+! const unsigned char *words = buffer;
+! const unsigned char *endp = words + len;
+ md5_uint32 A = ctx->A;
+ md5_uint32 B = ctx->B;
+ md5_uint32 C = ctx->C;
+ md5_uint32 D = ctx->D;
+
+***************
+*** 313,324 ****
+ we store the swapped words in the array CORRECT_WORDS. */
+
+ #define OP(a, b, c, d, s, T) \
+ do \
+ { \
+! a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \
+! ++words; \
+ CYCLIC (a, s); \
+ a += b; \
+ } \
+ while (0)
+
+--- 312,325 ----
+ we store the swapped words in the array CORRECT_WORDS. */
+
+ #define OP(a, b, c, d, s, T) \
+ do \
+ { \
+! md5_uint32 WORD_ = words[0] | (words[1] << 8) \
+! | (words[2] << 16) | (words[3] << 24); \
+! a += FF (b, c, d) + (*cwp++ = WORD_) + T; \
+! words += 4; \
+ CYCLIC (a, s); \
+ a += b; \
+ } \
+ while (0)
+
+***************
+*** 431,441 ****
+ ctx->D = D;
+ }
+
+ /* Writes the ASCII representation of the MD5 digest into the
+ * given buffer, which must be at least 33 characters long. */
+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer)
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
+--- 432,442 ----
+ ctx->D = D;
+ }
+
+ /* Writes the ASCII representation of the MD5 digest into the
+ * given buffer, which must be at least 33 characters long. */
+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer)
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4);
+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f);
+***************
+*** 443,453 ****
+ buffer[32] = '\0';
+ }
+
+ /* Reads the ASCII representation of an MD5 digest. The buffer must
+ * be at least 32 characters long. */
+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16])
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
+ ASC2HEX(buffer[count*2+1]);
+--- 444,454 ----
+ buffer[32] = '\0';
+ }
+
+ /* Reads the ASCII representation of an MD5 digest. The buffer must
+ * be at least 32 characters long. */
+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16])
+ {
+ int count;
+ for (count = 0; count<16; count++) {
+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) |
+ ASC2HEX(buffer[count*2+1]);

14
editors/openoffice/files/patch-external+neon+neonpatch.sh
View File

@ -1,14 +0,0 @@
--- ../external/neon/neonpatch.sh.orig Tue May 29 17:40:10 2001
+++ ../external/neon/neonpatch.sh Thu Aug 8 22:43:04 2002
@@ -119,10 +119,7 @@
# apply the patches
#
- for PNAME in `cat flist.pat`
- do
- patch -i pat/$PNAME.pat rtufiles/$PNAME
- done
+ patch < md5.c.pat rtufiles/md5.c
#
# copy the SD files into rtufiles directory

11
editors/openoffice/files/patch-external+npsdk+npsdkpatch.sh
View File

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

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

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

11
editors/openoffice/files/patch-i18n+inc+collator.hxx
View File

@ -1,11 +0,0 @@
--- ../i18n/inc/collator.hxx.orig Sat Apr 6 12:19:32 2002
+++ ../i18n/inc/collator.hxx Wed May 1 22:31:57 2002
@@ -78,7 +78,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#endif
-#if !(defined WIN32 || defined MACOSX || defined NETBSD)
+#if !(defined WIN32 || defined MACOSX || defined NETBSD || defined FREEBSD)
#include <alloca.h>
#endif
#include <tools/string.hxx>

10
editors/openoffice/files/patch-i18npool+source+localedata+localedata.cxx
View File

@ -1,10 +0,0 @@
--- ../i18npool/source/localedata/localedata.cxx.orig Mon Feb 24 17:47:22 2003
+++ ../i18npool/source/localedata/localedata.cxx Tue Feb 25 16:41:58 2003
@@ -150,6 +150,7 @@
{ "pt_BR", lcl_ASCII },
{ "pt_PT", lcl_ASCII },
{ "ru_RU", lcl_ASCII },
+ { "uk_UA", lcl_ASCII },
{ "sv_FI", lcl_ASCII },
{ "tr_TR", lcl_ASCII },
{ "th_TH", lcl_ASCII }, // PlaDao convenience entry

18
editors/openoffice/files/patch-i18npool+source+localedata_ascii+makefile.mk
View File

@ -1,18 +0,0 @@
--- ../i18npool/source/localedata_ascii/makefile.mk.orig Sun Nov 17 23:27:32 2002
+++ ../i18npool/source/localedata_ascii/makefile.mk Tue Feb 25 16:43:21 2003
@@ -138,6 +138,7 @@
$(MISC)$/localedata_pt_BR.cxx \
$(MISC)$/localedata_pt_PT.cxx \
$(MISC)$/localedata_ru_RU.cxx \
+ $(MISC)$/localedata_uk_UA.cxx \
$(MISC)$/localedata_sv_FI.cxx \
$(MISC)$/localedata_tr_TR.cxx \
$(MISC)$/localedata_nb_NO.cxx \
@@ -208,6 +209,7 @@
$(SLO)$/localedata_pt_BR.obj \
$(SLO)$/localedata_pt_PT.obj \
$(SLO)$/localedata_ru_RU.obj \
+ $(SLO)$/localedata_uk_UA.obj \
$(SLO)$/localedata_sv_FI.obj \
$(SLO)$/localedata_tr_TR.obj \
$(SLO)$/localedata_nb_NO.obj \

454
editors/openoffice/files/patch-i18npool+source+localedata_ascii+uk_UA.xml
View File

@ -1,454 +0,0 @@
--- ../i18npool/source/localedata_ascii/uk_UA.xml.orig Thu Jan 1 00:00:00 1970
+++ ../i18npool/source/localedata_ascii/uk_UA.xml Fri Feb 28 13:04:01 2003
@@ -0,0 +1,451 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<Locale version="1.2">
+<LC_INFO>
+<Language>
+<LangID>uk</LangID>
+<DefaultName>Ukrainian</DefaultName>
+</Language>
+<Country>
+<CountryID>UA</CountryID>
+<DefaultName>Ukraine</DefaultName>
+</Country>
+<Platform>
+<PlatformID>generic</PlatformID>
+</Platform>
+<Varient></Varient>
+</LC_INFO>
+<LC_CTYPE unoid="generic">
+<Separators>
+<DateSeparator>.</DateSeparator>
+<ThousandSeparator> </ThousandSeparator>
+<DecimalSeparator>,</DecimalSeparator>
+<TimeSeparator>:</TimeSeparator>
+<Time100SecSeparator>,</Time100SecSeparator>
+<ListSeparator>;</ListSeparator>
+<LongDateDayOfWeekSeparator></LongDateDayOfWeekSeparator>
+<LongDateDaySeparator> </LongDateDaySeparator>
+<LongDateMonthSeparator> </LongDateMonthSeparator>
+<LongDateYearSeparator> р.</LongDateYearSeparator>
+</Separators>
+<Markers>
+<QuotationStart>‘</QuotationStart>
+<QuotationEnd>’</QuotationEnd>
+<DoubleQuotationStart>“</DoubleQuotationStart>
+<DoubleQuotationEnd>”</DoubleQuotationEnd>
+</Markers>
+<TimeAM>AM</TimeAM>
+<TimePM>PM</TimePM>
+<MeasurementSystem>Metric</MeasurementSystem>
+</LC_CTYPE>
+<LC_FORMAT>
+<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
+<FormatCode>M/D/YY</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28">
+<FormatCode>NN DD/MMM YY</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34">
+<FormatCode>MM/YY</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35">
+<FormatCode>MMM DD</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36">
+<FormatCode>MMMM</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37">
+<FormatCode>QQ YY</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21">
+<FormatCode>MM/DD/YYYY</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20">
+<FormatCode>MM/DD/YY</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19">
+<FormatCode>NNNNMMMM DD, YYYY</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22">
+<FormatCode>MMM D, YY</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23">
+<FormatCode>MMM D, YYYY</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25">
+<FormatCode>MMMM D, YYYY</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27">
+<FormatCode>NN, MMM D, YY</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29">
+<FormatCode>NN, MMMM D, YYYY</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30">
+<FormatCode>NNNNMMMM D, YYYY</FormatCode>
+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24">
+<FormatCode>D. MMM. YYYY</FormatCode>
+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26">
+<FormatCode>D. MMMM YYYY</FormatCode>
+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31">
+<FormatCode>MM-DD</FormatCode>
+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32">
+<FormatCode>YY-MM-DD</FormatCode>
+<DefaultName>DIN 5008 (EN 28601) </DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="33">
+<FormatCode>YYYY-MM-DD</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38">
+<FormatCode>WW</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME" formatindex="39">
+<FormatCode>HH:MM</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="TimeFormatskey2" default="true" type="medium" usage="TIME" formatindex="40">
+<FormatCode>HH:MM:SS</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="TimeFormatskey3" default="false" type="short" usage="TIME" formatindex="41">
+<FormatCode>HH:MM AM/PM</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="TimeFormatskey4" default="false" type="medium" usage="TIME" formatindex="42">
+<FormatCode>HH:MM:SS AM/PM</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43">
+<FormatCode>[HH]:MM:SS</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44">
+<FormatCode>MM:SS,00</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45">
+<FormatCode>[HH]:MM:SS,00</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46">
+<FormatCode>MM/DD/YY HH:MM</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47">
+<FormatCode>MM/DD/YYYY HH:MM:SS</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
+<FormatCode>Standard</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER" formatindex="1">
+<FormatCode>0</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER" formatindex="2">
+<FormatCode>0,00</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER" formatindex="3">
+<FormatCode># ##0</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4">
+<FormatCode># ##0,00</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
+<FormatCode># ###,00</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
+<FormatCode>[$грн.-419]# ##0;-[$грн.-419]# ##0</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
+<FormatCode>[$грн.-419]# ##0,00;-[$грн.-419]# ##0,00</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
+ <FormatCode>[$грн.-419]# ##0;[RED]-[$грн.-419]# ##0</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
+<FormatCode>[$грн.-419]# ##0,00;[RED]-[$грн.-419]# ##0,00</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
+<FormatCode># ##0,00 CCC</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
+<FormatCode>[$грн.-419]# ##0,--;[RED]-[$грн.-419]# ##0,--</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
+<FormatCode>0%</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
+<FormatCode>0,00%</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
+<FormatCode>0,00E+000</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
+<FormatCode>0,00E+00</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+</LC_FORMAT>
+<LC_COLLATION>
+<Collator unoid="uk_UA.alphanumeric" default="true"/>
+<CollationOptions>
+<TransliterationModules>IGNORE_CASE</TransliterationModules>
+</CollationOptions>
+</LC_COLLATION>
+<LC_SEARCH>
+<SearchOptions>
+<TransliterationModules>IGNORE_CASE</TransliterationModules>
+</SearchOptions>
+</LC_SEARCH>
+<LC_CALENDAR>
+<Calendar unoid="gregorian" default="true">
+<DaysOfWeek>
+<Day>
+<DayID>sun</DayID>
+<DefaultAbbrvName>Нд</DefaultAbbrvName>
+<DefaultFullName>неділя</DefaultFullName>
+</Day>
+<Day>
+<DayID>mon</DayID>
+<DefaultAbbrvName>Пн</DefaultAbbrvName>
+<DefaultFullName>понеділок</DefaultFullName>
+</Day>
+<Day>
+<DayID>tue</DayID>
+<DefaultAbbrvName>Вт</DefaultAbbrvName>
+<DefaultFullName>вівторок</DefaultFullName>
+</Day>
+<Day>
+<DayID>wed</DayID>
+<DefaultAbbrvName>Ср</DefaultAbbrvName>
+<DefaultFullName>середа</DefaultFullName>
+</Day>
+<Day>
+<DayID>thu</DayID>
+<DefaultAbbrvName>Чт</DefaultAbbrvName>
+<DefaultFullName>четвер</DefaultFullName>
+</Day>
+<Day>
+<DayID>fri</DayID>
+<DefaultAbbrvName>Пт</DefaultAbbrvName>
+<DefaultFullName>п'ятниця</DefaultFullName>
+</Day>
+<Day>
+<DayID>sat</DayID>
+<DefaultAbbrvName>Сб</DefaultAbbrvName>
+<DefaultFullName>субота</DefaultFullName>
+</Day>
+</DaysOfWeek>
+<MonthsOfYear>
+<Month>
+<MonthID>jan</MonthID>
+<DefaultAbbrvName>січ</DefaultAbbrvName>
+<DefaultFullName>Січень</DefaultFullName>
+</Month>
+<Month>
+<MonthID>feb</MonthID>
+<DefaultAbbrvName>лют</DefaultAbbrvName>
+<DefaultFullName>Лютий</DefaultFullName>
+</Month>
+<Month>
+<MonthID>mar</MonthID>
+<DefaultAbbrvName>бер</DefaultAbbrvName>
+<DefaultFullName>Березень</DefaultFullName>
+</Month>
+<Month>
+<MonthID>apr</MonthID>
+<DefaultAbbrvName>квт</DefaultAbbrvName>
+<DefaultFullName>Квітень</DefaultFullName>
+</Month>
+<Month>
+<MonthID>may</MonthID>
+<DefaultAbbrvName>трв</DefaultAbbrvName>
+<DefaultFullName>Травень</DefaultFullName>
+</Month>
+<Month>
+<MonthID>jun</MonthID>
+<DefaultAbbrvName>чер</DefaultAbbrvName>
+<DefaultFullName>Червень</DefaultFullName>
+</Month>
+<Month>
+<MonthID>jul</MonthID>
+<DefaultAbbrvName>лип</DefaultAbbrvName>
+<DefaultFullName>Липень</DefaultFullName>
+</Month>
+<Month>
+<MonthID>aug</MonthID>
+<DefaultAbbrvName>сер</DefaultAbbrvName>
+<DefaultFullName>Серпень</DefaultFullName>
+</Month>
+<Month>
+<MonthID>sep</MonthID>
+<DefaultAbbrvName>вер</DefaultAbbrvName>
+<DefaultFullName>Вересень</DefaultFullName>
+</Month>
+<Month>
+<MonthID>oct</MonthID>
+<DefaultAbbrvName>жов</DefaultAbbrvName>
+<DefaultFullName>Жовтень</DefaultFullName>
+</Month>
+<Month>
+<MonthID>nov</MonthID>
+<DefaultAbbrvName>лис</DefaultAbbrvName>
+<DefaultFullName>Листопад</DefaultFullName>
+</Month>
+<Month>
+<MonthID>dec</MonthID>
+<DefaultAbbrvName>гру</DefaultAbbrvName>
+<DefaultFullName>Грудень</DefaultFullName>
+</Month>
+</MonthsOfYear>
+<Eras>
+<Era>
+<EraID>bc</EraID>
+<DefaultAbbrvName>до н.е.</DefaultAbbrvName>
+<DefaultFullName>до н.е.</DefaultFullName>
+</Era>
+<Era>
+<EraID>ad</EraID>
+<DefaultAbbrvName>н.е.</DefaultAbbrvName>
+<DefaultFullName>н.е.</DefaultFullName>
+</Era>
+</Eras>
+<StartDayOfWeek>
+<DayID>sun</DayID>
+</StartDayOfWeek>
+<MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
+</Calendar>
+</LC_CALENDAR>
+<LC_CURRENCY>
+<Currency default="true" usedInCompatibleFormatCodes="true">
+<CurrencyID>грн.</CurrencyID>
+<CurrencySymbol>грн.</CurrencySymbol>
+<BankSymbol>UAH</BankSymbol>
+<CurrencyName>Hrivnya</CurrencyName>
+<DecimalPlaces>2</DecimalPlaces>
+</Currency>
+</LC_CURRENCY>
+<LC_TRANSLITERATION>
+<Transliteration unoid="UPPERCASE_LOWERCASE"/>
+<Transliteration unoid="IGNORE_CASE"/>
+<Transliteration unoid="LOWERCASE_UPPERCASE" />
+</LC_TRANSLITERATION>
+<LC_MISC>
+<ReservedWords>
+<trueWord>true</trueWord>
+<falseWord>false</falseWord>
+<quarter1Word>1st quarter</quarter1Word>
+<quarter2Word>2nd quarter</quarter2Word>
+<quarter3Word>3rd quarter</quarter3Word>
+<quarter4Word>4th quarter</quarter4Word>
+<aboveWord>above</aboveWord>
+<belowWord>below</belowWord>
+</ReservedWords>
+</LC_MISC>
+<LC_NumberingLevel>
+<NumberingLevel Prefix=" " NumType="4" Suffix=")" />
+<NumberingLevel Prefix=" " NumType="4" Suffix="." />
+<NumberingLevel Prefix="(" NumType="4" Suffix="." />
+<NumberingLevel Prefix=" " NumType="2" Suffix="." />
+<NumberingLevel Prefix=" " NumType="0" Suffix=")" />
+<NumberingLevel Prefix=" " NumType="1" Suffix=")" />
+<NumberingLevel Prefix="(" NumType="1" Suffix=")" />
+<NumberingLevel Prefix=" " NumType="3" Suffix="." />
+</LC_NumberingLevel>
+<LC_OutLineNumberingLevel>
+<OutlineStyle>
+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
+</OutlineStyle>
+<OutlineStyle>
+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
+</OutlineStyle>
+<OutlineStyle>
+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix="(" NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix="." BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
+</OutlineStyle>
+<OutlineStyle>
+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
+</OutlineStyle>
+<OutlineStyle>
+<OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
+</OutlineStyle>
+<OutlineStyle>
+<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
+</OutlineStyle>
+<OutlineStyle>
+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="2" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="3" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="4" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
+</OutlineStyle>
+<OutlineStyle>
+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="27A2" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="E006" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=")" BulletChar="E004" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" />
+</OutlineStyle>
+</LC_OutLineNumberingLevel>
+</Locale>

36
editors/openoffice/files/patch-idlc+source+parser.yy
View File

@ -1,36 +0,0 @@
--- ../idlc/source/parser.yy.orig Wed Jul 10 11:43:18 2002
+++ ../idlc/source/parser.yy Thu Oct 31 10:00:47 2002
@@ -995,7 +995,8 @@
{
idlc()->setParseState(PS_ConstantDeclSeen);
}
- ';'
+ ';' {};
+
const_dcl :
IDL_CONST
@@ -1316,7 +1317,7 @@
* Push the scope of the exception on the scopes stack
*/
idlc()->scopes()->push(pExcept);
- delete $1
+ delete $1;
}
'{'
{
@@ -1705,10 +1706,10 @@
{
idlc()->setParseState(PS_TypedefSeen);
}
- type_declarator
- | struct_type
- | union_type
- | enum_type
+ type_declarator {}
+ | struct_type {}
+ | union_type {}
+ | enum_type {}
;
type_declarator :

Some files were not shown because too many files have changed in this diff Show More