From owner-svn-ports-head@FreeBSD.ORG Thu Mar 21 06:18:03 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 9DC162AE; Thu, 21 Mar 2013 06:18:03 +0000 (UTC) (envelope-from maho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8F684B0E; Thu, 21 Mar 2013 06:18:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2L6I3MH053802; Thu, 21 Mar 2013 06:18:03 GMT (envelope-from maho@svn.freebsd.org) Received: (from maho@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2L6I3Gv053799; Thu, 21 Mar 2013 06:18:03 GMT (envelope-from maho@svn.freebsd.org) Message-Id: <201303210618.r2L6I3Gv053799@svn.freebsd.org> From: Maho Nakata Date: Thu, 21 Mar 2013 06:18:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314806 - in head/editors/openoffice-3-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Mar 2013 06:18:03 -0000 Author: maho Date: Thu Mar 21 06:18:02 2013 New Revision: 314806 URL: http://svnweb.freebsd.org/changeset/ports/314806 Log: Update to svn 1457623 Deleted: head/editors/openoffice-3-devel/files/patch-i121098 Modified: head/editors/openoffice-3-devel/Makefile head/editors/openoffice-3-devel/distinfo Modified: head/editors/openoffice-3-devel/Makefile ============================================================================== --- head/editors/openoffice-3-devel/Makefile Thu Mar 21 05:27:16 2013 (r314805) +++ head/editors/openoffice-3-devel/Makefile Thu Mar 21 06:18:02 2013 (r314806) @@ -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}/archiver 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/ Modified: head/editors/openoffice-3-devel/distinfo ============================================================================== --- head/editors/openoffice-3-devel/distinfo Thu Mar 21 05:27:16 2013 (r314805) +++ head/editors/openoffice-3-devel/distinfo Thu Mar 21 06:18:02 2013 (r314806) @@ -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