From owner-freebsd-ports Fri Dec 15 0:20: 9 2000 From owner-freebsd-ports@FreeBSD.ORG Fri Dec 15 00:20:02 2000 Return-Path: Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 40C1837B400 for ; Fri, 15 Dec 2000 00:20:02 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id eBF8K2a43082; Fri, 15 Dec 2000 00:20:02 -0800 (PST) (envelope-from gnats) Date: Fri, 15 Dec 2000 00:20:02 -0800 (PST) Message-Id: <200012150820.eBF8K2a43082@freefall.freebsd.org> To: freebsd-ports@FreeBSD.org Cc: From: Maxim Sobolev Subject: Re: ports/23560: linux-jdk/Makefile assumes default `patch' behavior. Reply-To: Maxim Sobolev Sender: gnats@FreeBSD.org Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org The following reply was made to PR ports/23560; it has been noted by GNATS. From: Maxim Sobolev To: Alan Bawden Cc: FreeBSD-gnats-submit@FreeBSD.org, asami@FreeBSD.org Subject: Re: ports/23560: linux-jdk/Makefile assumes default `patch' behavior. Date: Fri, 15 Dec 2000 10:14:21 +0200 This is a multi-part message in MIME format. --------------973BD14F9E9ED6573A39E31F Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: 7bit Alan Bawden wrote: > >Number: 23560 > >Category: ports > >Synopsis: linux-jdk/Makefile assumes default `patch' behavior. > >Confidential: no > >Severity: non-critical > >Priority: low > >Responsible: freebsd-ports > >State: open > >Quarter: > >Keywords: > >Date-Required: > >Class: sw-bug > >Submitter-Id: current-users > >Arrival-Date: Thu Dec 14 23:50:01 PST 2000 > >Closed-Date: > >Last-Modified: > >Originator: Alan Bawden > >Release: FreeBSD 3.4-RELEASE i386 > >Organization: > ITS Preservation Society > >Environment: > > The most recent cvsup of my ports collection ended: > 13 Dec 2000 11:22:31 GMT. > > >Description: > > /usr/ports/java/linux-jdk/Makefile assumes that you don't have the > VERSION_CONTROL environment set. If you set it, then the `patch' > program might use a different scheme for naming backup files, and > so when the Makefile does: > > ${RM} ${PREFIX}/linux-jdk1.2.2/bin/.java_wrapper.orig > ${RM} ${PREFIX}/linux-jdk1.2.2/jre/bin/.java_wrapper.orig > > The files it expects to delete don't exist, and the install fails. > > >How-To-Repeat: > > cd /usr/ports/java/linux-jdk/ > export VERSION_CONTROL="t" > make install > > >Fix: > > Depends who you think is at fault here. Perhaps this Makefile is > making unjustified assumptions about the behavior of `patch', in > which case it should be fixed somehow. Or perhaps the ports system > could be fixed to always invoke `patch' with `-b .orig'. > > This isn't the first time I have had trouble with a port because I > set some environment variable in some unexpected way. So this is > actually another instance of a more general problem. I partially fixed linux-jdk, so at least it will not fail on install (however, some files will be missed out of plist if VERSION_CONTROL="t" is defined). Attached patch should solve this problem completely. -Maxim --------------973BD14F9E9ED6573A39E31F Content-Type: text/plain; charset=koi8-r; name="bsd.port.mk-patchargs.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="bsd.port.mk-patchargs.diff" --- bsd.port.mk.orig Fri Dec 15 10:03:13 2000 +++ bsd.port.mk Fri Dec 15 10:10:51 2000 @@ -993,6 +993,11 @@ PATCH_DIST_ARGS+= -C .endif +.if ${PATCH} == "/usr/bin/patch" +PATCH_ARGS+= -b .orig +PATCH_DIST_ARGS+= -b .orig +.endif + .if exists(/bin/tar) TAR?= /bin/tar .else --------------973BD14F9E9ED6573A39E31F-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message