diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2012-05-23 05:53:19 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2012-05-23 05:53:19 +0000 |
| commit | 0b88b0cc14a7c1467eaccd5744dc0ed95bc97418 (patch) | |
| tree | a3d204f00db090cf371e3c0e35f75165a48c2a7a /editors | |
| parent | - fix examples installation from commit revision 1.7 of Makefile (diff) | |
Fix bootstraprc, permission, and bump portrevision.
Submitted by: scf@ peter@ avg@
Notes
Notes:
svn path=/head/; revision=297259
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/openoffice-3-devel/Makefile | 5 | ||||
| -rw-r--r-- | editors/openoffice-3/Makefile | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index baa48b41bcd0..e1c5c4fd0892 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= apache-openoffice PORTVERSION= 3.4.${SVNREVISION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= editors java MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -237,11 +238,13 @@ 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}/openoffice.org3/program/bootstraprc + @${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/3/' ${PREFIX}/${INSTALLATION_BASEDIR}/openoffice.org3/program/bootstraprc @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ @cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ post-install: + @${FIND} ${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \; @${ECHO_MSG} "===> Add wrapper scripts"; @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 0f9888037bbf..e404f8f909e2 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -7,7 +7,7 @@ PORTNAME= apache-openoffice PORTVERSION= 3.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors java MASTER_SITES= http://people.apache.org/~jsc/aoo34-rc/rc1/src/ ${MASTER_SITE_LOCAL}:extsrc MASTER_SITE_SUBDIR= maho/openoffice:extsrc @@ -242,11 +242,13 @@ 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}/openoffice.org3/program/bootstraprc + @${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org\/3/' ${PREFIX}/${INSTALLATION_BASEDIR}/openoffice.org3/program/bootstraprc @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ @cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ post-install: + @${FIND} ${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \; @${ECHO_MSG} "===> Add wrapper scripts"; @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ |