Index: Makefile =================================================================== --- Makefile (revision 365430) +++ Makefile (working copy) @@ -2,24 +2,91 @@ # $FreeBSD$ PORTNAME= apache-openoffice -PORTVERSION= 4.1.${SVNREVISION} -PORTREVISION= 3 +PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} PORTEPOCH= 2 CATEGORIES= editors java -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= maho/openoffice -DISTFILES+= ${OOOSRC} ${EXTSRC} unowinreg.dll -EXTRACT_ONLY= ${OOOSRC} ${EXTSRC} +MASTER_SITES= http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-rc3-r${SVNREVISION}/source/ \ + ${MASTER_SITE_LOCAL:S@%SUBDIR%@truckman/openoffice@}:extsrc +.if defined(LANG_PKGNAME) +PKGNAMEPREFIX= ${LANG_PKGNAME}- +.endif +.if defined(LANG_SUFFIX) +PKGNAMESUFFIX= -${LANG_SUFFIX} +.endif +DISTFILES= ${OOOSRC} unowinreg.dll ${EXTSRC}:extsrc +EXTRACT_ONLY= ${OOOSRC} +MAINTAINER= office@FreeBSD.org #de facto maintainer is maho@FreeBSD.org #Frequent Patch submitters should optionally sign Apache iCLA -MAINTAINER= office@FreeBSD.org -COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version) +COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser LICENSE= APACHE20 -PKGNAMESUFFIX= -devel +BUILD_DEPENDS= \ + p5-Archive-Zip>=0:${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-httpclient \ + ${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}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \ + ${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \ + p5-libwww>=0:${PORTSDIR}/www/p5-libwww +LIB_DEPENDS= \ + 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= \ + ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ + ${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \ + ${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \ + ${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \ + ${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf +AOOVERSION1= 4 +AOOVERSION2= 1 +AOOVERSION3= 1 +AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3} +AOOXXX= ${AOOVERSION1}${AOOVERSION2}${AOOVERSION3} +SVNREVISION= 1617669 +OOOSRC= apache-openoffice-${AOOVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX} +EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20140809.tar.gz + +OOODIR= openoffice${AOOVERSION1} +#AOOSUFFIX= ${PORTVERSION} +AOOSUFFIX= ${AOOVERSION}-rc3 +INSTALLATION_BASEDIR?= openoffice-${AOOSUFFIX} +EXECBASE?= openoffice-${AOOSUFFIX} +DIST_SUBDIR= openoffice + +NO_LATEST_LINK= yes + +ONLY_FOR_ARCHS= i386 amd64 + USE_GNOME= gtk20 libxslt libidl glib20 USE_XORG= x11 ice xaw xau xext xrender xrandr \ xi xt xcursor xdamage xcomposite xfixes @@ -26,8 +93,7 @@ USE_GL= gl glu USE_GSTREAMER= yes USE_GCC= yes -USE_PYTHON= yes -USES+= bison perl5 gmake pkgconfig tar:bzip2 desktop-file-utils +USES+= bison desktop-file-utils gmake perl5 pkgconfig python tar:bzip2 USE_PERL5= build WITHOUT_CPU_CFLAGS= true MAKE_JOBS_SAFE= yes @@ -37,13 +103,6 @@ GNOMEVFS_DESC= Enable GNOME Virtual File System CCACHE_DESC= Mimimize compile time of C/C++ programs -.include "${.CURDIR}/files/Makefile.localized" - -USE_JAVA= yes -JAVA_BUILD= jdk -JAVA_VENDOR= openjdk -JAVA_VERSION= 1.6+ - GCONF_USE= GNOME=gconf2 GCONF_CONFIGURE_OFF=--disable-gconf @@ -50,10 +109,17 @@ GNOMEVFS_USE= GNOME=gnomevfs2 GNOMEVFS_CONFIGURE_OFF=--disable-gnome-vfs +.include + .include -ONLY_FOR_ARCHS= i386 amd64 +.include <${FILESDIR}/Makefile.localized> +USE_JAVA= yes +JAVA_BUILD= jdk +JAVA_VENDOR= openjdk +JAVA_VERSION= 1.6+ + .if ${ARCH} == amd64 FREEBSD_ENV_SET= FreeBSDAMDEnv.Set.sh .else @@ -60,16 +126,10 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh .endif -OOOSRC= ApacheOpenOffice.r${SVNREVISION}${EXTRACT_SUFX} -EXTSRC= ApacheOpenOffice.ext_sources.r${SVNREVISION}_2${EXTRACT_SUFX} -OOODIR= openoffice4 -SVNREVISION= 1560773 -INSTALLATION_BASEDIR?= openoffice-r${SVNREVISION} -EXECBASE?= openoffice-r${SVNREVISION} -DIST_SUBDIR= openoffice -SIMPLEOSVER= ${OSREL:C/\.//g} +LOCALIZED_LANG?= en-US PACKAGE_PREFIX= Apache_OpenOffice + .if ${ARCH} == amd64 PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_x86-64 .else @@ -76,20 +136,6 @@ PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_x86 .endif -LOCALIZED_LANG?= en-US -.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 \ - ${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \ - ${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \ - ${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \ - ${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf - .if ${PORT_OPTIONS:MCCACHE} || defined(WITH_CCACHE) BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache CCACHE_PREFIX= ccache @@ -100,48 +146,12 @@ OOOCXX= ${CXX} .endif CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \ - PATH=${WRKSRC}/solenv/bin:$$PATH \ - CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" + PATH=${WRKSRC}/solenv/bin:$$PATH -LIB_DEPENDS= 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+= zip:${PORTSDIR}/archivers/zip \ - ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \ - gpatch:${PORTSDIR}/devel/patch \ - p5-Archive-Zip>=0:${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-httpclient \ - ${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>=0:${PORTSDIR}/www/p5-libwww - USE_AUTOTOOLS= autoconf GNU_CONFIGURE= yes -WRKSRC?= ${WRKDIR}/aoo/main +WRKSUBDIR= ${WRKDIR}/aoo-${AOOVERSION} +WRKSRC?= ${WRKSUBDIR}/main BASH?= ${PREFIX}/bin/bash SUB_FILES= pkg-message SUB_LIST= EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR} @@ -150,62 +160,63 @@ MAKE_JOBS_NUMBER= 4 .endif -CONFIGURE_ARGS+= --enable-verbose \ - --enable-symbols=small \ - --enable-crashdump \ - --with-vendor="FreeBSD ports system" \ - --with-epm=${LOCALBASE}/bin/epm \ - --with-gnu-patch=${LOCALBASE}/bin/gpatch \ - --with-gperf=${LOCALBASE}/bin/gperf \ - --x-includes=${LOCALBASE}/include \ - --x-libraries=${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=yes \ +CONFIGURE_ARGS+= \ + --with-system-apache-commons=yes \ --with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \ - --with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar \ + --with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar \ --with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \ - --with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar \ - --with-system-lucene \ - --with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \ - --with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \ + --with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar \ + --with-system-apr \ + --with-system-apr-util \ + --with-system-beanshell \ + --with-beanshell-jar=${JAVALIBDIR}/bsh.jar \ + --enable-category-b \ + --with-system-cairo --enable-cairo \ + --with-system-coinmp \ + --with-system-curl \ + --enable-crashdump \ + --enable-dbus \ + --with-epm=${LOCALBASE}/bin/epm \ + --with-system-expat \ + --disable-fetch-external \ + --without-fonts \ + --with-gnu-patch=${LOCALBASE}/bin/gpatch \ + --with-gperf=${LOCALBASE}/bin/gperf \ + --enable-gstreamer \ + --with-system-hunspell \ + --with-system-hyphen \ + --with-system-jpeg \ --with-junit=${LOCALBASE}/share/java/classes/junit.jar \ - --with-package-format="archive" \ - --enable-gstreamer \ - --enable-wiki-publisher \ - --enable-dbus \ - --enable-opengl \ - --enable-category-b \ - --enable-lockdown \ - --with-system-hunspell \ - --with-system-saxon \ - --with-saxon-jar=${JAVALIBDIR}/saxon9.jar \ - --with-system-beanshell \ - --with-beanshell-jar=${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=${JAVALIBDIR}/lucene-core-3.6.2.jar \ + --with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \ + --with-system-mythes \ + --with-system-nss \ + --enable-opengl \ + --with-system-openssl \ + --with-package-format="archive" \ + --with-system-poppler \ + --with-system-python \ + --with-system-redland \ + --with-system-saxon \ + --with-saxon-jar=${JAVALIBDIR}/saxon9.jar \ + --with-system-serf \ + --with-system-stdlibs \ + --enable-symbols=small \ + --without-stlport \ + --with-vendor="FreeBSD ports system" \ + --enable-verbose \ + --with-system-vigra \ + --enable-wiki-publisher \ + --x-includes={LOCALBASE}/include \ + --x-libraries=${LOCALBASE}lib \ + --with-system-zlib +# --with-system-graphite -# --with-system-jpeg -# --enable-pdfimport -# --without-stlport --disable-mozilla \ -# --with-system-graphite \ - #OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt #OOOEXTENSIONS+= presenter/presenter-screen.oxt #OOOEXTENSIONS+= pdfimport/pdfimport.oxt @@ -234,11 +245,8 @@ .endif post-extract: + @${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC} @${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/ -# @${MKDIR} ${WRKSRC}/../ext_sources -# @${MV} ${WRKDIR}/aoo/ext_sources/* ${WRKSRC}/../ext_sources/ -# @${RM} -rf ${WRKSRC}/l10n - @${MKDIR} ${WRKSRC}/../ext_sources @${RM} -rf ${WRKSRC}/l10n post-patch: @@ -254,9 +262,9 @@ @${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip do-build: - @cd ${WRKDIR}/aoo ; ${PRINTF} "[repositories]\n" > source_config - @cd ${WRKDIR}/aoo ; ${PRINTF} "main=active\n" >> source_config - @cd ${WRKDIR}/aoo ; ${PRINTF} "extras=active\n" >> source_config + @cd ${WRKSUBDIR} ; ${PRINTF} "[repositories]\n" > source_config + @cd ${WRKSUBDIR} ; ${PRINTF} "main=active\n" >> source_config + @cd ${WRKSUBDIR} ; ${PRINTF} "extras=active\n" >> source_config @cd ${WRKSRC} ; ./bootstrap @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}" @@ -271,11 +279,15 @@ @${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} @cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} @${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc - @${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/4/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program/bootstraprc + @${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/${AOOVERSION1}/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc @${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ - @cd ${WRKSRC}/solver/4?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ + @cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ post-install: + @${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program -type f \( -name '*.so*' -or -name '*.bin' \) -print0 | ${XARGS} -0 -n1 ${STRIP_CMD} + @for prog in crashrep pagein uri-encode javaldx regmerge regview; do \ + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/$${prog}; \ + done @${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \; @${ECHO_MSG} "===> Add wrapper scripts"; @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ @@ -298,8 +310,6 @@ @${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 \) -name "${EXECBASE}*" >> ${TMPPLIST} @cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST} @cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \ @@ -341,4 +351,5 @@ @${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST} .include <${FILESDIR}/Makefile.others> + .include Index: distinfo =================================================================== --- distinfo (revision 365430) +++ distinfo (working copy) @@ -1,6 +1,6 @@ -SHA256 (openoffice/ApacheOpenOffice.r1560773.tar.bz2) = 5a6247121703b10c44161594c23f439d5488bf011750ed7e0632b3f033e67aea -SIZE (openoffice/ApacheOpenOffice.r1560773.tar.bz2) = 245790501 -SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1560773_2.tar.bz2) = ae9ab2fc1eeead0700ce95b8af01fab4f4b45f3f008d43b214f7ddec7f8c8e41 -SIZE (openoffice/ApacheOpenOffice.ext_sources.r1560773_2.tar.bz2) = 147382699 +SHA256 (openoffice/apache-openoffice-4.1.1-r1617669-src.tar.bz2) = bb89a6d2324ddfe4c475e5484fde0dea316078f6b8ff4d8a4ebc801d17f3ff9f +SIZE (openoffice/apache-openoffice-4.1.1-r1617669-src.tar.bz2) = 219054455 +SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20140809.tar.gz) = d0b4925cbf8a32b9dfbf8ca708a485e150c85fe131cc60cff9eb8f0d0b5a710d +SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20140809.tar.gz) = 94099621 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice/unowinreg.dll) = 6144 Index: files/patch-jpeg =================================================================== --- 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-vcl_source_glyphs_graphite_adaptors.cxx =================================================================== --- files/patch-vcl_source_glyphs_graphite_adaptors.cxx (revision 365430) +++ 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.000000000 +0000 -+++ vcl/source/glyphs/graphite_adaptors.cxx 2013-12-31 16:39:41.000000000 +0000 -@@ -45,7 +45,7 @@ - - #include - --#include -+#include - - // Module - #include "gcach_ftyp.hxx" Index: files/patch-webdav =================================================================== --- files/patch-webdav (revision 365430) +++ files/patch-webdav (working copy) @@ -32,3 +32,102 @@ typedef serf_connection_t SerfConnection; +--- ucb/source/ucp/webdav/SerfCallbacks.hxx.orig 2014-02-25 00:24:42.000000000 -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 + +-#include ++#include + + 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:43.000000000 -0800 ++++ ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx 2014-07-28 01:11:43.000000000 -0700 +@@ -24,7 +24,7 @@ + + #include "SerfCopyReqProcImpl.hxx" + +-#include ++#include + + 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.000000000 -0700 +@@ -24,7 +24,7 @@ + + #include "SerfDeleteReqProcImpl.hxx" + +-#include ++#include + + 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.000000000 -0700 +@@ -24,7 +24,7 @@ + + #include "SerfMkColReqProcImpl.hxx" + +-#include ++#include + + namespace http_dav_ucp + { +--- ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx.orig 2014-02-25 00:24:43.000000000 -0800 ++++ ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx 2014-07-28 01:11:57.000000000 -0700 +@@ -24,7 +24,7 @@ + + #include "SerfMoveReqProcImpl.hxx" + +-#include ++#include + + namespace http_dav_ucp + { +--- ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx.orig 2014-02-25 00:24:43.000000000 -0800 ++++ ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx 2014-07-28 01:12:00.000000000 -0700 +@@ -24,7 +24,7 @@ + + #include "SerfPostReqProcImpl.hxx" + +-#include ++#include + + using namespace com::sun::star; + +--- 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.000000000 -0700 +@@ -26,7 +26,7 @@ + + #include "SerfPutReqProcImpl.hxx" + +-#include ++#include + + 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.000000000 -0700 +@@ -26,7 +26,7 @@ + #include + #include + +-#include ++#include + + #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:14.000000000 -0700 +@@ -22,7 +22,7 @@ + #ifndef INCLUDED_SERFREQUESTPROCESSORIMPL_HXX + #define INCLUDED_SERFREQUESTPROCESSORIMPL_HXX + +-#include ++#include + + #include + #include "DAVRequestEnvironment.hxx" Index: pkg-plist =================================================================== --- pkg-plist (revision 365430) +++ pkg-plist (working copy) @@ -1 +0,0 @@ -# Dummy file, do not delete. Package list is generated automatically.