1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-24 09:25:01 +00:00

Remove OpenOffice.org 2.x, it is unsupported upstream and vulnerable[1]

Please use editors/openoffice.org-3 or editors/libreoffice

Reported by:	dougb[1]
Approved by:	maho
With hat:	office
This commit is contained in:
Baptiste Daroussin 2011-09-20 13:02:36 +00:00
parent 13e5b5f8bb
commit 0d73ab3a64
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=282068
32 changed files with 1 additions and 5582 deletions

1
MOVED
View File

@ -2642,3 +2642,4 @@ net-mgmt/cfgstoragemk||2011-09-07|Has expired: No more public distfiles
mail/libspf2-10||2011-09-09|Vulnerable, use mail/libspf2 instead
mail/postfix-policyd-spf||2011-09-09|Relies on vulnerable mail/libspf2-10
multimedia/bmpx||2011-09-11|Has expired: BROKEN for more than 6 month
editors/openoffice.org-2|editors/openoffice.org-3|2011-09-20|unsupported upstream and vulnerable

View File

@ -181,7 +181,6 @@
SUBDIR += nxml
SUBDIR += nxml-emacs21
SUBDIR += omegaT
SUBDIR += openoffice.org-2
SUBDIR += openoffice.org-3
SUBDIR += openoffice.org-3-RC
SUBDIR += openoffice.org-3-devel

View File

