Date: Sat, 25 Oct 2014 03:27:41 +0000 From: bugzilla-noreply@freebsd.org To: office@FreeBSD.org Subject: [Bug 192557] [patch] upgrade editors/openoffice-devel to SVN revision 1626099 (4.2.0 AOO420 m1 (Build 9800)) and switch to internal saxon Message-ID: <bug-192557-25061-mVp9BTorZt@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-192557-25061@https.bugs.freebsd.org/bugzilla/> References: <bug-192557-25061@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D192557 Don Lewis <truckman@FreeBSD.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #147512|0 |1 is obsolete| | --- Comment #9 from Don Lewis <truckman@FreeBSD.org> --- Comment on attachment 147512 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D147512 patch to upgrade editors/openoffice-devel to SVN revision 1626099 (4.2.0 AOO420m1 (Build 9800)) with Makefile and patch cleanups and conversion to internal saxon >Index: Makefile >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >--- Makefile (revision 368665) >+++ Makefile (working copy) >@@ -2,24 +2,91 @@ > # $FreeBSD$ >=20 > PORTNAME=3D apache-openoffice >-PORTVERSION=3D 4.1.${SVNREVISION} >-PORTREVISION=3D 4 >+PORTVERSION=3D ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} > PORTEPOCH=3D 2 > CATEGORIES=3D editors java >-MASTER_SITES=3D ${MASTER_SITE_LOCAL} >-MASTER_SITE_SUBDIR=3D maho/openoffice >-DISTFILES+=3D ${OOOSRC} ${EXTSRC} unowinreg.dll >-EXTRACT_ONLY=3D ${OOOSRC} ${EXTSRC} >+#MASTER_SITES=3D http://ci.apache.org/projects/openoffice/milestones/${AO= OVERSION}-rc3-r${SVNREVISION}/source/ >+MASTER_SITES=3D ${MASTER_SITE_LOCAL:S@%SUBDIR%@truckman/openoffice@} \ >+ ${MASTER_SITE_LOCAL:S@%SUBDIR%@truckman/openoffice@}:extsrc >+.if defined(LANG_PKGNAME) >+PKGNAMEPREFIX=3D ${LANG_PKGNAME}- >+.endif >+.if defined(LANG_SUFFIX) >+PKGNAMESUFFIX=3D -${LANG_SUFFIX} >+.endif >+DISTFILES=3D ${OOOSRC} unowinreg.dll ${EXTSRC}:extsrc >+EXTRACT_ONLY=3D ${OOOSRC} >=20 >+MAINTAINER=3D office@FreeBSD.org > #de facto maintainer is maho@FreeBSD.org > #Frequent Patch submitters should optionally sign Apache iCLA >-MAINTAINER=3D office@FreeBSD.org >-COMMENT=3D Integrated wordprocessor/dbase/spreadsheet/drawing/chart/brows= er(developer version) >+COMMENT=3D Integrated wordprocessor/dbase/spreadsheet/drawing/chart/brows= er (developer version) >=20 > LICENSE=3D APACHE20 >=20 >-PKGNAMESUFFIX=3D -devel >+BUILD_DEPENDS=3D \ >+ p5-Archive-Zip>=3D0:${PORTSDIR}/archivers/p5-Archive-Zip \ >+ ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \ >+ zip:${PORTSDIR}/archivers/zip \ >+ ant:${PORTSDIR}/devel/apache-ant \ >+ dmake:${PORTSDIR}/devel/dmake \ >+ epm:${PORTSDIR}/devel/epm \ >+ ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ >+ imake:${PORTSDIR}/devel/imake \ >+ gpatch:${PORTSDIR}/devel/patch \ >+ ${LOCALBASE}/bin/vigra-config:${PORTSDIR}/graphics/vigra \ >+ ${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-h= ttpclient \ >+ ${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \ >+ ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \ >+ ${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \ >+ bash:${PORTSDIR}/shells/bash \ >+ ${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \ >+ p5-libwww>=3D0:${PORTSDIR}/www/p5-libwww >+LIB_DEPENDS=3D \ >+ libapr-1.so:${PORTSDIR}/devel/apr1 \ >+ libcurl.so:${PORTSDIR}/ftp/curl \ >+ libcairo.so:${PORTSDIR}/graphics/cairo \ >+ libjpeg.so:${PORTSDIR}/graphics/jpeg \ >+ libpng.so:${PORTSDIR}/graphics/png \ >+ libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \ >+ libCoinMP.so:${PORTSDIR}/math/coinmp \ >+ libfreetype.so:${PORTSDIR}/print/freetype2 \ >+ libnss3.so:${PORTSDIR}/security/nss \ >+ libexpat.so:${PORTSDIR}/textproc/expat2 \ >+ libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \ >+ libhyphen.so:${PORTSDIR}/textproc/hyphen \ >+ libtextcat.so:${PORTSDIR}/textproc/libtextcat \ >+ libmythes-1.2.so:${PORTSDIR}/textproc/mythes \ >+ librdf.so:${PORTSDIR}/textproc/redland \ >+ libserf-1.so:${PORTSDIR}/www/serf >+# libgraphite.so:${PORTSDIR}/graphics/silgraphite >+RUN_DEPENDS=3D \ >+ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-i= con-theme \ >+ ${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-h= ttpclient \ >+ ${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \ >+ ${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-font= s/croscorefonts-fonts-ttf >=20 >+AOOVERSION1=3D 4 >+AOOVERSION2=3D 2 >+AOOVERSION3=3D 0 >+AOOVERSION=3D ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3} >+AOOXXX=3D ${AOOVERSION1}${AOOVERSION2}${AOOVERSION3} >+SVNREVISION=3D 1626099 >+#OOOSRC=3D apache-openoffice-${AOOVERSION}-r${SVNREVISION}-src${EXTRACT= _SUFX} >+OOOSRC=3D apache-openoffice-r${SVNREVISION}-src${EXTRACT_SUFX} >+EXTSRC=3D ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20140918.tar.= gz >+ >+OOODIR=3D openoffice${AOOVERSION1} >+AOOSUFFIX=3D ${PORTVERSION} >+#AOOSUFFIX=3D ${AOOVERSION}-rc3 >+INSTALLATION_BASEDIR?=3D openoffice-${AOOSUFFIX} >+EXECBASE?=3D openoffice-${AOOSUFFIX} >+DIST_SUBDIR=3D openoffice >+ >+NO_LATEST_LINK=3D yes >+ >+ONLY_FOR_ARCHS=3D i386 amd64 >+ > USE_GNOME=3D gtk20 libxslt libidl glib20 > USE_XORG=3D x11 ice xaw xau xext xrender xrandr \ > xi xt xcursor xdamage xcomposite xfixes >@@ -26,8 +93,7 @@ > USE_GL=3D gl glu > USE_GSTREAMER=3D yes > USE_GCC=3D yes >-USE_PYTHON=3D yes >-USES+=3D bison perl5 gmake pkgconfig tar:bzip2 desktop-file-utils >+USES+=3D bison desktop-file-utils gmake perl5 pkgconfig python tar:bzip2 > USE_PERL5=3D build > WITHOUT_CPU_CFLAGS=3D true > MAKE_JOBS_SAFE=3D yes >@@ -37,13 +103,6 @@ > GNOMEVFS_DESC=3D Enable GNOME Virtual File System > CCACHE_DESC=3D Mimimize compile time of C/C++ programs >=20 >-.include "${.CURDIR}/files/Makefile.localized" >- >-USE_JAVA=3D yes >-JAVA_BUILD=3D jdk >-JAVA_VENDOR=3D openjdk >-JAVA_VERSION=3D 1.6+ >- > GCONF_USE=3D GNOME=3Dgconf2 > GCONF_CONFIGURE_OFF=3D--disable-gconf >=20 >@@ -50,10 +109,17 @@ > GNOMEVFS_USE=3D GNOME=3Dgnomevfs2 > GNOMEVFS_CONFIGURE_OFF=3D--disable-gnome-vfs >=20 >+.include <bsd.port.options.mk> >+ > .include <bsd.port.pre.mk> >=20 >-ONLY_FOR_ARCHS=3D i386 amd64 >+.include <${FILESDIR}/Makefile.localized> >=20 >+USE_JAVA=3D yes >+JAVA_BUILD=3D jdk >+JAVA_VENDOR=3D openjdk >+JAVA_VERSION=3D 1.6+ >+ > .if ${ARCH} =3D=3D amd64 > FREEBSD_ENV_SET=3D FreeBSDAMDEnv.Set.sh > .else >@@ -60,16 +126,10 @@ > FREEBSD_ENV_SET=3D FreeBSDX86Env.Set.sh > .endif >=20 >-OOOSRC=3D ApacheOpenOffice.r${SVNREVISION}${EXTRACT_SUFX} >-EXTSRC=3D ApacheOpenOffice.ext_sources.r${SVNREVISION}_2${EXTRACT_SUFX} >-OOODIR=3D openoffice4 >-SVNREVISION=3D 1560773 >-INSTALLATION_BASEDIR?=3D openoffice-r${SVNREVISION} >-EXECBASE?=3D openoffice-r${SVNREVISION} >-DIST_SUBDIR=3D openoffice >-SIMPLEOSVER=3D ${OSREL:C/\.//g} >+LOCALIZED_LANG?=3D en-US >=20 > PACKAGE_PREFIX=3D Apache_OpenOffice >+ > .if ${ARCH} =3D=3D amd64 > PACKAGE_MIDDLE=3D ${PORTVERSION}_${OPSYS}_x86-64 > .else >@@ -76,20 +136,6 @@ > PACKAGE_MIDDLE=3D ${PORTVERSION}_${OPSYS}_x86 > .endif >=20 >-LOCALIZED_LANG?=3D en-US >-.if defined(LANG_PKGNAME) >-PKGNAMEPREFIX=3D ${LANG_PKGNAME}- >-.endif >-.if defined(LANG_SUFFIX) >-PKGNAMESUFFIX=3D -${LANG_SUFFIX} >-.endif >- >-RUN_DEPENDS+=3D ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/= misc/hicolor-icon-theme \ >- ${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-h= ttpclient \ >- ${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \ >- ${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \ >- ${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-font= s/croscorefonts-fonts-ttf >- > .if ${PORT_OPTIONS:MCCACHE} || defined(WITH_CCACHE) > BUILD_DEPENDS+=3D ccache:${PORTSDIR}/devel/ccache > CCACHE_PREFIX=3D ccache >@@ -100,48 +146,12 @@ > OOOCXX=3D ${CXX} > .endif > CONFIGURE_ENV+=3D CC=3D"${OOOCC}" CXX=3D"${OOOCXX}" \ >- PATH=3D${WRKSRC}/solenv/bin:$$PATH \ >- CPPFLAGS=3D"-I${LOCALBASE}/include" LDFLAGS=3D"-L${LOCALBASE}/lib" >+ PATH=3D${WRKSRC}/solenv/bin:$$PATH >=20 >-LIB_DEPENDS=3D libcairo.so:${PORTSDIR}/graphics/cairo \ >- libexpat.so:${PORTSDIR}/textproc/expat2 \ >- libjpeg.so:${PORTSDIR}/graphics/jpeg \ >- libcurl.so:${PORTSDIR}/ftp/curl \ >- libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \ >- libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \ >- librdf.so:${PORTSDIR}/textproc/redland \ >- libtextcat.so:${PORTSDIR}/textproc/libtextcat \ >- libfreetype.so:${PORTSDIR}/print/freetype2 \ >- libapr-1.so:${PORTSDIR}/devel/apr1 \ >- libCoinMP.so:${PORTSDIR}/math/coinmp \ >- libserf-1.so:${PORTSDIR}/www/serf \ >- libfreetype.so:${PORTSDIR}/print/freetype2 \ >- libtextcat.so:${PORTSDIR}/textproc/libtextcat \ >- libnss3.so:${PORTSDIR}/security/nss >- >-BUILD_DEPENDS+=3D zip:${PORTSDIR}/archivers/zip \ >- ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \ >- gpatch:${PORTSDIR}/devel/patch \ >- p5-Archive-Zip>=3D0:${PORTSDIR}/archivers/p5-Archive-Zip \ >- bash:${PORTSDIR}/shells/bash \ >- imake:${PORTSDIR}/devel/imake \ >- ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ >- ant:${PORTSDIR}/devel/apache-ant \ >- ${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs \ >- ${LOCALBASE}/bin/vigra-config:${PORTSDIR}/graphics/vigra \ >- ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \ >- ${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-h= ttpclient \ >- ${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \ >- ${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \ >- ${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \ >- ${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \ >- epm:${PORTSDIR}/devel/epm \ >- dmake:${PORTSDIR}/devel/dmake \ >- p5-libwww>=3D0:${PORTSDIR}/www/p5-libwww >- > USE_AUTOTOOLS=3D autoconf > GNU_CONFIGURE=3D yes >-WRKSRC?=3D ${WRKDIR}/aoo/main >+WRKSUBDIR=3D ${WRKDIR}/aoo-${AOOVERSION} >+WRKSRC?=3D ${WRKSUBDIR}/main > BASH?=3D ${PREFIX}/bin/bash > SUB_FILES=3D pkg-message > SUB_LIST=3D EXECBASE=3D${EXECBASE} OOOTAG=3D${OOOTAG} OOODIR=3D${OOODIR} >@@ -150,62 +160,63 @@ > MAKE_JOBS_NUMBER=3D 4 > .endif >=20 >-CONFIGURE_ARGS+=3D --enable-verbose \ >- --enable-symbols=3Dsmall \ >- --enable-crashdump \ >- --with-vendor=3D"FreeBSD ports system" \ >- --with-epm=3D${LOCALBASE}/bin/epm \ >- --with-gnu-patch=3D${LOCALBASE}/bin/gpatch \ >- --with-gperf=3D${LOCALBASE}/bin/gperf \ >- --x-includes=3D${LOCALBASE}/include \ >- --x-libraries=3D${LOCALBASE}lib \ >- --with-system-libxml \ >- --with-system-libxslt \ >- --with-system-cairo --enable-cairo \ >- --with-system-zlib \ >- --with-system-python \ >- --with-system-expat \ >- --with-system-openssl \ >- --with-system-curl \ >- --with-system-poppler \ >- --with-system-redland \ >- --with-system-libtextcat \ >- --with-system-vigra \ >- --with-system-stdlibs \ >- --with-system-apr \ >- --with-system-apr-util \ >- --with-system-coinmp \ >- --with-system-apache-commons=3Dyes \ >+CONFIGURE_ARGS+=3D \ >+ --with-system-apache-commons=3Dyes \ > --with-commons-codec-jar=3D${JAVALIBDIR}/commons-codec.jar \ >- --with-commons-lang-jar=3D${JAVALIBDIR}/commons-lang.jar \ >+ --with-commons-lang-jar=3D${JAVALIBDIR}/commons-lang.jar \ > --with-commons-httpclient-jar=3D${JAVALIBDIR}/commons-httpclient.jar \ >- --with-commons-logging-jar=3D${JAVALIBDIR}/commons-logging.jar \ >- --with-system-lucene \ >- --with-lucene-core-jar=3D${JAVALIBDIR}/lucene-core-3.6.2.jar \ >- --with-lucene-analyzers-jar=3D${JAVALIBDIR}/lucene-analyzers-3.6.2.jar= \ >+ --with-commons-logging-jar=3D${JAVALIBDIR}/commons-logging.jar \ >+ --with-system-apr \ >+ --with-system-apr-util \ >+ --with-system-beanshell \ >+ --with-beanshell-jar=3D${JAVALIBDIR}/bsh.jar \ >+ --enable-category-b \ >+ --with-system-cairo --enable-cairo \ >+ --with-system-coinmp \ >+ --with-system-curl \ >+ --enable-crashdump \ >+ --enable-dbus \ >+ --with-epm=3D${LOCALBASE}/bin/epm \ >+ --with-system-expat \ >+ --disable-fetch-external \ >+ --without-fonts \ >+ --with-gnu-patch=3D${LOCALBASE}/bin/gpatch \ >+ --with-gperf=3D${LOCALBASE}/bin/gperf \ >+ --enable-gstreamer \ >+ --with-system-hunspell \ >+ --with-system-hyphen \ >+ --with-system-jpeg \ > --with-junit=3D${LOCALBASE}/share/java/classes/junit.jar \ >- --with-package-format=3D"archive" \ >- --enable-gstreamer \ >- --enable-wiki-publisher \ >- --enable-dbus \ >- --enable-opengl \ >- --enable-category-b \ >- --enable-lockdown \ >- --with-system-hunspell \ >- --with-system-saxon \ >- --with-saxon-jar=3D${JAVALIBDIR}/saxon9.jar \ >- --with-system-beanshell \ >- --with-beanshell-jar=3D${JAVALIBDIR}/bsh.jar \ >- --without-fonts \ >- --with-system-serf \ >- --with-system-nss \ >- --without-stlport >+ --with-system-libtextcat \ >+ --with-system-libxml \ >+ --with-system-libxslt \ >+ --enable-lockdown \ >+ --with-system-lucene \ >+ --with-lucene-core-jar=3D${JAVALIBDIR}/lucene-core-3.6.2.jar \ >+ --with-lucene-analyzers-jar=3D${JAVALIBDIR}/lucene-analyzers-3.6.2.jar= \ >+ --with-system-mythes \ >+ --with-system-nss \ >+ --enable-opengl \ >+ --with-system-openssl \ >+ --with-package-format=3D"archive" \ >+ --with-system-poppler \ >+ --with-system-python \ >+ --with-system-redland \ >+ --with-system-serf \ >+ --with-system-stdlibs \ >+ --enable-symbols=3Dsmall \ >+ --without-stlport \ >+ --with-vendor=3D"FreeBSD ports system" \ >+ --enable-verbose \ >+ --with-system-vigra \ >+ --enable-wiki-publisher \ >+ --x-includes=3D{LOCALBASE}/include \ >+ --x-libraries=3D${LOCALBASE}lib \ >+ --with-system-zlib >+# system-graphite causes breakage when compiled with clang and linked >+# with libc++ because aoo is compiled with gcc and linked with libstdc++. >+# --with-system-graphite >=20 >-# --with-system-jpeg >-# --enable-pdfimport >-# --without-stlport --disable-mozilla \ >-# --with-system-graphite \ >- > #OOOEXTENSIONS+=3D minimizer/presentation-minimizer.oxt > #OOOEXTENSIONS+=3D presenter/presenter-screen.oxt > #OOOEXTENSIONS+=3D pdfimport/pdfimport.oxt >@@ -219,108 +230,107 @@ > # really tweak, extremely useful when you build all localized language ve= rsions > # needed after when you build with ALL_LOCALIZED_LANGS. > .if defined(TWEAK_L10N) >- @${RM} -f ${WRKDIR}/.PLIST* >- @${RM} -f ${WRKDIR}/.install_done.* >- @${RM} -f ${WRKDIR}/.package_done.* >- @${RM} -f ${WRKDIR}/.extract_done.* >- @${RM} -f ${WRKDIR}/.patch_done.* >- @${RM} -f ${WRKDIR}/.configure_done.* >- @${RM} -f ${WRKDIR}/.build_done.* >- @${MKDIR} ${WRKDIR} >- @${TOUCH} ${EXTRACT_COOKIE} >- @${TOUCH} ${PATCH_COOKIE} >- @${TOUCH} ${CONFIGURE_COOKIE} >- @${TOUCH} ${BUILD_COOKIE} >+ ${RM} -f ${WRKDIR}/.PLIST* >+ ${RM} -f ${WRKDIR}/.install_done.* >+ ${RM} -f ${WRKDIR}/.package_done.* >+ ${RM} -f ${WRKDIR}/.extract_done.* >+ ${RM} -f ${WRKDIR}/.patch_done.* >+ ${RM} -f ${WRKDIR}/.configure_done.* >+ ${RM} -f ${WRKDIR}/.build_done.* >+ ${MKDIR} ${WRKDIR} >+ ${TOUCH} ${EXTRACT_COOKIE} >+ ${TOUCH} ${PATCH_COOKIE} >+ ${TOUCH} ${CONFIGURE_COOKIE} >+ ${TOUCH} ${BUILD_COOKIE} > .endif >=20 > post-extract: >- @${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowin= reg/ >-# @${MKDIR} ${WRKSRC}/../ext_sources >-# @${MV} ${WRKDIR}/aoo/ext_sources/* ${WRKSRC}/../ext_sources/ >-# @${RM} -rf ${WRKSRC}/l10n >- @${MKDIR} ${WRKSRC}/../ext_sources >- @${RM} -rf ${WRKSRC}/l10n >+ ${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC} >+ ${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinr= eg/ >+ ${RM} -rf ${WRKSRC}/l10n >=20 > post-patch: > .if defined (USE_GCC) >- @${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=3D${_GCC_RUNTIME}+" ${WRKSR= C}/solenv/inc/unxfbsd.mk >- @${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=3D${_GCC_RUNTIME}+" ${WRKSR= C}/solenv/gbuild/platform/freebsd.mk >+ ${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=3D${_GCC_RUNTIME}+" ${WRKSRC= }/solenv/inc/unxfbsd.mk >+ ${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=3D${_GCC_RUNTIME}+" ${WRKSRC= }/solenv/gbuild/platform/freebsd.mk > .else >- @${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk >- @${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/fr= eebsd.mk >+ ${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk >+ ${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/fre= ebsd.mk > .endif >=20 > pre-configure: >- @${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip >+ ${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip >=20 > do-build: >- @cd ${WRKDIR}/aoo ; ${PRINTF} "[repositories]\n" > source_config >- @cd ${WRKDIR}/aoo ; ${PRINTF} "main=3Dactive\n" >> source_config >- @cd ${WRKDIR}/aoo ; ${PRINTF} "extras=3Dactive\n" >> source_config >- @cd ${WRKSRC} ; ./bootstrap >- @cd ${WRKSRC} ; ${SETENV} "LANG=3DC" "LC_ALL=3DC" ${BASH} -c "source ${F= REEBSD_ENV_SET} ; cd instsetoo_native/util ; build.pl --all -P${MAKE_JOBS_= NUMBER} -- -P${MAKE_JOBS_NUMBER}" >+ cd ${WRKSUBDIR} ; ${PRINTF} "[repositories]\n" > source_config >+ cd ${WRKSUBDIR} ; ${PRINTF} "main=3Dactive\n" >> source_config >+ cd ${WRKSUBDIR} ; ${PRINTF} "extras=3Dactive\n" >> source_config >+ cd ${WRKSRC} ; ./bootstrap >+ cd ${WRKSRC} ; ${SETENV} "LANG=3DC" "LC_ALL=3DC" ${BASH} -c "source ${FR= EEBSD_ENV_SET} ; cd instsetoo_native/util ; build.pl --all -P${MAKE_JOBS_N= UMBER} -- -P${MAKE_JOBS_NUMBER}" >=20 > do-install: >- @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/in= stall/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES >- @${RM} -Rf ${WRKDIR}/tmp >- @${MKDIR} ${WRKDIR}/tmp >+ cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/ins= tall/${LOCALIZED_LANG}/ ; ${LS} *.tar.?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/A= pache_OpenOffice/archive/install/${LOCALIZED_LANG}/$$i ; \ > done >- @${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} >- @cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${STAGEDIR}${= PREFIX}/${INSTALLATION_BASEDIR} >- @${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGE= DIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc >- @${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=3D$$SYSUSERCON= FIG\/\.openoffice\.org-devel\/4/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASED= IR}/openoffice4/program/bootstraprc >- @${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ >- @cd ${WRKSRC}/solver/4?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENS= IONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ >+ ${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} >+ cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${STAGEDIR}${P= REFIX}/${INSTALLATION_BASEDIR} >+ ${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGED= IR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc >+ ${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=3D$$SYSUSERCONF= IG\/\.openoffice\.org-devel\/${AOOVERSION1}/' ${STAGEDIR}${PREFIX}/${INSTAL= LATION_BASEDIR}/${OOODIR}/program/bootstraprc >+ ${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ >+ cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOE= XTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ >=20 > post-install: >- @${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CH= MOD} 755 {} \; >+ ${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program -= type f \( -name '*.so*' -or -name '*.bin' \) -print0 | ${XARGS} -0 -n1 ${ST= RIP_CMD} >+ for prog in crashrep pagein uri-encode javaldx regmerge regview; do \ >+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/pro= gram/$${prog}; \ >+ done >+ ${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHM= OD} 755 {} \; > @${ECHO_MSG} "=3D=3D=3D> Add wrapper scripts"; >- @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ >- @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ >+ ${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ >+ ${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ > -e 's#%%SVNREVISION%%#${SVNREVISION}#g' \ > -e 's#%%OOODIR%%#${OOODIR}#g' \ > -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ > ${WRKDIR}/openoffice-wrapper >- @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ >+ ${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ > ${STAGEDIR}${PREFIX}/bin/${EXECBASE} >- @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sbase >- @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-scalc >- @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sdraw >- @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-setofficelang >- @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-simpress >- @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-smath >- @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-spadmin >- @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-swriter >- @${ECHO_CMD} "" > ${TMPPLIST} >- @${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST} >- @${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE" >> ${TMPPLIST} >- @${ECHO_CMD} "share/licenses/${PKGNAME}/APACHE20" >> ${TMPPLIST} >- @${ECHO_CMD} "@dirrm share/licenses/${PKGNAME}" >> ${TMPPLIST} >- @${ECHO_CMD} "@dirrm share/licenses" >> ${TMPPLIST} >- @cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -nam= e "${EXECBASE}*" >> ${TMPPLIST} >- @cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f= -or -type l \) >> ${TMPPLIST} >- @cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${S= ORT} -r | \ >+ ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sbase >+ ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-scalc >+ ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sdraw >+ ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-setofficelang >+ ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-simpress >+ ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-smath >+ ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-spadmin >+ ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-swriter >+ ${ECHO_CMD} "" > ${TMPPLIST} >+ ${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST} >+ ${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE" >> ${TMPPLIST} >+ ${ECHO_CMD} "share/licenses/${PKGNAME}/APACHE20" >> ${TMPPLIST} >+ cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name= "${EXECBASE}*" >> ${TMPPLIST} >+ cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f = -or -type l \) >> ${TMPPLIST} >+ cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SO= RT} -r | \ > ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST} >- @for app in base calc draw impress math writer; do \ >+ for app in base calc draw impress math writer; do \ > ${REINPLACE_CMD} -e "s/^Exec.*/Exec=3D${EXECBASE} -$${app} %U/" \ > -e "s/^Icon.*/Icon=3D${EXECBASE}-$${app}.png/" \ > ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app= }.desktop ; \ > done >- @${REINPLACE_CMD} -e "s/^Exec.*/Exec=3D${EXECBASE}-spadmin %U/" \ >+ ${REINPLACE_CMD} -e "s/^Exec.*/Exec=3D${EXECBASE}-spadmin %U/" \ > -e "s/^Icon.*/Icon=3D${EXECBASE}-printeradmin.png/" \ > ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printe= radmin.desktop >- @${REINPLACE_CMD} -e "s/^Exec.*/Exec=3D${EXECBASE} -quickstart -nologo -= nodefault/" \ >+ ${REINPLACE_CMD} -e "s/^Exec.*/Exec=3D${EXECBASE} -quickstart -nologo -n= odefault/" \ > ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/startc= enter.desktop >- @${RM} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/= *.desktop.bak >- @${RM} -f ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} >- @${MKDIR} ${STAGEDIR}${DESKTOPDIR} >- @${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \ >+ ${RM} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*= .desktop.bak >+ ${RM} -f ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} >+ ${MKDIR} ${STAGEDIR}${DESKTOPDIR} >+ ${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \ > ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} >- @${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST} >- @for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \ >+ ${ECHO_CMD} "share/applications/${EXECBASE}" >> ${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 \ > ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/apps/ ; \ >@@ -336,9 +346,10 @@ > ${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${iconfile}" >> ${= TMPPLIST} ; \ > done ; \ > done >- @${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/d= ev/null || ${TRUE}" >> ${TMPPLIST} >- @${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/i= cons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST} >- @${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share= /icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST} >+ ${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/de= v/null || ${TRUE}" >> ${TMPPLIST} >+ ${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/ic= ons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST} >+ ${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/= icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST} >=20 > .include <${FILESDIR}/Makefile.others> >+ > .include <bsd.port.post.mk> >Index: distinfo >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >--- distinfo (revision 368665) >+++ distinfo (working copy) >@@ -1,6 +1,6 @@ >-SHA256 (openoffice/ApacheOpenOffice.r1560773.tar.bz2) =3D 5a6247121703b10= c44161594c23f439d5488bf011750ed7e0632b3f033e67aea >-SIZE (openoffice/ApacheOpenOffice.r1560773.tar.bz2) =3D 245790501 >-SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1560773_2.tar.bz2) =3D a= e9ab2fc1eeead0700ce95b8af01fab4f4b45f3f008d43b214f7ddec7f8c8e41 >-SIZE (openoffice/ApacheOpenOffice.ext_sources.r1560773_2.tar.bz2) =3D 147= 382699 >+SHA256 (openoffice/apache-openoffice-r1626099-src.tar.bz2) =3D 2415e264f8= 0f94b8e5b3054c0c401655c374011a7958936af3108c275aa34fcf >+SIZE (openoffice/apache-openoffice-r1626099-src.tar.bz2) =3D 250285313 >+SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20140918.tar.gz) = =3D c7085dbf597a31ef332585ab57041b7ec8baf29c5f6029a60be7b7c63cfcb166 >+SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20140918.tar.gz) =3D = 97839277 > SHA256 (openoffice/unowinreg.dll) =3D f563e522922133db9340b0306711c2d8767= cc3481dd9e7d9b0d059906d12653c > SIZE (openoffice/unowinreg.dll) =3D 6144 >Index: files/patch-jpeg >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >--- files/patch-jpeg (revision 0) >+++ files/patch-jpeg (working copy) >@@ -0,0 +1,12 @@ >+--- svtools/Library_svt.mk.orig 2014-02-25 00:28:36.000000000 -0800 >++++ svtools/Library_svt.mk 2014-08-04 21:40:00.000000000 -0700 >+@@ -76,6 +76,9 @@ >+ $(eval $(call gb_Library_set_ldflags,svt,\ >+ $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \ >+ )) >++$(eval $(call gb_Library_set_ldflags,svt,\ >++ $$(shell echo $$(LDFLAGS) | sed 's/ -L[^ ]*\/jre\/lib\/[^ ]*//g') \ >++)) >+ ifeq ($(GUIBASE),os2) >+ # YD FIXME above is not working... needs ldflags hack... >+ $(eval $(call gb_Library_set_ldflags,svt,\ > >Property changes on: files/patch-jpeg >___________________________________________________________________ >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Index: files/patch-sal >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >--- files/patch-sal (revision 368665) >+++ files/patch-sal (working copy) >@@ -11,43 +11,3 @@ > /** Returns a reference to a character of this string. */ > sal_Char& operator[]( int n ) { return pData->buffer[n]; } > /** Returns a const reference to a character of this string. */ >-build -- version: 275224 >- >- >-=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >-Building module canvas >-=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >- >-Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/op= enoffice-devel/work/aoo/main/canvas/inc >- >- >-Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/op= enoffice-devel/work/aoo/main/canvas/source/factory >- >- >-Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/op= enoffice-devel/work/aoo/main/canvas/source/tools >- >- >-Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/op= enoffice-devel/work/aoo/main/canvas/source/null >- >- >-Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/op= enoffice-devel/work/aoo/main/canvas/source/vcl >- >- >-Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/op= enoffice-devel/work/aoo/main/canvas/source/cairo >- >-Compiling: canvas/source/cairo/cairo_textlayout.cxx >-g++46 -fmessage-length=3D0 -c -O2 -fno-strict-aliasing -DENABLE_LAYOUT= =3D0 -DENABLE_LAYOUT_EXPERIMENTAL=3D0 -I/usr/local/include/cairo -I/usr/l= ocal/include/glib-2.0 -I/usr/local/include/pixman-1 -I/usr/local/include/f= reetype2 -I/usr/local/include/libpng15 -D_THREAD_SAFE -I/usr/local/include = -I/usr/local/include/freetype2 -I. -I../../unxfbsdx.pro/inc/cairocanvas= -I../inc -I../../inc/pch -I../../inc -I../../unx/inc -I../../unxfbsdx.pro/= inc -I. -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/ope= noffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/stl -I/work/tinderb= ox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/= main/solver/410/unxfbsdx.pro/inc/external -I/work/tinderbox-ligeti8amd64/po= rtstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/un= xfbsdx.pro/inc -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/edit= ors/openoffice-devel/work/aoo/main/solenv/unxfbsdx/inc -I/work/tinderbox-li= geti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/= solenv/inc -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/= openoffice-devel/work/aoo/main/res -I/work/tinderbox-ligeti8amd64/portstree= s/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solenv/inc/Xp31 -I/u= sr/local/openjdk6/include -I/usr/local/openjdk6/include/freebsd -I/usr/loca= l/openjdk6/include/bsd -I/usr/local/openjdk6/include/linux -I/usr/local/ope= njdk6/include/native_threads/include -I/usr/local/include -I/work/tinderbo= x-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/m= ain/solver/410/unxfbsdx.pro/inc/offuh -I. -I../../res -I. -pipe -Wl,-rpath= =3D/usr/local/lib/gcc46 -fvisibility-inlines-hidden -g1 -Wall -Wextra -Wend= if-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fpic= -DFREEBSD -DUNX -DVCL -DGCC -DC341 -DX86_64 -DX86_64 -D_PTHREADS -D_REENT= RANT -DNEW_SOLAR -D_USE_NAMESPACE=3D1 -DSTLPORT_VERSION=3D450 -DHAVE_GCC_VI= SIBILITY_FEATURE -D__DMAKE -DUNIX -DCPPU_ENV=3Dgcc3 -DGXX_INCLUDE_PATH=3D/u= sr/local/lib/gcc46/include/c++ -DSUPD=3D410 -DPRODUCT -DNDEBUG -DOSL_DEBUG_= LEVEL=3D0 -DOPTIMIZE -DGUI -DSOLAR_JAVA -DVERBOSE -DSHAREDLIB -D_DLL_ -= fexceptions -fno-enforce-eh-specs -DEXCEPTIONS_ON -o ../../unxfbsdx.pro/sl= o/cairo_textlayout.o /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/= editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout= .cxx=20 >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-= devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx: In member f= unction 'void cairocanvas::TextLayout::useFont(cairo::Cairo*)': >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-= devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx:237:5: error= : 'rtl::OString::operator const sal_Char*() const' is private >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-= devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:315:157: error= : within this context >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-= devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx: In member f= unction 'bool cairocanvas::TextLayout::draw(cairo::Cairo*)': >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-= devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx:237:5: error= : 'rtl::OString::operator const sal_Char*() const' is private >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-= devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:336:40: error:= within this context >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-= devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx: In member fun= ction 'bool cairocanvas::TextLayout::draw(cairo::SurfaceSharedPtr&, OutputD= evice&, const Point&, const com::sun::star::rendering::ViewState&, const co= m::sun::star::rendering::RenderState&) const': >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-= devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:475:51: warnin= g: declaration of 'aIter' shadows a previous local [-Wshadow] >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-= devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:415:47: warnin= g: shadowed declaration is here [-Wshadow] >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-= devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:476:57: warnin= g: declaration of 'aEnd' shadows a previous local [-Wshadow] >-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-= devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:416:53: warnin= g: shadowed declaration is here [-Wshadow] >-dmake: Error code 1, while making '../../unxfbsdx.pro/slo/cairo_textlayo= ut.obj' >-ERROR: error 65280 occurred while making /work/tinderbox-ligeti8amd64/por= tstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/= cairo >- >Index: files/patch-sal-inline >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >--- files/patch-sal-inline (revision 368665) >+++ files/patch-sal-inline (working copy) >@@ -1,16 +0,0 @@ >-Index: sal/util/makefile.mk >-=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >---- sal/util/makefile.mk (revision 1509387) >-+++ sal/util/makefile.mk (working copy) >-@@ -45,6 +45,11 @@ >- CFLAGS+=3D $(LFS_CFLAGS) >- CXXFLAGS+=3D $(LFS_CFLAGS) >-=20 >-+# gcc can have some broken inlining optimizations >-+.IF "$(OS)"=3D=3D"FREEBSD" && "$(COM)" =3D=3D "GCC" >-+CFLAGS +=3D -fkeep-inline-functions >-+.ENDIF >-+ >- .IF "$(depend)" =3D=3D "" >-=20 >- # --- Files -------------------------------------------------------- >Index: files/patch-vcl_source_glyphs_graphite_adaptors.cxx >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >--- files/patch-vcl_source_glyphs_graphite_adaptors.cxx (revision 368665) >+++ files/patch-vcl_source_glyphs_graphite_adaptors.cxx (working copy) >@@ -1,11 +0,0 @@ >---- vcl/source/glyphs/graphite_adaptors.cxx.orig 2013-08-13 11:45:43.0000= 00000 +0000 >-+++ vcl/source/glyphs/graphite_adaptors.cxx 2013-12-31 16:39:41.000000000= +0000 >-@@ -45,7 +45,7 @@ >-=20 >- #include <salgdi.hxx> >-=20 >--#include <freetype/ftsynth.h> >-+#include <ftsynth.h> >-=20 >- // Module >- #include "gcach_ftyp.hxx" >Index: files/patch-webdav >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >--- files/patch-webdav (revision 368665) >+++ files/patch-webdav (working copy) >@@ -32,3 +32,102 @@ >=20=20 > typedef serf_connection_t SerfConnection; >=20=20 >+--- ucb/source/ucp/webdav/SerfCallbacks.hxx.orig 2014-02-25 00:24:42.0000= 00000 -0800 >++++ ucb/source/ucp/webdav/SerfCallbacks.hxx 2014-07-28 01:11:38.000000000= -0700 >+@@ -23,7 +23,7 @@ >+ #ifndef INCLUDED_CALLBACKS_HXX >+ #define INCLUDED_CALLBACKS_HXX >+=20 >+-#include <serf/serf.h> >++#include <serf.h> >+=20 >+ extern "C" apr_status_t Serf_ConnectSetup( apr_socket_t *skt, >+ serf_bucket_t **read_bkt, >+--- ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx.orig 2014-02-25 00:24:4= 3.000000000 -0800 >++++ ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx 2014-07-28 01:11:43.000= 000000 -0700 >+@@ -24,7 +24,7 @@ >+=20 >+ #include "SerfCopyReqProcImpl.hxx" >+=20 >+-#include <serf/serf.h> >++#include <serf.h> >+=20 >+ namespace http_dav_ucp >+ { >+--- ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx.orig 2014-02-25 00:24= :42.000000000 -0800 >++++ ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx 2014-07-28 01:11:47.0= 00000000 -0700 >+@@ -24,7 +24,7 @@ >+=20 >+ #include "SerfDeleteReqProcImpl.hxx" >+=20 >+-#include <serf/serf.h> >++#include <serf.h> >+=20 >+ namespace http_dav_ucp >+ { >+--- ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx.orig 2014-02-25 00:24:= 43.000000000 -0800 >++++ ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx 2014-07-28 01:11:51.00= 0000000 -0700 >+@@ -24,7 +24,7 @@ >+=20 >+ #include "SerfMkColReqProcImpl.hxx" >+=20 >+-#include <serf/serf.h> >++#include <serf.h> >+=20 >+ namespace http_dav_ucp >+ { >+--- ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx.orig 2014-02-25 00:24:4= 3.000000000 -0800 >++++ ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx 2014-07-28 01:11:57.000= 000000 -0700 >+@@ -24,7 +24,7 @@ >+=20 >+ #include "SerfMoveReqProcImpl.hxx" >+=20 >+-#include <serf/serf.h> >++#include <serf.h> >+=20 >+ namespace http_dav_ucp >+ { >+--- ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx.orig 2014-02-25 00:24:4= 3.000000000 -0800 >++++ ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx 2014-07-28 01:12:00.000= 000000 -0700 >+@@ -24,7 +24,7 @@ >+=20 >+ #include "SerfPostReqProcImpl.hxx" >+=20 >+-#include <serf/serf.h> >++#include <serf.h> >+=20 >+ using namespace com::sun::star; >+=20 >+--- ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx.orig 2014-02-25 00:24:43= .000000000 -0800 >++++ ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx 2014-07-28 01:12:05.0000= 00000 -0700 >+@@ -26,7 +26,7 @@ >+=20 >+ #include "SerfPutReqProcImpl.hxx" >+=20 >+-#include <serf/serf.h> >++#include <serf.h> >+=20 >+ namespace http_dav_ucp >+ { >+--- ucb/source/ucp/webdav/SerfRequestProcessor.hxx.orig 2014-02-25 00:24:= 43.000000000 -0800 >++++ ucb/source/ucp/webdav/SerfRequestProcessor.hxx 2014-07-28 01:12:10.00= 0000000 -0700 >+@@ -26,7 +26,7 @@ >+ #include <apr_errno.h> >+ #include <apr_pools.h> >+=20 >+-#include <serf/serf.h> >++#include <serf.h> >+=20 >+ #include "DAVTypes.hxx" >+ #include "DAVResource.hxx" >+--- ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx.orig 2014-02-25 00= :24:42.000000000 -0800 >++++ ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx 2014-07-28 01:12:1= 4.000000000 -0700 >+@@ -22,7 +22,7 @@ >+ #ifndef INCLUDED_SERFREQUESTPROCESSORIMPL_HXX >+ #define INCLUDED_SERFREQUESTPROCESSORIMPL_HXX >+=20 >+-#include <serf/serf.h> >++#include <serf.h> >+=20 >+ #include <sal/types.h> >+ #include "DAVRequestEnvironment.hxx" >Index: pkg-plist >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >--- pkg-plist (revision 368665) >+++ pkg-plist (working copy) >@@ -1 +0,0 @@ >-# Dummy file, do not delete. Package list is generated automatically. --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-192557-25061-mVp9BTorZt>