diff options
Diffstat (limited to 'editors/openoffice.org-vcltesttool')
25 files changed, 0 insertions, 3943 deletions
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile deleted file mode 100644 index ed188d4d6d06..000000000000 --- a/editors/openoffice.org-vcltesttool/Makefile +++ /dev/null @@ -1,332 +0,0 @@ -# New ports collection makefile for: OpenOffice.org -# Date created: 28 February 2002 -# Whom: Martin Blapp -# -# $FreeBSD$ -# - -PORTNAME?= openoffice.org -PORTVERSION?= 2.3.${SNAPDATE} -CATEGORIES+= editors java -MASTER_SITES+= http://openoffice.lunarshells.com/sources/ \ - http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ - http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \ - ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ - ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \ - ${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 -.if defined(WITH_GNUGCJ) -DISTFILES+= ${ANT_DISTFILE}:antbin -.endif -EXTRACT_ONLY= ${OOOSRC} - -MAINTAINER= openoffice@FreeBSD.org -COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version) - -.if defined(WITH_CWS) -PORTNAME:= openoffice.org-${WITH_CWS} -DISTFILES+= ${CWSARCHIVE}:cws -.endif -CWSARCHIVE= ${WITH_CWS}.tar.gz - -NO_LATEST_LINK= yes -USE_GNOME= 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_XLIB= yes -USE_GMAKE= yes -USE_PERL5= yes -USE_BZIP2= yes -WITHOUT_CPU_CFLAGS= true - -.if !defined(WITH_GNUGCJ) -USE_JAVA= yes -JAVA_VERSION= 1.4+ -JAVA_BUILD= jdk -JAVA_VENDOR= freebsd bsdjava -.endif - -.include <bsd.port.pre.mk> -.include <${FILESDIR}/Makefile.localized> - -ONLY_FOR_ARCHS= i386 amd64 - -.if ${ARCH} == amd64 -GCC_TARGET= x86_64-portbld-freebsd${OSREL} -FREEBSD_ENV_SET= FreeBSDAMDEnv.Set -.else -GCC_TARGET= ${ARCH}-portbld-freebsd${OSREL} -FREEBSD_ENV_SET= FreeBSDX86Env.Set -.endif - -CODELINE= 680 -MILESTONE?= 211 -OOOTAG?= SRC680_m${MILESTONE} -OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20070428 -INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} -EXECBASE?= openoffice.org-${OOOTAG} -.if defined(WITH_CWS) -INSTALLATION_BASEDIR= openoffice.org-${OOOTAG}-${WITH_CWS} -EXECBASE= openoffice.org-${OOOTAG}-${WITH_CWS} -.endif -DIST_SUBDIR= openoffice.org2.0 -SIMPLEOSVER= ${OSREL:C/\.//g} -.if ${ARCH} == amd64 -PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}X86_64 -.else -PACKAGE_BASENAME= OOo_${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_GNUGCJ) -GCCVER=41 -BUILD_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt -BUILD_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat -RUN_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt -RUN_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat -.else -.if ${ARCH} == amd64 -GCCVER=41 -BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41 -RUN_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41 -.else -GCCVER=34 -BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo -.endif -.endif - -.if defined(WITH_CCACHE) -BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache -CCACHE_PREFIX= ccache -.else -CCACHE_PREFIX= -.endif -.if (${GCCVER} == 41) -CC= gcc41 -CXX= g++41 -.endif -.if (${GCCVER} == 34) -CC= gcc-ooo -CXX= g++-ooo -.endif -CC:= ${CCACHE_PREFIX} ${CC} -CXX:= ${CCACHE_PREFIX} ${CXX} - -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 \ - bison2:${PORTSDIR}/devel/bison2 \ - imake:${X_IMAKE_PORT} -.if defined(WITH_GNUGCJ) -LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt -LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 -ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin.tar.bz2 -ANT_VERSION= 1.6.5 -.else -BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant -.endif -.if !defined(WITH_GPC) -LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl -.endif - -GNU_CONFIGURE= yes -WRKSRC?= ${WRKDIR}/${OOOTAG} -CONFIGURE_WRKSRC= ${WRKSRC}/config_office -TCSH?= /bin/tcsh -PKGMESSAGE= ${WRKDIR}/pkg-message -NUMOFPROCESSES?= 1 -.if defined(WITH_GNUGCJ) -CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj41/bin:${PATH}" -.endif - -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ - --with-gnu-patch=${LOCALBASE}/bin/gpatch \ - --enable-crashdump=yes \ - --enable-symbols=SMALL - -.if ${ARCH} == amd64 || ${GCCVER} == 41 -WITHOUT_MOZILLA= yes -.endif -.if (${GCCVER} == 41) -LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost -CONFIGURE_ARGS+= --with-system-boost=yes #i58343# -.endif -.if (${OSVERSION} <= 602102) -EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 -.endif -.if defined(WITH_GNUGCJ) -EXTRA_PATCHES+= ${FILESDIR}/gcj-fbsdworkaround -.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.* - @${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_CWS) - cd ${WRKSRC} ; ${TAR} xvfz ${DISTDIR}/${DIST_SUBDIR}/${CWSARCHIVE} -.endif -.if defined(WITH_GNUGCJ) - @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf - -.endif -.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 - -do-build: - @cd ${WRKSRC} ; ./bootstrap -# PR:84786 #i53289# -.if (${NUMOFPROCESSES}>1) - @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all" -.else - @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; dmake" -.endif -.if ${LOCALIZED_LANG} == "all" - @${MAKE} languagepack -.endif - -do-install: -.if ${LOCALIZED_LANG} == "all" - @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} - @${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/" \ - ${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} - @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 \ - ${CP} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \ - ${PREFIX}/share/icons/hicolor/$${dir}/apps/openofficeorg23-$${app}.png ; \ - ${ECHO_CMD} "share/icons/hicolor/$${dir}/apps/openofficeorg23-$${app}.png" >> ${TMPPLIST} ; \ - fi \ - done ; \ - for file in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \ - ${CP} ${ICONS}/hicolor/$${dir}/mimetypes/$${file} \ - ${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \ - ${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${file}" >> ${TMPPLIST} ; \ - done ; \ - done - @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp - @${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST} - @${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE} - @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ - -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ - -e 's#%%EXECBASE%%#${EXECBASE}#g' \ - -e 's#%%OOOTAG%%#${OOOTAG}#g' \ - -e 's#%%OOOVERSION%%#${OOOVERSION}#g' \ - ${PKGMESSAGE} - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} - -.include <${FILESDIR}/Makefile.others> -.include <bsd.port.post.mk> diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo deleted file mode 100644 index 66910c96a1a5..000000000000 --- a/editors/openoffice.org-vcltesttool/distinfo +++ /dev/null @@ -1,15 +0,0 @@ -MD5 (openoffice.org2.0/OOo_SRC680_m211_source.tar.bz2) = 1a45342987e7b9137da1fca8ec1a763a -SHA256 (openoffice.org2.0/OOo_SRC680_m211_source.tar.bz2) = 8321544ec8d9f74ec7a620dcbee6dbf447713c86548a539eb7ce05e8f1ddeaa6 -SIZE (openoffice.org2.0/OOo_SRC680_m211_source.tar.bz2) = 272054401 -MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d -SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c -SIZE (openoffice.org2.0/unowinreg.dll) = 6144 -MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 -SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e -SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 -MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39 -SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936 -SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024 -MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14 -SHA256 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445 -SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366 diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs deleted file mode 100644 index 231af9477271..000000000000 --- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs +++ /dev/null @@ -1,164 +0,0 @@ -# Makefile for knobs -# Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD$ - -.if !defined(WITH_GNUGCJ) -CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant" -.else -CONFIGURE_ARGS+= --with-jdk-home="${LOCALBASE}/lib/jvm/java-gcj41" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}" -.endif - -.if defined(WITH_KDE) -CONFIGURE_ARGS+= --enable-kde QTDIR="${QT_PREFIX}" -.endif - -.if defined(WITH_CUPS) -LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base -CONFIGURE_ARGS+= --enable-cups=yes -.else -CONFIGURE_ARGS+= --enable-cups=no -.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) -.if ${WITH_DEBUG} == 2 -CONFIGURE_ARGS+= --enable-debug -.else -CONFIGURE_ARGS+= --enable-symbols -.endif -.endif - -pre-fetch: -.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000) - @${ECHO} - @${ECHO} "WARNING" - @${ECHO} "Your rtld seems to be old." - @${ECHO} "Please remake your rtld by:" - @${ECHO} "[1] if you use 4-series:" - @${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4" - @${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4" - @${ECHO} "# make ; make depend ; make install" - @${ECHO} "[2] if you use 5-series:" - @${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5" - @${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5" - @${ECHO} "# make ; make depend ; make install" - @${ECHO} "AT YOUR OWN RISK!" -.endif - @${ECHO} "OPTIONS:" -.if !defined(WITH_DEBUG) - @${ECHO} - @${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1" - @${ECHO} - @${ECHO} "If you set WITH_DEBUG=2, you add internal" - @${ECHO} "OOo debug support." -.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_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(LOCALIZED_LANG) - @${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 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 km kn-IN ko ku lo lt lv mk" - @${ECHO} "ms ml-IN mr-IN ne nb nl nn nr ns or-IN pa-IN pl pt" - @${ECHO} "pt-BR ru rw sk sl sh-YU sr-CS ss st sv sw sw-TZ sx" - @${ECHO} "te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk ve vi xh" - @${ECHO} "zh-CN zh-TW zu" - @${ECHO} "Default: en-US" -.endif -.if !defined(WITH_GNUGCJ) - @${ECHO} - @${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with" - @${ECHO} "make -DWITH_GNUGCJ" -.endif -.if !defined(WITH_CUPS) - @${ECHO} - @${ECHO} "You can compile OOo with CUPS support with" - @${ECHO} "make -DWITH_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} != "all" - @${ECHO} - @${ECHO} "You can compile OOo with full localized language support by" - @${ECHO} "make LOCALIZED_LANG=all" -.endif - @${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} == "all" - @${ECHO} "of free diskspace (~ 35GB) and memory (~ 2GB)." -.else - @${ECHO} "of free diskspace (~ 9GB) 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.org-vcltesttool/files/Makefile.localized b/editors/openoffice.org-vcltesttool/files/Makefile.localized deleted file mode 100644 index 4088c9664bfa..000000000000 --- a/editors/openoffice.org-vcltesttool/files/Makefile.localized +++ /dev/null @@ -1,396 +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} == "br" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "bn" -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} == "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} == "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+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts -.endif -################################################################ -.if ${LOCALIZED_LANG} == "km" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "kn-IN" -LANG_PKGNAME= kn -LANG_SUFFIX= IN -.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} == "ms" -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} == "ne" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "nb" -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} == "sk" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sl" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sh-YU" -LANG_PKGNAME= sh -LANG_SUFFIX= YU -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sr-CS" -LANG_PKGNAME= sr -LANG_SUFFIX= CS -.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" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sw-TZ" -LANG_PKGNAME= sw -LANG_SUFFIX= TZ -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sx" -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} == "ti-IN" -LANG_PKGNAME= ti -LANG_SUFFIX= IN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "th" -LANG_PKGNAME= ${LOCALIZED_LANG} -.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} == "tg" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ur-IN" -LANG_PKGNAME= ur -LANG_SUFFIX= IN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "uk" -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} == "all" -ALL_LOCALIZED_LANGS=yes -PKGNAMESUFFIX= -alllangs -.endif -################################################################ -.endif diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.others b/editors/openoffice.org-vcltesttool/files/Makefile.others deleted file mode 100644 index 444a91beac69..000000000000 --- a/editors/openoffice.org-vcltesttool/files/Makefile.others +++ /dev/null @@ -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"; - @${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 ${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 diff --git a/editors/openoffice.org-vcltesttool/files/gcj-fbsdworkaround b/editors/openoffice.org-vcltesttool/files/gcj-fbsdworkaround deleted file mode 100644 index 471f004db546..000000000000 --- a/editors/openoffice.org-vcltesttool/files/gcj-fbsdworkaround +++ /dev/null @@ -1,30 +0,0 @@ ---- config_office/configure~ Sat Mar 4 16:12:31 2006 -+++ config_office/configure Sat Mar 4 16:12:45 2006 -@@ -7544,7 +7544,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lgcjawt $LIBS" -+LIBS="-lgcjawt -pthread $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ - -http://qa.openoffice.org/issues/show_bug.cgi?id=63095 -Index: stoc/source/javaloader/makefile.mk -=================================================================== -RCS file: /cvs/udk/stoc/source/javaloader/makefile.mk,v -retrieving revision 1.16 -diff -u -r1.16 makefile.mk ---- stoc/source/javaloader/makefile.mk 8 Sep 2005 07:57:58 -0000 1.16 -+++ stoc/source/javaloader/makefile.mk 13 Mar 2006 00:54:46 -0000 -@@ -59,7 +59,8 @@ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ -- $(JVMACCESSLIB) -+ $(JVMACCESSLIB) \ -+ -L/usr/local/lib -liconv - - SHL1VERSIONMAP = javaloader.map - SHL1DEPN= diff --git a/editors/openoffice.org-vcltesttool/files/generate.pl b/editors/openoffice.org-vcltesttool/files/generate.pl deleted file mode 100644 index 8e400c20d4fe..000000000000 --- a/editors/openoffice.org-vcltesttool/files/generate.pl +++ /dev/null @@ -1,24 +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-vcltesttool/files/Attic/generate.pl,v 1.9 2006-11-12 22:11:34 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 "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"; - -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"; - } -} -close FILE; diff --git a/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper b/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper deleted file mode 100644 index 45c88c77163a..000000000000 --- a/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper,v 1.3 2006-11-12 22:11:35 maho Exp $ - -oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'` - -case $program in -$0) - $oopath/soffice "$@" - ;; - *) - $oopath/$program "$@" - ;; -esac diff --git a/editors/openoffice.org-vcltesttool/files/optpatch-freetype b/editors/openoffice.org-vcltesttool/files/optpatch-freetype deleted file mode 100644 index 36a8a8abb62f..000000000000 --- a/editors/openoffice.org-vcltesttool/files/optpatch-freetype +++ /dev/null @@ -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 -@@ -1,5 +1,5 @@ --*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h Mon Jan 30 17:49:42 2006 ----- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h Thu Jul 13 16:04:27 2006 -+*** 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 ---- -@@ -24,3 +24,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 -+ -+ -+ /*************************************************************************/ diff --git a/editors/openoffice.org-vcltesttool/files/patch-i65462 b/editors/openoffice.org-vcltesttool/files/patch-i65462 deleted file mode 100644 index 34a8a569562a..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i65462 +++ /dev/null @@ -1,24 +0,0 @@ -Re-add #i64906# workaround. The root cause of the crash is #i65462#. -Also see #i65004# for more information. - ---- sal/osl/unx/security.c 14 Mar 2007 08:28:11 -0000 1.24 -+++ sal/osl/unx/security.c 6 Apr 2007 05:59:15 -0000 -@@ -76,6 +76,10 @@ - static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax); - - static oslSecurityImpl * newSecurityImpl(size_t * bufSize) { -+#if defined (MACOSX) || defined (FREEBSD) -+ /* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X and FreeBSD */ -+ size_t n = 1024; -+#else - long m; - size_t n; - errno = 0; -@@ -95,6 +99,7 @@ - OSL_ASSERT(m >= 0 && (unsigned long) m < SIZE_MAX); - n = (size_t) m; - } -+#endif - if (n <= SIZE_MAX - offsetof(oslSecurityImpl, m_buffer)) { - *bufSize = n; - n += offsetof(oslSecurityImpl, m_buffer); diff --git a/editors/openoffice.org-vcltesttool/files/patch-i65514 b/editors/openoffice.org-vcltesttool/files/patch-i65514 deleted file mode 100644 index 59b7cd68b7ce..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i65514 +++ /dev/null @@ -1,140 +0,0 @@ ---- berkeleydb/db-4.2.52.patch Fri Apr 27 17:14:50 2007 -+++ berkeleydb/db-4.2.52.patch Fri Apr 27 17:14:15 2007 -@@ -221,6 +221,20 @@ - ! $(SLO)$/dbreg_util.obj - ! - ! .INCLUDE : target.mk -+*** misc/db-4.2.52.NC/dist/config.hin Wed Dec 3 16:10:00 2003 -+--- misc/build/db-4.2.52.NC/dist/config.hin Fri May 19 17:37:41 2006 -+*************** -+*** 193,198 **** -+--- 193,201 ---- -+ /* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */ -+ #undef HAVE_MUTEX_X86_GCC_ASSEMBLY -+ -++ /* Define to 1 to use the GCC compiler and x86-64 assembly language mutexes. */ -++ #undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY -++ -+ /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ -+ #undef HAVE_NDIR_H -+ - *** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100 - --- misc/build/db-4.2.52.NC/dist/configure 2007-02-19 16:12:12.000000000 +0100 - *************** -@@ -327,6 +341,76 @@ - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+*************** -+*** 28556,28561 **** -+--- 28556,28606 ---- -+ rm -f conftest.$ac_objext conftest.$ac_ext -+ fi -+ -++ # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux -++ if test "$db_cv_mutex" = no; then -++ cat >conftest.$ac_ext <<_ACEOF -++ #line $LINENO "configure" -++ /* confdefs.h. */ -++ _ACEOF -++ cat confdefs.h >>conftest.$ac_ext -++ cat >>conftest.$ac_ext <<_ACEOF -++ /* end confdefs.h. */ -++ -++ int -++ main () -++ { -++ -++ #if (defined(__amd64__) || defined(__x86_64__)) && defined(__GNUC__) -++ exit(0); -++ #else -++ FAIL TO COMPILE/LINK -++ #endif -++ -++ ; -++ return 0; -++ } -++ _ACEOF -++ rm -f conftest.$ac_objext -++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -++ (eval $ac_compile) 2>&5 -++ ac_status=$? -++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -++ (exit $ac_status); } && -++ { ac_try='test -s conftest.$ac_objext' -++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -++ (eval $ac_try) 2>&5 -++ ac_status=$? -++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -++ (exit $ac_status); }; }; then -++ db_cv_mutex="x86_64/gcc-assembly" -++ else -++ echo "$as_me: failed program was:" >&5 -++ sed 's/^/| /' conftest.$ac_ext >&5 -++ -++ fi -++ rm -f conftest.$ac_objext conftest.$ac_ext -++ fi -++ -+ # S390/cc: IBM OS/390 Unix -+ if test "$db_cv_mutex" = no; then -+ cat >conftest.$ac_ext <<_ACEOF -+*************** -+*** 28971,28976 **** -+--- 29016,29028 ---- -+ x86/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS" -+ cat >>confdefs.h <<\_ACEOF -+ #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1 -++ _ACEOF -++ -++ -++ ;; -++ x86_64/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS" -++ cat >>confdefs.h <<\_ACEOF -++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1 -+ _ACEOF -+ -+ - *** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 - --- misc/build/db-4.2.52.NC/dist/ltmain.sh 2007-02-19 16:12:12.000000000 +0100 - *************** -@@ -1080,3 +1164,39 @@ - ! $(SLO)$/xa_map.obj - ! - ! .INCLUDE : target.mk -+*** misc/db-4.2.52.NC/dbinc/mutex.h Sat Sep 20 17:40:49 2003 -+--- misc/build/db-4.2.52.NC/dbinc/mutex.h Fri May 19 12:43:58 2006 -+*************** -+*** 781,786 **** -+--- 781,811 ---- -+ #endif -+ #endif -+ -++ /********************************************************************* -++ * x86_64/gcc assembly. -++ *********************************************************************/ -++ #ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY -++ typedef unsigned char tsl_t; -++ -++ #ifdef LOAD_ACTUAL_MUTEX_CODE -++ /* -++ * For gcc/x86-64, 0 is clear, 1 is set. -++ */ -++ #define MUTEX_SET(tsl) ({ \ -++ register tsl_t *__l = (tsl); \ -++ int __r; \ -++ asm volatile("movq $1,%%rax; lock; xchgb %1,%%al; xorq $1,%%rax"\ -++ : "=&a" (__r), "=m" (*__l) \ -++ : "1" (*__l) \ -++ ); \ -++ __r & 1; \ -++ }) -++ -++ #define MUTEX_UNSET(tsl) (*(tsl) = 0) -++ #define MUTEX_INIT(tsl) MUTEX_UNSET(tsl) -++ #endif -++ #endif -++ -+ /* -+ * Mutex alignment defaults to one byte. -+ * diff --git a/editors/openoffice.org-vcltesttool/files/patch-i66667 b/editors/openoffice.org-vcltesttool/files/patch-i66667 deleted file mode 100644 index c1d8cd362e9b..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i66667 +++ /dev/null @@ -1,139 +0,0 @@ ---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Tue May 2 08:01:08 2006 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Fri Sep 8 17:25:05 2006 -@@ -120,6 +120,9 @@ - case typelib_TypeClass_UNSIGNED_HYPER: - case typelib_TypeClass_DOUBLE: - pCppStack += sizeof(sal_Int32); // extra long -+ break; -+ default: -+ break; - } - // no longer needed - TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -@@ -436,7 +439,7 @@ - unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( - void ** slots, unsigned char * code, - typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset, -- sal_Int32 functionCount, sal_Int32 vtableOffset) -+ sal_Int32 /*functionCount*/, sal_Int32 vtableOffset) - { - for (sal_Int32 i = 0; i < type->nMembers; ++i) { - typelib_TypeDescription * member = 0; ---- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx.orig Wed Sep 7 18:20:22 2005 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx Mon Sep 11 12:21:03 2006 -@@ -37,6 +37,7 @@ - #include <dlfcn.h> - #include <cxxabi.h> - #include <hash_map> -+#include <sys/param.h> - - #include <rtl/strbuf.hxx> - #include <rtl/ustrbuf.hxx> -@@ -122,7 +123,11 @@ - }; - //__________________________________________________________________________________________________ - RTTI::RTTI() SAL_THROW( () ) -+#if __FreeBSD_version < 602103 - : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) -+#else -+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) -+#endif - { - } - //__________________________________________________________________________________________________ -@@ -139,8 +144,8 @@ - OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName; - - MutexGuard guard( m_mutex ); -- t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) ); -- if (iFind == m_rttis.end()) -+ t_rtti_map::const_iterator iRttiFind( m_rttis.find( unoName ) ); -+ if (iRttiFind == m_rttis.end()) - { - // RTTI symbol - OStringBuffer buf( 64 ); -@@ -157,8 +162,11 @@ - buf.append( 'E' ); - - OString symName( buf.makeStringAndClear() ); --//#iZ 22253 -+#if __FreeBSD_version < 602103 /* #i22253# */ - rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); -+#else -+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); -+#endif - - if (rtti) - { -@@ -205,7 +213,7 @@ - } - else - { -- rtti = iFind->second; -+ rtti = iRttiFind->second; - } - - return rtti; ---- bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Mon Jun 19 19:43:09 2006 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Fri Sep 8 17:25:05 2006 -@@ -142,6 +142,8 @@ - case typelib_TypeClass_DOUBLE: - asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) ); - break; -+ default: -+ break; - } - } - -@@ -217,6 +219,9 @@ - case typelib_TypeClass_UNSIGNED_HYPER: - case typelib_TypeClass_DOUBLE: - pCppStack += sizeof(sal_Int32); // extra long -+ break; -+ default: -+ break; - } - // no longer needed - TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -@@ -329,7 +334,6 @@ - // is my surrogate - bridges::cpp_uno::shared::UnoInterfaceProxy * pThis - = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI); -- typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr; - - switch (pMemberDescr->eTypeClass) - { ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx.orig Wed Jul 19 05:30:01 2006 -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx Mon Sep 11 12:21:25 2006 -@@ -37,6 +37,7 @@ - #include <dlfcn.h> - #include <cxxabi.h> - #include <hash_map> -+#include <sys/param.h> - - #include <rtl/strbuf.hxx> - #include <rtl/ustrbuf.hxx> -@@ -122,7 +123,11 @@ - }; - //__________________________________________________________________________________________________ - RTTI::RTTI() SAL_THROW( () ) -+#if __FreeBSD_version < 602103 - : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) -+#else -+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) -+#endif - { - } - //__________________________________________________________________________________________________ -@@ -157,7 +162,11 @@ - buf.append( 'E' ); - - OString symName( buf.makeStringAndClear() ); -+#if __FreeBSD_version < 602103 /* #i22253# */ - rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); -+#else -+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); -+#endif - - if (rtti) - { diff --git a/editors/openoffice.org-vcltesttool/files/patch-i67904 b/editors/openoffice.org-vcltesttool/files/patch-i67904 deleted file mode 100644 index 520242bb45a0..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i67904 +++ /dev/null @@ -1,79 +0,0 @@ -Index: sal/osl/unx/socket.c -=================================================================== -RCS file: /cvs/porting/sal/osl/unx/socket.c,v -retrieving revision 1.26 -diff -u -r1.26 socket.c ---- sal/osl/unx/socket.c 19 Jul 2006 09:39:22 -0000 1.26 -+++ sal/osl/unx/socket.c 29 Jul 2006 09:53:04 -0000 -@@ -813,7 +813,7 @@ - const char *name, struct hostent *result, - char *buffer, int buflen, int *h_errnop) - { --#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 700015)) -+#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103)) - struct hostent *__result; /* will be the same as result */ - int __error; - __error = gethostbyname_r (name, result, buffer, buflen, -Index: sal/osl/unx/system.c -=================================================================== -RCS file: /cvs/porting/sal/osl/unx/system.c,v -retrieving revision 1.13 -diff -u -r1.13 system.c ---- sal/osl/unx/system.c 19 Jul 2006 09:39:37 -0000 1.13 -+++ sal/osl/unx/system.c 9 Sep 2006 09:57:26 -0000 -@@ -343,7 +343,7 @@ - } - #endif /* defined SCO */ - --#if !defined(FREEBSD) || (__FreeBSD_version < 700015) -+#if !defined(FREEBSD) || (__FreeBSD_version < 601103) - - extern int h_errno; - -@@ -435,7 +435,7 @@ - - return res; - } --#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */ -+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */ - - #if defined(MACOSX) - /* - -Index: sal/osl/unx/system.h -=================================================================== -RCS file: /cvs/porting/sal/osl/unx/system.h,v -retrieving revision 1.33 -diff -u -r1.33 system.h ---- sal/osl/unx/system.h 19 Jul 2006 09:39:50 -0000 1.33 -+++ sal/osl/unx/system.h 9 Sep 2006 09:55:55 -0000 -@@ -537,10 +537,10 @@ - struct tm *localtime_r(const time_t *timep, struct tm *buffer); - struct tm *gmtime_r(const time_t *timep, struct tm *buffer); - #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */ --#if !defined(FREEBSD) || (__FreeBSD_version < 700015) -+#if !defined(FREEBSD) || (__FreeBSD_version < 601103) - struct hostent *gethostbyname_r(const char *name, struct hostent *result, - char *buffer, int buflen, int *h_errnop); --#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */ -+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */ - #endif - - #endif /* __OSL_SYSTEM_H__ */ - -Index: moz/mozilla-source-1.7.5.patch -=================================================================== -RCS file: /cvs/external/moz/mozilla-source-1.7.5.patch,v -retrieving revision 1.14 -diff -u -r1.14 mozilla-source-1.7.5.patch ---- moz/mozilla-source-1.7.5.patch 17 Apr 2007 08:54:47 -0000 1.14 -+++ moz/mozilla-source-1.7.5.patch 27 Apr 2007 05:57:10 -0000 -@@ -7821,7 +7821,7 @@ - #endif - - ! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ --! (defined(__FreeBSD__) && __FreeBSD_version > 700016) -+! (defined(__FreeBSD__) && __FreeBSD_version > 601103) - #define _PR_HAVE_GETPROTO_R - #define _PR_HAVE_5_ARG_GETPROTO_R - #endif diff --git a/editors/openoffice.org-vcltesttool/files/patch-i69418 b/editors/openoffice.org-vcltesttool/files/patch-i69418 deleted file mode 100644 index dd23c55e4c9b..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i69418 +++ /dev/null @@ -1,38 +0,0 @@ ---- moz/mozilla-source-1.7.5.patch.org Sat Sep 9 18:43:45 2006 -+++ moz/mozilla-source-1.7.5.patch Sat Sep 9 18:42:00 2006 -@@ -151,6 +151,17 @@ - AR_EXTRACT="$AR x" - AR_DELETE="$AR d" - *************** -+*** 7504,7509 **** -+--- 7504,7511 ---- -+ case $target in -+ *-hpux11.*) -+ ;; -++ *-freebsd*) -++ ;; -+ *) -+ echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -+ echo "configure:7510: checking for gethostbyname_r in -lc_r" >&5 -+*************** - *** 16606,16613 **** - - case "$host_os" in -@@ -191,6 +202,17 @@ - AR_EXTRACT="$AR x" - AR_DELETE="$AR d" - *************** -+*** 1981,1986 **** -+--- 1981,1988 ---- -+ case $target in -+ *-hpux11.*) -+ ;; -++ *-freebsd*) -++ ;; -+ *) -+ AC_CHECK_LIB(c_r, gethostbyname_r) -+ ;; -+*************** - *** 5692,5699 **** - dnl ======================================================== - case "$host_os" in diff --git a/editors/openoffice.org-vcltesttool/files/patch-i69994 b/editors/openoffice.org-vcltesttool/files/patch-i69994 deleted file mode 100644 index 9d2718b4763c..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i69994 +++ /dev/null @@ -1,747 +0,0 @@ -Index: python/Python-2.3.4.patch -=================================================================== -RCS file: /cvs/external/python/Python-2.3.4.patch,v -retrieving revision 1.12 -diff -u -r1.12 Python-2.3.4.patch ---- python/Python-2.3.4.patch 25 Sep 2006 13:22:02 -0000 1.12 -+++ python/Python-2.3.4.patch 29 Sep 2006 22:06:08 -0000 -@@ -13463,3 +13463,739 @@ - handler = signal(sig, SIG_IGN); - signal(sig, handler); - return handler; -+*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py Tue Aug 9 06:26:23 2005 -+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py Tue Aug 9 06:20:25 2005 -+*************** -+*** 0 **** -+--- 1,355 ---- -++ # Generated by h2py from /usr/include/netinet/in.h -++ IPPROTO_IP = 0 -++ IPPROTO_HOPOPTS = 0 -++ IPPROTO_ICMP = 1 -++ IPPROTO_IGMP = 2 -++ IPPROTO_GGP = 3 -++ IPPROTO_IPV4 = 4 -++ IPPROTO_IPIP = IPPROTO_IPV4 -++ IPPROTO_TCP = 6 -++ IPPROTO_ST = 7 -++ IPPROTO_EGP = 8 -++ IPPROTO_PIGP = 9 -++ IPPROTO_RCCMON = 10 -++ IPPROTO_NVPII = 11 -++ IPPROTO_PUP = 12 -++ IPPROTO_ARGUS = 13 -++ IPPROTO_EMCON = 14 -++ IPPROTO_XNET = 15 -++ IPPROTO_CHAOS = 16 -++ IPPROTO_UDP = 17 -++ IPPROTO_MUX = 18 -++ IPPROTO_MEAS = 19 -++ IPPROTO_HMP = 20 -++ IPPROTO_PRM = 21 -++ IPPROTO_IDP = 22 -++ IPPROTO_TRUNK1 = 23 -++ IPPROTO_TRUNK2 = 24 -++ IPPROTO_LEAF1 = 25 -++ IPPROTO_LEAF2 = 26 -++ IPPROTO_RDP = 27 -++ IPPROTO_IRTP = 28 -++ IPPROTO_TP = 29 -++ IPPROTO_BLT = 30 -++ IPPROTO_NSP = 31 -++ IPPROTO_INP = 32 -++ IPPROTO_SEP = 33 -++ IPPROTO_3PC = 34 -++ IPPROTO_IDPR = 35 -++ IPPROTO_XTP = 36 -++ IPPROTO_DDP = 37 -++ IPPROTO_CMTP = 38 -++ IPPROTO_TPXX = 39 -++ IPPROTO_IL = 40 -++ IPPROTO_IPV6 = 41 -++ IPPROTO_SDRP = 42 -++ IPPROTO_ROUTING = 43 -++ IPPROTO_FRAGMENT = 44 -++ IPPROTO_IDRP = 45 -++ IPPROTO_RSVP = 46 -++ IPPROTO_GRE = 47 -++ IPPROTO_MHRP = 48 -++ IPPROTO_BHA = 49 -++ IPPROTO_ESP = 50 -++ IPPROTO_AH = 51 -++ IPPROTO_INLSP = 52 -++ IPPROTO_SWIPE = 53 -++ IPPROTO_NHRP = 54 -++ IPPROTO_ICMPV6 = 58 -++ IPPROTO_NONE = 59 -++ IPPROTO_DSTOPTS = 60 -++ IPPROTO_AHIP = 61 -++ IPPROTO_CFTP = 62 -++ IPPROTO_HELLO = 63 -++ IPPROTO_SATEXPAK = 64 -++ IPPROTO_KRYPTOLAN = 65 -++ IPPROTO_RVD = 66 -++ IPPROTO_IPPC = 67 -++ IPPROTO_ADFS = 68 -++ IPPROTO_SATMON = 69 -++ IPPROTO_VISA = 70 -++ IPPROTO_IPCV = 71 -++ IPPROTO_CPNX = 72 -++ IPPROTO_CPHB = 73 -++ IPPROTO_WSN = 74 -++ IPPROTO_PVP = 75 -++ IPPROTO_BRSATMON = 76 -++ IPPROTO_ND = 77 -++ IPPROTO_WBMON = 78 -++ IPPROTO_WBEXPAK = 79 -++ IPPROTO_EON = 80 -++ IPPROTO_VMTP = 81 -++ IPPROTO_SVMTP = 82 -++ IPPROTO_VINES = 83 -++ IPPROTO_TTP = 84 -++ IPPROTO_IGP = 85 -++ IPPROTO_DGP = 86 -++ IPPROTO_TCF = 87 -++ IPPROTO_IGRP = 88 -++ IPPROTO_OSPFIGP = 89 -++ IPPROTO_SRPC = 90 -++ IPPROTO_LARP = 91 -++ IPPROTO_MTP = 92 -++ IPPROTO_AX25 = 93 -++ IPPROTO_IPEIP = 94 -++ IPPROTO_MICP = 95 -++ IPPROTO_SCCSP = 96 -++ IPPROTO_ETHERIP = 97 -++ IPPROTO_ENCAP = 98 -++ IPPROTO_APES = 99 -++ IPPROTO_GMTP = 100 -++ IPPROTO_IPCOMP = 108 -++ IPPROTO_PIM = 103 -++ IPPROTO_PGM = 113 -++ IPPROTO_DIVERT = 254 -++ IPPROTO_RAW = 255 -++ IPPROTO_MAX = 256 -++ IPPROTO_DONE = 257 -++ IPPORT_RESERVED = 1024 -++ IPPORT_USERRESERVED = 5000 -++ IPPORT_HIFIRSTAUTO = 49152 -++ IPPORT_HILASTAUTO = 65535 -++ IPPORT_RESERVEDSTART = 600 -++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0) -++ -++ IN_CLASSA_NET = 0xff000000 -++ IN_CLASSA_NSHIFT = 24 -++ IN_CLASSA_HOST = 0x00ffffff -++ IN_CLASSA_MAX = 128 -++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000) -++ -++ IN_CLASSB_NET = 0xffff0000 -++ IN_CLASSB_NSHIFT = 16 -++ IN_CLASSB_HOST = 0x0000ffff -++ IN_CLASSB_MAX = 65536 -++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000) -++ -++ IN_CLASSC_NET = 0xffffff00 -++ IN_CLASSC_NSHIFT = 8 -++ IN_CLASSC_HOST = 0x000000ff -++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000) -++ -++ IN_CLASSD_NET = 0xf0000000 -++ IN_CLASSD_NSHIFT = 28 -++ IN_CLASSD_HOST = 0x0fffffff -++ def IN_MULTICAST(i): return IN_CLASSD(i) -++ -++ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) -++ -++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) -++ -++ INADDR_NONE = 0xffffffff -++ IN_LOOPBACKNET = 127 -++ INET_ADDRSTRLEN = 16 -++ IP_OPTIONS = 1 -++ IP_HDRINCL = 2 -++ IP_TOS = 3 -++ IP_TTL = 4 -++ IP_RECVOPTS = 5 -++ IP_RECVRETOPTS = 6 -++ IP_RECVDSTADDR = 7 -++ IP_RETOPTS = 8 -++ IP_MULTICAST_IF = 9 -++ IP_MULTICAST_TTL = 10 -++ IP_MULTICAST_LOOP = 11 -++ IP_ADD_MEMBERSHIP = 12 -++ IP_DROP_MEMBERSHIP = 13 -++ IP_MULTICAST_VIF = 14 -++ IP_RSVP_ON = 15 -++ IP_RSVP_OFF = 16 -++ IP_RSVP_VIF_ON = 17 -++ IP_RSVP_VIF_OFF = 18 -++ IP_PORTRANGE = 19 -++ IP_RECVIF = 20 -++ IP_IPSEC_POLICY = 21 -++ IP_FAITH = 22 -++ IP_FW_ADD = 50 -++ IP_FW_DEL = 51 -++ IP_FW_FLUSH = 52 -++ IP_FW_ZERO = 53 -++ IP_FW_GET = 54 -++ IP_FW_RESETLOG = 55 -++ IP_DUMMYNET_CONFIGURE = 60 -++ IP_DUMMYNET_DEL = 61 -++ IP_DUMMYNET_FLUSH = 62 -++ IP_DUMMYNET_GET = 64 -++ IP_DEFAULT_MULTICAST_TTL = 1 -++ IP_DEFAULT_MULTICAST_LOOP = 1 -++ IP_MAX_MEMBERSHIPS = 20 -++ IP_PORTRANGE_DEFAULT = 0 -++ IP_PORTRANGE_HIGH = 1 -++ IP_PORTRANGE_LOW = 2 -++ IPPROTO_MAXID = (IPPROTO_AH + 1) -++ IPCTL_FORWARDING = 1 -++ IPCTL_SENDREDIRECTS = 2 -++ IPCTL_DEFTTL = 3 -++ IPCTL_DEFMTU = 4 -++ IPCTL_RTEXPIRE = 5 -++ IPCTL_RTMINEXPIRE = 6 -++ IPCTL_RTMAXCACHE = 7 -++ IPCTL_SOURCEROUTE = 8 -++ IPCTL_DIRECTEDBROADCAST = 9 -++ IPCTL_INTRQMAXLEN = 10 -++ IPCTL_INTRQDROPS = 11 -++ IPCTL_STATS = 12 -++ IPCTL_ACCEPTSOURCEROUTE = 13 -++ IPCTL_FASTFORWARDING = 14 -++ IPCTL_KEEPFAITH = 15 -++ IPCTL_GIF_TTL = 16 -++ IPCTL_MAXID = 17 -++ -++ # Included from netinet6/in6.h -++ -++ # Included from sys/queue.h -++ def SLIST_HEAD_INITIALIZER(head): return \ -++ -++ def SLIST_ENTRY(type): return \ -++ -++ def STAILQ_HEAD_INITIALIZER(head): return \ -++ -++ def STAILQ_ENTRY(type): return \ -++ -++ def LIST_HEAD_INITIALIZER(head): return \ -++ -++ def LIST_ENTRY(type): return \ -++ -++ def TAILQ_HEAD_INITIALIZER(head): return \ -++ -++ def TAILQ_ENTRY(type): return \ -++ -++ def CIRCLEQ_ENTRY(type): return \ -++ -++ __KAME_VERSION = "20000701/FreeBSD-current" -++ IPV6PORT_RESERVED = 1024 -++ IPV6PORT_ANONMIN = 49152 -++ IPV6PORT_ANONMAX = 65535 -++ IPV6PORT_RESERVEDMIN = 600 -++ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -++ INET6_ADDRSTRLEN = 46 -++ IPV6_ADDR_INT32_ONE = 1 -++ IPV6_ADDR_INT32_TWO = 2 -++ IPV6_ADDR_INT32_MNL = 0xff010000 -++ IPV6_ADDR_INT32_MLL = 0xff020000 -++ IPV6_ADDR_INT32_SMP = 0x0000ffff -++ IPV6_ADDR_INT16_ULL = 0xfe80 -++ IPV6_ADDR_INT16_USL = 0xfec0 -++ IPV6_ADDR_INT16_MLL = 0xff02 -++ IPV6_ADDR_INT32_ONE = 0x01000000 -++ IPV6_ADDR_INT32_TWO = 0x02000000 -++ IPV6_ADDR_INT32_MNL = 0x000001ff -++ IPV6_ADDR_INT32_MLL = 0x000002ff -++ IPV6_ADDR_INT32_SMP = 0xffff0000 -++ IPV6_ADDR_INT16_ULL = 0x80fe -++ IPV6_ADDR_INT16_USL = 0xc0fe -++ IPV6_ADDR_INT16_MLL = 0x02ff -++ def IN6_IS_ADDR_UNSPECIFIED(a): return \ -++ -++ def IN6_IS_ADDR_LOOPBACK(a): return \ -++ -++ def IN6_IS_ADDR_V4COMPAT(a): return \ -++ -++ def IN6_IS_ADDR_V4MAPPED(a): return \ -++ -++ IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -++ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -++ IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -++ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -++ IPV6_ADDR_SCOPE_GLOBAL = 0x0e -++ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -++ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -++ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -++ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -++ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e -++ def IN6_IS_ADDR_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_GLOBAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_GLOBAL(a): return \ -++ -++ def IN6_IS_SCOPE_LINKLOCAL(a): return \ -++ -++ IPV6_OPTIONS = 1 -++ IPV6_RECVOPTS = 5 -++ IPV6_RECVRETOPTS = 6 -++ IPV6_RECVDSTADDR = 7 -++ IPV6_RETOPTS = 8 -++ IPV6_SOCKOPT_RESERVED1 = 3 -++ IPV6_UNICAST_HOPS = 4 -++ IPV6_MULTICAST_IF = 9 -++ IPV6_MULTICAST_HOPS = 10 -++ IPV6_MULTICAST_LOOP = 11 -++ IPV6_JOIN_GROUP = 12 -++ IPV6_LEAVE_GROUP = 13 -++ IPV6_PORTRANGE = 14 -++ ICMP6_FILTER = 18 -++ IPV6_PKTINFO = 19 -++ IPV6_HOPLIMIT = 20 -++ IPV6_NEXTHOP = 21 -++ IPV6_HOPOPTS = 22 -++ IPV6_DSTOPTS = 23 -++ IPV6_RTHDR = 24 -++ IPV6_PKTOPTIONS = 25 -++ IPV6_CHECKSUM = 26 -++ IPV6_BINDV6ONLY = 27 -++ IPV6_IPSEC_POLICY = 28 -++ IPV6_FAITH = 29 -++ IPV6_FW_ADD = 30 -++ IPV6_FW_DEL = 31 -++ IPV6_FW_FLUSH = 32 -++ IPV6_FW_ZERO = 33 -++ IPV6_FW_GET = 34 -++ IPV6_RTHDR_LOOSE = 0 -++ IPV6_RTHDR_STRICT = 1 -++ IPV6_RTHDR_TYPE_0 = 0 -++ IPV6_DEFAULT_MULTICAST_HOPS = 1 -++ IPV6_DEFAULT_MULTICAST_LOOP = 1 -++ IPV6_PORTRANGE_DEFAULT = 0 -++ IPV6_PORTRANGE_HIGH = 1 -++ IPV6_PORTRANGE_LOW = 2 -++ IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -++ IPV6CTL_FORWARDING = 1 -++ IPV6CTL_SENDREDIRECTS = 2 -++ IPV6CTL_DEFHLIM = 3 -++ IPV6CTL_DEFMTU = 4 -++ IPV6CTL_FORWSRCRT = 5 -++ IPV6CTL_STATS = 6 -++ IPV6CTL_MRTSTATS = 7 -++ IPV6CTL_MRTPROTO = 8 -++ IPV6CTL_MAXFRAGPACKETS = 9 -++ IPV6CTL_SOURCECHECK = 10 -++ IPV6CTL_SOURCECHECK_LOGINT = 11 -++ IPV6CTL_ACCEPT_RTADV = 12 -++ IPV6CTL_KEEPFAITH = 13 -++ IPV6CTL_LOG_INTERVAL = 14 -++ IPV6CTL_HDRNESTLIMIT = 15 -++ IPV6CTL_DAD_COUNT = 16 -++ IPV6CTL_AUTO_FLOWLABEL = 17 -++ IPV6CTL_DEFMCASTHLIM = 18 -++ IPV6CTL_GIF_HLIM = 19 -++ IPV6CTL_KAME_VERSION = 20 -++ IPV6CTL_USE_DEPRECATED = 21 -++ IPV6CTL_RR_PRUNE = 22 -++ IPV6CTL_MAPPED_ADDR = 23 -++ IPV6CTL_BINDV6ONLY = 24 -++ IPV6CTL_RTEXPIRE = 25 -++ IPV6CTL_RTMINEXPIRE = 26 -++ IPV6CTL_RTMAXCACHE = 27 -++ IPV6CTL_MAXID = 28 -+*** misc/Python-2.3.4/Lib/plat-freebsd6/regen Tue Aug 9 06:26:27 2005 -+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/regen Tue Aug 9 06:19:02 2005 -+*************** -+*** 0 **** -+--- 1,3 ---- -++ #! /bin/sh -++ set -v -++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h -+*** misc/Python-2.3.4/Lib/plat-freebsd7/IN.py Tue Aug 9 06:26:23 2005 -+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/IN.py Tue Aug 9 06:20:25 2005 -+*************** -+*** 0 **** -+--- 1,355 ---- -++ # Generated by h2py from /usr/include/netinet/in.h -++ IPPROTO_IP = 0 -++ IPPROTO_HOPOPTS = 0 -++ IPPROTO_ICMP = 1 -++ IPPROTO_IGMP = 2 -++ IPPROTO_GGP = 3 -++ IPPROTO_IPV4 = 4 -++ IPPROTO_IPIP = IPPROTO_IPV4 -++ IPPROTO_TCP = 6 -++ IPPROTO_ST = 7 -++ IPPROTO_EGP = 8 -++ IPPROTO_PIGP = 9 -++ IPPROTO_RCCMON = 10 -++ IPPROTO_NVPII = 11 -++ IPPROTO_PUP = 12 -++ IPPROTO_ARGUS = 13 -++ IPPROTO_EMCON = 14 -++ IPPROTO_XNET = 15 -++ IPPROTO_CHAOS = 16 -++ IPPROTO_UDP = 17 -++ IPPROTO_MUX = 18 -++ IPPROTO_MEAS = 19 -++ IPPROTO_HMP = 20 -++ IPPROTO_PRM = 21 -++ IPPROTO_IDP = 22 -++ IPPROTO_TRUNK1 = 23 -++ IPPROTO_TRUNK2 = 24 -++ IPPROTO_LEAF1 = 25 -++ IPPROTO_LEAF2 = 26 -++ IPPROTO_RDP = 27 -++ IPPROTO_IRTP = 28 -++ IPPROTO_TP = 29 -++ IPPROTO_BLT = 30 -++ IPPROTO_NSP = 31 -++ IPPROTO_INP = 32 -++ IPPROTO_SEP = 33 -++ IPPROTO_3PC = 34 -++ IPPROTO_IDPR = 35 -++ IPPROTO_XTP = 36 -++ IPPROTO_DDP = 37 -++ IPPROTO_CMTP = 38 -++ IPPROTO_TPXX = 39 -++ IPPROTO_IL = 40 -++ IPPROTO_IPV6 = 41 -++ IPPROTO_SDRP = 42 -++ IPPROTO_ROUTING = 43 -++ IPPROTO_FRAGMENT = 44 -++ IPPROTO_IDRP = 45 -++ IPPROTO_RSVP = 46 -++ IPPROTO_GRE = 47 -++ IPPROTO_MHRP = 48 -++ IPPROTO_BHA = 49 -++ IPPROTO_ESP = 50 -++ IPPROTO_AH = 51 -++ IPPROTO_INLSP = 52 -++ IPPROTO_SWIPE = 53 -++ IPPROTO_NHRP = 54 -++ IPPROTO_ICMPV6 = 58 -++ IPPROTO_NONE = 59 -++ IPPROTO_DSTOPTS = 60 -++ IPPROTO_AHIP = 61 -++ IPPROTO_CFTP = 62 -++ IPPROTO_HELLO = 63 -++ IPPROTO_SATEXPAK = 64 -++ IPPROTO_KRYPTOLAN = 65 -++ IPPROTO_RVD = 66 -++ IPPROTO_IPPC = 67 -++ IPPROTO_ADFS = 68 -++ IPPROTO_SATMON = 69 -++ IPPROTO_VISA = 70 -++ IPPROTO_IPCV = 71 -++ IPPROTO_CPNX = 72 -++ IPPROTO_CPHB = 73 -++ IPPROTO_WSN = 74 -++ IPPROTO_PVP = 75 -++ IPPROTO_BRSATMON = 76 -++ IPPROTO_ND = 77 -++ IPPROTO_WBMON = 78 -++ IPPROTO_WBEXPAK = 79 -++ IPPROTO_EON = 80 -++ IPPROTO_VMTP = 81 -++ IPPROTO_SVMTP = 82 -++ IPPROTO_VINES = 83 -++ IPPROTO_TTP = 84 -++ IPPROTO_IGP = 85 -++ IPPROTO_DGP = 86 -++ IPPROTO_TCF = 87 -++ IPPROTO_IGRP = 88 -++ IPPROTO_OSPFIGP = 89 -++ IPPROTO_SRPC = 90 -++ IPPROTO_LARP = 91 -++ IPPROTO_MTP = 92 -++ IPPROTO_AX25 = 93 -++ IPPROTO_IPEIP = 94 -++ IPPROTO_MICP = 95 -++ IPPROTO_SCCSP = 96 -++ IPPROTO_ETHERIP = 97 -++ IPPROTO_ENCAP = 98 -++ IPPROTO_APES = 99 -++ IPPROTO_GMTP = 100 -++ IPPROTO_IPCOMP = 108 -++ IPPROTO_PIM = 103 -++ IPPROTO_PGM = 113 -++ IPPROTO_DIVERT = 254 -++ IPPROTO_RAW = 255 -++ IPPROTO_MAX = 256 -++ IPPROTO_DONE = 257 -++ IPPORT_RESERVED = 1024 -++ IPPORT_USERRESERVED = 5000 -++ IPPORT_HIFIRSTAUTO = 49152 -++ IPPORT_HILASTAUTO = 65535 -++ IPPORT_RESERVEDSTART = 600 -++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0) -++ -++ IN_CLASSA_NET = 0xff000000 -++ IN_CLASSA_NSHIFT = 24 -++ IN_CLASSA_HOST = 0x00ffffff -++ IN_CLASSA_MAX = 128 -++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000) -++ -++ IN_CLASSB_NET = 0xffff0000 -++ IN_CLASSB_NSHIFT = 16 -++ IN_CLASSB_HOST = 0x0000ffff -++ IN_CLASSB_MAX = 65536 -++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000) -++ -++ IN_CLASSC_NET = 0xffffff00 -++ IN_CLASSC_NSHIFT = 8 -++ IN_CLASSC_HOST = 0x000000ff -++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000) -++ -++ IN_CLASSD_NET = 0xf0000000 -++ IN_CLASSD_NSHIFT = 28 -++ IN_CLASSD_HOST = 0x0fffffff -++ def IN_MULTICAST(i): return IN_CLASSD(i) -++ -++ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) -++ -++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) -++ -++ INADDR_NONE = 0xffffffff -++ IN_LOOPBACKNET = 127 -++ INET_ADDRSTRLEN = 16 -++ IP_OPTIONS = 1 -++ IP_HDRINCL = 2 -++ IP_TOS = 3 -++ IP_TTL = 4 -++ IP_RECVOPTS = 5 -++ IP_RECVRETOPTS = 6 -++ IP_RECVDSTADDR = 7 -++ IP_RETOPTS = 8 -++ IP_MULTICAST_IF = 9 -++ IP_MULTICAST_TTL = 10 -++ IP_MULTICAST_LOOP = 11 -++ IP_ADD_MEMBERSHIP = 12 -++ IP_DROP_MEMBERSHIP = 13 -++ IP_MULTICAST_VIF = 14 -++ IP_RSVP_ON = 15 -++ IP_RSVP_OFF = 16 -++ IP_RSVP_VIF_ON = 17 -++ IP_RSVP_VIF_OFF = 18 -++ IP_PORTRANGE = 19 -++ IP_RECVIF = 20 -++ IP_IPSEC_POLICY = 21 -++ IP_FAITH = 22 -++ IP_FW_ADD = 50 -++ IP_FW_DEL = 51 -++ IP_FW_FLUSH = 52 -++ IP_FW_ZERO = 53 -++ IP_FW_GET = 54 -++ IP_FW_RESETLOG = 55 -++ IP_DUMMYNET_CONFIGURE = 60 -++ IP_DUMMYNET_DEL = 61 -++ IP_DUMMYNET_FLUSH = 62 -++ IP_DUMMYNET_GET = 64 -++ IP_DEFAULT_MULTICAST_TTL = 1 -++ IP_DEFAULT_MULTICAST_LOOP = 1 -++ IP_MAX_MEMBERSHIPS = 20 -++ IP_PORTRANGE_DEFAULT = 0 -++ IP_PORTRANGE_HIGH = 1 -++ IP_PORTRANGE_LOW = 2 -++ IPPROTO_MAXID = (IPPROTO_AH + 1) -++ IPCTL_FORWARDING = 1 -++ IPCTL_SENDREDIRECTS = 2 -++ IPCTL_DEFTTL = 3 -++ IPCTL_DEFMTU = 4 -++ IPCTL_RTEXPIRE = 5 -++ IPCTL_RTMINEXPIRE = 6 -++ IPCTL_RTMAXCACHE = 7 -++ IPCTL_SOURCEROUTE = 8 -++ IPCTL_DIRECTEDBROADCAST = 9 -++ IPCTL_INTRQMAXLEN = 10 -++ IPCTL_INTRQDROPS = 11 -++ IPCTL_STATS = 12 -++ IPCTL_ACCEPTSOURCEROUTE = 13 -++ IPCTL_FASTFORWARDING = 14 -++ IPCTL_KEEPFAITH = 15 -++ IPCTL_GIF_TTL = 16 -++ IPCTL_MAXID = 17 -++ -++ # Included from netinet6/in6.h -++ -++ # Included from sys/queue.h -++ def SLIST_HEAD_INITIALIZER(head): return \ -++ -++ def SLIST_ENTRY(type): return \ -++ -++ def STAILQ_HEAD_INITIALIZER(head): return \ -++ -++ def STAILQ_ENTRY(type): return \ -++ -++ def LIST_HEAD_INITIALIZER(head): return \ -++ -++ def LIST_ENTRY(type): return \ -++ -++ def TAILQ_HEAD_INITIALIZER(head): return \ -++ -++ def TAILQ_ENTRY(type): return \ -++ -++ def CIRCLEQ_ENTRY(type): return \ -++ -++ __KAME_VERSION = "20000701/FreeBSD-current" -++ IPV6PORT_RESERVED = 1024 -++ IPV6PORT_ANONMIN = 49152 -++ IPV6PORT_ANONMAX = 65535 -++ IPV6PORT_RESERVEDMIN = 600 -++ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -++ INET6_ADDRSTRLEN = 46 -++ IPV6_ADDR_INT32_ONE = 1 -++ IPV6_ADDR_INT32_TWO = 2 -++ IPV6_ADDR_INT32_MNL = 0xff010000 -++ IPV6_ADDR_INT32_MLL = 0xff020000 -++ IPV6_ADDR_INT32_SMP = 0x0000ffff -++ IPV6_ADDR_INT16_ULL = 0xfe80 -++ IPV6_ADDR_INT16_USL = 0xfec0 -++ IPV6_ADDR_INT16_MLL = 0xff02 -++ IPV6_ADDR_INT32_ONE = 0x01000000 -++ IPV6_ADDR_INT32_TWO = 0x02000000 -++ IPV6_ADDR_INT32_MNL = 0x000001ff -++ IPV6_ADDR_INT32_MLL = 0x000002ff -++ IPV6_ADDR_INT32_SMP = 0xffff0000 -++ IPV6_ADDR_INT16_ULL = 0x80fe -++ IPV6_ADDR_INT16_USL = 0xc0fe -++ IPV6_ADDR_INT16_MLL = 0x02ff -++ def IN6_IS_ADDR_UNSPECIFIED(a): return \ -++ -++ def IN6_IS_ADDR_LOOPBACK(a): return \ -++ -++ def IN6_IS_ADDR_V4COMPAT(a): return \ -++ -++ def IN6_IS_ADDR_V4MAPPED(a): return \ -++ -++ IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -++ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -++ IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -++ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -++ IPV6_ADDR_SCOPE_GLOBAL = 0x0e -++ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -++ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -++ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -++ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -++ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e -++ def IN6_IS_ADDR_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_GLOBAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_GLOBAL(a): return \ -++ -++ def IN6_IS_SCOPE_LINKLOCAL(a): return \ -++ -++ IPV6_OPTIONS = 1 -++ IPV6_RECVOPTS = 5 -++ IPV6_RECVRETOPTS = 6 -++ IPV6_RECVDSTADDR = 7 -++ IPV6_RETOPTS = 8 -++ IPV6_SOCKOPT_RESERVED1 = 3 -++ IPV6_UNICAST_HOPS = 4 -++ IPV6_MULTICAST_IF = 9 -++ IPV6_MULTICAST_HOPS = 10 -++ IPV6_MULTICAST_LOOP = 11 -++ IPV6_JOIN_GROUP = 12 -++ IPV6_LEAVE_GROUP = 13 -++ IPV6_PORTRANGE = 14 -++ ICMP6_FILTER = 18 -++ IPV6_PKTINFO = 19 -++ IPV6_HOPLIMIT = 20 -++ IPV6_NEXTHOP = 21 -++ IPV6_HOPOPTS = 22 -++ IPV6_DSTOPTS = 23 -++ IPV6_RTHDR = 24 -++ IPV6_PKTOPTIONS = 25 -++ IPV6_CHECKSUM = 26 -++ IPV6_BINDV6ONLY = 27 -++ IPV6_IPSEC_POLICY = 28 -++ IPV6_FAITH = 29 -++ IPV6_FW_ADD = 30 -++ IPV6_FW_DEL = 31 -++ IPV6_FW_FLUSH = 32 -++ IPV6_FW_ZERO = 33 -++ IPV6_FW_GET = 34 -++ IPV6_RTHDR_LOOSE = 0 -++ IPV6_RTHDR_STRICT = 1 -++ IPV6_RTHDR_TYPE_0 = 0 -++ IPV6_DEFAULT_MULTICAST_HOPS = 1 -++ IPV6_DEFAULT_MULTICAST_LOOP = 1 -++ IPV6_PORTRANGE_DEFAULT = 0 -++ IPV6_PORTRANGE_HIGH = 1 -++ IPV6_PORTRANGE_LOW = 2 -++ IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -++ IPV6CTL_FORWARDING = 1 -++ IPV6CTL_SENDREDIRECTS = 2 -++ IPV6CTL_DEFHLIM = 3 -++ IPV6CTL_DEFMTU = 4 -++ IPV6CTL_FORWSRCRT = 5 -++ IPV6CTL_STATS = 6 -++ IPV6CTL_MRTSTATS = 7 -++ IPV6CTL_MRTPROTO = 8 -++ IPV6CTL_MAXFRAGPACKETS = 9 -++ IPV6CTL_SOURCECHECK = 10 -++ IPV6CTL_SOURCECHECK_LOGINT = 11 -++ IPV6CTL_ACCEPT_RTADV = 12 -++ IPV6CTL_KEEPFAITH = 13 -++ IPV6CTL_LOG_INTERVAL = 14 -++ IPV6CTL_HDRNESTLIMIT = 15 -++ IPV6CTL_DAD_COUNT = 16 -++ IPV6CTL_AUTO_FLOWLABEL = 17 -++ IPV6CTL_DEFMCASTHLIM = 18 -++ IPV6CTL_GIF_HLIM = 19 -++ IPV6CTL_KAME_VERSION = 20 -++ IPV6CTL_USE_DEPRECATED = 21 -++ IPV6CTL_RR_PRUNE = 22 -++ IPV6CTL_MAPPED_ADDR = 23 -++ IPV6CTL_BINDV6ONLY = 24 -++ IPV6CTL_RTEXPIRE = 25 -++ IPV6CTL_RTMINEXPIRE = 26 -++ IPV6CTL_RTMAXCACHE = 27 -++ IPV6CTL_MAXID = 28 -+*** misc/Python-2.3.4/Lib/plat-freebsd7/regen Tue Aug 9 06:26:27 2005 -+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/regen Tue Aug 9 06:19:02 2005 -+*************** -+*** 0 **** -+--- 1,3 ---- -++ #! /bin/sh -++ set -v -++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h diff --git a/editors/openoffice.org-vcltesttool/files/patch-i73157 b/editors/openoffice.org-vcltesttool/files/patch-i73157 deleted file mode 100644 index 17d987622060..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i73157 +++ /dev/null @@ -1,30 +0,0 @@ ---- epm/epm-3.7.patch.orig Tue Aug 1 22:20:23 2006 -+++ epm/epm-3.7.patch Sat Dec 23 07:00:30 2006 -@@ -68,7 +68,11 @@ - fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); - } - *************** --*** 330,337 **** -+*** 326,337 **** -+ if (Verbosity) -+ puts("Building FreeBSD pkg binary distribution..."); -+ -+! if (run_command(NULL, "pkg_create -p / -s %s -c %s -d %s -f %s %s", - current, commentname, descrname, plistname, name)) - return (1); - -@@ -77,7 +81,11 @@ - - /* - * Remove temporary files... ----- 348,356 ---- -+--- 344,356 ---- -+ if (Verbosity) -+ puts("Building FreeBSD pkg binary distribution..."); -+ -+! if (run_command(NULL, "/usr/sbin/pkg_create -p / -s %s -c %s -d %s -f %s %s", - current, commentname, descrname, plistname, name)) - return (1); - - - diff --git a/editors/openoffice.org-vcltesttool/files/patch-i73217 b/editors/openoffice.org-vcltesttool/files/patch-i73217 deleted file mode 100644 index 3dc7b4e28912..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i73217 +++ /dev/null @@ -1,97 +0,0 @@ -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.org-vcltesttool/files/patch-i75708 b/editors/openoffice.org-vcltesttool/files/patch-i75708 deleted file mode 100644 index 1fc8565c4fd4..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i75708 +++ /dev/null @@ -1,16 +0,0 @@ -Index: basctl/source/basicide/scriptdocument.cxx -=================================================================== -RCS file: /cvs/script/basctl/source/basicide/scriptdocument.cxx,v -retrieving revision 1.2 -diff -u -r1.2 scriptdocument.cxx ---- basctl/source/basicide/scriptdocument.cxx 15 Mar 2007 15:59:30 -0000 1.2 -+++ basctl/source/basicide/scriptdocument.cxx 25 Mar 2007 21:09:03 -0000 -@@ -921,7 +921,7 @@ - //-------------------------------------------------------------------- - sal_Int32 ScriptDocument::hashCode() const - { -- return reinterpret_cast< sal_Int32 >( m_pImpl->getObjectShell() ); -+ return reinterpret_cast< sal_IntPtr >( m_pImpl->getObjectShell() ); - } - - //-------------------------------------------------------------------- diff --git a/editors/openoffice.org-vcltesttool/files/patch-i76115 b/editors/openoffice.org-vcltesttool/files/patch-i76115 deleted file mode 100644 index f090b4337b09..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i76115 +++ /dev/null @@ -1,102 +0,0 @@ -Sync amd64 bridge with sixtyfour10 CWS. - ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx.orig Sat Sep 16 11:47:13 2006 -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx Tue Apr 3 20:36:13 2007 -@@ -49,6 +49,7 @@ - #include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" - #include "bridges/cpp_uno/shared/vtables.hxx" - -+#include "abi.hxx" - #include "share.hxx" - - using namespace ::rtl; -@@ -122,7 +123,7 @@ - // value verbatim, as a double without conversion. - pFPR[nr_fpr++] = *reinterpret_cast<double *>( pSV++ ); - else -- *pDS++ = *reinterpret_cast<double *>( pSV++ ); -+ *pDS++ = *pSV++; - break; - - case 'H': // 64-bit Word -@@ -165,7 +166,7 @@ - - //================================================================================================== - static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, -- void * pRegisterReturn, typelib_TypeClass eReturnType, -+ void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn, - char * pPT, sal_uInt64 * pStackLongs, sal_uInt32 nStackLongs) - { - sal_uInt32 nr_gpr, nr_fpr, nr_stack; -@@ -175,8 +176,6 @@ - if (nr_stack) - nr_stack = (nr_stack + 1) & ~1; - -- bool bReturnsSimpleType = bridges::cpp_uno::shared::isSimpleType( eReturnType ); -- - #if OSL_DEBUG_LEVEL > 1 - // Let's figure out what is really going on here - fprintf(stderr,"callVirtualMethod() parameters string is %s\n", pPT); -@@ -244,7 +243,7 @@ - #undef ARG_GPR - } - -- if ( bReturnsSimpleType ) -+ if ( bSimpleReturn ) - a0 = (sal_uInt64) pThis; - else - a1 = (sal_uInt64) pThis; -@@ -275,7 +274,7 @@ - // Perform the call - ReturnValue aRet = ( ( FunctionCall ) pMethod )( a0, a1, a2, a3, a4, a5 ); - -- switch (eReturnType) -+ switch (pReturnTypeDescr->eTypeClass) - { - case typelib_TypeClass_HYPER: - case typelib_TypeClass_UNSIGNED_HYPER: -@@ -301,6 +300,15 @@ - case typelib_TypeClass_DOUBLE: - *reinterpret_cast<double *>( pRegisterReturn ) = *reinterpret_cast<double*>( &aRet.f.xmm0 ); - break; -+ default: { -+ sal_Int32 const nRetSize = pReturnTypeDescr->nSize; -+ if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0) { -+ if (nRetSize > 8) -+ static_cast<sal_uInt64 *>(pRegisterReturn)[1] = aRet.i.rdx; -+ static_cast<sal_uInt64 *>(pRegisterReturn)[0] = aRet.i.rax; -+ } -+ break; -+ } - } - } - -@@ -327,13 +335,15 @@ - OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" ); - - void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion -- -+ -+ bool bSimpleReturn = true; - if (pReturnTypeDescr) - { -- if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr )) -- { -+ if ( x86_64::return_in_hidden_param( pReturnTypeRef ) ) -+ bSimpleReturn = false; -+ -+ if (bSimpleReturn) - pCppReturn = pUnoReturn; // direct way for simple types -- } - else - { - // complex return via ptr -@@ -458,7 +468,7 @@ - OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 7), "UNALIGNED STACK !!! (Please DO panic)" ); - callVirtualMethod( - pAdjustedThisPtr, aVtableSlot.index, -- pCppReturn, pReturnTypeDescr->eTypeClass, pParamType, -+ pCppReturn, pReturnTypeDescr, bSimpleReturn, pParamType, - (sal_uInt64 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_uInt64) ); - // NO exception occured... - *ppUnoExc = 0; diff --git a/editors/openoffice.org-vcltesttool/files/patch-i76141 b/editors/openoffice.org-vcltesttool/files/patch-i76141 deleted file mode 100644 index 1698b377a94f..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i76141 +++ /dev/null @@ -1,1318 +0,0 @@ ---- berkeleydb/db-4.2.52.patch Thu Apr 5 14:04:49 2007 -+++ berkeleydb/db-4.2.52.patch Thu Apr 5 14:26:49 2007 -@@ -276,6 +276,23 @@ - test "$with_gnu_ld" != no && break - ;; - *************** -+*** 9328,9334 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 9328,9334 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 10398,10404 **** - # yet detect zsh echo's removal of \ escapes. Also zsh mangles - # `"' quotes if we put them in here... so don't! -@@ -341,6 +358,57 @@ - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+*************** -+*** 12872,12878 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 12872,12878 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 15849,15855 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 15849,15855 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 18114,18120 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 18114,18120 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) - *************** - *** 28556,28561 **** - --- 28556,28606 ---- - ---- curl/curl-7.12.2.patch 25 Sep 2006 13:33:49 -0000 1.9 -+++ curl/curl-7.12.2.patch 5 Apr 2007 00:01:20 -0000 -@@ -1,3 +1,73 @@ -+*** misc/curl-7.12.2/configure Sun Oct 17 18:22:10 2004 -+--- misc/build/curl-7.12.2/configure Wed Apr 4 19:56:30 2007 -+*************** -+*** 9456,9462 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 9456,9462 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 13154,13160 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 13154,13160 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 16303,16309 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 16303,16309 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 18650,18656 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 18650,18656 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) - *** misc/curl-7.12.2/ltmain.sh Mon Aug 9 13:12:17 2004 - --- misc/build/curl-7.12.2/ltmain.sh Thu Jun 22 13:07:14 2006 - *************** ---- freetype/freetype-2.2.1.patch 3 Aug 2006 14:58:26 -0000 1.2 -+++ freetype/freetype-2.2.1.patch 5 Apr 2007 00:07:40 -0000 -@@ -1,5 +1,75 @@ --*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h Mon Jan 30 17:49:42 2006 ----- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h Thu Jul 13 16:04:27 2006 -+*** misc/freetype-2.2.1/builds/unix/configure Fri May 12 11:12:27 2006 -+--- misc/build/freetype-2.2.1/builds/unix/configure Wed Apr 4 20:05:15 2007 -+*************** -+*** 10644,10650 **** -+ freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 10644,10650 ---- -+ freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 14420,14426 **** -+ freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 14420,14426 ---- -+ freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 17684,17690 **** -+ freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 17684,17690 ---- -+ freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 20153,20159 **** -+ freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 20153,20159 ---- -+ freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*** 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 - *************** - *** 17,24 **** - --- 17,26 ---- ---- libwpd/libwpd-0.8.8.diff 19 Jan 2007 15:57:46 -0000 1.1.4.1 -+++ libwpd/libwpd-0.8.8.diff 5 Apr 2007 00:13:31 -0000 -@@ -1,3 +1,73 @@ -+*** misc/libwpd-0.8.8/configure Tue Jan 9 05:35:10 2007 -+--- misc/build/libwpd-0.8.8/configure Wed Apr 4 20:10:49 2007 -+*************** -+*** 8089,8095 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 8089,8095 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 11808,11814 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 11808,11814 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 14978,14984 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 14978,14984 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 17346,17352 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 17346,17352 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) - *** misc/libwpd-0.8.8/src/lib/WP1Part.cpp 2007-01-03 14:07:55.000000000 +0100 - --- misc/build/libwpd-0.8.8/src/lib/WP1Part.cpp 2007-01-13 00:18:52.000000000 +0100 - *************** - ---- moz/mozilla-source-1.7.5.patch.orig Fri Apr 27 15:23:29 2007 -+++ moz/mozilla-source-1.7.5.patch Fri Apr 27 15:32:07 2007 -@@ -266,6 +266,23 @@ - *** misc/mozilla/configure Tue Oct 12 00:13:29 2004 - --- misc/build/mozilla/configure Thu Mar 29 14:27:08 2007 - *************** -+*** 5228,5234 **** -+ ;; -+ -+ *-freebsd*) -+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then -+ DLL_SUFFIX=".so.1.0" -+ DSO_LDOPTS="-shared" -+ fi -+--- 5228,5234 ---- -+ ;; -+ -+ *-freebsd*) -+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then -+ DLL_SUFFIX=".so.1.0" -+ DSO_LDOPTS="-shared" -+ fi -+*************** - *** 5895,5901 **** - MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@' - MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' -@@ -311,6 +328,23 @@ - *** misc/mozilla/configure.in Tue Oct 12 00:13:29 2004 - --- misc/build/mozilla/configure.in Thu Mar 29 14:27:08 2007 - *************** -+*** 1006,1012 **** -+ ;; -+ -+ *-freebsd*) -+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then -+ DLL_SUFFIX=".so.1.0" -+ DSO_LDOPTS="-shared" -+ fi -+--- 1006,1012 ---- -+ ;; -+ -+ *-freebsd*) -+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then -+ DLL_SUFFIX=".so.1.0" -+ DSO_LDOPTS="-shared" -+ fi -+*************** - *** 1536,1542 **** - MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@' - MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' -@@ -449,6 +483,25 @@ - ASM_SUFFIX = @ASM_SUFFIX@ - PROG_SUFFIX = @PROG_SUFFIX@ - MOD_NAME = @NSPR_MODNAME@ -+*** misc/mozilla/directory/c-sdk/config/FreeBSD.mk Tue Mar 26 16:51:46 2002 -+--- misc/build/mozilla/directory/c-sdk/config/FreeBSD.mk Wed Apr 4 20:56:05 2007 -+*************** -+*** 66,72 **** -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+--- 66,72 ---- -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so - *** misc/mozilla/directory/c-sdk/config/cygwin-wrapper Wed Apr 2 19:22:39 2003 - --- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper Thu Mar 29 14:27:08 2007 - *************** -@@ -524,6 +577,23 @@ - MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' - PR_MD_ASFILES= - *************** -+*** 3465,3471 **** -+ EOF -+ -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+--- 3465,3471 ---- -+ EOF -+ -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+*************** - *** 3832,3837 **** - --- 3833,3839 ---- - MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' -@@ -604,6 +674,23 @@ - MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' - PR_MD_ASFILES= - *************** -+*** 896,902 **** -+ AC_DEFINE(FREEBSD) -+ AC_DEFINE(HAVE_BSD_FLOCK) -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+--- 896,902 ---- -+ AC_DEFINE(FREEBSD) -+ AC_DEFINE(HAVE_BSD_FLOCK) -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+*************** - *** 1144,1149 **** - --- 1145,1151 ---- - MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' -@@ -7562,6 +7649,44 @@ - - switch (name) { - case MAX_CONNECTIONS: -+*** misc/mozilla/nsprpub/configure Tue Sep 14 17:14:38 2004 -+--- misc/build/mozilla/nsprpub/configure Wed Apr 4 20:56:33 2007 -+*************** -+*** 3407,3413 **** -+ EOF -+ -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+--- 3407,3413 ---- -+ EOF -+ -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+*** misc/mozilla/nsprpub/configure.in Tue Sep 14 17:14:38 2004 -+--- misc/build/mozilla/nsprpub/configure.in Wed Apr 4 20:56:40 2007 -+*************** -+*** 922,928 **** -+ AC_DEFINE(HAVE_BSD_FLOCK) -+ AC_DEFINE(HAVE_SOCKLEN_T) -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+--- 922,928 ---- -+ AC_DEFINE(HAVE_BSD_FLOCK) -+ AC_DEFINE(HAVE_SOCKLEN_T) -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else - *** misc/mozilla/nsprpub/build/cygwin-wrapper Wed Apr 2 19:22:38 2003 - --- misc/build/mozilla/nsprpub/build/cygwin-wrapper Thu Mar 29 14:27:08 2007 - *************** -@@ -8090,6 +8215,25 @@ - + ifdef NS_USE_GCC - + NSPR31_LIB_PREFIX = lib - + endif -+*** misc/mozilla/security/coreconf/FreeBSD.mk Wed Mar 26 20:17:25 2003 -+--- misc/build/mozilla/security/coreconf/FreeBSD.mk Wed Apr 4 20:56:48 2007 -+*************** -+*** 63,69 **** -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+--- 63,69 ---- -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so - *** misc/mozilla/security/coreconf/command.mk Fri Feb 15 17:53:12 2002 - --- misc/build/mozilla/security/coreconf/command.mk Thu Mar 29 14:27:09 2007 - *************** ---- neon/neon.patch Tue Feb 6 09:08:59 2007 -+++ neon/neon.patch Thu Apr 5 14:36:14 2007 -@@ -1,5 +1,24 @@ --*** misc/neon-0.24.7/src/config.h Tue Jan 30 16:51:33 2007 ----- misc/build/neon-0.24.7/src/config.h Tue Jan 30 16:51:05 2007 -+*** misc/neon-0.24.7/configure Mon Jul 5 14:35:21 2004 -+--- misc/build/neon-0.24.7/configure Thu Apr 5 14:31:11 2007 -+*************** -+*** 6344,6350 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 6344,6350 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*** misc/neon-0.24.7/src/config.h Thu Apr 5 14:35:31 2007 -+--- misc/build/neon-0.24.7/src/config.h Thu Apr 5 14:30:40 2007 - *************** - *** 1 **** - ! dummy ---- sablot/Sablot-0.52.patch 19 Jun 2006 17:27:11 -0000 1.20 -+++ sablot/Sablot-0.52.patch 5 Apr 2007 00:24:32 -0000 -@@ -632,3 +632,22 @@ - }; - return cnt; - } -+*** misc/Sablot-0.52/tools/ltconfig Fri Apr 13 05:50:59 2001 -+--- misc/build/Sablot-0.52/tools/ltconfig Wed Apr 4 20:22:37 2007 -+*************** -+*** 1887,1893 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case "$version_type" in -+ freebsd-elf*) -+--- 1887,1893 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case "$version_type" in -+ freebsd-elf*) ---- sndfile/libsndfile-1.0.9.patch 3 Feb 2006 17:31:46 -0000 1.3 -+++ sndfile/libsndfile-1.0.9.patch 5 Apr 2007 00:31:26 -0000 -@@ -83,6 +83,23 @@ - shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' - *************** -+*** 7871,7877 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 7878,7884 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 9111,9120 **** - ;; - esac -@@ -143,6 +160,23 @@ - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - hardcode_direct_CXX=no - *************** -+*** 11560,11566 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 11567,11573 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 14069,14084 **** - lt_int_apple_cc_single_mod=yes - fi -@@ -178,6 +212,23 @@ - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - hardcode_direct_F77=no - *************** -+*** 14700,14706 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 14707,14713 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 16414,16429 **** - lt_int_apple_cc_single_mod=yes - fi -@@ -212,6 +263,23 @@ - fi - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - hardcode_direct_GCJ=no -+*************** -+*** 17045,17051 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 17052,17058 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) - *** misc/libsndfile-1.0.9/ltmain.sh Sat Mar 27 05:02:07 2004 - --- misc/build/libsndfile-1.0.9/ltmain.sh Mon Jan 23 20:13:31 2006 - *************** ---- vigra/vigra1.4.0.patch 12 Oct 2006 10:35:19 -0000 1.3 -+++ vigra/vigra1.4.0.patch 5 Apr 2007 00:40:20 -0000 -@@ -1,3 +1,42 @@ -+diff -uprN misc/vigra1.4.0/configure misc/build/vigra1.4.0/configure -+--- misc/vigra1.4.0/configure Tue Dec 20 23:53:28 2005 -++++ misc/build/vigra1.4.0/configure Wed Apr 4 20:35:48 2007 -+@@ -7259,7 +7259,7 @@ kfreebsd*-gnu) -+ ;; -+ -+ freebsd*) -+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -++ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+@@ -10961,7 +10961,7 @@ kfreebsd*-gnu) -+ ;; -+ -+ freebsd*) -+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -++ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+@@ -14110,7 +14110,7 @@ kfreebsd*-gnu) -+ ;; -+ -+ freebsd*) -+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -++ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+@@ -16461,7 +16461,7 @@ kfreebsd*-gnu) -+ ;; -+ -+ freebsd*) -+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -++ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) - diff -uprN misc/vigra1.4.0/include/vigra/array_vector.hxx misc/build/vigra1.4.0/include/vigra/array_vector.hxx - --- misc/vigra1.4.0/include/vigra/array_vector.hxx 2005-12-21 05:53:30.000000000 +0100 - +++ misc/build/vigra1.4.0/include/vigra/array_vector.hxx 2006-08-31 12:08:15.172679000 +0200 - - -Index: libxmlsec/xmlsec1-1.2.6.patch -=================================================================== -RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v -retrieving revision 1.19 -diff -u -r1.19 xmlsec1-1.2.6.patch ---- libxmlsec/xmlsec1-1.2.6.patch 27 Mar 2007 09:36:38 -0000 1.19 -+++ libxmlsec/xmlsec1-1.2.6.patch 28 Apr 2007 23:12:51 -0000 -@@ -1,5 +1,5 @@ --*** misc/xmlsec1-1.2.6/apps/Makefile.in Thu Aug 26 08:00:30 2004 ----- misc/build/xmlsec1-1.2.6/apps/Makefile.in Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/apps/Makefile.in Thu Aug 26 15:00:30 2004 -+--- misc/build/xmlsec1-1.2.6/apps/Makefile.in Sun Apr 29 08:10:05 2007 - *************** - *** 370,376 **** - $(CRYPTO_DEPS) \ -@@ -17,8 +17,8 @@ - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --*** misc/xmlsec1-1.2.6/configure Thu Aug 26 08:00:34 2004 ----- misc/build/xmlsec1-1.2.6/configure Tue Mar 27 11:26:19 2007 -+*** misc/xmlsec1-1.2.6/configure Thu Aug 26 15:00:34 2004 -+--- misc/build/xmlsec1-1.2.6/configure Sun Apr 29 08:10:06 2007 - *************** - *** 463,469 **** - # include <unistd.h> -@@ -158,6 +158,23 @@ - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - *************** -+*** 7778,7784 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 7779,7785 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 9046,9052 **** - ;; - esac -@@ -215,6 +232,23 @@ - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - *************** -+*** 11497,11503 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 11498,11504 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 13259,13269 **** - lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' - ;; -@@ -257,6 +291,23 @@ - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - *************** -+*** 14667,14673 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 14668,14674 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 15607,15617 **** - lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' - ;; -@@ -316,6 +367,23 @@ - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - *************** -+*** 17035,17041 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 17036,17042 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 24598,24604 **** - fi - -@@ -2379,8 +2447,8 @@ - s,@XMLSEC_NO_SHA1_TRUE@,$XMLSEC_NO_SHA1_TRUE,;t t - s,@XMLSEC_NO_SHA1_FALSE@,$XMLSEC_NO_SHA1_FALSE,;t t - s,@XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t --*** misc/xmlsec1-1.2.6/configure.in Thu Aug 26 04:49:24 2004 ----- misc/build/xmlsec1-1.2.6/configure.in Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/configure.in Thu Aug 26 11:49:24 2004 -+--- misc/build/xmlsec1-1.2.6/configure.in Sun Apr 29 08:10:06 2007 - *************** - *** 143,149 **** - dnl find libxml -@@ -2496,8 +2564,8 @@ - dnl do not add -L/usr/lib because compiler does it anyway - if test "z$dir" = "z/usr/lib" ; then - NSS_LIBS="$NSS_LIBS_LIST" --*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Tue Mar 27 11:34:32 2007 ----- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Sun Apr 29 08:10:41 2007 -+--- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/Makefile.in Sun Apr 29 08:10:06 2007 - *************** - *** 1 **** - ! dummy -@@ -2560,8 +2628,8 @@ - ! # Tell versions [3.59,3.63) of GNU make to not export all variables. - ! # Otherwise a system limit (for SysV at least) may be exceeded. - ! .NOEXPORT: --*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Tue Mar 27 11:34:32 2007 ----- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Sun Apr 29 08:10:41 2007 -+--- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h Sun Apr 29 08:10:06 2007 - *************** - *** 1 **** - ! dummy -@@ -2637,8 +2705,8 @@ - ! #endif /* __XMLSEC_MSCRYPTO_AKMNGR_H__ */ - ! - ! --*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Fri Sep 26 08:12:46 2003 ----- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Fri Sep 26 15:12:46 2003 -+--- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h Sun Apr 29 08:10:06 2007 - *************** - *** 77,82 **** - --- 77,97 ---- -@@ -2663,8 +2731,8 @@ - - #endif /* XMLSEC_NO_X509 */ - --*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Wed Jul 30 04:46:35 2003 ----- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Wed Jul 30 11:46:35 2003 -+--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am Sun Apr 29 08:10:06 2007 - *************** - *** 3,8 **** - --- 3,9 ---- -@@ -2686,8 +2754,8 @@ - $(NULL) - - install-exec-hook: --*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Thu Aug 26 08:00:31 2004 ----- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Thu Aug 26 15:00:31 2004 -+--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in Sun Apr 29 08:10:06 2007 - *************** - *** 273,278 **** - --- 273,279 ---- -@@ -2709,8 +2777,8 @@ - $(NULL) - - all: all-am --*** misc/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Tue Mar 27 11:34:32 2007 ----- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Sun Apr 29 08:10:41 2007 -+--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h Sun Apr 29 08:10:06 2007 - *************** - *** 1 **** - ! dummy -@@ -2771,8 +2839,8 @@ - ! #endif /* __XMLSEC_NSS_AKMNGR_H__ */ - ! - ! --*** misc/xmlsec1-1.2.6/include/xmlsec/nss/app.h Mon Jan 12 22:06:14 2004 ----- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/app.h Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/include/xmlsec/nss/app.h Tue Jan 13 06:06:14 2004 -+--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/app.h Sun Apr 29 08:10:06 2007 - *************** - *** 22,27 **** - --- 22,30 ---- -@@ -2796,8 +2864,8 @@ - XMLSEC_CRYPTO_EXPORT int xmlSecNssAppDefaultKeysMngrLoad (xmlSecKeysMngrPtr mngr, - const char* uri); - XMLSEC_CRYPTO_EXPORT int xmlSecNssAppDefaultKeysMngrSave (xmlSecKeysMngrPtr mngr, --*** misc/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Tue Mar 27 11:34:32 2007 ----- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Sun Apr 29 08:10:41 2007 -+--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h Sun Apr 29 08:10:06 2007 - *************** - *** 1 **** - ! dummy -@@ -2837,8 +2905,8 @@ - ! #endif /* __XMLSEC_NSS_CIPHERS_H__ */ - ! - ! --*** misc/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Mon Jan 12 22:06:14 2004 ----- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Tue Jan 13 06:06:14 2004 -+--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h Sun Apr 29 08:10:06 2007 - *************** - *** 264,269 **** - --- 264,278 ---- -@@ -2857,8 +2925,8 @@ - #endif /* XMLSEC_NO_RSA */ - - --*** misc/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Wed Jul 30 04:46:35 2003 ----- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Wed Jul 30 11:46:35 2003 -+--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h Sun Apr 29 08:10:06 2007 - *************** - *** 16,21 **** - --- 16,23 ---- -@@ -2881,8 +2949,8 @@ - XMLSEC_CRYPTO_EXPORT int xmlSecNssKeysStoreLoad (xmlSecKeyStorePtr store, - const char *uri, - xmlSecKeysMngrPtr keysMngr); --*** misc/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Tue Mar 27 11:34:32 2007 ----- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Sun Apr 29 08:10:41 2007 -+--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h Sun Apr 29 08:10:06 2007 - *************** - *** 1 **** - ! dummy -@@ -3069,8 +3137,8 @@ - ! - ! #endif /* __XMLSEC_NSS_TOKENS_H__ */ - ! --*** misc/xmlsec1-1.2.6/libxml2-config Tue Mar 27 11:34:32 2007 ----- misc/build/xmlsec1-1.2.6/libxml2-config Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/libxml2-config Sun Apr 29 08:10:41 2007 -+--- misc/build/xmlsec1-1.2.6/libxml2-config Sun Apr 29 08:10:06 2007 - *************** - *** 1 **** - ! dummy -@@ -3123,8 +3191,8 @@ - ! done - ! - ! exit 0 --*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 08:00:15 2004 ----- misc/build/xmlsec1-1.2.6/ltmain.sh Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 15:00:15 2004 -+--- misc/build/xmlsec1-1.2.6/ltmain.sh Sun Apr 29 08:10:06 2007 - *************** - *** 1661,1666 **** - --- 1661,1671 ---- -@@ -3199,8 +3267,8 @@ - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in --*** misc/xmlsec1-1.2.6/src/bn.c Mon Jun 21 20:33:27 2004 ----- misc/build/xmlsec1-1.2.6/src/bn.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/bn.c Tue Jun 22 03:33:27 2004 -+--- misc/build/xmlsec1-1.2.6/src/bn.c Sun Apr 29 08:10:06 2007 - *************** - *** 170,177 **** - */ -@@ -3766,8 +3834,8 @@ - } - - return(0); --*** misc/xmlsec1-1.2.6/src/dl.c Wed Oct 29 16:57:20 2003 ----- misc/build/xmlsec1-1.2.6/src/dl.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/dl.c Thu Oct 30 00:57:20 2003 -+--- misc/build/xmlsec1-1.2.6/src/dl.c Sun Apr 29 08:10:06 2007 - *************** - *** 329,334 **** - --- 329,338 ---- -@@ -3793,8 +3861,8 @@ - } - - --- 354,359 ---- --*** misc/xmlsec1-1.2.6/src/mscrypto/Makefile.in Tue Mar 27 11:34:32 2007 ----- misc/build/xmlsec1-1.2.6/src/mscrypto/Makefile.in Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/mscrypto/Makefile.in Sun Apr 29 08:10:41 2007 -+--- misc/build/xmlsec1-1.2.6/src/mscrypto/Makefile.in Sun Apr 29 08:10:06 2007 - *************** - *** 1 **** - ! dummy -@@ -3977,8 +4045,8 @@ - ! # Tell versions [3.59,3.63) of GNU make to not export all variables. - ! # Otherwise a system limit (for SysV at least) may be exceeded. - ! .NOEXPORT: --*** misc/xmlsec1-1.2.6/src/mscrypto/akmngr.c Tue Mar 27 11:34:32 2007 ----- misc/build/xmlsec1-1.2.6/src/mscrypto/akmngr.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/mscrypto/akmngr.c Sun Apr 29 08:10:41 2007 -+--- misc/build/xmlsec1-1.2.6/src/mscrypto/akmngr.c Sun Apr 29 08:10:06 2007 - *************** - *** 1 **** - ! dummy -@@ -4218,8 +4286,8 @@ - ! return( 0 ) ; - ! } - ! --*** misc/xmlsec1-1.2.6/src/mscrypto/certkeys.c Wed Mar 17 06:06:43 2004 ----- misc/build/xmlsec1-1.2.6/src/mscrypto/certkeys.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/mscrypto/certkeys.c Wed Mar 17 14:06:43 2004 -+--- misc/build/xmlsec1-1.2.6/src/mscrypto/certkeys.c Sun Apr 29 08:10:06 2007 - *************** - *** 41,46 **** - --- 41,47 ---- -@@ -4896,8 +4964,8 @@ - } - - static xmlSecKeyDataType --*** misc/xmlsec1-1.2.6/src/mscrypto/ciphers.c Fri Sep 26 08:12:51 2003 ----- misc/build/xmlsec1-1.2.6/src/mscrypto/ciphers.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/mscrypto/ciphers.c Fri Sep 26 15:12:51 2003 -+--- misc/build/xmlsec1-1.2.6/src/mscrypto/ciphers.c Sun Apr 29 08:10:06 2007 - *************** - *** 785,791 **** - * AES CBC cipher transforms -@@ -4966,8 +5034,8 @@ - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* size_t klassSize */ - xmlSecMSCryptoBlockCipherSize, /* size_t objSize */ --*** misc/xmlsec1-1.2.6/src/mscrypto/crypto.c Wed Nov 12 03:38:51 2003 ----- misc/build/xmlsec1-1.2.6/src/mscrypto/crypto.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/mscrypto/crypto.c Wed Nov 12 11:38:51 2003 -+--- misc/build/xmlsec1-1.2.6/src/mscrypto/crypto.c Sun Apr 29 08:10:06 2007 - *************** - *** 330,342 **** - BYTE* -@@ -4999,8 +5067,8 @@ - return(NULL); - } - --*** misc/xmlsec1-1.2.6/src/mscrypto/digests.c Tue Sep 30 04:09:51 2003 ----- misc/build/xmlsec1-1.2.6/src/mscrypto/digests.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/mscrypto/digests.c Tue Sep 30 11:09:51 2003 -+--- misc/build/xmlsec1-1.2.6/src/mscrypto/digests.c Sun Apr 29 08:10:06 2007 - *************** - *** 96,107 **** - -@@ -5031,8 +5099,8 @@ - } - - return(0); --*** misc/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Fri Sep 26 22:29:25 2003 ----- misc/build/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Sat Sep 27 05:29:25 2003 -+--- misc/build/xmlsec1-1.2.6/src/mscrypto/kt_rsa.c Sun Apr 29 08:10:06 2007 - *************** - *** 66,72 **** - static int xmlSecMSCryptoRsaPkcs1Process (xmlSecTransformPtr transform, -@@ -5050,8 +5118,8 @@ - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ - xmlSecMSCryptoRsaPkcs1Size, /* xmlSecSize objSize */ --*** misc/xmlsec1-1.2.6/src/mscrypto/signatures.c Fri Sep 26 22:29:25 2003 ----- misc/build/xmlsec1-1.2.6/src/mscrypto/signatures.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/mscrypto/signatures.c Sat Sep 27 05:29:25 2003 -+--- misc/build/xmlsec1-1.2.6/src/mscrypto/signatures.c Sun Apr 29 08:10:06 2007 - *************** - *** 483,489 **** - * RSA-SHA1 signature transform -@@ -5086,8 +5154,8 @@ - /* klass/object sizes */ - sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ - xmlSecMSCryptoSignatureSize, /* xmlSecSize objSize */ --*** misc/xmlsec1-1.2.6/src/mscrypto/symkeys.c Fri Sep 26 02:58:13 2003 ----- misc/build/xmlsec1-1.2.6/src/mscrypto/symkeys.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/mscrypto/symkeys.c Fri Sep 26 09:58:13 2003 -+--- misc/build/xmlsec1-1.2.6/src/mscrypto/symkeys.c Sun Apr 29 08:10:06 2007 - *************** - *** 72,78 **** - * <xmlsec:AESKeyValue> processing -@@ -5122,8 +5190,8 @@ - sizeof(xmlSecKeyDataKlass), - xmlSecKeyDataBinarySize, - --*** misc/xmlsec1-1.2.6/src/mscrypto/x509.c Fri Sep 26 02:58:13 2003 ----- misc/build/xmlsec1-1.2.6/src/mscrypto/x509.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/mscrypto/x509.c Fri Sep 26 09:58:13 2003 -+--- misc/build/xmlsec1-1.2.6/src/mscrypto/x509.c Sun Apr 29 08:10:06 2007 - *************** - *** 240,246 **** - -@@ -5369,8 +5437,8 @@ - sizeof(xmlSecKeyDataKlass), - sizeof(xmlSecKeyData), - --*** misc/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Sat Sep 27 05:12:22 2003 ----- misc/build/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Sat Sep 27 12:12:22 2003 -+--- misc/build/xmlsec1-1.2.6/src/mscrypto/x509vfy.c Sun Apr 29 08:10:06 2007 - *************** - *** 70,76 **** - static xmlSecByte * xmlSecMSCryptoX509NameRead (xmlSecByte *str, -@@ -6115,8 +6183,8 @@ - } - } - xmlFree(cName); --*** misc/xmlsec1-1.2.6/src/nss/Makefile.am Tue Sep 16 11:43:03 2003 ----- misc/build/xmlsec1-1.2.6/src/nss/Makefile.am Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/nss/Makefile.am Tue Sep 16 18:43:03 2003 -+--- misc/build/xmlsec1-1.2.6/src/nss/Makefile.am Sun Apr 29 08:10:06 2007 - *************** - *** 20,40 **** - $(NULL) -@@ -6163,8 +6231,8 @@ - $(NULL) - - libxmlsec1_nss_la_LIBADD = \ --*** misc/xmlsec1-1.2.6/src/nss/Makefile.in Thu Aug 26 08:00:32 2004 ----- misc/build/xmlsec1-1.2.6/src/nss/Makefile.in Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/nss/Makefile.in Thu Aug 26 15:00:32 2004 -+--- misc/build/xmlsec1-1.2.6/src/nss/Makefile.in Sun Apr 29 08:10:06 2007 - *************** - *** 54,62 **** - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -@@ -6288,8 +6356,8 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkikeys.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signatures.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symkeys.Plo@am__quote@ --*** misc/xmlsec1-1.2.6/src/nss/akmngr.c Tue Mar 27 11:34:32 2007 ----- misc/build/xmlsec1-1.2.6/src/nss/akmngr.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/nss/akmngr.c Sun Apr 29 08:10:41 2007 -+--- misc/build/xmlsec1-1.2.6/src/nss/akmngr.c Sun Apr 29 08:10:06 2007 - *************** - *** 1 **** - ! dummy -@@ -6678,8 +6746,8 @@ - ! return(0) ; - ! } - ! --*** misc/xmlsec1-1.2.6/src/nss/ciphers.c Fri Sep 26 02:58:15 2003 ----- misc/build/xmlsec1-1.2.6/src/nss/ciphers.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/nss/ciphers.c Fri Sep 26 09:58:15 2003 -+--- misc/build/xmlsec1-1.2.6/src/nss/ciphers.c Sun Apr 29 08:10:06 2007 - *************** - *** 1,838 **** - ! /** -@@ -8472,8 +8540,8 @@ - } - ! - --*** misc/xmlsec1-1.2.6/src/nss/crypto.c Wed Oct 29 16:57:25 2003 ----- misc/build/xmlsec1-1.2.6/src/nss/crypto.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/nss/crypto.c Thu Oct 30 00:57:25 2003 -+--- misc/build/xmlsec1-1.2.6/src/nss/crypto.c Sun Apr 29 08:10:06 2007 - *************** - *** 130,135 **** - --- 130,136 ---- -@@ -8526,8 +8594,8 @@ - - return(gXmlSecNssFunctions); - } --*** misc/xmlsec1-1.2.6/src/nss/digests.c Fri Sep 26 02:58:15 2003 ----- misc/build/xmlsec1-1.2.6/src/nss/digests.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/nss/digests.c Fri Sep 26 09:58:15 2003 -+--- misc/build/xmlsec1-1.2.6/src/nss/digests.c Sun Apr 29 08:10:06 2007 - *************** - *** 21,27 **** - #include <xmlsec/transforms.h> -@@ -8623,8 +8691,8 @@ - return(-1); - } - xmlSecAssert2(ctx->dgstSize > 0, -1); --*** misc/xmlsec1-1.2.6/src/nss/hmac.c Fri Sep 26 02:58:15 2003 ----- misc/build/xmlsec1-1.2.6/src/nss/hmac.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/nss/hmac.c Fri Sep 26 09:58:15 2003 -+--- misc/build/xmlsec1-1.2.6/src/nss/hmac.c Sun Apr 29 08:10:06 2007 - *************** - *** 23,30 **** - #include <xmlsec/transforms.h> -@@ -8758,8 +8826,8 @@ - return(-1); - } - xmlSecAssert2(dgstSize > 0, -1); --*** misc/xmlsec1-1.2.6/src/nss/keysstore.c Fri Sep 26 02:58:15 2003 ----- misc/build/xmlsec1-1.2.6/src/nss/keysstore.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/nss/keysstore.c Fri Sep 26 09:58:15 2003 -+--- misc/build/xmlsec1-1.2.6/src/nss/keysstore.c Sun Apr 29 08:10:06 2007 - *************** - *** 1,119 **** - /** -@@ -9826,8 +9894,8 @@ - ! return(0); - } - + --*** misc/xmlsec1-1.2.6/src/nss/keytrans.c Tue Mar 27 11:34:32 2007 ----- misc/build/xmlsec1-1.2.6/src/nss/keytrans.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/nss/keytrans.c Sun Apr 29 08:10:41 2007 -+--- misc/build/xmlsec1-1.2.6/src/nss/keytrans.c Sun Apr 29 08:10:06 2007 - *************** - *** 1 **** - ! dummy -@@ -10576,8 +10644,8 @@ - ! - ! #endif /* XMLSEC_NO_RSA */ - ! --*** misc/xmlsec1-1.2.6/src/nss/keywrapers.c Tue Mar 27 11:34:32 2007 ----- misc/build/xmlsec1-1.2.6/src/nss/keywrapers.c Tue Mar 27 11:21:29 2007 -+*** misc/xmlsec1-1.2.6/src/nss/keywrapers.c Sun Apr 29 08:10:41 2007 -+--- misc/build/xmlsec1-1.2.6/src/nss/keywrapers.c Sun Apr 29 08:10:07 2007 - *************** - *** 1 **** - ! dummy -@@ -11779,8 +11847,8 @@ - ! - ! #endif /* XMLSEC_NO_DES */ - ! --*** misc/xmlsec1-1.2.6/src/nss/pkikeys.c Wed Mar 17 06:06:45 2004 ----- misc/build/xmlsec1-1.2.6/src/nss/pkikeys.c Tue Mar 27 11:21:30 2007 -+*** misc/xmlsec1-1.2.6/src/nss/pkikeys.c Wed Mar 17 14:06:45 2004 -+--- misc/build/xmlsec1-1.2.6/src/nss/pkikeys.c Sun Apr 29 08:10:07 2007 - *************** - *** 5,10 **** - --- 5,11 ---- -@@ -12579,8 +12647,8 @@ - - return(8 * SECKEY_PublicKeyStrength(ctx->pubkey)); - } --*** misc/xmlsec1-1.2.6/src/nss/signatures.c Fri Sep 26 02:58:15 2003 ----- misc/build/xmlsec1-1.2.6/src/nss/signatures.c Tue Mar 27 11:21:30 2007 -+*** misc/xmlsec1-1.2.6/src/nss/signatures.c Fri Sep 26 09:58:15 2003 -+--- misc/build/xmlsec1-1.2.6/src/nss/signatures.c Sun Apr 29 08:10:07 2007 - *************** - *** 199,205 **** - xmlSecErrorsSafeString(xmlSecTransformGetName(transform)), -@@ -12717,8 +12785,8 @@ - return(-1); - } - --*** misc/xmlsec1-1.2.6/src/nss/symkeys.c Mon Jul 21 05:12:52 2003 ----- misc/build/xmlsec1-1.2.6/src/nss/symkeys.c Tue Mar 27 11:21:30 2007 -+*** misc/xmlsec1-1.2.6/src/nss/symkeys.c Mon Jul 21 12:12:52 2003 -+--- misc/build/xmlsec1-1.2.6/src/nss/symkeys.c Sun Apr 29 08:10:07 2007 - *************** - *** 15,192 **** - #include <stdio.h> -@@ -14049,8 +14117,8 @@ - * - * Sets the value of HMAC key data. - * --*** misc/xmlsec1-1.2.6/src/nss/tokens.c Tue Mar 27 11:34:32 2007 ----- misc/build/xmlsec1-1.2.6/src/nss/tokens.c Tue Mar 27 11:21:30 2007 -+*** misc/xmlsec1-1.2.6/src/nss/tokens.c Sun Apr 29 08:10:41 2007 -+--- misc/build/xmlsec1-1.2.6/src/nss/tokens.c Sun Apr 29 08:10:07 2007 - *************** - *** 1 **** - ! dummy -@@ -14599,8 +14667,8 @@ - ! return(0); - ! } - ! --*** misc/xmlsec1-1.2.6/src/nss/x509.c Fri Sep 26 05:53:09 2003 ----- misc/build/xmlsec1-1.2.6/src/nss/x509.c Tue Mar 27 11:21:30 2007 -+*** misc/xmlsec1-1.2.6/src/nss/x509.c Fri Sep 26 12:53:09 2003 -+--- misc/build/xmlsec1-1.2.6/src/nss/x509.c Sun Apr 29 08:10:07 2007 - *************** - *** 34,40 **** - #include <xmlsec/keys.h> -@@ -15708,8 +15776,8 @@ - static void - xmlSecNssX509CertDebugDump(CERTCertificate* cert, FILE* output) { - --- 1700,1705 ---- --*** misc/xmlsec1-1.2.6/src/nss/x509vfy.c Fri Sep 26 02:58:15 2003 ----- misc/build/xmlsec1-1.2.6/src/nss/x509vfy.c Tue Mar 27 11:21:30 2007 -+*** misc/xmlsec1-1.2.6/src/nss/x509vfy.c Fri Sep 26 09:58:15 2003 -+--- misc/build/xmlsec1-1.2.6/src/nss/x509vfy.c Sun Apr 29 08:10:07 2007 - *************** - *** 30,35 **** - --- 30,36 ---- -@@ -16851,8 +16919,8 @@ - - + #endif /* XMLSEC_NO_X509 */ - --*** misc/xmlsec1-1.2.6/win32/Makefile.msvc Wed Jun 9 16:35:12 2004 ----- misc/build/xmlsec1-1.2.6/win32/Makefile.msvc Tue Mar 27 11:21:30 2007 -+*** misc/xmlsec1-1.2.6/win32/Makefile.msvc Wed Jun 9 23:35:12 2004 -+--- misc/build/xmlsec1-1.2.6/win32/Makefile.msvc Sun Apr 29 08:10:07 2007 - *************** - *** 223,228 **** - --- 223,232 ---- diff --git a/editors/openoffice.org-vcltesttool/files/patch-i76320 b/editors/openoffice.org-vcltesttool/files/patch-i76320 deleted file mode 100644 index bd4639171dde..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i76320 +++ /dev/null @@ -1,17 +0,0 @@ -Index: sd/source/ui/inc/tools/ConfigurationAccess.hxx -=================================================================== -RCS file: /cvs/graphics/sd/source/ui/inc/tools/ConfigurationAccess.hxx,v -retrieving revision 1.2.8.1 -retrieving revision 1.2 -diff -u -r1.2.8.1 -r1.2 ---- sd/source/ui/inc/tools/ConfigurationAccess.hxx 12 Apr 2007 20:30:02 -0000 1.2.8.1 -+++ sd/source/ui/inc/tools/ConfigurationAccess.hxx 3 Apr 2007 16:14:52 -0000 1.2 -@@ -110,7 +110,7 @@ - @param rList - The list to be filled. - */ -- static void FillList( -+ static void ConfigurationAccess::FillList( - const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& rxContainer, - const ::rtl::OUString& rsArgument, - ::std::vector<rtl::OUString>& rList); diff --git a/editors/openoffice.org-vcltesttool/files/pkg-message.in b/editors/openoffice.org-vcltesttool/files/pkg-message.in deleted file mode 100644 index 03a7ca76151e..000000000000 --- a/editors/openoffice.org-vcltesttool/files/pkg-message.in +++ /dev/null @@ -1,42 +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, 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. diff --git a/editors/openoffice.org-vcltesttool/files/rtld-workaround-i66667 b/editors/openoffice.org-vcltesttool/files/rtld-workaround-i66667 deleted file mode 100644 index 26c0b1b4a88c..000000000000 --- a/editors/openoffice.org-vcltesttool/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.org-vcltesttool/pkg-descr b/editors/openoffice.org-vcltesttool/pkg-descr deleted file mode 100644 index bc2ede1b8c2b..000000000000 --- a/editors/openoffice.org-vcltesttool/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.org-vcltesttool/pkg-plist b/editors/openoffice.org-vcltesttool/pkg-plist deleted file mode 100644 index 28bd78453b52..000000000000 --- a/editors/openoffice.org-vcltesttool/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, do not delete. Package list is generated automatically. |