@ -1,281 +0,0 @@
# New ports collection makefile for: OpenOffice.org
# Date created: 28 February 2002
# Whom: Martin Blapp
#
# $FreeBSD$
#
PORTNAME?= openoffice.org
PORTVERSION?= ${OOOVERSION}
PORTREVISION= 2
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= ${OOOSRC} unowinreg.dll:unowinreg
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
.endif
EXTRACT_ONLY= ${OOOSRC}
#de facto maintainer is maho@FreeBSD.org
#patch submitters must sign SCA; see http://porting.openoffice.org/freebsd/#policy
MAINTAINER= office@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
CONFLICTS= cppunit*
OOOVERSION= 2.4.3
NO_LATEST_LINK= yes
USE_GNOME= desktopfileutils gtk20
MOZILLA_VERSION= 1.7.5
MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz
.if !defined(WITHOUT_MOZILLA)
DISTFILES+= ${MOZILLA_SOURCE}:mozsrc
USE_GNOME+= libidl
.endif
.if defined(WITH_KDE)
USE_KDELIBS_VER= 3
.endif
USE_XORG= x11 ice xaw xau xext xrender xrandr \
xi xt xcursor xdamage xcomposite xfixes
USE_GMAKE= yes
USE_PERL5= yes
USE_BZIP2= yes
WITHOUT_CPU_CFLAGS= true
MAKE_JOBS_SAFE= yes
.include <bsd.port.pre.mk>
USE_JAVA= yes
JAVA_BUILD= jdk
JAVA_VENDOR= freebsd bsdjava openjdk
JAVA_VERSION= 1.5 1.6
.include <${FILESDIR}/Makefile.localized>
ONLY_FOR_ARCHS= i386 amd64
.if ${ARCH} == amd64
FREEBSD_ENV_SET= FreeBSDAMDEnv.Set
.else
FREEBSD_ENV_SET= FreeBSDX86Env.Set
.endif
MILESTONE?= 21
OOOTAG?= OOH680_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
EXECBASE?= openoffice.org-${OOOVERSION}
DIST_SUBDIR= openoffice.org2
SIMPLEOSVER= ${OSREL:C/\.//g}
.if ${ARCH} == amd64
PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86-64
.else
PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
.endif
LOCALIZED_LANG?= en-US
# FIXME (Somehow INDEX build fails)
.if defined(LANG_PKGNAME)
PKGNAMEPREFIX= ${LANG_PKGNAME}-
.endif
.if defined(LANG_SUFFIX)
PKGNAMESUFFIX= -${LANG_SUFFIX}
.endif
RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
.if defined(WITH_CCACHE)
BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
CCACHE_PREFIX= ccache
OOOCC= ${CCACHE_PREFIX} ${CC}
OOOCXX= ${CCACHE_PREFIX} ${CXX}
.else
OOOCC= ${CC}
OOOCXX= ${CXX}
.endif
CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
gcp:${PORTSDIR}/sysutils/coreutils \
gpatch:${PORTSDIR}/devel/patch \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bash:${PORTSDIR}/shells/bash \
imake:${PORTSDIR}/devel/imake \
${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
ant:${PORTSDIR}/devel/apache-ant
.if !defined(WITH_GPC)
LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
.endif
USE_BISON= build
GNU_CONFIGURE= yes
WRKSRC?= ${WRKDIR}/${OOOTAG}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
TCSH?= /bin/tcsh
SUB_FILES= pkg-message
SUB_LIST= EXECBASE=${EXECBASE} INSTALLATION_BASEDIR=${INSTALLATION_BASEDIR} OOOTAG=${OOOTAG} OOOVERSION=${OOOVERSION}
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \
--with-gnu-patch=${LOCALBASE}/bin/gpatch \
--enable-crashdump=yes \
--with-system-zlib \
--with-system-stdlibs \
--with-epm=internal
.if ${ARCH} == amd64
WITHOUT_MOZILLA= yes
.endif
.if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
EXTRA_PATCHES+= ${FILESDIR}/optpatch-freetype
.endif
ICONS= ${WRKSRC}/sysui/desktop/icons
.include <${FILESDIR}/Makefile.knobs>
pre-everything::
# really tweak, extremely useful when you build all localized language versions
# needed after when you build with ALL_LOCALIZED_LANGS.
.if defined(TWEAK_L10N)
@${RM} -f ${WRKDIR}/.PLIST*
@${RM} -f ${WRKDIR}/.install_done.*
@${RM} -f ${WRKDIR}/.package_done.*
@${RM} -f ${WRKDIR}/.extract_done.*
@${RM} -f ${WRKDIR}/.patch_done.*
@${RM} -f ${WRKDIR}/.configure_done.*
@${RM} -f ${WRKDIR}/.build_done.*
@${MKDIR} ${WRKDIR}
@${TOUCH} ${EXTRACT_COOKIE}
@${TOUCH} ${PATCH_COOKIE}
@${TOUCH} ${CONFIGURE_COOKIE}
@${TOUCH} ${BUILD_COOKIE}
.endif
post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
.if defined(WITH_GPC)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
.endif
.if !defined(WITHOUT_MOZILLA)
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
.endif
pre-configure:
#Workaround for gperf. #i85469#
@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
@${LN} -sf ${LOCALBASE}/bin/unzip ${WRKSRC}/solenv/bin/unzip
do-build:
@cd ${WRKSRC} ; ./bootstrap
# PR:84786 #i53289#
.if !defined(DISABLE_MAKE_JOBS)
@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl -P${MAKE_JOBS_NUMBER} --all"
.else
@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; dmake"
.endif
.if ${LOCALIZED_LANG} == "alllangs"
@${MAKE} languagepack
.endif
do-install:
.if ${LOCALIZED_LANG} == "alllangs"
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/ ; ${LS} */freebsd*/*.t?z > ${WRKDIR}/LANGPACKFILES
@${RM} -Rf ${WRKDIR}/tmp
@${MKDIR} ${WRKDIR}/tmp
@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
${ECHO_CMD} "extracting $$i" ; \
cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/$$i ; \
done
@for i in `${CAT} ${WRKDIR}/LANGPACKFILES`; do \
${ECHO_CMD} "extracting $$i" ; \
cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/$$i ;\
done
@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
.else
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
@${RM} -Rf ${WRKDIR}/tmp
@${MKDIR} ${WRKDIR}/tmp
@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
${ECHO_CMD} "extracting $$i" ; \
cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ; \
done
@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
.endif
post-install:
@${ECHO_MSG} "===> Add wrapper scripts";
@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-e 's#%%OOOTAG%%#${OOOTAG}#g' \
-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
${WRKDIR}/openoffice.org-wrapper
@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
${PREFIX}/bin/${EXECBASE}
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
@${ECHO_CMD} "" > ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \
${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
@${REINPLACE_CMD} -e '/^Exec/s/printeradmin/spadmin/' \
${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
@for app in base calc draw impress math printeradmin writer; do \
${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
-e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \
${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/$${app}.desktop ; \
done
@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
@${RM} -f ${DESKTOPDIR}/${EXECBASE}
@${MKDIR} ${DESKTOPDIR}
@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
${DESKTOPDIR}/${EXECBASE}
@${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
@${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE}
@${ECHO_CMD} "@exec ${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
for app in base calc draw impress math printeradmin writer; do \
if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \
${PREFIX}/share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png ; \
${ECHO_CMD} "share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png" >> ${TMPPLIST} ; \
fi \
done ; \
for file in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \
${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/mimetypes/$${file} \
${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \
${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${file}" >> ${TMPPLIST} ; \
done ; \
done
@${PREFIX}/bin/gtk-update-icon-cache -q -f ${PREFIX}/share/icons/hicolor 2>/dev/null || ${TRUE}
@${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
@${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
@${ECHO_CMD}
@${CAT} ${PKGMESSAGE}
@${ECHO_CMD}
.include <${FILESDIR}/Makefile.others>
.include <bsd.port.post.mk>

View File

@ -1,8 +0,0 @@
SHA256 (openoffice.org2/OOo_OOH680_m21_source.tar.bz2) = 26d23ea8befdd6c97b4f3e7a1bb7e185c55020cf12a34ac2fee22ebfcd5bf72f
SIZE (openoffice.org2/OOo_OOH680_m21_source.tar.bz2) = 286347872
SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2/unowinreg.dll) = 6144
SHA256 (openoffice.org2/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2/gpc231.tar.Z) = 27917
SHA256 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
SIZE (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 38721366

View File

@ -1,148 +0,0 @@
# Makefile for knobs
# Whom: Maho Nakata <maho@FreeBSD.org>
# $FreeBSD$
CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
CONFIGURE_ARGS+= --with-vba-package-format="builtin"
.if defined(WITH_KDE)
CONFIGURE_ARGS+= --enable-kde QTDIR="${QT_PREFIX}"
.endif
.if defined(WITHOUT_CUPS)
CONFIGURE_ARGS+= --enable-cups=no
.else
LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client
CONFIGURE_ARGS+= --enable-cups=yes
.endif
.if defined(WITHOUT_MOZILLA)
CONFIGURE_ARGS+= --disable-mozilla
.else
CONFIGURE_ARGS+= --enable-build-mozilla
.endif
.if defined(WITHOUT_GNOMEVFS)
CONFIGURE_ARGS+= --disable-gnome-vfs
.else
USE_GNOME+= gnomevfs2
.endif
.if defined(WITH_EVOLUTION2)
CONFIGURE_ARGS+= --enable-evolution2=yes
.else
USE_GNOME+= glib20
.endif
.if defined(WITH_SYSTEM_FREETYPE)
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
CONFIGURE_ARGS+= --with-system-freetype=yes
.else
CONFIGURE_ARGS+= --with-system-freetype=no
.endif
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang=ALL
.else
CONFIGURE_ARGS+= --with-lang=${LOCALIZED_LANG}
.endif
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-debug --enable-symbols=TRUE --enable-dbgutil
.else
CONFIGURE_ARGS+= --enable-symbols=SMALL
.endif
.if defined(WITH_SYSTEM_ICU)
LIB_DEPENDS+= icule:${PORTSDIR}/devel/icu
CONFIGURE_ARGS+= --with-system-icu=yes
.else
CONFIGURE_ARGS+= --with-system-icu=no
.endif
pre-fetch:
@${ECHO} "OPTIONS:"
.if !defined(WITH_DEBUG)
@${ECHO}
@${ECHO} "You can compile OOo with debug symbols/supports with"
@${ECHO} "make -DWITH_DEBUG"
.endif
.if !defined(WITHOUT_MOZILLA)
@${ECHO}
@${ECHO} "You can compile OOo without Mozilla connectivity with"
@${ECHO} "make -DWITHOUT_MOZILLA"
.endif
.if !defined(WITHOUT_GNOMEVFS)
@${ECHO}
@${ECHO} "You can compile OOo without gnome VFS support with"
@${ECHO} "make -DWITHOUT_GNOMEVFS"
.endif
.if !defined(WITH_SYSTEM_ICU)
@${ECHO}
@${ECHO} "You can compile OOo with devel/icu from ports with"
@${ECHO} "make -DWITH_SYSTEM_ICU"
.endif
.if !defined(WITH_SYSTEM_FREETYPE)
@${ECHO}
@${ECHO} "You can compile OOo with freetype2 from ports with"
@${ECHO} "make -DWITH_SYSTEM_FREETYPE"
.if !defined(WITH_TTF_BYTECODE_ENABLED)
@${ECHO}
@${ECHO} "You may get better quality of glyphs"
@${ECHO} "at small bitmap sizes if you have"
@${ECHO} "licensed the Apple patents"
@${ECHO} "US05155805 US05159668 and US05325479, with"
@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
@${ECHO} "See http://www.freetype.org/patents.html for details"
.endif
.endif
.if !defined(WITHOUT_CUPS)
@${ECHO}
@${ECHO} "You can compile OOo without CUPS support with"
@${ECHO} "make -DWITHOUT_CUPS"
.endif
.if !defined(WITH_KDE)
@${ECHO}
@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
@${ECHO} "make -DWITH_KDE"
.endif
.if !defined(WITH_GPC)
@${ECHO}
@${ECHO} "You can compile OOo with gpc instead of libart by"
@${ECHO} "make -DWITH_GPC"
.endif
.if !defined(WITH_EVOLUTION2)
@${ECHO}
@${ECHO} "You can compile OOo with evolution2 support by"
@${ECHO} "make -DWITH_EVOLUTION2"
.endif
.if ${LOCALIZED_LANG} != "alllangs"
@${ECHO}
@${ECHO} "You can compile OOo with full localized language support by"
@${ECHO} "make LOCALIZED_LANG=alllangs"
.endif
@${ECHO}
@${ECHO} "You can select the language for OOo by making it with:"
@${ECHO} "make LOCALIZED_LANG=xx"
@${ECHO} "while xx can be one of the following"
@${ECHO} "af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da"
@${ECHO} "de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl"
@${ECHO} "gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk"
@${ECHO} "ms ml-IN mr-IN ne nb nl nn nr ns oc or-IN pa-IN pl pt"
@${ECHO} "pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER"
@${ECHO} "ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW"
@${ECHO} "zu"
@${ECHO} "Current setting: ${LOCALIZED_LANG}"
@${ECHO}
@${ECHO} "NOTICE:"
@${ECHO}
@${ECHO} "To build OOo, you should have a lot"
.if defined(WITH_DEBUG)
@${ECHO} "of free diskspace (~ 18GB) and memory (~ 2GB)."
.elif ${LOCALIZED_LANG} == "alllangs"
@${ECHO} "of free diskspace (~ 35GB) and memory (~ 2GB)."
.else
@${ECHO} "of free diskspace (~ 11GB) and memory (~ 2GB)."
.endif
@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"

View File

@ -1,401 +0,0 @@
# localized makefile
# Whom: Maho Nakata <maho@FreeBSD.org>
# $FreeBSD$
################################################################
#See solenv/inc/postset.mk for details
################################################################
.if defined(LOCALIZED_LANG)
.if ${LOCALIZED_LANG} == "af"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "ar"
CATEGORIES+= arabic
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "as-IN"
LANG_PKGNAME= as
LANG_SUFFIX= IN
.endif
################################################################
.if ${LOCALIZED_LANG} == "be-BY"
LANG_PKGNAME= be
LANG_SUFFIX= BY
.endif
################################################################
.if ${LOCALIZED_LANG} == "bg"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "bn-BD"
LANG_PKGNAME= be
LANG_SUFFIX= BD
.endif
################################################################
.if ${LOCALIZED_LANG} == "bn-IN"
LANG_PKGNAME= bn
LANG_SUFFIX= IN
.endif
################################################################
.if ${LOCALIZED_LANG} == "bn"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "br"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "bs"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "ca"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "cs"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "cy"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "da"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "de"
CATEGORIES+= german
LANG_PKGNAME= ${LOCALIZED_LANG}
COMMENT= Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
.endif
################################################################
.if ${LOCALIZED_LANG} == "dz"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "el"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "en-GB"
LANG_PKGNAME= en
LANG_SUFFIX= GB
.endif
################################################################
.if ${LOCALIZED_LANG} == "en-US"
LANG_PKGNAME= en
LANG_SUFFIX= US
.endif
################################################################
.if ${LOCALIZED_LANG} == "en-ZA"
LANG_PKGNAME= en
LANG_SUFFIX= ZA
.endif
################################################################
.if ${LOCALIZED_LANG} == "eo"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "es"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "et"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "eu"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "fa"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "fi"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "fr"
CATEGORIES+= french
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "ga"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "gl"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "gu-IN"
LANG_PKGNAME= gu
LANG_SUFFIX= IN
.endif
################################################################
.if ${LOCALIZED_LANG} == "he"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "hi-IN"
LANG_PKGNAME= hi
LANG_SUFFIX= IN
.endif
################################################################
.if ${LOCALIZED_LANG} == "hr"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "hu"
CATEGORIES+= hungarian
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "it"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "ja"
CATEGORIES+= japanese
LANG_PKGNAME= ${LOCALIZED_LANG}
RUN_DEPENDS+= ${LOCALBASE}/share/fonts/std.ja_JP/Ryumin-Light:${PORTSDIR}/japanese/font-std
.endif
################################################################
.if ${LOCALIZED_LANG} == "ka"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "km"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "kn"
LANG_PKGNAME= kn
.endif
################################################################
.if ${LOCALIZED_LANG} == "ko"
CATEGORIES+= korean
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "ku"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "lo"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "lt"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "lv"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "mk"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "ml-IN"
LANG_PKGNAME= ml
LANG_SUFFIX= IN
.endif
################################################################
.if ${LOCALIZED_LANG} == "mr-IN"
LANG_PKGNAME= mr
LANG_SUFFIX= IN
.endif
################################################################
.if ${LOCALIZED_LANG} == "ms"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "nb"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "ne"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "nl"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "nn"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "nr"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "ns"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "or-IN"
LANG_PKGNAME= or
LANG_SUFFIX= IN
.endif
################################################################
.if ${LOCALIZED_LANG} == "pa-IN"
LANG_PKGNAME= pa
LANG_SUFFIX= IN
.endif
################################################################
.if ${LOCALIZED_LANG} == "pl"
CATEGORIES+= polish
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "pt"
COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado
CATEGORIES+= portuguese
LANG_PKGNAME= ${LOCALIZED_LANG}
LANG_CONFIGURE_ARG= PORT
.endif
################################################################
.if ${LOCALIZED_LANG} == "pt-BR"
COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado
CATEGORIES+= portuguese
LANG_PKGNAME= pt
LANG_SUFFIX= BR
.endif
################################################################
.if ${LOCALIZED_LANG} == "ru"
CATEGORIES+= russian
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "rw"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "sh"
LANG_PKGNAME= sh
.endif
################################################################
.if ${LOCALIZED_LANG} == "sk"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "sl"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "sr"
LANG_PKGNAME= sr
.endif
################################################################
.if ${LOCALIZED_LANG} == "ss"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "st"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "sv"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "sw-TZ"
LANG_PKGNAME= sw
LANG_SUFFIX= TZ
.endif
################################################################
.if ${LOCALIZED_LANG} == "sw"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "ta-IN"
LANG_PKGNAME= ta
LANG_SUFFIX= IN
.endif
################################################################
.if ${LOCALIZED_LANG} == "te-IN"
LANG_PKGNAME= te
LANG_SUFFIX= IN
.endif
################################################################
.if ${LOCALIZED_LANG} == "tg"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "th"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "ti-ER"
LANG_PKGNAME= ti
LANG_SUFFIX= ER
.endif
################################################################
.if ${LOCALIZED_LANG} == "tn"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "tr"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "ts"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "uk"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "ur-IN"
LANG_PKGNAME= ur
LANG_SUFFIX= IN
.endif
################################################################
.if ${LOCALIZED_LANG} == "uz"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "ve"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "vi"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "xh"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "zh-CN"
CATEGORIES+= chinese
LANG_PKGNAME= zh
LANG_SUFFIX= CN
BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
.endif
################################################################
.if ${LOCALIZED_LANG} == "zh-TW"
CATEGORIES+= chinese
LANG_PKGNAME= zh
LANG_SUFFIX= TW
BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
.endif
################################################################
.if ${LOCALIZED_LANG} == "zu"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
.if ${LOCALIZED_LANG} == "alllangs"
ALL_LOCALIZED_LANGS=yes
PKGNAMESUFFIX= -alllangs
.endif
################################################################
.endif

View File

@ -1,67 +0,0 @@
# Makefile for other stuffs
# Whom: Maho Nakata <maho@FreeBSD.org>
# $FreeBSD$
#other stuffs which are not directly related to making ports
#package-rename: rename package for uploading
#package-canonical: making official packages (WIP)
#ure: URE (Uno Runtime Environment) packages (WIP)
#solver: solver
#languagepack: language pack
package-rename:
@${ECHO_MSG} "===> Rename package for OpenOffice.org mirror upload";
@${LN} ${PKGFILE} \
${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX}
package-canonical:
@${ECHO_MSG} "===> Canonical packaging for OpenOffice.org";
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ;\
${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} .
sdk:
@${ECHO_MSG} "===> Make SDK of OpenOffice.org"
@${RM} -fr ${WRKDIR}/sdk_tmp
@${MKDIR} ${WRKDIR}/sdk_tmp
@cd ${WRKDIR}/sdk_tmp ; \
${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}_sdk
ure:
@${ECHO_MSG} "===> Make Uno Runtime Environment of OpenOffice.org"
@${RM} -fr ${WRKDIR}/ure_tmp
@${MKDIR} ${WRKDIR}/ure_tmp
@cd ${WRKDIR}/ure_tmp ; \
${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
@cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \
${MKDIR} ../${INSTALLATION_BASEDIR} ; \
${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_URE.tar.bz2 ${INSTALLATION_BASEDIR}
solver:
@${ECHO_MSG} "===> Make Solver of OpenOffice.org"
@cd ${WRKSRC} ; ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_solver.tar.bz2 solver
languagepack:
@${ECHO_MSG} "===> Make languagepack of OpenOffice.org"
.if defined (ALL_LOCALIZED_LANGS)
@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack'
.else
@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
.endif
.if !defined (ALL_LOCALIZED_LANGS)
@${RM} -fr ${WRKDIR}/langpack_tmp
@${MKDIR} ${WRKDIR}/langpack_tmp
.if defined (LOCALIZED_LANG)
@cd ${WRKDIR}/langpack_tmp ; \
${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
@cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \
${MKDIR} ../${INSTALLATION_BASEDIR} ; \
${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_langpack_${LOCALIZED_LANG}.tar.bz2 ${INSTALLATION_BASEDIR}
.endif
.endif

View File

@ -1,30 +0,0 @@
#!/usr/bin/perl
# generate full build shell script for OpenOffice.org
# Whom: Maho Nakata <maho@FreeBSD.org>
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2/files/Attic/generate.pl,v 1.10 2008-04-04 10:05:22 maho Exp $
print "#!/bin/csh\n";
print "make deinstall clean\n";
print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk ure languagepack deinstall >& log.en\n";
print "bzip2 log.en\n";
#print "rm work/.configure* work/.build* \n";
#workaround for breakage at odk sdk_oo
print "make deinstall clean\n";
print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n";
print "bzip2 log.all\n";
open ( FILE, "< Makefile.localized") ;
while(<FILE>){
@tmp=split (' ',$_);
@tmp2=split ('"',$tmp[3]);
if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1];
print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n";
print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes languagepack package package-rename deinstall >& log.$LANG\n";
print "bzip2 log.$LANG\n";
}
}
close FILE;
print "md5 OOo* > MD5SUMS.log\n";
print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/FreeBSD/`make -V PORTVERSION`/`uname -r`/`uname -m`\n";
print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/FreeBSD/`make -V PORTVERSION`/`uname -r`/`uname -m`\n";

View File

@ -1,15 +0,0 @@
#!/bin/sh
#
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2/files/Attic/openoffice.org-wrapper,v 1.3 2006-04-20 21:56:12 maho Exp $
oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
program=`echo $0 | sed -e 's|.*-%%OOOVERSION%%-||'`
case $program in
$0)
$oopath/soffice "$@"
;;
*)
$oopath/$program "$@"
;;
esac

View File

@ -1,38 +0,0 @@
Index: freetype/freetype-2.2.1.patch
===================================================================
RCS file: /cvs/external/freetype/freetype-2.2.1.patch,v
retrieving revision 1.2
diff -u -r1.2 freetype-2.2.1.patch
--- freetype/freetype-2.2.1.patch 3 Aug 2006 14:58:26 -0000 1.2
+++ freetype/freetype-2.2.1.patch 18 Nov 2006 07:15:21 -0000
@@ -71,5 +71,5 @@
-*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h Mon Jan 30 11:49:42 2006
---- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h Wed Apr 4 20:04:02 2007
+*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h Tue Jan 31 01:49:42 2006
+--- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h Sat Nov 18 16:06:09 2006
***************
*** 17,24 ****
--- 17,26 ----
@@ -94,3 +94,22 @@
+ #endif
/* EOF */
+*** misc/freetype-2.2.1/include/freetype/config/ftoption.h Fri May 12 03:05:49 2006
+--- misc/build/freetype-2.2.1/include/freetype/config/ftoption.h Sat Nov 18 16:07:55 2006
+***************
+*** 436,442 ****
+ /* Do not #undef this macro here, since the build system might */
+ /* define it for certain configurations only. */
+ /* */
+! /* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
+
+
+ /*************************************************************************/
+--- 436,442 ----
+ /* Do not #undef this macro here, since the build system might */
+ /* define it for certain configurations only. */
+ /* */
+! #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+
+
+ /*************************************************************************/

View File

@ -1,26 +0,0 @@
very strange workaround indeed.
--- qadevOOo/runner/makefile.mk 2009-07-04 12:13:19.000000000 +0900
+++ qadevOOo/runner/makefile.mk 2009-07-19 09:37:44.000000000 +0900
@@ -42,6 +42,7 @@ SUBDIRS_RUNNER = util share stats lib co
JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i)
JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i)
+JAR=${JAVA_HOME}/bin/jar
# --- Targets ------------------------------------------------------
.IF "$(SOLAR_JAVA)"=="TRUE"
@@ -52,11 +53,11 @@ OWNJAR: ALLTAR
# LLA: parameter v is only verbose, need too long!
OWNJAR: LIGHT
- jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
+ ${JAR} cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
# LLA: parameter v is only verbose, need too long!
LIGHT:
- jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
+ ${JAR} cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
.ELSE
all:

