svn commit: r397761 - in head/editors/openoffice-4: . files
Don Lewis
truckman at FreeBSD.org
Thu Sep 24 21:07:19 UTC 2015
Author: truckman
Date: Thu Sep 24 21:07:18 2015
New Revision: 397761
URL: https://svnweb.freebsd.org/changeset/ports/397761
Log:
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.
Modified:
head/editors/openoffice-4/Makefile
head/editors/openoffice-4/files/pkg-message.in
Modified: head/editors/openoffice-4/Makefile
==============================================================================
--- head/editors/openoffice-4/Makefile Thu Sep 24 21:06:29 2015 (r397760)
+++ head/editors/openoffice-4/Makefile Thu Sep 24 21:07:18 2015 (r397761)
@@ -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
Modified: head/editors/openoffice-4/files/pkg-message.in
==============================================================================
--- head/editors/openoffice-4/files/pkg-message.in Thu Sep 24 21:06:29 2015 (r397760)
+++ head/editors/openoffice-4/files/pkg-message.in Thu Sep 24 21:07:18 2015 (r397761)
@@ -33,8 +33,13 @@ to your PATH and you will be able to use
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.
More information about the svn-ports-all
mailing list