From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 25 21:00:51 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0198816A4CE for ; Fri, 25 Jun 2004 21:00:51 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E528A43D5E for ; Fri, 25 Jun 2004 21:00:50 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i5PKeGWi016787 for ; Fri, 25 Jun 2004 20:40:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i5PKeGIG016786; Fri, 25 Jun 2004 20:40:16 GMT (envelope-from gnats) Resent-Date: Fri, 25 Jun 2004 20:40:16 GMT Resent-Message-Id: <200406252040.i5PKeGIG016786@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@freebsd.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@freebsd.org, Adam Weinberger Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 045E616A4CE for ; Fri, 25 Jun 2004 20:32:55 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9A6743D55 for ; Fri, 25 Jun 2004 20:32:54 +0000 (GMT) (envelope-from adamw@FreeBSD.org) Received: from freefall.freebsd.org (adamw@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.11/8.12.11) with ESMTP id i5PKVkM8016497 for ; Fri, 25 Jun 2004 20:31:46 GMT (envelope-from adamw@freefall.freebsd.org) Received: (from adamw@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i5PKVkfB016496; Fri, 25 Jun 2004 20:31:46 GMT (envelope-from adamw) Message-Id: <200406252031.i5PKVkfB016496@freefall.freebsd.org> Date: Fri, 25 Jun 2004 20:31:46 GMT From: Adam Weinberger To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/68343: allow custom patch targets in _PATCH_SEQ X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Adam Weinberger List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 21:00:51 -0000 >Number: 68343 >Category: ports >Synopsis: allow custom patch targets in _PATCH_SEQ >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jun 25 20:40:16 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Adam Weinberger >Release: FreeBSD 4.10-STABLE i386 >Organization: >Environment: System: FreeBSD freefall.freebsd.org 4.10-STABLE FreeBSD 4.10-STABLE #13: Fri May 28 21:29:54 PDT 2004 kensmith@freefall.freebsd.org:/c/src/sys/compile/FREEFALL i386 >Description: Currently, bsd.gnome.mk uses pre-patch to do its bidness. I've been putting together a bsd.mozilla.mk, but it's going to have to do some patching as well. And, KDE does some patching tricks of its own. The following patch creates an EXTRA_PATCH_TARGETS variable that appears right before do-patch in _PATCH_SEQ. By adding to this variable, other bsd.*.mk thingers can do their patching business without clobbering patch targets. A viable bsd.mozilla.mk is pretty much contingent upon the ability to use a new patch target. I've included the change that'd take place in bsd.gnome.mk to utilize the new variable, but I'll leave the decision to mess with bsd.gnome.mk at this time up to Joe. >How-To-Repeat: >Fix: --- patch_seq.patch begins here --- Index: bsd.gnome.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.gnome.mk,v retrieving revision 1.70 diff -u -r1.70 bsd.gnome.mk --- bsd.gnome.mk 7 Jun 2004 20:42:02 -0000 1.70 +++ bsd.gnome.mk 25 Jun 2004 20:16:06 -0000 @@ -578,10 +578,11 @@ . endfor .endif -.if defined(GNOME_PRE_PATCH) && !target(pre-patch) +.if defined(GNOME_PRE_PATCH) +EXTRA_PATCH_TARGETS+= gnome-patch USE_REINPLACE= yes -pre-patch: +gnome-patch: @${GNOME_PRE_PATCH:C/^;//1} .endif Index: bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.491 diff -u -r1.491 bsd.port.mk --- bsd.port.mk 10 Jun 2004 07:30:19 -0000 1.491 +++ bsd.port.mk 25 Jun 2004 20:16:07 -0000 @@ -3483,7 +3483,7 @@ post-extract post-extract-script _PATCH_DEP= extract _PATCH_SEQ= patch-message patch-depends pre-patch pre-patch-script \ - do-patch post-patch post-patch-script + ${EXTRA_PATCH_TARGETS} do-patch post-patch post-patch-script _CONFIGURE_DEP= patch _CONFIGURE_SEQ= build-depends lib-depends misc-depends configure-message \ pre-configure pre-configure-script patch-autotools \ --- patch_seq.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: