Update to svn 1457623

3 files changed, 13 insertions, 26 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 075f7017232a..c71443eface2 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -29,6 +29,7 @@ USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_PERL5_BUILD=	yes
 USE_BZIP2=	yes
+USES+=		bison
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
 
@@ -67,8 +68,8 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 
 OOOSRC=			ApacheOpenOffice.r${SVNREVISION}${EXTRACT_SUFX}
 EXTSRC=			ApacheOpenOffice.ext_sources.r${SVNREVISION}${EXTRACT_SUFX}
-OOODIR=			apache_openoffice4
-SVNREVISION=		1444279
+OOODIR=			openoffice4
+SVNREVISION=		1457623
 INSTALLATION_BASEDIR?=	openoffice-r${SVNREVISION}
 EXECBASE?=		openoffice-r${SVNREVISION}
 DIST_SUBDIR=		openoffice
@@ -144,7 +145,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 
 USE_AUTOTOOLS=	autoconf
-USES=		bison
 GNU_CONFIGURE=	yes
 WRKSRC?=	${WRKDIR}/ooo/main
 BASH?=		${PREFIX}/bin/bash
@@ -192,12 +192,11 @@ CONFIGURE_ARGS+=	--enable-verbose \
 			--with-junit=${LOCALBASE}/share/java/classes/junit.jar \
 			--with-package-format="archive" \
 			--enable-gstreamer \
-			--enable-minimizer \
-			--enable-presenter-console \
 			--enable-wiki-publisher \
 			--enable-dbus \
 			--enable-opengl \
 			--enable-category-b \
+			--enable-lockdown \
 			--with-system-hunspell \
 			--with-system-saxon     \
 			--with-saxon-jar=${JAVALIBDIR}/saxon9.jar  \
@@ -206,9 +205,10 @@ CONFIGURE_ARGS+=	--enable-verbose \
 			--without-fonts \
 			--with-system-serf
 #			--with-system-jpeg
+#			--enable-pdfimport
 
-OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
-OOOEXTENSIONS+=		presenter/presenter-screen.oxt
+#OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
+#OOOEXTENSIONS+=		presenter/presenter-screen.oxt
 #OOOEXTENSIONS+=		pdfimport/pdfimport.oxt
 OOOEXTENSIONS+=		swext/wiki-publisher.oxt
 
@@ -269,8 +269,8 @@ do-install:
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
-	@${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${PREFIX}/${INSTALLATION_BASEDIR}/apache_openoffice4/program/bootstraprc
-	@${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/4/' ${PREFIX}/${INSTALLATION_BASEDIR}/apache_openoffice4/program/bootstraprc
+	@${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc
+	@${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/4/' ${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program/bootstraprc
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
 	@cd ${WRKSRC}/solver/4?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
 
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index a32152b7d31c..68f546c5328b 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-SHA256 (openoffice/ApacheOpenOffice.r1444279.tar.bz2) = cb0e84ec13ae923f8b4da4886c9583665cdb5c7bcacb6c8bddd0e2b76d7d91a8
-SIZE (openoffice/ApacheOpenOffice.r1444279.tar.bz2) = 246919636
-SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1444279.tar.bz2) = c2945307cb4ad347746ca131568e9a2503b9a24a01651ccd5f76ebf0087f7979
-SIZE (openoffice/ApacheOpenOffice.ext_sources.r1444279.tar.bz2) = 80436967
+SHA256 (openoffice/ApacheOpenOffice.r1457623.tar.bz2) = 932fed9624a517759e9005f196ae31227818f6214fb67edee50093f8036574f6
+SIZE (openoffice/ApacheOpenOffice.r1457623.tar.bz2) = 246781778
+SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1457623.tar.bz2) = 9c86b8e8d4565f328d1f58c00fc09a01019ec769d8ef8a621ac127f4ebbae58a
+SIZE (openoffice/ApacheOpenOffice.ext_sources.r1457623.tar.bz2) = 80436947
 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/patch-i121098 b/editors/openoffice-3-devel/files/patch-i121098
deleted file mode 100644
index 0d2549229f82..000000000000
--- a/editors/openoffice-3-devel/files/patch-i121098
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: codemaker/source/javamaker/classfile.cxx
-===================================================================
---- codemaker/source/javamaker/classfile.cxx	(revision 1389908)
-+++ codemaker/source/javamaker/classfile.cxx	(working copy)
-@@ -695,7 +695,7 @@
- void ClassFile::write(FileStream & file) const {
-     writeU4(file, 0xCAFEBABE);
-     writeU2(file, 0);
--    writeU2(file, 46);
-+    writeU2(file, 49);
-     writeU2(file, m_constantPoolCount);
-     writeStream(file, m_constantPool);
-     writeU2(file, static_cast< sal_uInt16 >(m_accessFlags));