=== Applying patches on top of PostgreSQL commit ID cec5fe0d1e192b3b0005063011f113ac99f6908c ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Jan 21 19:21:21 UTC 2026
On branch cf/6367
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Generate-pkg-config-for-server-module-development.patch ===
Applying: Generate pkg-config for server module development
Using index info to reconstruct a base tree...
M	src/Makefile.global.in
M	src/backend/Makefile
Falling back to patching base and 3-way merge...
Auto-merging src/backend/Makefile
CONFLICT (content): Merge conflict in src/backend/Makefile
Auto-merging src/Makefile.global.in
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Generate pkg-config for server module development
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Unstaged changes after reset:
M	src/Makefile.global.in
M	src/Makefile.shlib
M	src/backend/.gitignore
M	src/backend/Makefile
=== using patch(1) to apply patch ./0001-Generate-pkg-config-for-server-module-development.patch ===
patching file src/Makefile.global.in
patching file src/Makefile.shlib
patching file src/backend/.gitignore
patching file src/backend/Makefile
Hunk #1 FAILED at 59.
Hunk #2 succeeded at 117 (offset 22 lines).
Hunk #3 succeeded at 209 (offset 22 lines).
Hunk #4 FAILED at 221.
Hunk #5 FAILED at 243.
3 out of 5 hunks FAILED -- saving rejects to file src/backend/Makefile.rej
Unstaged changes after reset:
M	src/Makefile.global.in
M	src/Makefile.shlib
M	src/backend/.gitignore
M	src/backend/Makefile
Removing src/backend/Makefile.rej
=== using 'git apply' to apply patch ./0001-Generate-pkg-config-for-server-module-development.patch ===
Applied patch to 'src/Makefile.global.in' cleanly.
Applied patch to 'src/Makefile.shlib' cleanly.
Applied patch to 'src/backend/.gitignore' cleanly.
Applied patch to 'src/backend/Makefile' with conflicts.
U src/backend/Makefile
diff --cc src/backend/Makefile
index baa9b05d021,63b8a20dc49..00000000000
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@@ -81,7 -59,7 +81,11 @@@ override LDFLAGS := $(LDFLAGS) $(LDFLAG
  
  ##########################################################################
  
++<<<<<<< ours
 +all: submake-libpgport submake-catalog-headers submake-utils-headers postgres
++=======
+ all: submake-libpgport submake-catalog-headers submake-utils-headers postgres postgresql-server.pc $(POSTGRES_IMP)
++>>>>>>> theirs
  
  ifneq ($(PORTNAME), cygwin)
  ifneq ($(PORTNAME), win32)
@@@ -223,17 -217,21 +243,29 @@@ install-bin: postgres installdir
  
  .PHONY: install-bin
  
+ install-lib-pc: postgresql-server.pc installdirs
+ 	$(INSTALL_DATA) $< '$(DESTDIR)$(pkgconfigdir)/postgresql-server.pc'
+ 
+ .PHONY: install-lib-pc
+ 
  installdirs:
  	$(MKDIR_P) '$(DESTDIR)$(bindir)' '$(DESTDIR)$(datadir)'
++<<<<<<< ours
 +ifeq ($(PORTNAME), cygwin)
 +ifeq ($(MAKE_DLL), true)
 +	$(MKDIR_P) '$(DESTDIR)$(libdir)'
 +endif
 +endif
 +ifeq ($(PORTNAME), win32)
 +ifeq ($(MAKE_DLL), true)
 +	$(MKDIR_P) '$(DESTDIR)$(libdir)'
 +endif
++=======
+ 	$(MKDIR_P) '$(DESTDIR)$(libdir)' '$(DESTDIR)$(pkgconfigdir)'
+ ifeq ($(MAKE_EXPORTS), true)
+ 	$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
+ 	$(MKDIR_P) '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)'
++>>>>>>> theirs
  endif
  
  
@@@ -241,6 -239,11 +273,14 @@@
  
  uninstall:
  	rm -f '$(DESTDIR)$(bindir)/postgres$(X)'
++<<<<<<< ours
++=======
+ 	rm -f '$(DESTDIR)$(pkgconfigdir)/postgresql-server.pc'
+ ifeq ($(MAKE_EXPORTS), true)
+ 	rm -f '$(DESTDIR)$(pkglibdir)/$(POSTGRES_IMP)'
+ 	rm -f '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)/mkldexport.sh'
+ endif
++>>>>>>> theirs
  ifeq ($(PORTNAME), cygwin)
  ifeq ($(MAKE_DLL), true)
  	rm -f '$(DESTDIR)$(libdir)/libpostgres.a'