ports/68343: allow custom patch targets in _PATCH_SEQ

[Adam Weinberger]

>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 at 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: