Update openoffice-devel to SVN revision 1652526

[truckman]

Summary

Update to SVN revision 1652526

Resynchronize to openoffice-4 including:

• portlint fixes

• fix all but one stage-qa warning

• add source makefile patch to unbreak --with-system-jpeg

• add the --with-system-hyphen, --with-system-nss,

	    --with-system-jpeg, and --with-system-mythes configure options

	  * remove the --with-system-saxon option to allow coexistance with
	    math/scilab

	  * add all distfiles that were previously downloaded during build
	    to the ext_sources distfile, and add --disable-fetch-external

	  * make the graphics/png dependency explicit

	  * Change from USE_GCC=yes to USE_GCC=4.8 because of a compile error with
	     gcc 4.9

	  * remove SVNREVISION from the ext_sources tarball name and
	    tweak how it is extracted to allow it to be shared by
	    multiple AOO releases

	  * remove trailing cruft from files/patch-sal (from pfg@)

	  * nuke files/patch-sal-inline (from pfg@)

	  * modernize MASTER_SITES syntax and update MASTER_SITE for
	    unowinreg.dll

	  * unbreak sdk, package-canonical, and languagepack targets
	    (from pfg@)

	  * don't truncate generated plist (from mat@)

	  * don't add @dirrm to generated plist, but add @dir for empty
	    directories

	  * don't add license files to generated plist because the framework
	    does this (from mat@)

	  * don't add a blank line to generated plist

	  * merge post-install target into do-install (from mat@)

	  * misc Makefile cleanup

Test Plan

Build the port and test editing and saving documents, printing, etc.

[truckman]

The svn diff is fairly lengthy, but the differences between openoffice-4 and openoffice-devel are much simpler:

%diff -u openoffice-4 openoffice-devel
diff -u openoffice-4/Makefile openoffice-devel/Makefile
--- openoffice-4/Makefile	2015-01-20 16:41:32.000000000 -0800
+++ openoffice-devel/Makefile	2015-01-20 21:20:31.000000000 -0800
@@ -1,26 +1,26 @@
 # Created by: Martin Blapp
-# $FreeBSD: head/editors/openoffice-4/Makefile 377444 2015-01-19 17:45:17Z truckman $
+# $FreeBSD: head/editors/openoffice-devel/Makefile 373404 2014-11-25 12:55:53Z makc $
 
 PORTNAME=	apache-openoffice
-PORTVERSION=	${AOOVERSION}
-PORTREVISION=	4
+PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
+PORTEPOCH=	2
 CATEGORIES=	editors java
-MASTER_SITES=	APACHE/openoffice/${PORTVERSION}/source \
+MASTER_SITES=	http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
-		LOCAL/truckman/openoffice:extsrc
+		LOCAL/truckman/openoffice:snap,extsrc
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=		${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX=		-${LANG_SUFFIX}
 .endif
-DISTFILES=	${OOOSRC} unowinreg.dll:unoreg ${EXTSRC}:extsrc
+DISTFILES=	${OOOSRC}${OOODISTTAG} unowinreg.dll:unoreg ${EXTSRC}:extsrc
 EXTRACT_ONLY=	${OOOSRC}
 
 MAINTAINER=	[e-mail]
 #de facto maintainer is [e-mail]
 #Frequent Patch submitters should optionally sign Apache iCLA
-COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
+COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser (developer version)
 
 LICENSE=	APACHE20
 
@@ -67,15 +67,23 @@
 		${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
 
 AOOVERSION1=	4
-AOOVERSION2=	1
-AOOVERSION3=	1
-SVNREVISION=	1617669
-EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20140918.tar.gz
+AOOVERSION2=	2
+AOOVERSION3=	0
+SVNREVISION=	1652526
+#AOORC=rc3
+EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150118.tar.gz
 
 AOOVERSION=	${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
 AOOXXX=		${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
-AOOSUFFIX=	${PORTVERSION}
+.if defined(AOORC)
+AOOSUFFIX=	${AOOVERSION}-${AOORC}
 OOOSRC=		apache-openoffice-${AOOVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX}
+AOODISTTAG=	
+.else
+AOOSUFFIX=	${PORTVERSION}
+OOOSRC=		apache-openoffice-r${SVNREVISION}-src${EXTRACT_SUFX}
+AOODISTTAG=	:snap
+.endif
 
 OOODIR=			openoffice${AOOVERSION1}
 INSTALLATION_BASEDIR?=	openoffice-${AOOSUFFIX}
@@ -92,7 +100,7 @@
 USE_GL=		gl glu
 USE_GSTREAMER=	yes
 USE_GCC=	4.8
-USES+=		bison desktop-file-utils gmake perl5 pkgconfig python tar:bzip2
+USES+=		bison desktop-file-utils gmake perl5 pkgconfig python tar:xz
 USE_PERL5=	build
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
--- openoffice-4/distinfo	2014-09-18 21:27:18.000000000 -0700
+++ openoffice-devel/distinfo	2015-01-18 00:20:53.000000000 -0800
@@ -1,6 +1,6 @@
-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.20140918.tar.gz) = c7085dbf597a31ef332585ab57041b7ec8baf29c5f6029a60be7b7c63cfcb166
-SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20140918.tar.gz) = 97839277
+SHA256 (openoffice/apache-openoffice-r1652526-src.tar.xz) = 0db1401923df096dd9497813ef5849f3fbe91f9c49f32e252a389649315ec906
+SIZE (openoffice/apache-openoffice-r1652526-src.tar.xz) = 215154504
+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/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice/unowinreg.dll) = 6144
Common subdirectories: openoffice-4/files and openoffice-devel/files

[mat]

You are right, the diff is aweful :-p

[pfg]

Ugh, the serf stuff looks like something I'd want to upstream but I have to check first if it doesn't break the internal AOO serf.

Thanks!

[pfg]

FWIW, Looking at opengrok
http://opengrok.adfinis-sygroup.org/source/xref/aoo-trunk/main/ucb/source/ucp/webdav/makefile.mk#84

Maybe it's possible to adjust SERF_CFLAGS instead of patching the includes.

[pfg]

Nevermind... I think patch-webdav is correct, I'll just have to test the build with the internal serf before upstreaming it.

[truckman]

Closed by commit rP377620 (authored by @truckman).