View File

@ -1,13 +0,0 @@
--- berkeleydb/makefile.mk 25 May 2007 10:48:51 -0000 1.40
+++ berkeleydb/makefile.mk 2 Jul 2007 20:15:24 -0000
@@ -105,6 +105,10 @@
..$/dist$/configure
CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
+.IF "$(COM)$(CPU)"=="GCCX"
+CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
+.ENDIF
+
# just pass ARCH_FLAGS to native build
CFLAGS+:=$(ARCH_FLAGS)
CXXFLAGS+:=$(ARCH_FLAGS)

View File

@ -1,12 +0,0 @@
--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx 16 Sep 2006 17:46:13 -0000 1.7
+++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx 22 Jun 2007 21:36:24 -0000
@@ -94,6 +94,9 @@
static char const * ar[] = {
"/lib/" JFW_PLUGIN_ARCH "/client",
+#if SAL_TYPES_SIZEOFPOINTER == 8
+ "/lib/" JFW_PLUGIN_ARCH "/server",
+#endif
"/lib/" JFW_PLUGIN_ARCH "/native_threads",
"/lib/" JFW_PLUGIN_ARCH

File diff suppressed because it is too large Load Diff

View File

@ -1,99 +0,0 @@
It won't fix in the master as it breaks the POSIX.
Index: epm/epm-3.7.patch
===================================================================
RCS file: /cvs/external/epm/epm-3.7.patch,v
retrieving revision 1.11
diff -u -r1.11 epm-3.7.patch
--- epm/epm-3.7.patch 1 Aug 2006 12:20:23 -0000 1.11
+++ epm/epm-3.7.patch 6 Jan 2007 10:10:38 -0000
@@ -247,6 +247,23 @@
*** misc/epm-3.7/dist.c Thu Aug 7 16:14:40 2003
--- misc/build/epm-3.7/dist.c Wed Jul 26 21:01:11 2006
***************
+*** 339,345 ****
+ const char *defval) /* I - Default value of option */
+ {
+ char *ptr; /* Pointer to option */
+! static char option[256]; /* Copy of file option */
+
+
+ /*
+--- 339,345 ----
+ const char *defval) /* I - Default value of option */
+ {
+ char *ptr; /* Pointer to option */
+! static char option[1024]; /* Copy of file option */
+
+
+ /*
+***************
*** 394,401 ****
strcpy(platform->machine, "mips");
#elif defined(__hpux)
@@ -292,6 +309,35 @@
else if (strncmp(platform->machine, "sun", 3) == 0)
strcpy(platform->machine, "sparc");
#endif /* __sgi */
+***************
+*** 550,562 ****
+ char line[2048], /* Expanded line from list file */
+ buf[1024], /* Original line from list file */
+ type, /* File type */
+! dst[256], /* Destination path */
+! src[256], /* Source path */
+! pattern[256], /* Pattern for source files */
+ user[32], /* User */
+ group[32], /* Group */
+ *temp, /* Temporary pointer */
+! options[256]; /* File options */
+ int mode, /* File permissions */
+ skip; /* 1 = skip files, 0 = archive files */
+ dist_t *dist; /* Distribution data */
+--- 560,572 ----
+ char line[2048], /* Expanded line from list file */
+ buf[1024], /* Original line from list file */
+ type, /* File type */
+! dst[1024], /* Destination path */
+! src[1024], /* Source path */
+! pattern[1024], /* Pattern for source files */
+ user[32], /* User */
+ group[32], /* Group */
+ *temp, /* Temporary pointer */
+! options[1024]; /* File options */
+ int mode, /* File permissions */
+ skip; /* 1 = skip files, 0 = archive files */
+ dist_t *dist; /* Distribution data */
*** misc/epm-3.7/epm.c Tue Oct 28 15:48:30 2003
--- misc/build/epm-3.7/epm.c Wed Jul 26 20:59:48 2006
***************
@@ -304,6 +350,29 @@
puts("");
puts("EPM is free software and comes with ABSOLUTELY NO WARRANTY; for details");
puts("see the GNU General Public License in the file COPYING or at");
+*** misc/epm-3.7/epm.h Thu Jul 24 10:20:54 2003
+--- misc/build/epm-3.7/epm.h Sat Jan 6 19:08:44 2007
+***************
+*** 167,175 ****
+ int mode; /* Permissions of file */
+ char user[32], /* Owner of file */
+ group[32], /* Group of file */
+! src[512], /* Source path */
+! dst[512], /* Destination path */
+! options[256]; /* File options (nostrip, etc.) */
+ } file_t;
+
+ typedef struct /**** Install/Patch/Remove Commands ****/
+--- 167,175 ----
+ int mode; /* Permissions of file */
+ char user[32], /* Owner of file */
+ group[32], /* Group of file */
+! src[1024], /* Source path */
+! dst[1024], /* Destination path */
+! options[1024]; /* File options (nostrip, etc.) */
+ } file_t;
+
+ typedef struct /**** Install/Patch/Remove Commands ****/
*** misc/epm-3.7/file.c Wed Jul 23 23:41:08 2003
--- misc/build/epm-3.7/file.c Wed Jul 26 20:59:48 2006
***************

