svn commit: r329134 - head/editors/openoffice-4

[Maho Nakata]

Author: maho
Date: Thu Oct  3 00:50:12 2013
New Revision: 329134
URL: http://svnweb.freebsd.org/changeset/ports/329134

Log:
  update to 4.0.1

Modified:
  head/editors/openoffice-4/Makefile
  head/editors/openoffice-4/distinfo

Modified: head/editors/openoffice-4/Makefile
==============================================================================
--- head/editors/openoffice-4/Makefile	Thu Oct  3 00:47:29 2013	(r329133)
+++ head/editors/openoffice-4/Makefile	Thu Oct  3 00:50:12 2013	(r329134)
@@ -2,9 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	apache-openoffice
-PORTVERSION=	4.0.0
+PORTVERSION=	4.0.1
 CATEGORIES=	editors java
-MASTER_SITES=	ftp://ftp.riken.jp/net/apache/openoffice/${PORTVERSION}/source/ \
+MASTER_SITES=	http://www.apache.org/dist/openoffice/${PORTVERSION}/source/ \
+		ftp://ftp.riken.jp/net/apache/openoffice/${PORTVERSION}/source/ \
 		${MASTER_SITE_LOCAL:S@%SUBDIR%@maho/openoffice@}:extsrc
 DISTFILES+=	${OOOSRC} unowinreg.dll ${EXTSRC}:extsrc
 EXTRACT_ONLY=	${OOOSRC} ${EXTSRC}
@@ -23,7 +24,7 @@ USE_XORG=	x11 ice xaw xau xext xrender x
 		xi xt xcursor xdamage xcomposite xfixes
 USE_GL=		gl glu
 USE_GSTREAMER=	yes
-#USE_GCC=	4.6+
+USE_GCC=	any
 USE_PYTHON=	yes
 USE_BZIP2=	yes
 USES+=		bison perl5 gmake pkgconfig
@@ -68,9 +69,9 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
 OOOSRC=			apache-openoffice-${PORTVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX}
-EXTSRC=			ApacheOpenOffice.ext_sources.${PORTVERSION}.r${SVNREVISION}_2${EXTRACT_SUFX}
+EXTSRC=			ApacheOpenOffice.ext_sources.${PORTVERSION}.r${SVNREVISION}${EXTRACT_SUFX}
 OOODIR=			openoffice4
-SVNREVISION=		1503704
+SVNREVISION=		1524958
 INSTALLATION_BASEDIR?=	openoffice-${PORTVERSION}
 EXECBASE?=		openoffice-${PORTVERSION}
 DIST_SUBDIR=		openoffice
@@ -277,7 +278,7 @@ do-install:
 	@${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/
+	@cd ${WRKSRC}/solver/4??/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
 
 post-install:
 	@${FIND} ${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;

Modified: head/editors/openoffice-4/distinfo
==============================================================================
--- head/editors/openoffice-4/distinfo	Thu Oct  3 00:47:29 2013	(r329133)
+++ head/editors/openoffice-4/distinfo	Thu Oct  3 00:50:12 2013	(r329134)
@@ -1,6 +1,6 @@
-SHA256 (openoffice/apache-openoffice-4.0.0-r1503704-src.tar.bz2) = 019a7c213f7020afa23bfee555c9d70a1df92fa6e759d20f7e6fa31e01b0aec8
-SIZE (openoffice/apache-openoffice-4.0.0-r1503704-src.tar.bz2) = 211869164
+SHA256 (openoffice/apache-openoffice-4.0.1-r1524958-src.tar.bz2) = 577862db1934754e56475b4c124a303a8825cbaefef5ede570c2aee7c99b0667
+SIZE (openoffice/apache-openoffice-4.0.1-r1524958-src.tar.bz2) = 214506399
 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice/unowinreg.dll) = 6144
-SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.0.0.r1503704_2.tar.bz2) = b666eb5207d5ff749659c96092d00598b629168fb881e8609b494f9ac68b4f5a
-SIZE (openoffice/ApacheOpenOffice.ext_sources.4.0.0.r1503704_2.tar.bz2) = 241610572
+SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.0.1.r1524958.tar.bz2) = 0c77c1edd0641336d839f27424f89808c61cf9cfeefba4f5e015c4cf2685a63c
+SIZE (openoffice/ApacheOpenOffice.ext_sources.4.0.1.r1524958.tar.bz2) = 137466799