2 files changed, 72 insertions, 27 deletions
diff --git a/graphics/mupdf/files/patch-Makefile b/graphics/mupdf/files/patch-Makefile
index f0e900bcb7d8..5e6e9433c122 100644
--- a/graphics/mupdf/files/patch-Makefile
+++ b/graphics/mupdf/files/patch-Makefile
@@ -1,26 +1,11 @@
-$OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $
---- Makefile.orig	2022-10-30 12:16:03 UTC
+--- Makefile.orig	2025-07-13 20:35:02 UTC
 +++ Makefile
-@@ -257,17 +257,19 @@ $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)
- $(THREAD_LIB) : $(THREAD_OBJ)
- $(PKCS7_LIB) : $(PKCS7_OBJ)
- else
--MUPDF_LIB = $(OUT)/libmupdf.a
-+MUPDF_LIB = $(OUT)/libmupdf.so.$(SOVERSION)
-+THIRD_LIB = $(OUT)/libmupdf-third.so.$(SOVERSION)
- LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB) $(THIRD_LIB)
--THIRD_LIB = $(OUT)/libmupdf-third.a
- ifneq ($(USE_SYSTEM_GLUT),yes)
- THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a
- endif
- THREAD_LIB = $(OUT)/libmupdf-threads.a
- PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
+@@ -116,7 +116,7 @@ $(OUT)/generated/%.o : generated/%.c
+ 	$(CC_CMD) $(LIB_CFLAGS) $(WARNING_CFLAGS) $(THIRD_CFLAGS) $(THREADING_CFLAGS)
  
--$(MUPDF_LIB) : $(MUPDF_OBJ)
-+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB)
-+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so.$(SOVERSION)
- $(THIRD_LIB) : $(THIRD_OBJ)
-+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so.$(SOVERSION)
- $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)
- $(THREAD_LIB) : $(THREAD_OBJ)
- $(PKCS7_LIB) : $(PKCS7_OBJ)
+ $(OUT)/generated/%.o : generated/%.c
+-	$(CC_CMD) $(WARNING_CFLAGS) $(LIB_CFLAGS) -O0
++	$(CC_CMD) $(WARNING_CFLAGS) $(LIB_CFLAGS)
+ 
+ $(OUT)/platform/x11/%.o : platform/x11/%.c
+ 	$(CC_CMD) $(WARNING_CFLAGS) $(X11_CFLAGS)
diff --git a/graphics/mupdf/files/patch-Makerules b/graphics/mupdf/files/patch-Makerules
index d03a83bbeb7d..00558a02e170 100644
--- a/graphics/mupdf/files/patch-Makerules
+++ b/graphics/mupdf/files/patch-Makerules
@@ -1,9 +1,57 @@
---- Makerules.orig	2023-11-24 18:10:54 UTC
+--- Makerules.orig	2025-05-19 15:38:05 UTC
 +++ Makerules
-@@ -331,3 +331,43 @@ ifeq "$(OS)" "ios"
+@@ -131,28 +131,28 @@ else ifeq ($(build),release)
+   CFLAGS += -pipe -g
+   LDFLAGS += -g
+ else ifeq ($(build),release)
+-  CFLAGS += -pipe -O2 -DNDEBUG
++  CFLAGS +=  -DNDEBUG
+   LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
+ else ifeq ($(build),small)
+   CFLAGS += -pipe -Os -DNDEBUG
+   LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
+ else ifeq ($(build),valgrind)
+-  CFLAGS += -pipe -O2 -DNDEBUG -DPACIFY_VALGRIND
++  CFLAGS +=  -DNDEBUG -DPACIFY_VALGRIND
+   LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
+ else ifeq ($(build),sanitize)
+   CFLAGS += -pipe -g $(SANITIZE_FLAGS)
+   LDFLAGS += -g $(SANITIZE_FLAGS)
+ else ifeq ($(build),sanitize-release)
+-  CFLAGS += -pipe -O2 -DNDEBUG $(SANITIZE_FLAGS)
++  CFLAGS +=  -DNDEBUG $(SANITIZE_FLAGS)
+   LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s $(SANITIZE_FLAGS)
+ else ifeq ($(build),profile)
+-  CFLAGS += -pipe -O2 -DNDEBUG -pg
++  CFLAGS +=  -DNDEBUG -pg
+   LDFLAGS += -pg
+ else ifeq ($(build),coverage)
+   CFLAGS += -pipe -g -pg -fprofile-arcs -ftest-coverage
+   LIBS += -lgcov
+ else ifeq ($(build),native)
+-  CFLAGS += -pipe -O2 -DNDEBUG -march=native
++  CFLAGS +=  -DNDEBUG -march=native
+   LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
+ else ifeq ($(build),memento)
+   CFLAGS += -pipe -g -DMEMENTO -DMEMENTO_MUPDF_HACKS
+@@ -162,11 +162,11 @@ else ifeq ($(build),memento)
+     ifeq ($(OS),OpenBSD)
+       LIBS += -L /usr/local/lib -l execinfo
+     else
+-      LIBS += -ldl
++      LIBS += 
+     endif
+   endif
+ else ifeq ($(build),gperf)
+-  CFLAGS += -pipe -O2 -DNDEBUG -DGPERF
++  CFLAGS +=  -DNDEBUG -DGPERF
+   LIBS += -lprofiler
+ else
+   $(error unknown build setting: '$(build)')
+@@ -201,6 +201,46 @@ ifeq ($(OS),Darwin)
    LD = xcrun ld
    RANLIB = xcrun ranlib
- endif
+ 
 +
 +
 +# added from FreeBSD ports
@@ -44,3 +92,15 @@
 +USE_SYSTEM_ZLIB := yes
 +SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
 +SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
+   ifneq ($(ARCHFLAGS),)
+     $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.")
+     HAVE_LIBCRYPTO := no
+@@ -220,7 +260,7 @@ else
+     HAVE_OBJCOPY := yes
+   endif
+ 
+-  ifeq ($(OS),OpenBSD)
++  ifeq ($(OS),FreeBSD)
+     LDFLAGS += -pthread
+   endif
+