View File

@ -1,107 +0,0 @@
http://www.freebsd.org/cgi/query-pr.cgi?pr=121953 (Dwayne MacKinnon)
http://qa.openoffice.org/issues/show_bug.cgi?id=75190
Turn the GTK Recent Manager feature off.
Other workaround
% setenv OOO_FORCE_DESKTOP gnome
Backout of misfeature in cws_src680_obr05 branch.
* rev 1.9 of gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx
* rev 1.8 of gsl/shell/source/unix/sysshell/systemshell.cxx
See also
http://lists.freebsd.org/pipermail/freebsd-openoffice/2007-December/003453.html
gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx
(rev. 1.8.44.2)
gsl/shell/source/unix/sysshell/systemshell.cxx
(rev. 1.7.44.1)
Index: systemshell.cxx
===================================================================
RCS file: /cvs/gsl/shell/source/unix/sysshell/systemshell.cxx,v
retrieving revision 1.8
diff -u -u -r1.8 systemshell.cxx
--- shell/source/unix/sysshell/systemshell.cxx 19 Jun 2007 16:12:44 -0000 1.8
+++ shell/source/unix/sysshell/systemshell.cxx 30 Mar 2008 22:06:15 -0000
@@ -72,9 +72,6 @@
const rtl::OUString LIB_RECENT_FILE = UNISTRING("librecentfile.so");
const rtl::OUString DEFAULT_CONTEXT = UNISTRING("DefaultContext");
-void * (* sym_gtk_recent_manager_get_default) () = NULL;
-void (* sym_gtk_recent_manager_add_item) (void *, const char *) = NULL;
-
// We need to re-encode file urls because osl_getFileURLFromSystemPath converts
// to UTF-8 before encoding non ascii characters, which is not what other apps expect.
static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
@@ -114,57 +111,31 @@
return url;
}
- bool init_recent_manager_api()
- {
- oslModule hDefault;
- if( osl_getModuleHandle( NULL, &hDefault ) )
- {
- sym_gtk_recent_manager_get_default = (void * (*)())
- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_get_default");
- sym_gtk_recent_manager_add_item = (void (*)(void *, const char *))
- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_add_item");
-
- }
- bool ret = (NULL != sym_gtk_recent_manager_get_default) && (NULL != sym_gtk_recent_manager_add_item);
- return ret;
- }
-
-
//##############################
void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType)
{
- static bool bIsRecentManagerPresent = init_recent_manager_api();
-
// Convert file URL for external use (see above)
rtl::OUString externalUrl = translateToExternalUrl(aFileUrl);
+ rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE);
+
if( 0 == externalUrl.getLength() )
externalUrl = aFileUrl;
-
- if( bIsRecentManagerPresent )
- {
- void * recent_manager = sym_gtk_recent_manager_get_default();
- sym_gtk_recent_manager_add_item(recent_manager, rtl::OUStringToOString(aFileUrl, RTL_TEXTENCODING_UTF8).getStr());
- }
- else
+
+ if (librecentfile_url.getLength())
{
- rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE);
-
- if (librecentfile_url.getLength())
- {
- osl::Module module(librecentfile_url);
+ osl::Module module(librecentfile_url);
- if (module.is())
- {
- // convert from reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>
- // not allowed in gcc 3.3 without permissive.
- PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list =
- reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST));
-
- if (add_to_recently_used_file_list)
- add_to_recently_used_file_list(aFileUrl, aMimeType);
- }
+ if (module.is())
+ {
+ // convert from reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>
+ // not allowed in gcc 3.3 without permissive.
+ PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list =
+ reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST));
+
+ if (add_to_recently_used_file_list)
+ add_to_recently_used_file_list(aFileUrl, aMimeType);
}
- }
+ }
}
} // namespace SystemShell

