diff options
Diffstat (limited to 'editors/openoffice-3-devel')
34 files changed, 0 insertions, 2223 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile deleted file mode 100644 index 3ffd09b45286..000000000000 --- a/editors/openoffice-3-devel/Makefile +++ /dev/null @@ -1,309 +0,0 @@ -# New ports collection makefile for: OpenOffice.org -# Date created: 28 February 2002 -# Whom: Martin Blapp -# -# $FreeBSD$ -# - -PORTNAME?= openoffice.org -PORTVERSION?= 3.2.${SNAPDATE} -CATEGORIES+= editors java -MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ - http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \ - http://ooopackages.good-day.net/pub/OpenOffice.org/misc/moz/:mozsrc \ - ${MASTER_SITE_MOZILLA_EXTENDED:S/$/:mozsrc/} \ - http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg -MASTER_SITE_SUBDIR+= seamonkey/releases/${SEAMONKEY_VERSION}/:mozsrc -DISTFILES+= ${OOOSRC} unowinreg.dll:unowinreg - -MAINTAINER= openoffice@FreeBSD.org -COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version) - -EXTRATC_ONLY?= ${OOOSRC} - -.if defined(CWS) -PORTNAME:= openoffice.org-${CWS} -OOOSRC= OOo_${CWS}_source.tar.bz2:cws -OOOTAG= ${CWS} -.endif - -NO_LATEST_LINK= yes - -.if !defined(WITHOUT_MOZILLA) -SEAMONKEY_VERSION= 1.1.14 -SEAMONKEY_SOURCE= seamonkey-${SEAMONKEY_VERSION}.source.tar.bz2 -DISTFILES+= ${SEAMONKEY_SOURCE}:mozsrc -USE_GNOME+= libidl -.endif - -USE_GNOME= desktopfileutils gtk20 - -.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 -.if (${OSVERSION} >= 700000) -JAVA_VERSION= 1.5 1.6 -.else -JAVA_VERSION= 1.4 1.5 1.6 -.endif - -.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?= 60 -OOOTAG?= DEV300_m${MILESTONE} -OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -OOODIR= openoffice.org3 -SNAPDATE= 20090926 -INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} -EXECBASE?= openoffice.org-${OOOTAG} -DIST_SUBDIR= openoffice.org3 -SIMPLEOSVER= ${OSREL:C/\.//g} -.if ${ARCH} == amd64 -PACKAGE_BASENAME= OOo_Dev_${OOOTAG}_${OPSYS}${SIMPLEOSVER}X86-64 -.else -PACKAGE_BASENAME= OOo_Dev_${OOOTAG}_${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" \ - PATH=${WRKSRC}/solenv/bin:$$PATH - -BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ - 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 \ - gtar:${PORTSDIR}/archivers/gtar \ - ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ - ant:${PORTSDIR}/devel/apache-ant -#see #i85469# for gperf - -USE_BISON= build -GNU_CONFIGURE= yes -WRKSRC?= ${WRKDIR}/${OOOTAG} -TCSH?= /bin/tcsh -PKGMESSAGE= ${WRKDIR}/pkg-message - -.if defined(DISABLE_MAKE_JOBS) -MAKE_JOBS_NUMBER= 1 -.endif - -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 \ - --enable-hids \ - --enable-minimizer \ - --enable-presenter-console \ - --enable-pdfimport \ - --enable-wiki-publisher \ - --enable-report-builder - -OOOEXTENSIONS+= minimizer/sun-presentation-minimizer.oxt -OOOEXTENSIONS+= presenter/presenter-screen.oxt -OOOEXTENSIONS+= pdfimport/pdfimport.oxt -OOOEXTENSIONS+= swext/wiki-publisher.oxt -OOOEXTENSIONS+= sun-report-builder.oxt - -.if (${OSVERSION} <= 602102) -EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 -.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 - -#issue XXXXXX not raised yet... -CRLFFILES=curl/curl*patch neon/neon*patch jfreereport/patches/*.patch - -post-extract: - for i in ${CRLFFILES}; do \ - cd ${WRKSRC} ; ${REINPLACE_CMD} -e 's#
##g' $$i ; \ - done - @${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/ -.if !defined(WITHOUT_MOZILLA) - @${CP} ${DISTDIR}/${DIST_SUBDIR}/${SEAMONKEY_SOURCE} ${WRKSRC}/moz/download -.endif - -pre-configure: -#Workaround for gperf. #i85469# - @${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf - -do-build: - @cd ${WRKSRC} ; ./bootstrap - @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMPDIR ${WRKSRC} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput -- -P${MAKE_JOBS_NUMBER}" - -.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/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR} - @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ - @cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ - @${INSTALL_DATA} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/bin/hid.lst ${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/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR} -.endif - @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ - @cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ - @${INSTALL_DATA} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/bin/hid.lst ${PREFIX}/${INSTALLATION_BASEDIR} - -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#%%OOODIR%%#${OOODIR}#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}-simpress - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath - @${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} - @for app in base calc draw impress math writer; do \ - ${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \ - -e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \ - ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \ - done - @${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \ - -e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \ - ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop - @${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \ - ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/qstart.desktop - @${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak - @${RM} -f ${DESKTOPDIR}/${EXECBASE} - @${MKDIR} ${DESKTOPDIR} - @${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/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} - @${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE} - @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ - -e 's#%%EXECBASE%%#${EXECBASE}#g' \ - -e 's#%%OOOTAG%%#${OOOTAG}#g' \ - -e 's#%%OOODIR%%#${OOODIR}#g' \ - ${PKGMESSAGE} - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} - -.include <${FILESDIR}/Makefile.others> -.include <bsd.port.post.mk> diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo deleted file mode 100644 index 83683e34afea..000000000000 --- a/editors/openoffice-3-devel/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -MD5 (openoffice.org3/OOo_DEV300_m60_source.tar.bz2) = e526954409b83f4042b9ce766a15406e -SHA256 (openoffice.org3/OOo_DEV300_m60_source.tar.bz2) = 65f26630e5e0ad2f69973a4dc13b1f6ee85505351bdc1cb1933cba170c4aa1e5 -SIZE (openoffice.org3/OOo_DEV300_m60_source.tar.bz2) = 454443470 -MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d -SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c -SIZE (openoffice.org3/unowinreg.dll) = 6144 -MD5 (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 31eb6ce742dc73609884dab11b1f2712 -SHA256 (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 82d5166b227d0157c1108dc03809a89bea23cfd21f31c7e6767ef5ce1983ca28 -SIZE (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 38063082 diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs deleted file mode 100644 index ebc227322996..000000000000 --- a/editors/openoffice-3-devel/files/Makefile.knobs +++ /dev/null @@ -1,125 +0,0 @@ -# Makefile for knobs -# Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD$ -# 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" - -.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-base -CONFIGURE_ARGS+= --enable-cups=yes -.endif - -.if defined(WITHOUT_MOZILLA) -CONFIGURE_ARGS+= --disable-mozilla -.else -CONFIGURE_ARGS+= --enable-build-mozilla -.endif - -.if defined(WITHOUT_GNOME) -CONFIGURE_ARGS+= --disable-gconf --disable-gnome-vfs -.else -USE_GNOME+= gconf2 gnomevfs2 -.endif - -.if defined(WITH_EVOLUTION2) -CONFIGURE_ARGS+= --enable-evolution2=yes -.else -USE_GNOME+= glib20 -.endif - -LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 - -.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/Mozilla NSS-using components" - @${ECHO} "make -DWITHOUT_MOZILLA" -.endif -.if !defined(WITHOUT_GNOME) - @${ECHO} - @${ECHO} "You can compile OOo without gnome VFS support with" - @${ECHO} "make -DWITHOUT_GNOME" -.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(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_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" diff --git a/editors/openoffice-3-devel/files/Makefile.localized b/editors/openoffice-3-devel/files/Makefile.localized deleted file mode 100644 index 321b84500718..000000000000 --- a/editors/openoffice-3-devel/files/Makefile.localized +++ /dev/null @@ -1,405 +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} == "oc" -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 diff --git a/editors/openoffice-3-devel/files/Makefile.others b/editors/openoffice-3-devel/files/Makefile.others deleted file mode 100644 index f5848df41e31..000000000000 --- a/editors/openoffice-3-devel/files/Makefile.others +++ /dev/null @@ -1,71 +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"; - @${MV} ${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 ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ls openoffice*.t?z > ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK - @cd ${WRKDIR}/langpack_tmp ; \ - for i in `${CAT} ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK`; do \ - ${ECHO_CMD} "extracting $$i" ; \ - cd ${WRKDIR}/langpack_tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ; \ - done - @cd ${WRKDIR}/langpack_tmp/opt/ ; \ - ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ - ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ - ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_langpack_${LOCALIZED_LANG}.tar.bz2 ${INSTALLATION_BASEDIR} -.endif -.endif diff --git a/editors/openoffice-3-devel/files/generate.pl b/editors/openoffice-3-devel/files/generate.pl deleted file mode 100644 index 825da3c3efda..000000000000 --- a/editors/openoffice-3-devel/files/generate.pl +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/perl -# generate full build shell script for OpenOffice.org -# Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD$ - -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 OOOTAG`/`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 OOOTAG`/`uname -r`/`uname -m`\n"; diff --git a/editors/openoffice-3-devel/files/openoffice.org-wrapper b/editors/openoffice-3-devel/files/openoffice.org-wrapper deleted file mode 100644 index 007c52b04037..000000000000 --- a/editors/openoffice-3-devel/files/openoffice.org-wrapper +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3-devel/files/Attic/openoffice.org-wrapper,v 1.5 2008-07-03 11:10:53 maho Exp $ - -oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/%%OOODIR%% -program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'` - -case $program in -$0) - $oopath/program/soffice "$@" - ;; -setofficelang) - $oopath/basis-link/program/$program "$@" - ;; -*) - $oopath/program/$program "$@" - ;; -esac diff --git a/editors/openoffice-3-devel/files/patch-i100395 b/editors/openoffice-3-devel/files/patch-i100395 deleted file mode 100644 index afd73b787e8f..000000000000 --- a/editors/openoffice-3-devel/files/patch-i100395 +++ /dev/null @@ -1,15 +0,0 @@ ---- solenv/inc/unx.mk~ 2009-02-25 02:58:24.000000000 +0900 -+++ solenv/inc/unx.mk 2009-03-20 16:52:22.000000000 +0900 -@@ -242,9 +242,9 @@ - # potentially affects multiple commands following on the recipe line: - .IF "$(USE_SHELL)" == "bash" - AUGMENT_LIBRARY_PATH *= : && \ -- LD_LIBRARY_PATH=$${{LD_LIBRARY_PATH+$${{LD_LIBRARY_PATH}}:}}$(SOLARLIBDIR) -+ LD_LIBRARY_PATH=$${{LD_LIBRARY_PATH+$${{LD_LIBRARY_PATH}}:}}$(SOLARLIBDIR):. - .ELSE - AUGMENT_LIBRARY_PATH *= if ($$?LD_LIBRARY_PATH == 1) \ -- eval 'setenv LD_LIBRARY_PATH "$${{LD_LIBRARY_PATH}}:$(SOLARLIBDIR)"' && \ -- if ($$?LD_LIBRARY_PATH == 0) setenv LD_LIBRARY_PATH "$(SOLARLIBDIR)" && -+ eval 'setenv LD_LIBRARY_PATH "$${{LD_LIBRARY_PATH}}:$(SOLARLIBDIR):."' && \ -+ if ($$?LD_LIBRARY_PATH == 0) setenv LD_LIBRARY_PATH "$(SOLARLIBDIR):." && - .ENDIF diff --git a/editors/openoffice-3-devel/files/patch-i102181 b/editors/openoffice-3-devel/files/patch-i102181 deleted file mode 100644 index a074079aa43b..000000000000 --- a/editors/openoffice-3-devel/files/patch-i102181 +++ /dev/null @@ -1,23 +0,0 @@ ---- openssl/makefile.mk.orig 2009-06-11 09:05:38.000000000 +0900 -+++ openssl/makefile.mk 2009-06-11 20:30:14.000000000 +0900 -@@ -105,6 +105,20 @@ - .ENDIF - .ENDIF - -+.IF "$(OS)" == "FREEBSD" -+ PATCH_FILES=openssllnx.patch -+ ADDITIONAL_FILES:= \ -+ libcrypto_OOo_0_9_8k.map \ -+ libssl_OOo_0_9_8k.map -+ .IF "$(CPU)" == "X" -+ CONFIGURE_ACTION=Configure BSD-x86_64 -+ .ELSE -+ CONFIGURE_ACTION=Configure BSD-x86-elf -+ .ENDIF -+ # if you build openssl as shared library you have to patch the Makefile.Shared "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \" -+ #BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map' -+.ENDIF -+ - .IF "$(OS)" == "WNT" - - .IF "$(COM)"=="GCC" diff --git a/editors/openoffice-3-devel/files/patch-i102183 b/editors/openoffice-3-devel/files/patch-i102183 deleted file mode 100644 index e5293feef0ce..000000000000 --- a/editors/openoffice-3-devel/files/patch-i102183 +++ /dev/null @@ -1,36 +0,0 @@ ---- redland/raptor/raptor-1.4.18.patch.autotools 2009-07-11 13:49:32.000000000 +0900 -+++ redland/raptor/raptor-1.4.18.patch.autotools 2009-07-11 13:52:31.000000000 +0900 -@@ -40,7 +40,7 @@ - - major=".$current" - - versuffix=".$current"; - + major=.`expr $current - $age` --+ versuffix="$major.$age.$revision" -++ versuffix="$major" - ;; - - irix | nonstopux) - - ---- redland/rasqal/rasqal-0.9.16.patch.autotools 2009-07-11 13:49:32.000000000 +0900 -+++ redland/rasqal/rasqal-0.9.16.patch.autotools 2009-07-11 13:52:09.000000000 +0900 -@@ -32,7 +32,7 @@ - - major=".$current" - - versuffix=".$current"; - + major=.`expr $current - $age` --+ versuffix="$major.$age.$revision" -++ versuffix="$major" - ;; - - irix | nonstopux) - ---- redlan_/redland/redland-1.0.8.patch.autotools 2009-07-11 13:49:32.000000000 +0900 -+++ redland/redland/redland-1.0.8.patch.autotools 2009-07-11 13:49:54.000000000 +0900 -@@ -52,7 +52,7 @@ - - major=".$current" - - versuffix=".$current"; - + major=.`expr $current - $age` --+ versuffix="$major.$age.$revision" -++ versuffix="$major" - ;; - - irix | nonstopux) diff --git a/editors/openoffice-3-devel/files/patch-i102184 b/editors/openoffice-3-devel/files/patch-i102184 deleted file mode 100644 index e84902f436e0..000000000000 --- a/editors/openoffice-3-devel/files/patch-i102184 +++ /dev/null @@ -1,11 +0,0 @@ ---- libxslt/libxslt-1.1.24.patch 2009-05-24 16:32:30.000000000 +0900 -+++ libxslt/libxslt-1.1.24.patch 2009-05-24 16:38:38.000000000 +0900 -@@ -20,7 +20,7 @@ - - major=".$current" - - versuffix=".$current"; - + major=.`expr $current - $age` --+ versuffix="$major.$age.$revision" -++ versuffix="$major" - ;; - - irix | nonstopux) diff --git a/editors/openoffice-3-devel/files/patch-i103628 b/editors/openoffice-3-devel/files/patch-i103628 deleted file mode 100644 index c3846bc27ae2..000000000000 --- a/editors/openoffice-3-devel/files/patch-i103628 +++ /dev/null @@ -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: diff --git a/editors/openoffice-3-devel/files/patch-i103792 b/editors/openoffice-3-devel/files/patch-i103792 deleted file mode 100644 index 9fe82f0ea2ce..000000000000 --- a/editors/openoffice-3-devel/files/patch-i103792 +++ /dev/null @@ -1,194 +0,0 @@ ---- moz/seamonkey-source-1.1.14.patch.orig 2009-08-05 06:24:32.000000000 +0900 -+++ moz/seamonkey-source-1.1.14.patch 2009-08-05 12:23:12.000000000 +0900 -@@ -12,6 +12,7 @@ - do - if test -f "$_config"; then - echo "$_config"; -+ - --- misc/mozilla/build/cygwin-wrapper 2004-08-19 01:18:55.000000000 +0200 - +++ misc/build/mozilla/build/cygwin-wrapper 2008-08-14 16:22:21.000000000 +0200 - @@ -1,4 +1,4 @@ -@@ -86,7 +87,7 @@ - PYTHON = @MOZ_PYTHON@ - --- misc/mozilla/config/config.mk 2008-01-29 20:30:22.000000000 +0100 - +++ misc/build/mozilla/config/config.mk 2008-08-14 16:22:21.000000000 +0200 --@@ -758,6 +758,23 @@ -+@@ -758,6 +758,30 @@ - endif - - # -@@ -106,6 +107,13 @@ - +endif # IS_COMPONENT - +endif # SunOS - + -++ifeq ($(OS_ARCH),FreeBSD) -++EXTRA_DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib -++ifdef IS_COMPONENT -++EXTRA_DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN/..:\$$ORIGIN/../../ure-link/lib -++endif # IS_COMPONENT -++endif # FreeBSD -++ - +# - # Include any personal overrides the user might think are needed. - # -@@ -5810,7 +5818,7 @@ - else - --- misc/mozilla/nsprpub/lib/ds/Makefile.in 2006-12-22 14:47:17.000000000 +0100 - +++ misc/build/mozilla/nsprpub/lib/ds/Makefile.in 2008-08-14 16:22:21.000000000 +0200 --@@ -79,18 +79,22 @@ -+@@ -79,18 +79,26 @@ - OS_LIBS = -lc - endif - -@@ -5818,6 +5826,10 @@ - +MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib - +endif - + -++ifeq ($(OS_ARCH),FreeBSD) -++MKSHLIB += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib -++endif -++ - ifeq ($(OS_ARCH),SunOS) - OS_LIBS = -lc - MAPFILE = $(OBJDIR)/pldsmap.sun -@@ -5838,7 +5850,7 @@ - # dependencies in the same directory where it resides. - --- misc/mozilla/nsprpub/lib/libc/src/Makefile.in 2006-12-22 14:47:17.000000000 +0100 - +++ misc/build/mozilla/nsprpub/lib/libc/src/Makefile.in 2008-08-14 16:22:21.000000000 +0200 --@@ -89,18 +89,22 @@ -+@@ -89,18 +89,26 @@ - OS_LIBS = -lc - endif - -@@ -5846,6 +5858,10 @@ - +MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib - +endif - + -++ifeq ($(OS_ARCH),FreeBSD) -++MKSHLIB += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib -++endif -++ - ifeq ($(OS_ARCH),SunOS) - OS_LIBS = -lc - MAPFILE = $(OBJDIR)/plcmap.sun -@@ -6353,3 +6369,120 @@ - - clean clobber:: - rm -rf $(DIST)/$(APP_NAME).app -+ -+--- misc/mozilla/security/coreconf/FreeBSD.mk 2009-06-28 16:28:27.000000000 +0900 -++++ misc/build/mozilla/security/coreconf/FreeBSD.mk 2009-06-28 16:25:10.000000000 +0900 -+@@ -52,6 +52,7 @@ -+ -+ DSO_CFLAGS = -fPIC -+ DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@) -++DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib -+ -+ # -+ # The default implementation strategy for FreeBSD is pthreads. -+--- misc/mozilla/config/mkdepend/imakemdep.h 2009-06-29 02:48:45.000000000 +0900 -++++ misc/build/mozilla/config/mkdepend/imakemdep.h 2009-06-29 02:48:01.000000000 +0900 -+@@ -277,8 +277,8 @@ -+ # ifdef __i386__ -+ "-D__i386__", -+ # endif -+-# ifdef __x86_64__ -+- "-D__x86_64__", -++# if defined(__amd64__) || defined(__x86_64__) -++ "-D__amd64__ -D__x86_64__", -+ # endif -+ # ifdef __GNUC__ -+ "-traditional", -+ -+--- misc/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2009-07-02 10:03:28.000000000 +0900 -++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2009-07-02 10:14:17.000000000 +0900 -+@@ -249,6 +249,10 @@ -+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -pthread -+ endif -+ -++ifeq ($(OS_ARCH), FreeBSD) -++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -++endif -++ -+ ########################################################################### -+ -+ ifeq ($(USE_DLL_EXPORTS_FILE), 1) -+@@ -306,7 +306,7 @@ -+ ifdef SO_FILES_TO_REMOVE -+ -$(RM) $(SO_FILES_TO_REMOVE) -+ endif -+-ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH))) -++ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD FreeBSD, $(OS_ARCH))) -+ $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a -+ else -+ ifeq ($(OS_ARCH),OS2) -+ -+######################################## -+following is re_comp issue. FBSD has re_comp in /usr/lib/libcompat.a, -+but since re_comp, re_exec are deprecated, shared libs are not provided. -+This causes a problem for amd64 arch at extension project like following: -+ -+Making: ../../../unxfbsdx.pro/lib/ldapbe2.uno.so -+ccache c++ -Wl,-z,combreloc -Wl,-rpath,'$ORIGIN:$ORIGIN/../ure-link/lib' -shared -L../../../unxfbsdx.pro/lib -L../lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solenv/unxfbsdx/lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solver/300/unxfbsdx.pro/lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solenv/unxfbsdx/lib -L/usr/local/diablo-jdk1.6.0/lib -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64 -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64/server -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64/native_threads -L/usr/local/lib ../../../unxfbsdx.pro/slo/ldapbe2.uno_version.o -o ../../../unxfbsdx.pro/lib/ldapbe2.uno.so ../../../unxfbsdx.pro/slo/ldapuserprofilebe.o ../../../unxfbsdx.pro/slo/ldapuserprof.o ../../../unxfbsdx.pro/slo/ldapaccess.o ../../../unxfbsdx.pro/slo/ldapuserprofilelayer.o ../../../unxfbsdx.pro/slo/propertysethelper.o ../../../unxfbsdx.pro/slo/componentdef.o -lldap50 -luno_cppuhelpergcc3 -luno_cppu -luno_salhelpergcc3 -luno_sal -lcompat -Wl,-Bstatic -llber50 -pthread -lm -Wl,-Bdynamic -lstlport_gcc -+/usr/bin/ld: /usr/lib/libcompat.a(regex.o): relocation R_X86_64_32 can not be used when making a shared object; recompile with -fPIC -+/usr/lib/libcompat.a: could not read symbols: Bad value -+dmake: Error code 1, while making '../../../unxfbsdx.pro/lib/ldapbe2.uno.so' -+. -+ -+However, simply activating via "#define NEED_BSDREGEX" doesn't work as -+regex.h in seamonkey and /usr/include/unistd.h conflicts. We cannot -+stop include unistd.h :-( -+ -+In file included from getfilter.c:53: -+../../../ldap/include/regex.h:76: error: conflicting types for 're_comp' -+/usr/include/unistd.h:516: error: previous declaration of 're_comp' was here -+../../../ldap/include/regex.h:77: error: conflicting types for 're_exec' -+/usr/include/unistd.h:517: error: previous declaration of 're_exec' was here -+ -+--- misc/mozilla/directory/c-sdk/ldap/include/portable.h 2006-02-03 23:44:40.000000000 +0900 -++++ misc/build/mozilla/directory/c-sdk/ldap/include/portable.h 2009-07-02 10:35:23.000000000 +0900 -+@@ -131,7 +131,7 @@ -+ * some systems don't have the BSD re_comp and re_exec routines -+ */ -+ #ifndef NEED_BSDREGEX -+-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) -++#if ( defined( SYSV ) || defined( NETBSD ) || defined( FREEBSD ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) -+ #define NEED_BSDREGEX -+ #endif -+ #endif -+ -+--- misc/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c 2006-02-03 23:44:42.000000000 +0900 -++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c 2009-07-02 11:05:54.000000000 +0900 -+@@ -267,7 +267,7 @@ -+ -+ char * -+ LDAP_CALL -+-re_comp( char *pat ) -++re_comp( const char *pat ) -+ { -+ register REGEXCHAR *p; /* pattern pointer */ -+ register REGEXCHAR *mp=nfa; /* nfa pointer */ -+@@ -513,7 +513,7 @@ -+ -+ int -+ LDAP_CALL -+-re_exec( char *lp ) -++re_exec( const char *lp ) -+ { -+ register REGEXCHAR c; -+ register REGEXCHAR *ep = 0; -+--- misc/mozilla/directory/c-sdk/ldap/include/regex.h 2006-02-03 23:44:40.000000000 +0900 -++++ misc/build/mozilla/directory/c-sdk/ldap/include/regex.h 2009-07-02 11:05:24.000000000 +0900 -+@@ -73,8 +73,8 @@ -+ int re_init( void ); -+ void re_lock( void ); -+ int re_unlock( void ); -+-char * LDAP_CALL re_comp( char *pat ); -+-int LDAP_CALL re_exec( char *lp ); -++char * LDAP_CALL re_comp( const char *pat ); -++int LDAP_CALL re_exec( const char *lp ); -+ void LDAP_CALL re_modw( char *s ); -+ int LDAP_CALL re_subs( char *src, char *dst ); -+ #else /* NEEDPROTOS */ -+ -+ diff --git a/editors/openoffice-3-devel/files/patch-i104014 b/editors/openoffice-3-devel/files/patch-i104014 deleted file mode 100644 index 424b7b18ffc9..000000000000 --- a/editors/openoffice-3-devel/files/patch-i104014 +++ /dev/null @@ -1,20 +0,0 @@ ---- solenv/inc/unxfbsd.mk 2009-08-05 06:24:36.000000000 +0900 -+++ solenv/inc/unxfbsd.mk 2009-08-05 09:20:06.000000000 +0900 -@@ -141,12 +141,12 @@ - - # default linker flags - LINKFLAGSDEFS*=#-Wl,-z,defs --LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\' --LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' -+LINKFLAGSRUNPATH_URELIB=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\' -+LINKFLAGSRUNPATH_UREBIN=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' - #TODO: drop $ORIGIN once no URE executable is also shipped in OOo --LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' --LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\' --LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' -+LINKFLAGSRUNPATH_OOO=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -+LINKFLAGSRUNPATH_SDK=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\' -+LINKFLAGSRUNPATH_BRAND=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' - LINKFLAGSRUNPATH_OXT= - LINKFLAGSRUNPATH_NONE= - LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) diff --git a/editors/openoffice-3-devel/files/patch-i104015 b/editors/openoffice-3-devel/files/patch-i104015 deleted file mode 100644 index 72147bd49e23..000000000000 --- a/editors/openoffice-3-devel/files/patch-i104015 +++ /dev/null @@ -1,13 +0,0 @@ -origin support - ---- stlport/STLport-4.5.patch~ 2009-07-23 10:00:59.000000000 +0900 -+++ stlport/STLport-4.5.patch 2009-08-03 01:33:01.000000000 +0900 -@@ -137,7 +137,7 @@ - +# - +# - +LINK=ar cr --+DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o -++DYN_LINK=${CXX} -Wl,-z,origin -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o - + - +OBJEXT=o - +DYNEXT=so diff --git a/editors/openoffice-3-devel/files/patch-i65514 b/editors/openoffice-3-devel/files/patch-i65514 deleted file mode 100644 index f12266b5fede..000000000000 --- a/editors/openoffice-3-devel/files/patch-i65514 +++ /dev/null @@ -1,12 +0,0 @@ ---- berkeleydb/makefile.mk 2009-09-26 08:52:35.000000000 +0900 -+++ berkeleydb/makefile.mk 2009-09-26 08:54:31.000000000 +0900 -@@ -102,6 +102,9 @@ - CONFIGURE_ACTION= \ - ..$/dist$/configure - CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 -+.IF "$(OS)"==FREEBSD && "$(COM)$(CPU)"=="GCCX" -+CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly -+.ENDIF - .IF "$(OS)"=="MACOSX" - CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" - .ENDIF diff --git a/editors/openoffice-3-devel/files/patch-i65974 b/editors/openoffice-3-devel/files/patch-i65974 deleted file mode 100644 index 40de0acde40f..000000000000 --- a/editors/openoffice-3-devel/files/patch-i65974 +++ /dev/null @@ -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 - diff --git a/editors/openoffice-3-devel/files/patch-i73217 b/editors/openoffice-3-devel/files/patch-i73217 deleted file mode 100644 index 712631a136f1..000000000000 --- a/editors/openoffice-3-devel/files/patch-i73217 +++ /dev/null @@ -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 - *************** diff --git a/editors/openoffice-3-devel/files/patch-i75190 b/editors/openoffice-3-devel/files/patch-i75190 deleted file mode 100644 index f382267ffd7e..000000000000 --- a/editors/openoffice-3-devel/files/patch-i75190 +++ /dev/null @@ -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 diff --git a/editors/openoffice-3-devel/files/patch-i80129 b/editors/openoffice-3-devel/files/patch-i80129 deleted file mode 100644 index f590cb16a50d..000000000000 --- a/editors/openoffice-3-devel/files/patch-i80129 +++ /dev/null @@ -1,16 +0,0 @@ -Index: libxml2/libxml2-2.6.31.patch -=================================================================== -RCS file: /cvs/external/libxml2/libxml2-2.6.31.patch,v -retrieving revision 1.2 -diff -u -r1.2 libxml2-2.6.31.patch ---- libxml2/libxml2-2.6.31.patch 6 Jun 2008 11:48:45 -0000 1.2 -+++ libxml2/libxml2-2.6.31.patch 8 Jul 2008 02:54:59 -0000 -@@ -88,7 +88,7 @@ - - freebsd-elf) - ! major=.`expr $current - $age` --! versuffix=".$major.$age.$revision"; -+! versuffix="$major"; - ;; - - irix | nonstopux) diff --git a/editors/openoffice-3-devel/files/patch-i84549 b/editors/openoffice-3-devel/files/patch-i84549 deleted file mode 100644 index 1d7f6517953b..000000000000 --- a/editors/openoffice-3-devel/files/patch-i84549 +++ /dev/null @@ -1,16 +0,0 @@ -Index: neon/neon.patch -=================================================================== -RCS file: /cvs/external/neon/neon.patch,v -retrieving revision 1.25 -diff -u -r1.25 neon.patch ---- neon/neon.patch 22 Jul 2008 17:17:06 -0000 1.25 -+++ neon/neon.patch 10 Aug 2008 04:20:27 -0000 -@@ -266,7 +266,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 - + diff --git a/editors/openoffice-3-devel/files/patch-i85027 b/editors/openoffice-3-devel/files/patch-i85027 deleted file mode 100644 index e6fe720647bc..000000000000 --- a/editors/openoffice-3-devel/files/patch-i85027 +++ /dev/null @@ -1,63 +0,0 @@ ------------------ -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 - ---- scp2/source/ooo/ure.scp 18 Mar 2008 13:35:26 -0000 1.2 -+++ scp2/source/ooo/ure.scp 21 Mar 2008 09:26:48 -0000 -@@ -728,7 +730,7 @@ - End - #endif - --#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \ -+#if defined _gcc3 && !(defined NETBSD \ - || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT)) - File gid_File_Dl_GccS - TXT_FILE_BODY; -@@ -739,7 +741,7 @@ - End - #endif - --#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \ -+#if defined _gcc3 && !(defined NETBSD \ - || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT)) - File gid_File_Dl_Stdcpp - Dir = SCP2_URE_DL_DIR; - diff --git a/editors/openoffice-3-devel/files/patch-i85126 b/editors/openoffice-3-devel/files/patch-i85126 deleted file mode 100644 index d2b427c99915..000000000000 --- a/editors/openoffice-3-devel/files/patch-i85126 +++ /dev/null @@ -1,202 +0,0 @@ -catch up to recent bridge also fixes following issues -for amd64 -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 - -We also need #define USE_DOUBLE_MMAP for FreeBSD as well. -It's very hard to maintain without it, and performance loss is -negligible. See also -http://www.openoffice.org/issues/show_bug.cgi?id=97320 -. Note that i386 also requires the patch for -"bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx" -. - ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 2009-06-13 15:39:58.000000000 +0900 -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 2009-06-13 15:41:26.000000000 +0900 -@@ -353,6 +353,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 2009-06-13 15:39:58.000000000 +0900 -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx 2009-06-13 15:41:26.000000000 +0900 -@@ -77,8 +77,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; -@@ -489,13 +489,12 @@ - //================================================================================================== - - unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( -- Slot ** slots, unsigned char * code, -+ Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, - typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset, - sal_Int32 functionCount, sal_Int32 nVtableOffset ) - { - (*slots) -= functionCount; - Slot * s = *slots; -- - for ( sal_Int32 nPos = 0; nPos < type->nMembers; ++nPos ) - { - typelib_TypeDescription * pTD = 0; -@@ -509,14 +508,14 @@ - reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>( pTD ); - - // get method -- (s++)->fn = code; -+ (s++)->fn = code + writetoexecdiff; - code = codeSnippet( code, nFunctionOffset++, nVtableOffset, - x86_64::return_in_hidden_param( pAttrTD->pAttributeTypeRef ) ); - - if ( ! pAttrTD->bReadOnly ) - { - // set method -- (s++)->fn = code; -+ (s++)->fn = code + writetoexecdiff; - code = codeSnippet( code, nFunctionOffset++, nVtableOffset, false ); - } - } -@@ -525,7 +524,7 @@ - typelib_InterfaceMethodTypeDescription *pMethodTD = - reinterpret_cast<typelib_InterfaceMethodTypeDescription *>( pTD ); - -- (s++)->fn = code; -+ (s++)->fn = code + writetoexecdiff; - code = codeSnippet( code, nFunctionOffset++, nVtableOffset, - x86_64::return_in_hidden_param( pMethodTD->pReturnTypeRef ) ); - } - ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx 2009-06-13 15:39:58.000000000 +0900 -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx 2009-06-13 15:41:27.000000000 +0900 -@@ -68,13 +68,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" ); - } -@@ -323,6 +323,8 @@ - case typelib_TypeClass_DOUBLE: - INSERT_FLOAT_DOUBLE( pCppArgs[nPos], nFPR, pFPR, pStack ); - break; -+ default: -+ break; - } - - // no longer needed -@@ -435,16 +437,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< -@@ -489,10 +494,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 2009-06-13 15:39:58.000000000 +0900 -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 15:42:43.000000000 +0900 -@@ -32,6 +32,7 @@ - #include "precompiled_bridges.hxx" - - #include <stdio.h> -+#include <string.h> - #include <dlfcn.h> - #include <cxxabi.h> - #include <hash_map> -@@ -121,7 +121,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 ) ) -@@ -160,7 +160,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() ); -@@ -175,8 +175,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, -@@ -205,7 +205,7 @@ - } - else // taking already generated rtti - { -- rtti = iFind->second; -+ rtti = iFind2->second; - } - } - } - ---- bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx~ 2009-06-13 16:41:45.000000000 +0900 -+++ bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx 2009-06-13 16:42:24.000000000 +0900 -@@ -40,7 +40,7 @@ - #include <hash_map> - - /*See: http://people.redhat.com/drepper/selinux-mem.html*/ --#ifdef LINUX -+#if defined (LINUX) || defined (FREEBSD) - #define USE_DOUBLE_MMAP - #endif - diff --git a/editors/openoffice-3-devel/files/patch-i85972 b/editors/openoffice-3-devel/files/patch-i85972 deleted file mode 100644 index 78860836b84e..000000000000 --- a/editors/openoffice-3-devel/files/patch-i85972 +++ /dev/null @@ -1,61 +0,0 @@ -Index: lpsolve/lp_solve_5.5.patch -=================================================================== -RCS file: /cvs/external/lpsolve/lp_solve_5.5.patch,v -retrieving revision 1.4 -diff -u -r1.4 lp_solve_5.5.patch ---- lpsolve/lp_solve_5.5.patch 16 Jun 2008 14:19:46 -0000 1.4 -+++ lpsolve/lp_solve_5.5.patch 3 Jul 2008 00:20:52 -0000 -@@ -72,3 +72,25 @@ - +fi - + - +rm *.o 2>/dev/null -+--- misc/lp_solve_5.5/lpsolve55/ccc.freebsd Wed May 21 17:45:07 2008 -++++ misc/build/lp_solve_5.5/lpsolve55/ccc.freebsd Wed May 21 17:44:54 2008 -+@@ -1,1 +1,18 @@ -+-dummy -++src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' -++ -++c=$CC -++def= -++so=yes -++ -++opts='-O3 -DINTEGERTIME' -++$CC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -++ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -++ranlib liblpsolve55.a -++ -++if [ "$so" != "" ] -++then -++ $CC -fPIC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -++ $CC -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -++fi -++ -++rm *.o 2>/dev/null - ---- lpsolve/makefile.mk.orig 2008-12-24 09:40:11.000000000 +0900 -+++ lpsolve/makefile.mk 2008-12-24 12:09:06.000000000 +0900 -@@ -46,7 +47,7 @@ - PATCH_FILES=lp_solve_5.5-windows.patch - .ELSE - PATCH_FILES=lp_solve_5.5.patch --ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 -+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 lpsolve55$/ccc.freebsd - .ENDIF - - CONFIGURE_DIR= -@@ -73,11 +74,16 @@ - .IF "$(COMNAME)"=="sunpro5" - BUILD_ACTION=sh ccc.solaris - .ELSE -+.IF "$(OS)"=="FREEBSD" -+BUILD_ACTION=sh -x ccc.freebsd -+OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so -+.ELSE - BUILD_ACTION=sh ccc - .ENDIF - OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so - .ENDIF - .ENDIF -+.ENDIF - - OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h diff --git a/editors/openoffice-3-devel/files/patch-i87583 b/editors/openoffice-3-devel/files/patch-i87583 deleted file mode 100644 index 750935a3030b..000000000000 --- a/editors/openoffice-3-devel/files/patch-i87583 +++ /dev/null @@ -1,36 +0,0 @@ ---- desktop/scripts/soffice.sh.orig 2008-06-09 08:57:10.000000000 -0400 -+++ desktop/scripts/soffice.sh 2008-06-27 16:12:58.000000000 -0400 -@@ -75,6 +75,15 @@ - - # extend the ld_library_path for java: javaldx checks the sofficerc for us - if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then -+ # this is a temporary hack until we can live with the default search paths -+ case "`uname -s`" in -+ FreeBSD) -+ sd_prog1="$sd_prog/../basis-link/program" -+ sd_prog2="$sd_prog/../basis-link/ure-link/lib" -+ LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}} -+ export LD_LIBRARY_PATH -+ ;; -+ esac - my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ - "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` - if [ -n "$my_path" ] ; then ---- padmin/source/spadmin.sh.orig 2008-06-27 01:18:09.000000000 -0400 -+++ padmin/source/spadmin.sh 2008-06-27 13:31:09.000000000 -0400 -@@ -58,6 +58,15 @@ - - # extend the ld_library_path for java: javaldx checks the sofficerc for us - if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then -+ # this is a temporary hack until we can live with the default search paths -+ case "`uname -s`" in -+ FreeBSD) -+ sd_prog1="$sd_prog/../basis-link/program" -+ sd_prog2="$sd_prog/../basis-link/ure-link/lib" -+ LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}} -+ export LD_LIBRARY_PATH -+ ;; -+ esac - my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ - "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` - if [ -n "$my_path" ] ; then diff --git a/editors/openoffice-3-devel/files/patch-i88156 b/editors/openoffice-3-devel/files/patch-i88156 deleted file mode 100644 index 7c8b38558433..000000000000 --- a/editors/openoffice-3-devel/files/patch-i88156 +++ /dev/null @@ -1,18 +0,0 @@ -Index: binfilter/bf_sw/source/filter/w4w/makefile.mk -=================================================================== -RCS file: /cvs/framework/binfilter/bf_sw/source/filter/w4w/makefile.mk,v -retrieving revision 1.9 -diff -u -r1.9 makefile.mk ---- binfilter/bf_sw/source/filter/w4w/makefile.mk 20 Nov 2006 12:38:59 -0000 1.9 -+++ binfilter/bf_sw/source/filter/w4w/makefile.mk 12 Apr 2008 00:02:49 -0000 -@@ -58,6 +58,10 @@ - CDEFS=$(CDEFS) -Dmydebug - .ENDIF - -+.IF "$(OSL_DEBUG_LEVEL)" > 0 -+CDEFS += -DENABLE_BYTESTRING_STREAM_OPERATORS -+.ENDIF -+ - # --- Files -------------------------------------------------------- - - CXXFILES = \ diff --git a/editors/openoffice-3-devel/files/patch-i91318 b/editors/openoffice-3-devel/files/patch-i91318 deleted file mode 100644 index a87ec93e2460..000000000000 --- a/editors/openoffice-3-devel/files/patch-i91318 +++ /dev/null @@ -1,14 +0,0 @@ ---- hunspell/hunspell-1.2.8.patch~ 2009-03-11 22:17:54.000000000 +0900 -+++ hunspell/hunspell-1.2.8.patch 2009-03-20 21:37:49.000000000 +0900 -@@ -619,3 +619,11 @@ - p++; - } - if (i > 0 && buf[i - 1] == '\n') { -+--- misc/hunspell-1.2.8/tests/test.sh 2007-07-15 22:33:13.000000000 +0900 -++++ misc/build/hunspell-1.2.8/tests/test.sh 2008-08-10 10:00:33.000000000 +0900 -+@@ -1,4 +1,4 @@ -+-#!/bin/bash -++#!/usr/bin/env bash -+ export LC_ALL="C" -+ -+ function check_valgrind_log () { diff --git a/editors/openoffice-3-devel/files/patch-i91861 b/editors/openoffice-3-devel/files/patch-i91861 deleted file mode 100644 index 93c8021d3385..000000000000 --- a/editors/openoffice-3-devel/files/patch-i91861 +++ /dev/null @@ -1,25 +0,0 @@ -Index: vcl/source/glyphs/makefile.mk -=================================================================== -RCS file: /cvs/gsl/vcl/source/glyphs/makefile.mk,v -retrieving revision 1.13.106.1 -diff -u -r1.13.106.1 makefile.mk ---- vcl/source/glyphs/makefile.mk 31 Jul 2008 20:14:59 -0000 1.13.106.1 -+++ vcl/source/glyphs/makefile.mk 10 Aug 2008 01:06:59 -0000 -@@ -41,9 +41,17 @@ - .INCLUDE : settings.mk - .INCLUDE : $(PRJ)$/util$/makefile2.pmk - -+.IF "$(OS)" != "FREEBSD" - CFLAGS+= $(FREETYPE_CFLAGS) -+.ELSE -+ADDCDEFS+= $(FREETYPE_CFLAGS) -+.ENDIF - .IF "$(USE_FT_EMBOLDEN)" == "YES" -+.IF "$(OS)" != "FREEBSD" - CFLAGS+=-DUSE_FT_EMBOLDEN -+.ELSE -+ADDCDEFS+=-DUSE_FT_EMBOLDEN -+.ENDIF - .ENDIF - - # --- Files -------------------------------------------------------- diff --git a/editors/openoffice-3-devel/files/patch-i98714 b/editors/openoffice-3-devel/files/patch-i98714 deleted file mode 100644 index 50cecadf6ede..000000000000 --- a/editors/openoffice-3-devel/files/patch-i98714 +++ /dev/null @@ -1,13 +0,0 @@ ---- writerfilter/source/resourcemodel/makefile.mk.orig 2008-07-22 08:53:57.000000000 -0400 -+++ writerfilter/source/resourcemodel/makefile.mk 2008-09-03 12:26:09.000000000 -0400 -@@ -56,8 +56,8 @@ - $(SLO)$/TagLogger.obj \ - $(SLO)$/WW8Analyzer.obj - --# linux 64 bit: compiler (gcc 4.2.3) fails with 'out of memory' --.IF "$(OUTPATH)"=="unxlngx6" -+# FreeBSD/Linux 64-bit: compiler (gcc 4.2.x) fails with 'out of memory' -+.IF "$(OUTPATH)"=="unxfbsdx" || "$(OUTPATH)"=="unxfbsdi" || "$(OUTPATH)"=="unxlngx6" - NOOPTFILES= \ - $(SLO)$/qnametostr.obj - .ENDIF diff --git a/editors/openoffice-3-devel/files/patch-i98781 b/editors/openoffice-3-devel/files/patch-i98781 deleted file mode 100644 index ca3849a011f7..000000000000 --- a/editors/openoffice-3-devel/files/patch-i98781 +++ /dev/null @@ -1,112 +0,0 @@ -catch up to recent bridge also fixes following issues -for i386 -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 - -We also need -#define USE_DOUBLE_MMAP for FreeBSD as well. The patch was included -in files/patches-i85126 - ---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx 2009-06-13 14:17:39.000000000 +0900 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx 2009-06-13 15:11:21.000000000 +0900 -@@ -362,7 +362,7 @@ - int const codeSnippetSize = 16; - - unsigned char * codeSnippet( -- unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, -+ unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 functionIndex, sal_Int32 vtableOffset, - typelib_TypeClass returnTypeClass) - { - if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) { -@@ -408,7 +408,7 @@ - // jmp privateSnippetExecutor: - *p++ = 0xE9; - *reinterpret_cast< sal_Int32 * >(p) -- = ((unsigned char *) exec) - p - sizeof (sal_Int32); -+ = ((unsigned char *) exec) - p - sizeof (sal_Int32) - writetoexecdiff; - p += sizeof (sal_Int32); - OSL_ASSERT(p - code <= codeSnippetSize); - return code + codeSnippetSize; -@@ -419,8 +419,7 @@ - struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; }; - - bridges::cpp_uno::shared::VtableFactory::Slot * --bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block) --{ -+bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block) { - return static_cast< Slot * >(block) + 2; - } - -@@ -441,7 +440,7 @@ - } - - unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( -- Slot ** slots, unsigned char * code, -+ Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, - typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset, - sal_Int32 functionCount, sal_Int32 vtableOffset) - { -@@ -454,9 +453,9 @@ - switch (member->eTypeClass) { - case typelib_TypeClass_INTERFACE_ATTRIBUTE: - // Getter: -- (s++)->fn = code; -+ (s++)->fn = code + writetoexecdiff; - code = codeSnippet( -- code, functionOffset++, vtableOffset, -+ code, writetoexecdiff, functionOffset++, vtableOffset, - reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( - member)->pAttributeTypeRef->eTypeClass); - // Setter: -@@ -464,17 +463,17 @@ - typelib_InterfaceAttributeTypeDescription * >( - member)->bReadOnly) - { -- (s++)->fn = code; -+ (s++)->fn = code + writetoexecdiff; - code = codeSnippet( -- code, functionOffset++, vtableOffset, -+ code, writetoexecdiff, functionOffset++, vtableOffset, - typelib_TypeClass_VOID); - } - break; - - case typelib_TypeClass_INTERFACE_METHOD: -- (s++)->fn = code; -+ (s++)->fn = code + writetoexecdiff; - code = codeSnippet( -- code, functionOffset++, vtableOffset, -+ code, writetoexecdiff, functionOffset++, vtableOffset, - reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( - member)->pReturnTypeRef->eTypeClass); - break; - ---- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-13 14:17:39.000000000 +0900 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-13 15:14:24.000000000 +0900 -@@ -32,6 +32,7 @@ - #include "precompiled_bridges.hxx" - - #include <stdio.h> -+#include <string.h> - #include <dlfcn.h> - #include <cxxabi.h> - #include <hash_map> -@@ -121,7 +122,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 ) ) -@@ -160,7 +161,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() ); diff --git a/editors/openoffice-3-devel/files/pkg-message.in b/editors/openoffice-3-devel/files/pkg-message.in deleted file mode 100644 index 7bfa92c74667..000000000000 --- a/editors/openoffice-3-devel/files/pkg-message.in +++ /dev/null @@ -1,39 +0,0 @@ -OpenOffice.org Build %%OOOTAG%% Personal Install How-To - -Written by: Martin Blapp <mbr@freebsd.org> - and Maho Nakata <maho@FreeBSD.org> - -OpenOffice.org %%OOOTAG%% 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, the setup installs ".%%OOODIR%%" folder. - -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 ".%%OOODIR%%" dir in your homedir. Redo the user -installation and the problems should go away. diff --git a/editors/openoffice-3-devel/files/rtld-workaround-i66667 b/editors/openoffice-3-devel/files/rtld-workaround-i66667 deleted file mode 100644 index 26c0b1b4a88c..000000000000 --- a/editors/openoffice-3-devel/files/rtld-workaround-i66667 +++ /dev/null @@ -1,55 +0,0 @@ -Index: vcl/unx/gtk/app/gtkinst.cxx -=================================================================== -RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v -retrieving revision 1.14 -diff -u -r1.14 gtkinst.cxx ---- vcl/unx/gtk/app/gtkinst.cxx 19 Jun 2006 19:44:33 -0000 1.14 -+++ vcl/unx/gtk/app/gtkinst.cxx 27 Jun 2006 02:11:09 -0000 -@@ -43,6 +43,7 @@ - #include <plugins/gtk/atkbridge.hxx> - - #include <rtl/strbuf.hxx> -+#include <rtl/ustrbuf.hxx> - - #if OSL_DEBUG_LEVEL > 1 - #include <stdio.h> -@@ -111,13 +112,27 @@ - GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX(); - pYieldMutex->ThreadsLeave(); - } -- static bool hookLocks( oslModule pModule ) -+ static bool hookLocks( void ) - { -- typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn); -+ typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn ); - rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") ); - -+ /* XXX GDK library path should be set by configure. */ -+ OUStringBuffer aModName( 128 ); -+ aModName.appendAscii( SAL_DLLPREFIX"gdk-x11-2.0" ); -+ aModName.appendAscii( SAL_DLLEXTENSION ); -+ OUString aModule = aModName.makeStringAndClear(); -+ oslModule aMod = osl_loadModule( aModule.pData, SAL_LOADMODULE_DEFAULT ); -+ -+ if ( !aMod ) -+ { -+#if OSL_DEBUG_LEVEL > 1 -+ fprintf( stderr, "Failed to load "SAL_DLLPREFIX"gdk-x11-2.0"SAL_DLLEXTENSION"\n" ); -+#endif -+ return false; -+ } - GdkLockFn gdk_threads_set_lock_functions = -- (GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData ); -+ (GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData ); - if ( !gdk_threads_set_lock_functions ) - { - #if OSL_DEBUG_LEVEL > 1 -@@ -150,7 +165,7 @@ - if ( !g_thread_supported() ) - g_thread_init( NULL ); - -- if ( hookLocks( pModule ) ) -+ if ( hookLocks() ) - pYieldMutex = new GtkHookedYieldMutex(); - else - pYieldMutex = new GtkYieldMutex(); diff --git a/editors/openoffice-3-devel/pkg-descr b/editors/openoffice-3-devel/pkg-descr deleted file mode 100644 index bc2ede1b8c2b..000000000000 --- a/editors/openoffice-3-devel/pkg-descr +++ /dev/null @@ -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/ diff --git a/editors/openoffice-3-devel/pkg-plist b/editors/openoffice-3-devel/pkg-plist deleted file mode 100644 index 28bd78453b52..000000000000 --- a/editors/openoffice-3-devel/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, do not delete. Package list is generated automatically. |