kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to svn revsion r1704217.

Browse source 
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.
This commit is contained in:
Don Lewis 2015-09-24 21:06:29 +00:00
parent f10dc3e1c3
commit fbf2b5c96f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=397760
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
editors/openoffice-devel/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
PORTREVISION= 2
#PORTREVISION= 1
PORTEPOCH= 3
CATEGORIES= editors java
MASTER_SITES= http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
@ -100,7 +100,7 @@ AOOVERSION2= 2
AOOVERSION3= 0
# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
AOOTAG= AOO420m1\(Build:9800\)
SVNREVISION= 1697984
SVNREVISION= 1704217
#AOORC=rc3
EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
@ -204,7 +204,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} \
@ -397,7 +398,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 \
@ -413,8 +415,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

4
editors/openoffice-devel/distinfo
View file

@ -1,5 +1,5 @@
SHA256 (openoffice/apache-openoffice-r1697984-src.tar.xz) = 50eb71b4af05d55071a03c85449108efb9351ee8c0f158d44413bd4726c557f8
SIZE (openoffice/apache-openoffice-r1697984-src.tar.xz) = 215196304
SHA256 (openoffice/apache-openoffice-r1704217-src.tar.xz) = 52b0c1c54cfd0aa9ec1bd27a99c2c6240fd4279171bcf6025383fe7e0d55f24b
SIZE (openoffice/apache-openoffice-r1704217-src.tar.xz) = 215145548
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice/unowinreg.dll) = 6144
SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa

9
editors/openoffice-devel/files/pkg-message.in
View file

@ -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.