View File

@ -1,18 +0,0 @@
Merely a workaround
Index: scp2/source/ure/ure.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
retrieving revision 1.14
diff -u -r1.14 ure.scp
--- scp2/source/ure/ure.scp 18 Jul 2007 08:07:32 -0000 1.14
+++ scp2/source/ure/ure.scp 27 Jul 2007 22:07:16 -0000
@@ -610,6 +610,8 @@
#endif
#elif defined MACOSX
Name = SCP2_URE_DL_NORMAL(xml2.2);
+#elif defined FREEBSD
+ Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17));
#else
Name = SCP2_URE_DL_VER(xml2, 2);
#endif

View File

@ -1,17 +0,0 @@
? neon/unxfbsdi.pro
Index: neon/neon.patch
===================================================================
RCS file: /cvs/external/neon/neon.patch,v
retrieving revision 1.20
diff -u -r1.20 neon.patch
--- neon/neon.patch 14 Nov 2007 09:49:43 -0000 1.20
+++ neon/neon.patch 13 Dec 2007 17:16:29 -0000
@@ -268,7 +268,7 @@
! #define HAVE_SYS_TYPES_H 1
!
! /* Define if the timezone global is available */
-! #ifndef MACOSX
+! #if !defined (MACOSX) && !defined (FREEBSD)
! #define HAVE_TIMEZONE 1
! #endif
!

