diff options
| author | truckman <truckman@FreeBSD.org> | 2015-09-25 05:07:18 +0800 |
|---|---|---|
| committer | truckman <truckman@FreeBSD.org> | 2015-09-25 05:07:18 +0800 |
| commit | ea57ecc9c79ea576ace73f0723f2baf4fa593960 (patch) | |
| tree | 52b8cbfec4730af7ddd1a129f40c72546eeb096a /editors | |
| parent | 7649ef3fe1196624c26a8b2d9ce748d559edd4e9 (diff) | |
| download | freebsd-ports-gnome-ea57ecc9c79ea576ace73f0723f2baf4fa593960.tar.gz freebsd-ports-gnome-ea57ecc9c79ea576ace73f0723f2baf4fa593960.tar.zst freebsd-ports-gnome-ea57ecc9c79ea576ace73f0723f2baf4fa593960.zip | |
Fix a regression in directory permissions and add a missing directory used
for shared extensions. This combination of issues could cause incomplete
cleanup on pkg removal if OpenOffice had been run by a user in the wheel
group.
Add a note about the location of the Wiki Publisher extension to
pkg-message.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/openoffice-4/Makefile | 11 | ||||
| -rw-r--r-- | editors/openoffice-4/files/pkg-message.in | 9 |
2 files changed, 13 insertions, 7 deletions
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index b2f1bac9dac0..effd27fa780a 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= editors java MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ @@ -192,7 +192,8 @@ GNU_CONFIGURE= yes WRKSUBDIR= ${WRKDIR}/aoo-${AOOVERSION} WRKSRC?= ${WRKSUBDIR}/main SUB_FILES= pkg-message -SUB_LIST= EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR} +SUB_LIST= EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR} \ + PRINSTALLATION_BASEDIR=${PRINSTALLATION_BASEDIR} CONFIGURE_ARGS+= \ --with-unix-wrapper=${EXECBASE} \ @@ -385,7 +386,8 @@ do-build: LANG=C LC_ALL=C build.pl --all -P$${numproc} -- -P$${dmproc} do-install: - @${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR}/extensions/ \ + @${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR}/extensions \ + ${STAGEDIR}${OOPATH}/uno_packages/cache/uno_packages \ ${STAGEDIR}${DESKTOPDIR} @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \ for i in *.tar.?z ; do \ @@ -401,8 +403,7 @@ do-install: ${ECHO_CMD} "stripping executables and shared libraries" ; \ ${STRIP_CMD} crashrep pagein uri-encode javaldx regmerge \ regview *.so* *.bin ; \ - ${ECHO_CMD} "fixing permissions" ; \ - ${FIND} . -type d -exec ${CHMOD} 755 {} \; + ${FIND} ${STAGEDIR}${PRINSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \; ${REINPLACE_CMD} \ -e '/^UserInstallation/s/=.*/=$$SYSUSERCONFIG\/${AOOUDIR}/' \ ${STAGEDIR}${OOPATH}/program/bootstraprc diff --git a/editors/openoffice-4/files/pkg-message.in b/editors/openoffice-4/files/pkg-message.in index e551c076647b..467f53f96bef 100644 --- a/editors/openoffice-4/files/pkg-message.in +++ b/editors/openoffice-4/files/pkg-message.in @@ -33,8 +33,13 @@ to your PATH and you will be able to use them. OpenOffice does need $LANG to be set to a suitable value. -4. If you run into problems --------------------------------------------------- +4. Wiki Publisher Extension +--------------------------- +The Wiki Publisher extension can be installed from +%%PRINSTALLATION_BASEDIR%%/extensions/ + +5. If you run into problems +--------------------------- If you somehow run into problems, please remove the already installed "%%AOOUDIR%%" directory in your home directory, then redo the user installation and the problems should go away. |