CVS commit: pkgsrc/print/mupdf

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/print/mupdf
From: "Leonardo Taccari" <leot%netbsd.org@localhost>
Date: Fri, 29 Aug 2025 09:17:06 +0000

Module Name:    pkgsrc
Committed By:   leot
Date:           Fri Aug 29 09:17:06 UTC 2025

Modified Files:
        pkgsrc/print/mupdf: Makefile PLIST distinfo
        pkgsrc/print/mupdf/patches: patch-Makefile patch-Makerules

Log Message:
mupdf: Update to 1.26.7

Changes:
List of changes in MuPDF 1.26
- Removed PDF linearization support:
- Object labels:
  Write a comment before numbered objects listing the possible
  ways it can be reached from the document root.
  Enable with mutool show -L, mutool clean -L, and PDF write
  option "labels".
  Library functions pdf_load_object_labels and pdf_label_object.
- Brotli compression:
  Experimental feature from latest PDF specification proposal.
- Optional barcode support:
  Build with "make barcode=yes".
  Uses zxing-cpp (zebra crossing) C++ as a third party dependency.
  Adds mutool barcode sub-command.
  To detect barcodes in a PDF:
   mutool barcode -d barcode.pdf
  To create barcode images as PNG file:
   mutool barcode -c -o barcode.png -F qrcode "Hello, world!"
  Library functions fz_new_barcode_image and
  fz_decode_barcode_from_pixmap.
- New Structured Text extraction passes:
  Paragraph Breaking: Detect paragraphs from first-line
  indentation and other heuristics.
  Table Hunt: Scan text and try to assemble it into tables with
  rows and columns.
- New Structured Text extraction options:
   - allow reading raw character or glyph index when unicode is not available
   - collect styles to detect fake bold, underlines, strike-through, etc.
   - clip-rect to only extract text inside the specified area
   - accurate-ascenders to measure ascender data from font outline
   - accurate-side-bearings to measure glyph widths from font outline
- CSV output format (using "Table Hunt" pass on input document).
- Core library additions:
  JSON parser, object model, and printer.
  Activity logger API.
  Support "overlong null" characters in utf-8 (using "\xC0\x80"
  to represent \x00 in C strings, without being misconstrued as a
  string terminator).
- Build system changes:
  Cleaned up Makefile cruft and refactored how shared libraries
  are built.
  Removed bit-rotted sections of the Makefile that have not been
  maintained and no longer work (primarily iOS and MinGW).
  Don't build example tools muraster and mupdf-x11-curl by
  default. These examples can be built with "make extra-apps".
- Miscellaneous improvements and new behavior:
  Include more data in structured text XML dumps.
  Ignore junk at the start of a PDF file (such as PJL commands)
  without needing to perform a full repair pass.
  Support non-latin/greek/cyrillic/CJK languages in annotations
  and widgets (requires HTML layout engine).
  Use system font callback to look for missing fonts in HTML
  layout.
  Support CSS text fill and stroke properties:
   -webkit-text-fill-color
   -webkit-stroke-color
   -webkit-stroke-width
  Updated unicode line breaking (UAX 14) and upper/lowercase
  tables to Unicode 16.0.
- Bug fixes and stability improvements:
- Command line tool additional options:
   mutool poster: new option -m (margin)
   mutool show: new option -r (force repair)
   mutool clean: --structure=keep to keep tagged content when
   subsetting pages. WARNING: This option will prevent the file
   from shrinking, because we must still keep all the objects from
   deleted pages around.
   mutool clean: -t option will always write compact objects
   mutool clean: -tt option will always pretty-print objects

List of changes in MuPDF 1.25
- New logo!
- Redaction options:
   - New "don't redact text" option
   - New "redact line art" option
- Structured Text options:
   - Use "Tagged PDF" structure information
   - Detect underlines and strikeouts
   - Mark automatically inserted spaces
   - Mark areas where line art (vectors) are present
   - Use accurate glyph bounding boxes
   - Ignore ActualText tags
   - Scan page for 'grid' lines
   - Segment page into areas (headers, columns, etc)
- Annotation features:
   - Intent property accessors.
   - Rich Content styling on FreeText annotations.
   - Callout arrows on FreeText annotations.
   - Leader Line and Caption on Line annotations.
   - Improved handling of Rect and RD.
- Low level FDF format support.
   - See docs/examples/import-fdf.js for how to use.
- Improved FileSpec handling with new functions.
   - Functions for listing document and page Associated Files (AF).
   - Functions to create and write XML DOM trees (fz_xml).
   - Skew detection and deskew algorithms on pixmaps and PDFOCR device.
   - Document area detection in scanned images.
   - ZUGFeRD support.
   - New tool "mutool audit" to create summary of PDF file composition.
- Important bug fixes


To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 pkgsrc/print/mupdf/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/print/mupdf/PLIST
cvs rdiff -u -r1.77 -r1.78 pkgsrc/print/mupdf/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/mupdf/patches/patch-Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/mupdf/patches/patch-Makerules

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/mupdf/Makefile
diff -u pkgsrc/print/mupdf/Makefile:1.129 pkgsrc/print/mupdf/Makefile:1.130
--- pkgsrc/print/mupdf/Makefile:1.129   Mon Jul 21 20:50:16 2025
+++ pkgsrc/print/mupdf/Makefile Fri Aug 29 09:17:06 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.129 2025/07/21 20:50:16 yhardy Exp $
+# $NetBSD: Makefile,v 1.130 2025/08/29 09:17:06 leot Exp $
 
-DISTNAME=      mupdf-1.24.10-source
+DISTNAME=      mupdf-1.26.7-source
 PKGNAME=       ${DISTNAME:S/-source//}
-PKGREVISION=   8
 CATEGORIES=    print
 MASTER_SITES=  https://mupdf.com/downloads/archive/
 

Index: pkgsrc/print/mupdf/PLIST
diff -u pkgsrc/print/mupdf/PLIST:1.28 pkgsrc/print/mupdf/PLIST:1.29
--- pkgsrc/print/mupdf/PLIST:1.28       Wed May 15 21:00:43 2024
+++ pkgsrc/print/mupdf/PLIST    Fri Aug 29 09:17:06 2025
@@ -1,12 +1,11 @@
-@comment $NetBSD: PLIST,v 1.28 2024/05/15 21:00:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.29 2025/08/29 09:17:06 leot Exp $
 bin/mupdf
-${PLIST.opengl}bin/mupdf-gl
-${PLIST.curl}bin/mupdf-x11-curl
-bin/muraster
+bin/mupdf-gl
 bin/mutool
 include/mupdf/fitz.h
 include/mupdf/fitz/archive.h
 include/mupdf/fitz/band-writer.h
+include/mupdf/fitz/barcode.h
 include/mupdf/fitz/bidi.h
 include/mupdf/fitz/bitmap.h
 include/mupdf/fitz/buffer.h
@@ -16,6 +15,7 @@ include/mupdf/fitz/compressed-buffer.h
 include/mupdf/fitz/config.h
 include/mupdf/fitz/context.h
 include/mupdf/fitz/crypt.h
+include/mupdf/fitz/deskew.h
 include/mupdf/fitz/device.h
 include/mupdf/fitz/display-list.h
 include/mupdf/fitz/document.h
@@ -30,6 +30,7 @@ include/mupdf/fitz/hash.h
 include/mupdf/fitz/heap-imp.h
 include/mupdf/fitz/heap.h
 include/mupdf/fitz/image.h
+include/mupdf/fitz/json.h
 include/mupdf/fitz/link.h
 include/mupdf/fitz/log.h
 include/mupdf/fitz/outline.h
@@ -75,8 +76,10 @@ include/mupdf/pdf/name-table.h
 include/mupdf/pdf/object.h
 include/mupdf/pdf/page.h
 include/mupdf/pdf/parse.h
+include/mupdf/pdf/recolor.h
 include/mupdf/pdf/resource.h
 include/mupdf/pdf/xref.h
+include/mupdf/pdf/zugferd.h
 include/mupdf/ucdn.h
 lib/libmupdf-third.a
 lib/libmupdf.a

Index: pkgsrc/print/mupdf/distinfo
diff -u pkgsrc/print/mupdf/distinfo:1.77 pkgsrc/print/mupdf/distinfo:1.78
--- pkgsrc/print/mupdf/distinfo:1.77    Tue Oct 22 09:34:44 2024
+++ pkgsrc/print/mupdf/distinfo Fri Aug 29 09:17:06 2025
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.77 2024/10/22 09:34:44 leot Exp $
+$NetBSD: distinfo,v 1.78 2025/08/29 09:17:06 leot Exp $
 
-BLAKE2s (mupdf-1.24.10-source.tar.gz) = ce3240ea683004c68ad084ce3e66071179cbb7c6ae88c06aaabf393a9d2a021b
-SHA512 (mupdf-1.24.10-source.tar.gz) = 4f2d1447e6d090d461af761df1a15bf054fe56d3e8f6a8a01bedd103ae6bdefb98e98d76af93d34e8aa61ae06b94eca15dcddfc4411c5288d1c77d1ce31563a8
-Size (mupdf-1.24.10-source.tar.gz) = 54042778 bytes
-SHA1 (patch-Makefile) = e5ee2b6ff9160dcfb6ccb26cb09f1fd380cd541e
+BLAKE2s (mupdf-1.26.7-source.tar.gz) = 181155ce4293b960e2803e5e595eede245ab9ba94e7b436baf857469953fce83
+SHA512 (mupdf-1.26.7-source.tar.gz) = e447447e10f752ea612e091de9af4bdc8144393a3349b73578d172e40e45a1c25b3a30c2a6d92b2d8c6589790171420d10174197debe2fe5ee1ebe052d82c43b
+Size (mupdf-1.26.7-source.tar.gz) = 64529748 bytes
+SHA1 (patch-Makefile) = 9f15d6b0c9a122993e71728adb8b77945c79152b
 SHA1 (patch-Makelists) = 714157e21b2b609ac4f0adacc73c3e3a2156640a
-SHA1 (patch-Makerules) = 8308d5a6467abdad9d9fe0ad96aaeb4693f0a5cd
+SHA1 (patch-Makerules) = 5caa3319b121201952b0562201cee7bf0f0ea55f
 SHA1 (patch-docs_man_mupdf.1) = c2a2c1ad283428168a714adb634aa50cdd6a4aba
 SHA1 (patch-platform_gl_gl-app.h) = 1e915249010acd3ff1343f0607e785d06577fe78
 SHA1 (patch-platform_x11_curl__stream.c) = ccabcd665359ae00b76230a4ced22f360a0989e5

Index: pkgsrc/print/mupdf/patches/patch-Makefile
diff -u pkgsrc/print/mupdf/patches/patch-Makefile:1.2 pkgsrc/print/mupdf/patches/patch-Makefile:1.3
--- pkgsrc/print/mupdf/patches/patch-Makefile:1.2       Tue Oct 22 09:34:44 2024
+++ pkgsrc/print/mupdf/patches/patch-Makefile   Fri Aug 29 09:17:06 2025
@@ -1,12 +1,12 @@
-$NetBSD: patch-Makefile,v 1.2 2024/10/22 09:34:44 leot Exp $
+$NetBSD: patch-Makefile,v 1.3 2025/08/29 09:17:06 leot Exp $
 
 - Install target cleanup
 - Also install muthreads and mupkcs7 libraries (needed by various tools)
 - Use sh instead of bash
 
---- Makefile.orig      2024-10-02 17:10:33.000000000 +0000
+--- Makefile.orig      2025-08-22 20:10:30.000000000 +0000
 +++ Makefile
-@@ -245,10 +245,10 @@ endif
+@@ -240,10 +240,10 @@ endif
  
  FONT_GEN := $(FONT_BIN:%=generated/%.c)
  
@@ -21,8 +21,8 @@ $NetBSD: patch-Makefile,v 1.2 2024/10/22
  
  ifeq ($(HAVE_OBJCOPY),yes)
    MUPDF_OBJ += $(FONT_BIN:%=$(OUT)/%.o)
-@@ -474,51 +474,55 @@ tools: $(TOOL_APPS)
- apps: $(TOOL_APPS) $(VIEW_APPS)
+@@ -442,46 +442,46 @@ extra-apps: $(EXTRA_TOOL_APPS) $(EXTRA_V
+ libmupdf-threads: $(THREAD_LIB)
  
  install-headers:
 -      install -d $(DESTDIR)$(incdir)/mupdf
@@ -39,34 +39,50 @@ $NetBSD: patch-Makefile,v 1.2 2024/10/22
 +      ${BSD_INSTALL_DATA} include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf
  
  install-libs: libs install-headers
- ifneq ($(LIBS_TO_INSTALL_IN_LIB),)
 -      install -d $(DESTDIR)$(libdir)
--      install -m 644 $(LIBS_TO_INSTALL_IN_LIB) $(DESTDIR)$(libdir)
-+      ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(libdir)
-+      for f in $(LIBS_TO_INSTALL_IN_LIB); do \
-+              ${BSD_INSTALL_LIB} $$f $(DESTDIR)$(libdir); \
-+      done
++      ${BSD_INSTALL_LIB_DIR} $(DESTDIR)$(libdir)
+ ifeq ($(shared),yes)
+-      install -m $(SO_INSTALL_MODE) $(OUT)/libmupdf.$(SO)$(SO_VERSION) $(DESTDIR)$(libdir)/libmupdf.$(SO)$(SO_VERSION)
++      ${BSD_INSTALL_LIB} $(OUT)/libmupdf.$(SO)$(SO_VERSION) $(DESTDIR)$(libdir)/libmupdf.$(SO)$(SO_VERSION)
+   ifneq ($(OS),OpenBSD)
+       ln -sf libmupdf.$(SO)$(SO_VERSION) $(DESTDIR)$(libdir)/libmupdf.$(SO)$(SO_VERSION_MAJOR)
+       ln -sf libmupdf.$(SO)$(SO_VERSION) $(DESTDIR)$(libdir)/libmupdf.$(SO)
+   endif
+ else
+-      install -m 644 $(MUPDF_LIB) $(DESTDIR)$(libdir)
+-      install -m 644 $(THIRD_LIB) $(DESTDIR)$(libdir)
++      ${BSD_INSTALL_LIB} $(MUPDF_LIB) $(DESTDIR)$(libdir)
++      ${BSD_INSTALL_LIB} $(THIRD_LIB) $(DESTDIR)$(libdir)
  endif
  
+ install-tools: tools
+-      install -d $(DESTDIR)$(bindir)
+-      install -m 755 $(TOOL_APPS) $(DESTDIR)$(bindir)
++      ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(bindir)
++      ${BSD_INSTALL_PROGRAM} $(TOOL_APPS) $(DESTDIR)$(bindir)
+ 
  install-apps: apps
 -      install -d $(DESTDIR)$(bindir)
--      install -m 755 $(LIBS_TO_INSTALL_IN_BIN) $(TOOL_APPS) $(VIEW_APPS) $(DESTDIR)$(bindir)
-+      ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(bindir)
-+      for f in $(LIBS_TO_INSTALL_IN_BIN) $(TOOL_APPS) $(VIEW_APPS); do \
-+              ${BSD_INSTALL_LIB} $$f $(DESTDIR)$(bindir); \
-+      done
+-      install -m 755 $(TOOL_APPS) $(VIEW_APPS) $(DESTDIR)$(bindir)
++      ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(bindir)
++      ${BSD_INSTALL_PROGRAM} $(TOOL_APPS) $(VIEW_APPS) $(DESTDIR)$(bindir)
+ 
+ install-extra-apps: install-apps extra-apps
+-      install -d $(DESTDIR)$(bindir)
+-      install -m 755 $(EXTRA_TOOL_APPS) $(EXTRA_VIEW_APPS) $(DESTDIR)$(bindir)
++      ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(bindir)
++      ${BSD_INSTALL_PROGRAM} $(EXTRA_TOOL_APPS) $(EXTRA_VIEW_APPS) $(DESTDIR)$(bindir)
  
  install-docs:
 -      install -d $(DESTDIR)$(mandir)/man1
 -      install -m 644 docs/man/*.1 $(DESTDIR)$(mandir)/man1
-+      ${BSD_INSTALL_MAN_DIR} $(DESTDIR)$(mandir)/man1
-+      ${BSD_INSTALL_MAN} docs/man/*.1 $(DESTDIR)$(mandir)/man1
- 
 -      install -d $(DESTDIR)$(docdir)
 -      install -d $(DESTDIR)$(docdir)/examples
 -      install -m 644 README CHANGES $(DESTDIR)$(docdir)
 -      install -m 644 $(wildcard COPYING LICENSE) $(DESTDIR)$(docdir)
 -      install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples
++      ${BSD_INSTALL_MAN_DIR} $(DESTDIR)$(mandir)/man1
++      ${BSD_INSTALL_MAN} docs/man/*.1 $(DESTDIR)$(mandir)/man1
 +      ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir)
 +      ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir)/examples
 +      ${BSD_INSTALL_DATA} README CHANGES $(DESTDIR)$(docdir)
@@ -75,64 +91,14 @@ $NetBSD: patch-Makefile,v 1.2 2024/10/22
  
  install: install-libs install-apps install-docs
  
- install-docs-html:
-       python3 scripts/build-docs.py
--      install -d $(DESTDIR)$(docdir)
--      install -d $(DESTDIR)$(docdir)/_images
--      install -d $(DESTDIR)$(docdir)/_static
--      install -d $(DESTDIR)$(docdir)/_static/js
--      install -d $(DESTDIR)$(docdir)/_static/css
--      install -d $(DESTDIR)$(docdir)/_static/css/fonts
--      install -m 644 build/docs/html/*.html $(DESTDIR)$(docdir)
--      install -m 644 build/docs/html/*.inv $(DESTDIR)$(docdir)
--      install -m 644 build/docs/html/*.js $(DESTDIR)$(docdir)
--      install -m 644 build/docs/html/_images/* $(DESTDIR)$(docdir)/_images
--      install -m 644 build/docs/html/_static/*.css $(DESTDIR)$(docdir)/_static
--      install -m 644 build/docs/html/_static/*.ico $(DESTDIR)$(docdir)/_static
--      install -m 644 build/docs/html/_static/*.js $(DESTDIR)$(docdir)/_static
--      install -m 644 build/docs/html/_static/*.png $(DESTDIR)$(docdir)/_static
-+      ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir)
-+      ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir)/_images
-+      ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir)/_static
-+      ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir)/_static/js
-+      ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir)/_static/css
-+      ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir)/_static/css/fonts
-+      ${BSD_INSTALL_DATA} build/docs/html/*.html $(DESTDIR)$(docdir)
-+      ${BSD_INSTALL_DATA} build/docs/html/*.inv $(DESTDIR)$(docdir)
-+      ${BSD_INSTALL_DATA} build/docs/html/*.js $(DESTDIR)$(docdir)
-+      ${BSD_INSTALL_DATA} build/docs/html/_images/* $(DESTDIR)$(docdir)/_images
-+      ${BSD_INSTALL_DATA} build/docs/html/_static/*.css $(DESTDIR)$(docdir)/_static
-+      ${BSD_INSTALL_DATA} build/docs/html/_static/*.ico $(DESTDIR)$(docdir)/_static
-+      ${BSD_INSTALL_DATA} build/docs/html/_static/*.js $(DESTDIR)$(docdir)/_static
-+      ${BSD_INSTALL_DATA} build/docs/html/_static/*.png $(DESTDIR)$(docdir)/_static
+@@ -500,8 +500,8 @@ docs-clean:
+       rm -rf build/.doctrees
+ 
+ install-docs-html: docs
+-      mkdir -p $(DESTDIR)$(docdir)
+-      cp -r build/docs/* $(DESTDIR)$(docdir)
++      ${BSD_INSTALL_DATA} $(DESTDIR)$(docdir)
++      ${BSD_INSTALL_DATA} build/docs/* $(DESTDIR)$(docdir) # TODO
  
  tarball:
        bash scripts/archive.sh
-@@ -643,23 +647,23 @@ ifneq ($(USE_SYSTEM_LIBS),yes)
- endif
- 
- install-shared-c: install-shared-check shared install-headers
--      install -d $(DESTDIR)$(libdir)
-+      ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(libdir)
-       install -m $(SO_INSTALL_MODE) $(OUT)/libmupdf.$(SO)$(SO_VERSION) $(DESTDIR)$(libdir)/
- ifneq ($(OS),OpenBSD)
-       ln -sf libmupdf.$(SO)$(SO_VERSION) $(DESTDIR)$(libdir)/libmupdf.$(SO)
- endif
- 
- install-shared-c++: install-shared-c c++
--      install -m 644 platform/c++/include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf
-+      ${BSD_INSTALL_DATA} platform/c++/include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf
-       install -m $(SO_INSTALL_MODE) $(OUT)/libmupdfcpp.$(SO)$(SO_VERSION) $(DESTDIR)$(libdir)/
- ifneq ($(OS),OpenBSD)
-       ln -sf libmupdfcpp.$(SO)$(SO_VERSION) $(DESTDIR)$(libdir)/libmupdfcpp.$(SO)
- endif
- 
- install-shared-python: install-shared-c++ python
--      install -d $(DESTDIR)$(pydir)/mupdf
-+      ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(pydir)/mupdf
-       install -m $(SO_INSTALL_MODE) $(OUT)/_mupdf.$(SO) $(DESTDIR)$(pydir)/mupdf
--      install -m 644 $(OUT)/mupdf.py $(DESTDIR)$(pydir)/mupdf/__init__.py
-+      ${BSD_INSTALL_DATA} $(OUT)/mupdf.py $(DESTDIR)$(pydir)/mupdf/__init__.py
- 
- else
- 

Index: pkgsrc/print/mupdf/patches/patch-Makerules
diff -u pkgsrc/print/mupdf/patches/patch-Makerules:1.1 pkgsrc/print/mupdf/patches/patch-Makerules:1.2
--- pkgsrc/print/mupdf/patches/patch-Makerules:1.1      Wed Aug 14 05:55:32 2024
+++ pkgsrc/print/mupdf/patches/patch-Makerules  Fri Aug 29 09:17:06 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makerules,v 1.1 2024/08/14 05:55:32 adam Exp $
+$NetBSD: patch-Makerules,v 1.2 2025/08/29 09:17:06 leot Exp $
 
 - Handle the various operating systems in the same way avoiding hardcoding
 - Avoid to use objcopy by setting HAVE_OBJCOPY to no (if `yes', and with
@@ -10,9 +10,9 @@ $NetBSD: patch-Makerules,v 1.1 2024/08/1
 - Avoid internal version of freeglut and try to pick it up via pkg-config and
   set SYS_GLUT_{CFLAGS,LIBS} accordingly.
 
---- Makerules.orig     2024-03-19 15:31:58.000000000 +0000
+--- Makerules.orig     2025-08-22 20:10:30.000000000 +0000
 +++ Makerules
-@@ -48,30 +48,6 @@ endif
+@@ -100,19 +100,6 @@ endif
  
  # System specific features
  
@@ -21,37 +21,22 @@ $NetBSD: patch-Makerules,v 1.1 2024/08/1
 -  CFLAGS += -ffunction-sections -fdata-sections
 -endif
 -
--ifeq ($(OS),MACOS)
+-ifeq ($(OS),Darwin)
 -  LDREMOVEUNREACH := -Wl,-dead_strip
 -  SO := dylib
 -else
 -  LDREMOVEUNREACH := -Wl,--gc-sections
--  ifeq ($(OS),MINGW)
--    SO := dll
--    EXE := .exe
--  else
--    SO := so
--  endif
--endif
--
--ifeq "$(OS)" "ios"
--  NEONFLAGS =
--else
--  NEONFLAGS = -mneon
+-  SO := so
 -endif
 -
  SANITIZE_FLAGS += -fsanitize=address
  SANITIZE_FLAGS += -fsanitize=leak
  
-@@ -178,37 +154,7 @@ ifeq ($(OS),OpenBSD)
-     LINUX_OR_OPENBSD := yes
+@@ -212,37 +199,7 @@ ifneq "$(CLUSTER)" ""
+   CFLAGS += -DCLUSTER
  endif
  
--ifeq ($(OS),MINGW)
--  WINDRES := windres
--  HAVE_WIN32 := yes
--
--else ifeq ($(OS),MACOS)
+-ifeq ($(OS),Darwin)
 -  HAVE_GLUT := yes
 -  SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
 -  SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
@@ -68,38 +53,26 @@ $NetBSD: patch-Makerules,v 1.1 2024/08/1
 -  else
 -    HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
 -    ifeq ($(HAVE_LIBCRYPTO),yes)
--        LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
--        LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
+-      LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
+-      LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
 -    endif
 -  endif
 -
--else ifeq ($(LINUX_OR_OPENBSD),yes)
+-else
 -
 -  ifeq ($(OS),Linux)
 -    HAVE_OBJCOPY := yes
 -  endif
+-
+-  ifeq ($(OS),OpenBSD)
+-    LDFLAGS += -pthread
+-  endif
 +HAVE_OBJCOPY := no
  
-   ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
-       SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
-@@ -263,15 +209,9 @@ else ifeq ($(LINUX_OR_OPENBSD),yes)
-       SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
-   endif
- 
--  HAVE_GLUT := yes
-   ifeq ($(HAVE_GLUT),yes)
--    ifeq ($(OS),OpenBSD)
-       SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut gl)
-       SYS_GLUT_LIBS := $(shell pkg-config --libs glut gl)
--    else
--      SYS_GLUT_CFLAGS :=
--      SYS_GLUT_LIBS := -lglut -lGL
--    endif
-   endif
- 
-   HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
-@@ -294,8 +234,6 @@ else ifeq ($(LINUX_OR_OPENBSD),yes)
-       PTHREAD_LIBS := -lpthread
+   ifeq ($(shell pkg-config --exists 'freetype2 >= 18.3.12' && echo yes),yes)
+     SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
+@@ -344,8 +301,6 @@ else
+     PTHREAD_LIBS := -lpthread
    endif
  
 -endif

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index