View File

@ -1,43 +0,0 @@
? sc/unxfbsdi.pro
Index: sc/source/ui/vba/vbaaxis.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/vba/vbaaxis.cxx,v
retrieving revision 1.2
diff -u -r1.2 vbaaxis.cxx
--- sc/source/ui/vba/vbaaxis.cxx 7 Dec 2007 10:43:48 -0000 1.2
+++ sc/source/ui/vba/vbaaxis.cxx 14 Dec 2007 23:40:31 -0000
@@ -47,8 +47,8 @@
const rtl::OUString ORIGIN( RTL_CONSTASCII_USTRINGPARAM("Origin") );
const rtl::OUString AUTOORIGIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
-const rtl::OUString MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
-const rtl::OUString MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+const rtl::OUString VBA_MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+const rtl::OUString VBA_MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
ScVbaChart*
ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
{
@@ -142,12 +142,12 @@
bCrossesAreCustomized = sal_False;
return;
case xlAxisCrossesMinimum: // The axis crosses at the minimum value.
- mxPropertySet->getPropertyValue(MIN) >>= fNum;
+ mxPropertySet->getPropertyValue(VBA_MIN) >>= fNum;
setCrossesAt( fNum );
bCrossesAreCustomized = sal_False;
break;
case xlAxisCrossesMaximum: // The axis crosses at the maximum value.
- mxPropertySet->getPropertyValue(MAX) >>= fNum;
+ mxPropertySet->getPropertyValue(VBA_MAX) >>= fNum;
setCrossesAt(fNum);
bCrossesAreCustomized = sal_False;
break;
@@ -182,7 +182,7 @@
mxPropertySet->getPropertyValue(ORIGIN) >>= forigin;
//obsolete double fmax = AnyConverter.toDouble(mxPropertySet.getPropertyValue("Max"));
double fmin = 0.0;
- mxPropertySet->getPropertyValue(MIN) >>= fmin;
+ mxPropertySet->getPropertyValue(VBA_MIN) >>= fmin;
if (forigin == fmin)
nCrosses = xlAxisCrossesMinimum;
else

View File

@ -1,69 +0,0 @@
Index: scp2/source/ooo/file_library_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
retrieving revision 1.269
diff -u -r1.269 file_library_ooo.scp
--- scp2/source/ooo/file_library_ooo.scp 12 Dec 2007 13:29:11 -0000 1.269
+++ scp2/source/ooo/file_library_ooo.scp 6 Jan 2008 04:19:50 -0000
@@ -979,7 +979,7 @@
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwm , fwm)
-#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
+#if ! (defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
#if defined( _gcc3 )
File gid_File_Lib_Gcc
@@ -993,7 +993,7 @@
#endif
-#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
+#if ! (defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
#if defined( _gcc3 )
File gid_File_Lib_Stdc
-----------------
Strange behaviour of stock gcc of FreeBSD 7.
# gcc -print-file-name=libgcc_s.so
/usr/lib/libgcc_s.so
# gcc -print-file-name=libgcc_s.so.1
libgcc_s.so.1
. This sould be
# gcc -print-file-name=libgcc_s.so.1
/lib/libgcc_s.so.1
However gcc42 from ports behaves correctly;
and
# gcc42 -print-file-name=libgcc_s.so.1
/usr/local/lib/gcc-4.2.3/gcc/i386-portbld-freebsd7.0/4.2.3/../../../libgcc_s.so.1
# gcc42 -print-file-name=libgcc_s.so
/usr/local/lib/gcc-4.2.3/gcc/i386-portbld-freebsd7.0/4.2.3/../../../libgcc_s.so
.
Index: work/OOH680_m1/external/gcc3_specific/makefile.mk
===================================================================
RCS file: /cvs/util/external/gcc3_specific/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- external/gcc3_specific/makefile.mk 30 Aug 2006 12:39:00 -0000 1.5
+++ external/gcc3_specific/makefile.mk 6 Jan 2008 08:10:19 -0000
@@ -12,7 +12,6 @@
.IF "$(OS)"!="MACOSX"
.IF "$(OS)"!="IRIX"
-.IF "$(OS)"!="FREEBSD"
.EXPORT : CC
@@ -25,7 +24,6 @@
$(LB)$/libgcc_s.so.1 :
$(GCCINSTLIB) libgcc_s.so.1 $(LB)
-.ENDIF
.ENDIF
.ENDIF

View File

