CVS commit: pkgsrc/print/mupdf

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Thu Sep  7 15:02:03 UTC 2023

Modified Files:
        pkgsrc/print/mupdf: Makefile distinfo

Log Message:
print/mupdf: better sort Makefile.


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 pkgsrc/print/mupdf/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/print/mupdf/distinfo

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.108 pkgsrc/print/mupdf/Makefile:1.109
--- pkgsrc/print/mupdf/Makefile:1.108   Thu Sep  7 14:36:54 2023
+++ pkgsrc/print/mupdf/Makefile Thu Sep  7 15:02:03 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2023/09/07 14:36:54 vins Exp $
+# $NetBSD: Makefile,v 1.109 2023/09/07 15:02:03 vins Exp $
 
 DISTNAME=      mupdf-1.23.3-source
 PKGNAME=       ${DISTNAME:S/-source//}
@@ -13,10 +13,9 @@ LICENSE=     gnu-agpl-v3
 USE_LANGUAGES= c99 c++11
 USE_TOOLS+=    pkg-config gmake
 
-INSTALLATION_DIRS+=    bin include lib/pkgconfig
-INSTALL_MAKE_FLAGS+=   prefix=${PREFIX}
-INSTALL_MAKE_FLAGS+=   mandir=${PREFIX}/${PKGMANDIR}
-LDFLAGS+=              ${COMPILER_RPATH_FLAG}${X11BASE}/lib
+CFLAGS.SunOS+= -D_XOPEN_SOURCE=600
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${X11BASE}/lib
+
 MAKE_FLAGS+=           LDFLAGS=${LDFLAGS:Q}
 MAKE_FLAGS+=           XCFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=           XLIBS=${LIBS:Q}
@@ -24,17 +23,19 @@ MAKE_FLAGS+=                build=release
 MAKE_FLAGS+=           USE_SYSTEM_LIBS=yes
 MAKE_FLAGS+=           USE_SYSTEM_MUJS=yes
 
-CFLAGS.SunOS+= -D_XOPEN_SOURCE=600
+INSTALL_MAKE_FLAGS+=   prefix=${PREFIX}
+INSTALL_MAKE_FLAGS+=   mandir=${PREFIX}/${PKGMANDIR}
 
 .include "options.mk"
 
+INSTALLATION_DIRS+=    bin include lib/pkgconfig
+INSTALLATION_DIRS+=    share/pixmaps share/applications
+
 REPLACE_INTERPRETER+=  shell
 REPLACE.shell.old=     .*/bin/bash
 REPLACE.shell.new=     ${SH}
 REPLACE_FILES.shell+=  scripts/hexdump.sh
 
-INSTALLATION_DIRS+=    share/pixmaps share/applications
-
 # Remove thirdparty directory in order to use the libraries provided by pkgsrc
 # thirdparty/lcms2 is not removed intentionally because ICC support requires
 # the internal lcms2 library. ICC support is essential to display some PDF

Index: pkgsrc/print/mupdf/distinfo
diff -u pkgsrc/print/mupdf/distinfo:1.69 pkgsrc/print/mupdf/distinfo:1.70
--- pkgsrc/print/mupdf/distinfo:1.69    Thu Sep  7 14:36:54 2023
+++ pkgsrc/print/mupdf/distinfo Thu Sep  7 15:02:03 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.69 2023/09/07 14:36:54 vins Exp $
+$NetBSD: distinfo,v 1.70 2023/09/07 15:02:03 vins Exp $
 
 BLAKE2s (mupdf-1.23.3-source.tar.gz) = 8b4358ea917f4e068a56d4565bb1d0c342518854ea446b219a02df852d813094
 SHA512 (mupdf-1.23.3-source.tar.gz) = 37fbebd07680d79a38d289264a4028396ee58fad52c541efa37463e63a45ed8bab71188d6c05eb15e602964d89ee6633575dceb972f7bd8b0b5efdde5af9b737
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = 2377fe83c6ff3b976a20a9
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-docs_man_mupdf.1) = c2a2c1ad283428168a714adb634aa50cdd6a4aba
 SHA1 (patch-platform_gl_gl-app.h) = 1e915249010acd3ff1343f0607e785d06577fe78
-SHA1 (patch-platform_x11_curl__stream.c) = eb895282ca99daf49cffa6d9a5f04009e295993b
+SHA1 (patch-platform_x11_curl__stream.c) = ccabcd665359ae00b76230a4ced22f360a0989e5
 SHA1 (patch-platform_x11_pdfapp.c) = 33b53c845c6778614e4384a783a34d00b6814e74
 SHA1 (patch-source_fitz_load-jpx.c) = 8d7f58168c8429a82127b821387298341a1fcbfb
 SHA1 (patch-source_helpers_pkcs7_pkcs7-openssl.c) = f3e949de8bdfc55e2da402a5bc59b4baf04b0d55