Move more "patch"-related variables and targets out of bsd.pkg.mk and into

bsd.pkg.patch.mk.

1 files changed, 7 insertions, 25 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index aac37a5f595..cd4533b0926 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1793 2006/01/19 19:35:25 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1794 2006/01/19 20:32:17 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -391,7 +391,6 @@ CONFIGURE_ENV+=		lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN_CMD:sh}
 
 _TOOLS_COOKIE=		${WRKDIR}/.tools_done
 _WRAPPER_COOKIE=	${WRKDIR}/.wrapper_done
-_PATCH_COOKIE=		${WRKDIR}/.patch_done
 _CONFIGURE_COOKIE=	${WRKDIR}/.configure_done
 _BUILD_COOKIE=		${WRKDIR}/.build_done
 _TEST_COOKIE=		${WRKDIR}/.test_done
@@ -2453,11 +2452,9 @@ show-shlib-type:
 .endif
 .endif # !_USE_PLIST_MODULE
 
-.PHONY: acquire-patch-lock acquire-tools-lock
+.PHONY: acquire-tools-lock
 .PHONY: acquire-wrapper-lock acquire-configure-lock acquire-build-lock
 .PHONY: acquire-install-lock acquire-package-lock
-acquire-patch-lock:
-	${_ACQUIRE_LOCK}
 acquire-tools-lock:
 	${_ACQUIRE_LOCK}
 acquire-wrapper-lock:
@@ -2471,11 +2468,9 @@ acquire-install-lock:
 acquire-package-lock:
 	${_ACQUIRE_LOCK}
 
-.PHONY: release-patch-lock release-tools-lock
+.PHONY: release-tools-lock
 .PHONY: release-wrapper-lock release-configure-lock release-build-lock
 .PHONY: release-install-lock release-package-lock
-release-patch-lock:
-	${_RELEASE_LOCK}
 release-tools-lock:
 	${_RELEASE_LOCK}
 release-wrapper-lock:
@@ -2504,11 +2499,6 @@ fetch:
 	@cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} real-fetch PKG_PHASE=fetch
 .endif
 
-.PHONY: patch
-.if !target(patch)
-patch: extract acquire-patch-lock ${_PATCH_COOKIE} release-patch-lock
-.endif
-
 .PHONY: tools
 .if !target(tools)
 tools: patch acquire-tools-lock ${_TOOLS_COOKIE} release-tools-lock
@@ -2554,9 +2544,6 @@ replace: ${_PKGSRC_BUILD_TARGETS} real-replace
 undo-replace: real-undo-replace
 .endif
 
-${_PATCH_COOKIE}:
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} real-patch PKG_PHASE=patch
-
 ${_TOOLS_COOKIE}:
 	${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} real-tools PKG_PHASE=tools
 
@@ -2633,10 +2620,8 @@ ${_INSTALL_COOKIE}:
 ${_PACKAGE_COOKIE}:
 	${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${BUILD_ENV} ${MAKE} ${MAKEFLAGS} real-package PKG_PHASE=package
 
-.PHONY: patch-message tools-message wrapper-message
+.PHONY: tools-message wrapper-message
 .PHONY: configure-message build-message test-message
-patch-message:
-	@${ECHO_MSG} "${_PKGSRC_IN}> Patching for ${PKGNAME}"
 tools-message:
 	@${ECHO_MSG} "${_PKGSRC_IN}> Overriding tools for ${PKGNAME}"
 wrapper-message:
@@ -2648,10 +2633,8 @@ build-message:
 test-message:
 	@${ECHO_MSG} "${_PKGSRC_IN}> Testing for ${PKGNAME}"
 
-.PHONY: patch-cookie tools-cookie wrapper-cookie
+.PHONY: tools-cookie wrapper-cookie
 .PHONY: configure-cookie build-cookie test-cookie
-patch-cookie:
-	${_PKG_SILENT}${_PKG_DEBUG}${_GENERATE_PATCH_COOKIE}
 tools-cookie:
 	${_PKG_SILENT}${_PKG_DEBUG} ${TOUCH} ${TOUCH_FLAGS} ${_TOOLS_COOKIE}
 wrapper-cookie:
@@ -2673,12 +2656,11 @@ test-cookie:
 # Please note that the order of the following targets is important, and
 # should not be modified (.ORDER is not recognised by make(1) in a serial
 # make i.e. without -j n)
-.PHONY: real-fetch real-patch
+.PHONY: real-fetch
 .PHONY: real-tools real-wrapper
 .PHONY: real-configure real-build real-test real-install real-package
 .PHONY: real-replace real-undo-replace
 real-fetch: pre-fetch do-fetch post-fetch
-real-patch: patch-message patch-vars pre-patch do-patch post-patch patch-cookie
 real-tools: tools-message tools-vars pre-tools do-tools post-tools tools-cookie
 real-wrapper: wrapper-message wrapper-vars pre-wrapper do-wrapper post-wrapper wrapper-cookie
 real-configure: configure-message configure-vars pre-configure pre-configure-override do-configure post-configure configure-cookie
@@ -2756,7 +2738,7 @@ do-su-undo-replace:
 
 # Empty pre-* and post-* targets
 
-.for name in fetch patch tools wrapper configure build test install-script install package
+.for name in fetch tools wrapper configure build test install-script install package
 
 .  if !target(pre-${name})
 pre-${name}: