svn commit: r310767 - head/editors/openoffice-3-devel

[Maho Nakata]

Author: maho
Date: Mon Jan 21 12:19:29 2013
New Revision: 310767
URL: http://svnweb.freebsd.org/changeset/ports/310767

Log:
  * update to svn 1434565
  * adapt installation process [1]
  
  Submitted by:	pfg@ [1]

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	Mon Jan 21 12:16:00 2013	(r310766)
+++ head/editors/openoffice-3-devel/Makefile	Mon Jan 21 12:19:29 2013	(r310767)
@@ -68,14 +68,14 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 
 OOOSRC=			ApacheOpenOffice.r${SVNREVISION}${EXTRACT_SUFX}
 EXTSRC=			ApacheOpenOffice.ext_sources.r${SVNREVISION}${EXTRACT_SUFX}
-OOODIR=			openoffice.org3
-SVNREVISION=		1425776
+OOODIR=			apache_openoffice3
+SVNREVISION=		1434565
 INSTALLATION_BASEDIR?=	openoffice-r${SVNREVISION}
 EXECBASE?=		openoffice-r${SVNREVISION}
 DIST_SUBDIR=		openoffice
 SIMPLEOSVER=		${OSREL:C/\.//g}
 
-PACKAGE_PREFIX=		Apache_OpenOffice_incubating
+PACKAGE_PREFIX=		Apache_OpenOffice
 .if ${ARCH} == amd64
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86-64
 .else
@@ -261,17 +261,17 @@ do-build:
 	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util  ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
 
 do-install:
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${ECHO_CMD} "extracting $$i" ; \
-		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/archive/install/${LOCALIZED_LANG}/$$i ; \
+		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/$$i ; \
 	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}/openoffice.org3/program/bootstraprc
-	@${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/3/' ${PREFIX}/${INSTALLATION_BASEDIR}/openoffice.org3/program/bootstraprc
+	@${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${PREFIX}/${INSTALLATION_BASEDIR}/apache_openoffice3/program/bootstraprc
+	@${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/3/' ${PREFIX}/${INSTALLATION_BASEDIR}/apache_openoffice3/program/bootstraprc
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
 	@cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
 

Modified: head/editors/openoffice-3-devel/distinfo
==============================================================================
--- head/editors/openoffice-3-devel/distinfo	Mon Jan 21 12:16:00 2013	(r310766)
+++ head/editors/openoffice-3-devel/distinfo	Mon Jan 21 12:19:29 2013	(r310767)
@@ -1,6 +1,6 @@
-SHA256 (openoffice/ApacheOpenOffice.r1425776.tar.bz2) = 85ea195a8fde33aaa16169b78eaa4106cf9db5bff8c42a4f59a455b499532286
-SIZE (openoffice/ApacheOpenOffice.r1425776.tar.bz2) = 251395503
-SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1425776.tar.bz2) = 9dcc682f22a146912034514beab2e5d25f61ab6aa0ebfb3ac544485a2ef52b1d
-SIZE (openoffice/ApacheOpenOffice.ext_sources.r1425776.tar.bz2) = 80437417
+SHA256 (openoffice/ApacheOpenOffice.r1434565.tar.bz2) = c574a142b3618e720698a1d6e7e335edd45bb077de6b04d15f884da23756a7cb
+SIZE (openoffice/ApacheOpenOffice.r1434565.tar.bz2) = 252915419
+SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1434565.tar.bz2) = cb0880f32370479b981c084072b49edd655e77a2cd32c7264bc46a3b46ce38d3
+SIZE (openoffice/ApacheOpenOffice.ext_sources.r1434565.tar.bz2) = 80437578
 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice/unowinreg.dll) = 6144