@ -1,145 +0,0 @@
Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
also fixes
http://www.openoffice.org/issues/show_bug.cgi?id=98781
http://www.openoffice.org/issues/show_bug.cgi?id=82690
http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 16 Sep 2006 15:46:23 -0000 1.3
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 8 Jan 2008 16:57:00 -0000
@@ -358,6 +358,8 @@
case X86_64_SSEDF_CLASS:
*pStructAlign++ = *reinterpret_cast<sal_uInt64 *>( *pSSE++ );
break;
+ default:
+ break;
}
}
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx 16 Sep 2006 15:46:37 -0000 1.3
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx 8 Jan 2008 16:57:00 -0000
@@ -82,8 +82,8 @@
void ** gpreg, void ** fpreg, void ** ovrflw,
sal_uInt64 * pRegisterReturn /* space for register return */ )
{
- int nr_gpr = 0; //number of gpr registers used
- int nr_fpr = 0; //number of fpr regsiters used
+ unsigned int nr_gpr = 0; //number of gpr registers used
+ unsigned int nr_fpr = 0; //number of fpr registers used
// return
typelib_TypeDescription * pReturnTypeDescr = 0;
@@ -492,7 +492,7 @@
unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
void ** slots, unsigned char * code,
typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset,
- sal_Int32 functionCount, sal_Int32 nVtableOffset )
+ sal_Int32 /* functionCount */, sal_Int32 nVtableOffset )
{
for ( sal_Int32 nPos = 0; nPos < type->nMembers; ++nPos )
{
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 5 Jul 2007 09:01:44 -0000 1.4
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 8 Jan 2008 16:57:00 -0000
@@ -180,8 +180,8 @@
else
{
// try to lookup the symbol in the generated rtti map
- t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
- if (iFind == m_generatedRttis.end())
+ t_rtti_map::const_iterator iFind2( m_generatedRttis.find( unoName ) );
+ if (iFind2 == m_generatedRttis.end())
{
// we must generate it !
// symbol and rtti-name is nearly identical,
@@ -210,7 +210,7 @@
}
else // taking already generated rtti
{
- rtti = iFind->second;
+ rtti = iFind2->second;
}
}
}
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx 5 Jul 2007 09:02:53 -0000 1.4
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx 8 Jan 2008 16:57:00 -0000
@@ -73,13 +73,13 @@
// Let's figure out what is really going on here
{
fprintf( stderr, "= callVirtualMethod() =\nGPR's (%d): ", nGPR );
- for ( int i = 0; i < nGPR; ++i )
+ for ( unsigned int i = 0; i < nGPR; ++i )
fprintf( stderr, "0x%lx, ", pGPR[i] );
fprintf( stderr, "\nFPR's (%d): ", nFPR );
- for ( int i = 0; i < nFPR; ++i )
+ for ( unsigned int i = 0; i < nFPR; ++i )
fprintf( stderr, "%f, ", pFPR[i] );
fprintf( stderr, "\nStack (%d): ", nStack );
- for ( int i = 0; i < nStack; ++i )
+ for ( unsigned int i = 0; i < nStack; ++i )
fprintf( stderr, "0x%lx, ", pStack[i] );
fprintf( stderr, "\n" );
}
@@ -328,6 +328,8 @@
case typelib_TypeClass_DOUBLE:
INSERT_FLOAT_DOUBLE( pCppArgs[nPos], nFPR, pFPR, pStack );
break;
+ default:
+ break;
}
// no longer needed
@@ -440,16 +442,19 @@
// is my surrogate
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
= static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
+#if OSL_DEBUG_LEVEL > 0
typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
+#endif
switch (pMemberDescr->eTypeClass)
{
case typelib_TypeClass_INTERFACE_ATTRIBUTE:
{
+#if OSL_DEBUG_LEVEL > 0
// determine vtable call index
sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-
+#endif
VtableSlot aVtableSlot(
getVtableSlot(
reinterpret_cast<
@@ -494,10 +499,11 @@
}
case typelib_TypeClass_INTERFACE_METHOD:
{
+#if OSL_DEBUG_LEVEL > 0
// determine vtable call index
sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-
+#endif
VtableSlot aVtableSlot(
getVtableSlot(
reinterpret_cast<
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2008-02-04 22:43:50.000000000 +0900
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 21:41:29.000000000 +0900
@@ -126,7 +126,7 @@
};
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#if __FreeBSD_version < 702104
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -165,7 +165,7 @@
buf.append( 'E' );
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

File diff suppressed because it is too large Load Diff

View File

@ -1,18 +0,0 @@
--- psprint/source/printer/printerinfomanager.cxx.orig 2007-12-12 09:56:19.000000000 -0500
+++ psprint/source/printer/printerinfomanager.cxx 2008-02-28 17:46:34.000000000 -0500
@@ -145,12 +145,12 @@
bool bSuccess = false;
// try libpaper
- #ifdef SOLARIS
+ #ifdef LINUX
// #i78617# workaround missing paperconf command; on e.g. Linux
// the 2>/dev/null works on the started shell also
- FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" );
- #else
FILE* pPipe = popen( "paperconf 2>/dev/null", "r" );
+ #else
+ FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" );
#endif
if( pPipe )
{

View File

@ -1,17 +0,0 @@
Removing OC lang as it is not supported.
Index: solenv/inc/postset.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/postset.mk,v
retrieving revision 1.41.50.2
diff -u -r1.41.50.2 postset.mk
--- solenv/inc/postset.mk 18 Jan 2008 13:44:54 -0000 1.41.50.2
+++ solenv/inc/postset.mk 4 Sep 2008 00:15:33 -0000
@@ -39,6 +39,6 @@
defaultlangiso=en-US
# Complete list of all supported ISO codes
-completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
+completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns or-IN pa-IN pl pt pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))

View File

@ -1,25 +0,0 @@
#FBSD7+amd64+gcc421 is okay without the patch (w/o -lsupc++ is fine)
#FBSD6+amd64+gcc342 is okay with the patch (w/o -lsupc++ is fine)
...-lsupc++ is static, and cannot find -lgcc_s
#FBSD6+i386+gcc342 is okay with the patch (w/o -lsupc++ -lgcc_s is fine)
cannot find -lgcc_s
--- store/util/makefile.mk.orig 2007-12-12 22:23:13.000000000 +0900
+++ store/util/makefile.mk 2008-08-16 20:52:44.000000000 +0900
@@ -76,6 +76,7 @@
.ENDIF
# On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
+# FBSD6+amd64+gcc342 does not require -lsupc++. only libsupc++.a is supplied
.IF "$(COMID)"=="gcc3" && "$(GUI)"!="OS2"
.IF "$(GUI)"=="WNT"
SHL1STDLIBS+= -lsupc++
@@ -86,6 +87,8 @@
.IF "$(CCNUMVER)"<="000399999999"
SHL1STDLIBS+= -lsupc++
.ENDIF # CCNUMVER
+.ELIF "$(OS)"=="FREEBSD"
+SHL1STDLIBS+=
.ELIF "$(CCNUMVER)"<="000400000999"
SHL1STDLIBS+= -lsupc++ -lgcc_s
.ENDIF

View File

@ -1,26 +0,0 @@
? vcl/unxfbsdi.pro
Index: vcl/source/glyphs/makefile.mk
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/makefile.mk,v
retrieving revision 1.13
diff -u -r1.13 makefile.mk
--- vcl/source/glyphs/makefile.mk 11 Apr 2008 08:59:18 -0000 1.13
+++ vcl/source/glyphs/makefile.mk 20 Jul 2008 03:14:41 -0000
@@ -42,9 +42,17 @@
.INCLUDE : $(PRJ)$/util$/makefile2.pmk
.IF "$(SYSTEM_FREETYPE)" == "YES"
+.IF "$(OS)" != "FREEBSD"
CFLAGS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS)
+.ELSE
+ADDCDEFS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS)
+.ENDIF
.IF "$(USE_FT_EMBOLDEN)" == "YES"
+.IF "$(OS)" != "FREEBSD"
CFLAGS+=-DUSE_FT_EMBOLDEN
+.ELSE
+ADDCDEFS+=-DUSE_FT_EMBOLDEN
+.ENDIF
.ENDIF
.ENDIF

View File

@ -1,102 +0,0 @@
--- /dev/null 2008-08-27 17:05:37.000000000 -0400
+++ jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml 2008-08-27 17:20:55.000000000 -0400
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <updated>2008-08-27</updated>
+
+ <vendorInfos>
+ <vendor name="Sun Microsystems Inc.">
+ <minVersion>1.3.1</minVersion>
+ </vendor>
+ <vendor name="The FreeBSD Foundation">
+ <minVersion>1.6.0</minVersion>
+ </vendor>
+ <vendor name="IBM Corporation">
+ <minVersion>1.3.1</minVersion>
+ <maxVersion>1.4.2</maxVersion>
+ </vendor>
+ <vendor name="Blackdown Java-Linux Team">
+ <minVersion>1.3.1</minVersion>
+ </vendor>
+ <vendor name="Free Software Foundation, Inc.">
+ <minVersion>1.4.2</minVersion>
+ </vendor>
+ <vendor name="BEA Systems, Inc.">
+ <minVersion>1.4.1</minVersion>
+ </vendor>
+ </vendorInfos>
+
+ <plugins>
+ <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ </plugins>
+</javaSelection>
Index: jvmfwk/distributions/OpenOfficeorg/makefile.mk
===================================================================
RCS file: /cvs/udk/jvmfwk/distributions/OpenOfficeorg/makefile.mk,v
retrieving revision 1.7
diff -u -r1.7 makefile.mk
--- jvmfwk/distributions/OpenOfficeorg/makefile.mk 2 Nov 2007 12:26:51 -0000 1.7
+++ jvmfwk/distributions/OpenOfficeorg/makefile.mk 28 Aug 2008 23:58:26 -0000
@@ -47,9 +47,11 @@
.IF "$(SOLAR_JAVA)"!=""
$(BIN)$/javavendors_ooo.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_macosx.xml javavendors_linux.xml
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)"=="FREEBSD"
+ -$(COPY) javavendors_freebsd.xml $(BIN)$/javavendors_ooo.xml
+.ELIF "$(OS)"=="MACOSX"
-$(COPY) javavendors_macosx.xml $(BIN)$/javavendors_ooo.xml
-.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
+.ELIF "$(OS)"=="LINUX"
-$(COPY) javavendors_linux.xml $(BIN)$/javavendors_ooo.xml
.ELSE
-$(COPY) javavendors_unx.xml $(BIN)$/javavendors_ooo.xml
Index: jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx,v
retrieving revision 1.14
diff -u -r1.14 javaldx.cxx
--- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 12 Nov 2007 15:31:19 -0000 1.14
+++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 28 Aug 2008 23:58:26 -0000
@@ -133,13 +133,15 @@
rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("Apple Computer, Inc."));
rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc."));
rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc."));
+ rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation"));
if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True
|| sVendor2.equals(pInfo->sVendor) == sal_True
|| sVendor3.equals(pInfo->sVendor) == sal_True
|| sVendor4.equals(pInfo->sVendor) == sal_True
|| sVendor5.equals(pInfo->sVendor) == sal_True
|| sVendor6.equals(pInfo->sVendor) == sal_True
- || sVendor7.equals(pInfo->sVendor) == sal_True))
+ || sVendor7.equals(pInfo->sVendor) == sal_True
+ || sVendor8.equals(pInfo->sVendor) == sal_True))
return 0;
rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
Index: jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx,v
retrieving revision 1.9
diff -u -r1.9 vendorlist.cxx
--- jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx 12 Nov 2007 15:31:32 -0000 1.9
+++ jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx 28 Aug 2008 23:58:26 -0000
@@ -61,6 +61,7 @@
VENDOR_MAP_ENTRY("Apple Computer, Inc.", OtherInfo)
VENDOR_MAP_ENTRY("BEA Systems, Inc.", OtherInfo)
VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo)
+ VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo)
END_VENDOR_MAP()

