From 88d415640d20174302d2d8eaa6b036dfaa19730f Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Fri, 05 Apr 2024 12:31:04 +0200
Subject: [PATCH] pkgconf: update to 2.2.0

---
 make-rules/prep.mk |   44 ++++++++++++++++----------------------------
 1 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/make-rules/prep.mk b/make-rules/prep.mk
index 9b2f28f..618e466 100644
--- a/make-rules/prep.mk
+++ b/make-rules/prep.mk
@@ -18,47 +18,35 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, Oracle and/or it's affiliates.  All rights reserved.
+
 #
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+.NOTPARALLEL:
 
-UNPACK =	$(WS_TOOLS)/userland-unpack
-FETCH =		$(WS_TOOLS)/userland-fetch
+include $(WS_MAKE_RULES)/prep-download.mk
 
-ARCHIVES += $(COMPONENT_ARCHIVE)
-CLEAN_PATHS += $(COMPONENT_SRC)
-CLOBBER_PATHS += $(COMPONENT_ARCHIVE)
+include $(WS_MAKE_RULES)/prep-hg.mk
+include $(WS_MAKE_RULES)/prep-git.mk
+include $(WS_MAKE_RULES)/prep-svn.mk
+include $(WS_MAKE_RULES)/prep-unpack.mk
+include $(WS_MAKE_RULES)/prep-patch.mk
 
-PATCHES =	$(shell find . -type f -name '*.patch' | \
-			 sed -e 's;^\./;;' | grep -v $(COMPONENT_SRC) | sort)
-STAMPS =	$(PATCHES:%=$(COMPONENT_SRC)/.%ed)
+download::
 
-$(COMPONENT_SRC)/.%ed:	%
-	$(GPATCH) -d $(@D) $(GPATCH_FLAGS) < $<
-	$(TOUCH) $@
+unpack::	download
 
-$(COMPONENT_ARCHIVE):
-	$(FETCH) --file $@ \
-		$(COMPONENT_ARCHIVE_URL:%=--url %) \
-		$(COMPONENT_ARCHIVE_HASH:%=--hash %)
+patch::		unpack
 
-$(COMPONENT_SRC)/.unpacked:	$(COMPONENT_ARCHIVE)
-	$(UNPACK) $(UNPACK_ARGS) $(COMPONENT_ARCHIVE)
-	$(TOUCH) $@
-
-$(COMPONENT_SRC)/.patched:	$(COMPONENT_SRC)/.unpacked $(STAMPS)
-	$(TOUCH) $@
-
-$(COMPONENT_SRC)/.prep:	$(COMPONENT_SRC)/.patched
+$(SOURCE_DIR)/.prep:	component-environment-prep download unpack patch
 	$(COMPONENT_PREP_ACTION)
 	$(TOUCH) $@
 
-prep::	$(COMPONENT_SRC)/.prep
-
-download::	$(COMPONENT_ARCHIVE)
+prep::	$(SOURCE_DIR)/.prep
 
 clean::
+	$(PRE_CLEAN_ACTION)
 	$(RM) -r $(CLEAN_PATHS)
 
 clobber::	clean
 	$(RM) -r $(CLOBBER_PATHS)
-

--
Gitblit v1.9.3