From owner-svn-ports-head@freebsd.org Thu Sep 24 21:07:19 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 90F88A0765B; Thu, 24 Sep 2015 21:07:19 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 81E5410CB; Thu, 24 Sep 2015 21:07:19 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8OL7Jh5041086; Thu, 24 Sep 2015 21:07:19 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8OL7JxM041084; Thu, 24 Sep 2015 21:07:19 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201509242107.t8OL7JxM041084@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Thu, 24 Sep 2015 21:07:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397761 - in head/editors/openoffice-4: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Sep 2015 21:07:19 -0000 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.