Date: Fri, 3 Jul 2009 17:24:48 GMT From: Pavel Plesov <pavel.plesov@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/136291: [patch] editors/openoffice.org-3: gpatch failure Message-ID: <200907031724.n63HOmHp027426@www.freebsd.org> Resent-Message-ID: <200907031730.n63HU8V0031324@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 136291
>Category: ports
>Synopsis: [patch] editors/openoffice.org-3: gpatch failure
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 03 17:30:08 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Pavel Plesov
>Release: FreeBSD 7.2-STABLE amd64
>Organization:
>Environment:
FreeBSD 7.2-STABLE #17: Mon Jun 29 18:24:56 MSD 2009 amd64
cvsup'ed ports.
$FreeBSD: ports/editors/openoffice.org-3/Makefile,v 1.319 2009/07/03 07:11:29 maho Exp $
>Description:
gpatch fails to apply the patches to many parts of OO.org. He dies with the message:
----
/usr/local/bin/gpatch: **** File libmspack/mspack/mspack.h seems to be locked by somebody else under Perforce
----
I have checked some of files gpatch fails on. Them was not owned to root - e.g. uid=500 or 1500 (I have no such uids registered on my host anyway). All of them have have 0755 mode.
I am pretty sure these files are not locked under Perforce.
>How-To-Repeat:
cd /usr/ports/editors/openoffice.org-3 && make
>Fix:
gpatch needs "-g0" command line flag or PATCH_GET=0 env var to be set.
===
-g num or --get=num
This option controls patch's actions when a file is under RCS or
SCCS control, and does not exist or is read-only and matches the
default version, or when a file is under ClearCase or Perforce con-
trol and does not exist. If num is positive, patch gets (or checks
out) the file from the revision control system; if zero, patch
ignores RCS, ClearCase, Perforce, and SCCS and does not get the
file; and if negative, patch asks the user whether to get the file.
The default value of this option is given by the value of the
PATCH_GET environment variable if it is set; if not, the default
value is zero if patch is conforming to POSIX, negative otherwise.
===
Attached oo-gpatch.txt solved the problem. OO.org 3.1 seems to operate well.
Patch attached with submission follows:
--- /usr/ports/editors/openoffice.org-3/Makefile-orig 2009-07-03 17:02:56.000000000 +0400
+++ /usr/ports/editors/openoffice.org-3/Makefile 2009-07-03 17:07:18.000000000 +0400
@@ -191,7 +191,7 @@
do-build:
@cd ${WRKSRC} ; ./bootstrap
- @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput -- -P${MAKE_JOBS_NUMBER}"
+ @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" "PATCH_GET=0" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput -- -P${MAKE_JOBS_NUMBER}"
.if ${LOCALIZED_LANG} == "alllangs"
@${MAKE} languagepack
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907031724.n63HOmHp027426>