svn commit: r395652 - in head/editors/openoffice-devel: . files

[Don Lewis]

Author: truckman
Date: Mon Aug 31 07:54:42 2015
New Revision: 395652
URL: https://svnweb.freebsd.org/changeset/ports/395652

Log:
  Upgrade to upstream svn revision r1697984.
  
  Nuke patch-clang34 because it has been incorporated upstream.
  
  Replace the default images in the opening splash window and the
  Help->About window with FreeBSD-branded versions that also mark
  this as a developer snapshot.  Thanks to pfg for suggesting this
  and reviewing the new images.

Added:
  head/editors/openoffice-devel/files/freebsd-aoo-about-developer.png   (contents, props changed)
  head/editors/openoffice-devel/files/freebsd-aoo-intro-developer.png   (contents, props changed)
Deleted:
  head/editors/openoffice-devel/files/patch-clang34amd64
Modified:
  head/editors/openoffice-devel/Makefile
  head/editors/openoffice-devel/distinfo

Modified: head/editors/openoffice-devel/Makefile
==============================================================================
--- head/editors/openoffice-devel/Makefile	Mon Aug 31 07:18:23 2015	(r395651)
+++ head/editors/openoffice-devel/Makefile	Mon Aug 31 07:54:42 2015	(r395652)
@@ -100,7 +100,7 @@ AOOVERSION2=	2
 AOOVERSION3=	0
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
 AOOTAG=		AOO420m1\(Build:9800\)
-SVNREVISION=	1694132
+SVNREVISION=	1697984
 #AOORC=rc3
 EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
 
@@ -293,6 +293,8 @@ pre-everything::
 post-extract:
 	${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
+	${CP} ${FILESDIR}/freebsd-aoo-intro-developer.png ${WRKSRC}/default_images/introabout/intro.png
+	${CP} ${FILESDIR}/freebsd-aoo-about-developer.png ${WRKSRC}/default_images/introabout/about.png
 	${RM} -rf ${WRKSRC}/l10n
 	${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
 	${SED}  -e '\|^For main/vcl/unx/generic/fontmanager/parseAFM|,/^__/p' \

Modified: head/editors/openoffice-devel/distinfo
==============================================================================
--- head/editors/openoffice-devel/distinfo	Mon Aug 31 07:18:23 2015	(r395651)
+++ head/editors/openoffice-devel/distinfo	Mon Aug 31 07:54:42 2015	(r395652)
@@ -1,5 +1,5 @@
-SHA256 (openoffice/apache-openoffice-r1694132-src.tar.xz) = 861f9e7c559a3bc345c4a3e5e94fa15683259ee00692034833a40d03bdb2ddce
-SIZE (openoffice/apache-openoffice-r1694132-src.tar.xz) = 215178940
+SHA256 (openoffice/apache-openoffice-r1697984-src.tar.xz) = 50eb71b4af05d55071a03c85449108efb9351ee8c0f158d44413bd4726c557f8
+SIZE (openoffice/apache-openoffice-r1697984-src.tar.xz) = 215196304
 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice/unowinreg.dll) = 6144
 SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa

Added: head/editors/openoffice-devel/files/freebsd-aoo-about-developer.png
==============================================================================
Binary file. No diff available.

Added: head/editors/openoffice-devel/files/freebsd-aoo-intro-developer.png
==============================================================================
Binary file. No diff available.