View File

@ -1,16 +0,0 @@
Index: libxslt/libxslt-1.1.16.patch
===================================================================
RCS file: /cvs/external/libxslt/Attic/libxslt-1.1.16.patch,v
retrieving revision 1.5
diff -u -r1.5 libxslt-1.1.16.patch
--- libxslt/libxslt-1.1.16.patch 19 Jul 2007 13:25:43 -0000 1.5
+++ libxslt/libxslt-1.1.16.patch 9 Oct 2008 08:03:50 -0000
@@ -30,7 +30,7 @@
fi
-! if test "1" == "1"
+! if test "1" = "1"
then
XMLVERS=`$XML_CONFIG --version`
if test `echo $XMLVERS | sed -e 's/libxml //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -ge `echo $LIBXML_REQUIRED_VERSION | sed -e 's/libxml //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`

View File

@ -1,24 +0,0 @@
http://www.openoffice.org/issues/show_bug.cgi?id=98781
http://www.openoffice.org/issues/show_bug.cgi?id=82690
http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:53:52.000000000 +0900
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:56:37.000000000 +0900
@@ -126,7 +126,7 @@
};
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#if __FreeBSD_version < 702104 /* #i22253# */
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -165,7 +165,7 @@
buf.append( 'E' );
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

View File

@ -1,42 +0,0 @@
OpenOffice.org Build %%OOOVERSION%% Personal Install How-To
Written by: Martin Blapp <mbr@freebsd.org>
and Maho Nakata <maho@FreeBSD.org>
OpenOffice.org %%OOOVERSION%% will soon been installed in
%%PREFIX%%/%%EXECBASE%%
1. User installation
--------------------
Just type "%%EXECBASE%%" after you have successfully
installed the package. If there is no installed
OO.org dir in your homedir, you'll be prompted to
install some files and choose an installed JDK.
The setup installs a ".openoffice.org2" folder
in your homedir.
2. Starting OO.org
------------------
There are some wrappers installed for faster startup.
Add "%%PREFIX%%/bin/" to your PATH and you will be able
to use them.
%%PREFIX%%/bin/%%EXECBASE%%
%%PREFIX%%/bin/%%EXECBASE%%-sbase
%%PREFIX%%/bin/%%EXECBASE%%-scalc
%%PREFIX%%/bin/%%EXECBASE%%-sdraw
%%PREFIX%%/bin/%%EXECBASE%%-setofficelang
%%PREFIX%%/bin/%%EXECBASE%%-smath
%%PREFIX%%/bin/%%EXECBASE%%-simpress
%%PREFIX%%/bin/%%EXECBASE%%-spadmin
%%PREFIX%%/bin/%%EXECBASE%%-swriter
OO.org does need $LANG to be set to a suitable value.
3. If you run into problems
--------------------------------------------------
If you somehow run into problems, please remove the already installed
".openoffice.org2" dir in your homedir. Redo the user
installation and the problems should go away.

View File

@ -1,17 +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
WWW: http://www.openoffice.org/
http://porting.openoffice.org/freebsd/

View File

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