svn commit: r391960 - in head/editors/openoffice-devel: . files
Don Lewis
truckman at FreeBSD.org
Mon Jul 13 21:03:28 UTC 2015
Author: truckman
Date: Mon Jul 13 21:03:26 2015
New Revision: 391960
URL: https://svnweb.freebsd.org/changeset/ports/391960
Log:
Upgrade to upstream SVN revision 1689959.
patch-jpeg and patch-nss have been upstreamed and are no longer needed.
patch-i118574 no longer seems necessary for a clean build.
Regnerate patch-i114430 with make makepatch.
Always build using boost from ports instead of the bundled boost, updating
the BUILD_DEPENDS with the header that configure looks for.
Add missing LIB_DEPENDS that are brought in by other dependencies, but are
directly linked as requested by pkgconfig/*.pc.
Build using sane and xrender headers from ports instead of bundled headers.
Update LICENSE* to account for bundled software.
Reformat pkg-message and mention that the scanner interface can be enabled
by installing sane-backends.
Pet portlint.
Reviewed by: pfg
Approved by: mat (mentor)
Differential Revision: https://reviews.freebsd.org/D3064
Deleted:
head/editors/openoffice-devel/files/patch-i118574
head/editors/openoffice-devel/files/patch-jpeg
head/editors/openoffice-devel/files/patch-nss
Modified:
head/editors/openoffice-devel/Makefile
head/editors/openoffice-devel/distinfo
head/editors/openoffice-devel/files/patch-i114430
head/editors/openoffice-devel/files/pkg-message.in
Modified: head/editors/openoffice-devel/Makefile
==============================================================================
--- head/editors/openoffice-devel/Makefile Mon Jul 13 21:00:47 2015 (r391959)
+++ head/editors/openoffice-devel/Makefile Mon Jul 13 21:03:26 2015 (r391960)
@@ -17,6 +17,7 @@ PKGNAMESUFFIX= -${LANG_SUFFIX}
.endif
PKGNAMESUFFIX= -devel
DISTFILES= ${OOOSRC}${AOODISTTAG} unowinreg.dll:unoreg ${EXTSRC}:extsrc
+DIST_SUBDIR= openoffice
EXTRACT_ONLY= ${OOOSRC}
MAINTAINER= office at FreeBSD.org
@@ -24,7 +25,28 @@ MAINTAINER= office at FreeBSD.org
#Frequent Patch submitters should optionally sign Apache iCLA
COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser (developer version)
-LICENSE= APACHE20
+LICENSE= APACHE20 ADOBE BSD3CLAUSE BSD4CLAUSE BSL ICU MIT MPL \
+ PSFL TWAIN W3C
+LICENSE_COMB= multi
+LICENSE_NAME_ADOBE= Adobe Systems Incorporated license
+LICENSE_NAME_ICU= ICU License
+LICENSE_NAME_TWAIN= TWAIN Working Group license
+LICENSE_NAME_W3C= W3C license
+LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE_ALv2
+LICENSE_FILE_ADOBE= ${WRKSRC}/LICENSE_ADOBE
+LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE_BSD3CLAUSE
+LICENSE_FILE_BSD4CLAUSE= ${WRKSRC}/LICENSE_BSD4CLAUSE
+LICENSE_FILE_BSL= ${WRKSRC}/LICENSE_BSL
+LICENSE_FILE_ICU= ${WRKSRC}/LICENSE_ICU
+LICENSE_FILE_MIT= ${WRKSRC}/LICENSE_MIT
+LICENSE_FILE_MPL= ${WRKSRC}/LICENSE_MPL
+LICENSE_FILE_PSFL= ${WRKSRC}/LICENSE_PSFL
+LICENSE_FILE_TWAIN= ${WRKSRC}/LICENSE_TWAIN
+LICENSE_FILE_W3C= ${WRKSRC}/LICENSE_W3C
+LICENSE_PERMS_ADOBE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS_ICU= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS_TWAIN= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS_W3C= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
BUILD_DEPENDS= \
p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
@@ -33,11 +55,13 @@ BUILD_DEPENDS= \
${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
zip:${PORTSDIR}/archivers/zip \
ant:${PORTSDIR}/devel/apache-ant \
+ ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs \
dmake:${PORTSDIR}/devel/dmake \
epm:${PORTSDIR}/devel/epm \
${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
imake:${PORTSDIR}/devel/imake \
gpatch:${PORTSDIR}/devel/patch \
+ ${LOCALBASE}/include/sane/sane.h:${PORTSDIR}/graphics/sane-backends \
${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 \
@@ -48,6 +72,7 @@ BUILD_DEPENDS= \
p5-libwww>=0:${PORTSDIR}/www/p5-libwww
LIB_DEPENDS= \
libapr-1.so:${PORTSDIR}/devel/apr1 \
+ libnspr4.so:${PORTSDIR}/devel/nspr \
libcurl.so:${PORTSDIR}/ftp/curl \
libcairo.so:${PORTSDIR}/graphics/cairo \
libpng.so:${PORTSDIR}/graphics/png \
@@ -62,7 +87,8 @@ LIB_DEPENDS= \
libtextcat.so:${PORTSDIR}/textproc/libtextcat \
libmythes-1.2.so:${PORTSDIR}/textproc/mythes \
librdf.so:${PORTSDIR}/textproc/redland \
- libserf-1.so:${PORTSDIR}/www/serf
+ libserf-1.so:${PORTSDIR}/www/serf \
+ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= \
${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
@@ -74,9 +100,9 @@ AOOVERSION2= 2
AOOVERSION3= 0
# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
AOOTAG= AOO420m1\(Build:9800\)
-SVNREVISION= 1677314
+SVNREVISION= 1689959
#AOORC=rc3
-EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150118.tar.gz
+EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
AOOXXX= ${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
@@ -96,7 +122,6 @@ OOODIR= openoffice${AOOVERSION1}
AOOUDIR= .openoffice.org\/${AOOVERSION1}
INSTALLATION_BASEDIR?= openoffice-${AOOSUFFIX}
EXECBASE?= openoffice-${AOOSUFFIX}
-DIST_SUBDIR= openoffice
NO_LATEST_LINK= yes
@@ -112,7 +137,8 @@ USE_PERL5= build
USE_XORG= x11 ice xaw xau xext xrender xrandr \
xi xt xcursor xdamage xcomposite xfixes
USES= autoreconf:autoconf bison compiler cpe desktop-file-utils \
- gmake jpeg perl5 pkgconfig python tar:${TARTYPE}
+ gettext-runtime gmake iconv jpeg perl5 pkgconfig python \
+ tar:${TARTYPE}
WITHOUT_CPU_CFLAGS= true
CPE_PRODUCT= ${PORTNAME:S|apache-||}
CPE_VENDOR= apache
@@ -150,12 +176,10 @@ CPP= clang-cpp35
CC= clang35
CXX= clang++35
. endif
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs
-CONFIGURE_ARGS+= --with-system-boost
CPPFLAGS+= -I${LOCALBASE}/include
.else
USE_GCC= yes
-SUBST= "s/-fexceptions/& -fno-enforce-eh-specs/;s/-DHAVE_STL_INCLUDE_PATH//"
+SUBST= "s/-fexceptions/& -fno-enforce-eh-specs/;s/-DHAVE_STL_INCLUDE_PATH/-DBOOST_TR1_DISABLE_INCLUDE_NEXT -DBOOST_TR1_GCC_INCLUDE_PATH=c++/"
.endif
.if ${ARCH} == amd64
@@ -203,6 +227,7 @@ CONFIGURE_ARGS+= \
--with-system-apr-util \
--with-system-beanshell \
--with-beanshell-jar=${JAVALIBDIR}/bsh.jar \
+ --with-system-boost \
--enable-category-b \
--with-system-cairo --enable-cairo \
--with-system-coinmp \
@@ -240,6 +265,7 @@ CONFIGURE_ARGS+= \
--with-system-poppler \
--with-system-python \
--with-system-redland \
+ --with-system-sane \
--with-system-serf \
--with-system-stdlibs \
--enable-symbols=small \
@@ -248,6 +274,7 @@ CONFIGURE_ARGS+= \
--enable-verbose \
--with-system-vigra \
--enable-wiki-publisher \
+ --with-system-xrender \
--with-system-zlib
#OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt
@@ -281,6 +308,34 @@ post-extract:
${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC}
${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
${RM} -rf ${WRKSRC}/l10n
+ ${SED} -e '\|^For main/vcl/unx/generic/fontmanager/parseAFM|,/^__/p' \
+ -e '\|^For PostScript(R) AFM|,/^__/p' \
+ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_ADOBE}
+ ${SED} -e '\|^For main/unixODBC|,/^__/p' \
+ -e '\|^For main/connectivity|,/^__/p' \
+ -e '\|^For main/libtextcat/data|,/^__/p' \
+ -e '\|^For integration of HSQLDB|,/^__/p' \
+ -e '\|^For C preprocessor|,/^__/p' \
+ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSD3CLAUSE}
+ ${SED} -e '\|^For ICC |,/^__/p' \
+ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSD4CLAUSE}
+ ${SED} -e '\|^For integration of the C++ Boost |,/^__/p' \
+ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSL}
+ ${SED} -e '\|^For main/i18npool/source/breakiterator|,/^__/p' \
+ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_ICU}
+ ${SED} -e '\|^For Multi-Dimensional Data|,/^__/p' \
+ -e '\|^For XSLT MathML Library|,/^__/p' \
+ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_MIT}
+ ${SED} -e '\|^For XMLSec Library|,/^__/p' \
+ -e d ${WRKSRC}/LICENSE_category_b >> ${LICENSE_FILE_MIT}
+ ${SED} -e '\|^For Graphite|,$$d' \
+ ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL}
+ ${SED} -e '\|^For main/filter/source/config/tools/merge/pyAltFCFGMerge|,/^__/p' \
+ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_PSFL}
+ ${SED} -e '\|^For main/twain|,/^__/p' \
+ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_TWAIN}
+ ${SED} -e '\|^For main/MathMLDTD|,/^__/p' \
+ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_W3C}
post-patch:
.if defined (USE_GCC)
Modified: head/editors/openoffice-devel/distinfo
==============================================================================
--- head/editors/openoffice-devel/distinfo Mon Jul 13 21:00:47 2015 (r391959)
+++ head/editors/openoffice-devel/distinfo Mon Jul 13 21:03:26 2015 (r391960)
@@ -1,6 +1,6 @@
-SHA256 (openoffice/apache-openoffice-r1677314-src.tar.xz) = 7db08f046ae1cb87ac5d9788a4507d4bd70df1be73c9044a71182087f9ff231c
-SIZE (openoffice/apache-openoffice-r1677314-src.tar.xz) = 215202736
+SHA256 (openoffice/apache-openoffice-r1689959-src.tar.xz) = 22f66a8d19d1bb3355370875628f5bc44ec02c7ce75fb57021ced1834eb8da29
+SIZE (openoffice/apache-openoffice-r1689959-src.tar.xz) = 215148292
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice/unowinreg.dll) = 6144
-SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150118.tar.gz) = b01b8894469a80667b0551ea6c0abffd3fb9e79c8a304d48091ff57ab53f10b7
-SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150118.tar.gz) = 102513542
+SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa
+SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004
Modified: head/editors/openoffice-devel/files/patch-i114430
==============================================================================
--- head/editors/openoffice-devel/files/patch-i114430 Mon Jul 13 21:00:47 2015 (r391959)
+++ head/editors/openoffice-devel/files/patch-i114430 Mon Jul 13 21:03:26 2015 (r391960)
@@ -1,8 +1,6 @@
-Index: sc/source/core/tool/interpr5.cxx
-===================================================================
---- sc/source/core/tool/interpr5.cxx (revision 1678278)
-+++ sc/source/core/tool/interpr5.cxx (working copy)
-@@ -1611,7 +1611,7 @@
+--- sc/source/core/tool/interpr5.cxx.orig 2014-09-19 18:03:51 UTC
++++ sc/source/core/tool/interpr5.cxx
+@@ -1611,14 +1611,14 @@ void ScInterpreter::ScPow()
if (bFlag)
{ for ( SCSIZE i = 0; i < nCount; i++ )
if (pMat->IsValue(i))
@@ -11,7 +9,6 @@ Index: sc/source/core/tool/interpr5.cxx
else
pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i);
}
-@@ -1618,7 +1618,7 @@
else
{ for ( SCSIZE i = 0; i < nCount; i++ )
if (pMat->IsValue(i))
@@ -20,7 +17,7 @@ Index: sc/source/core/tool/interpr5.cxx
else
pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i);
}
-@@ -1628,7 +1628,7 @@
+@@ -1628,7 +1628,7 @@ void ScInterpreter::ScPow()
PushIllegalArgument();
}
else
Modified: head/editors/openoffice-devel/files/pkg-message.in
==============================================================================
--- head/editors/openoffice-devel/files/pkg-message.in Mon Jul 13 21:00:47 2015 (r391959)
+++ head/editors/openoffice-devel/files/pkg-message.in Mon Jul 13 21:03:26 2015 (r391960)
@@ -6,20 +6,20 @@ Written by: Martin Blapp <mbr at freebsd.or
Apache OpenOffice %%AOOTAG%% will soon be installed in
%%PREFIX%%/%%EXECBASE%%
-1. User installation
+1. Scanner interface
--------------------
+To enable the scanner interface, install the sane-backends package.
-Just type "%%EXECBASE%%" after you have successfully
-installed the package. If there is no installed
-.openoffice.org directory in your home directory, the
-setup installs the "%%AOOUDIR%%" folder.
+2. User installation
+--------------------
+Just type "%%EXECBASE%%" after you have successfully installed
+the package. If there is no installed .openoffice.org directory in your
+home directory, the setup installs the "%%AOOUDIR%%" folder.
-2. Starting Apache OpenOffice
+3. Starting Apache OpenOffice
-----------------------------
-
-There are some wrappers installed for faster startup.
-Add "%%PREFIX%%/bin/" to your PATH and you will be able
-to use them.
+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
@@ -31,11 +31,10 @@ to use them.
%%PREFIX%%/bin/%%EXECBASE%%-spadmin
%%PREFIX%%/bin/%%EXECBASE%%-swriter
-OO.org does need $LANG to be set to a suitable value.
+OpenOffice does need $LANG to be set to a suitable value.
-3. If you run into problems
+4. If you run into problems
--------------------------------------------------
-If you somehow run into problems, please remove the already
-installed "%%AOOUDIR%%" directory in your home directory,
-then redo the user installation and the problems should go
-away.
+If you somehow run into problems, please remove the already installed
+"%%AOOUDIR%%" directory in your home directory, then redo the
+user installation and the problems should go away.
More information about the svn-ports-head
mailing list