Attachment #199760 for bug #233727

View | Details | Raw Unified | Return to bug 233727
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	mupdf
PORTVERSION=	1.14.0
DISTVERSIONSUFFIX=	-source
PORTREVISION=	3
PORTEPOCH=	1
CATEGORIES=	graphics
MASTER_SITES=	http://www.mupdf.com/downloads/ \

		libfreetype.so:print/freetype2 \
		libharfbuzz.so:print/harfbuzz \
		libjbig2dec.so:graphics/jbig2dec \
		libjpeg.so:graphics/jpeg-turbo \
		libopenjp2.so:graphics/openjpeg

USES=		cpe compiler:c++11-lang gl gmake jpeg pkgconfig
MAKE_ARGS=	build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes \
		SOVERSION=${PORTVERSION}
ALL_TARGET=	all extra
USE_XORG=	x11 xcursor xext xinerama xrandr
USE_GL=		gl glut
USE_LDCONFIG=	yes

MAKE_ARGS=	build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes \
		XCFLAGS+="-I${WRKSRC}/include/mupdf -fPIC" \
		XLIBS+="-L${LOCALBASE}/lib -L${WRKSRC}/build/release" \
		SOVERSION=${PORTVERSION}
ALL_TARGET=	all extra

CPE_VENDOR=	artifex


	@${REINPLACE_CMD} -e 's/-pipe -O2 //' \
		${WRKSRC}/Makerules
	@${REINPLACE_CMD} -e 's/-ldl //' ${WRKSRC}/Makerules ${WRKSRC}/Makethird
	@${RM} -r ${WRKSRC}/thirdparty/curl \
		${WRKSRC}/thirdparty/freetype \
		${WRKSRC}/thirdparty/freeglut \
		${WRKSRC}/thirdparty/harfbuzz \
		${WRKSRC}/thirdparty/jbig2dec \
		${WRKSRC}/thirdparty/libjpeg \
		${WRKSRC}/thirdparty/openjpeg \
		${WRKSRC}/thirdparty/zlib

post-install:
	${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 ${STAGEDIR}${PREFIX}/bin/mupdf

	${INSTALL_PROGRAM} \
		${WRKSRC}/build/release/mjsgen \
		${WRKSRC}/build/release/mujstest \
		${WRKSRC}/build/release/mupdf-x11-curl \
		${WRKSRC}/build/release/muraster \
		${STAGEDIR}${PREFIX}/bin
	${LN} -s libmupdf.so.${PORTVERSION} \
		${STAGEDIR}${PREFIX}/lib/libmupdf.so
	${LN} -s libmupdf-third.so.${PORTVERSION} \
		${STAGEDIR}${PREFIX}/lib/libmupdf-third.so

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)graphics/mupdf/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1529321680	1	TIMESTAMP = 1542296614
2	SHA256 (mupdf-1.13.0-source.tar.gz) = 071c6962cbee1136188da62136596a9d704b81e35fe617cd34874bbb0ae7ca09	2	SHA256 (mupdf-1.14.0-source.tar.gz) = c443483a678c3fc258fa4adc124146225d0bb443c522619faadebf6b363d7724
3	SIZE (mupdf-1.13.0-source.tar.gz) = 51425034	3	SIZE (mupdf-1.14.0-source.tar.gz) = 55654104




$OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $
--- Makefile.orig	2018-10-04 09:19:28 UTC
+++ Makefile
@@ -190,13 +190,15 @@ generate: source/pdf/js/util.js.h
 
 # --- Library ---
 
-MUPDF_LIB = $(OUT)/libmupdf.a
-THIRD_LIB = $(OUT)/libmupdf-third.a
+MUPDF_LIB = $(OUT)/libmupdf.so.$(SOVERSION)
+THIRD_LIB = $(OUT)/libmupdf-third.so.$(SOVERSION)
 THREAD_LIB = $(OUT)/libmupdf-threads.a
 PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
 
 MUPDF_OBJ := \
@@ -344,7 +344,11 @@ THIRD_OBJ := \
 THREAD_OBJ := $(THREAD_OBJ)
 
-$(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)
+
 $(THREAD_LIB) : $(THREAD_OBJ)
 $(PKCS7_LIB) : $(PKCS7_OBJ)
 
 INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)




--- Makerules.orig	2018-10-04 09:19:28 UTC
+++ Makerules
@@ -24,28 +24,28 @@ ifeq ($(build),debug)
   CFLAGS += -pipe -g
   LDFLAGS += -g $(LDREMOVEUNREACH)
 else ifeq ($(build),release)
-  CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
+  CFLAGS += -DNDEBUG -fomit-frame-pointer
   LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
 else ifeq ($(build),small)
   CFLAGS += -pipe -Os -DNDEBUG -fomit-frame-pointer
   LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
 else ifeq ($(build),valgrind)
-  CFLAGS += -pipe -O2 -DNDEBUG -DPACIFY_VALGRIND -fno-omit-frame-pointer
+  CFLAGS += -DNDEBUG -DPACIFY_VALGRIND -fno-omit-frame-pointer
   LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
 else ifeq ($(build),sanitize)
   CFLAGS += -pipe -g -fno-omit-frame-pointer $(SANITIZE_FLAGS)
   LDFLAGS += -g $(SANITIZE_FLAGS)
 else ifeq ($(build),sanitize-release)
-  CFLAGS += -pipe -O2 -DNDEBUG -fno-omit-frame-pointer $(SANITIZE_FLAGS)
+  CFLAGS += -DNDEBUG -fno-omit-frame-pointer $(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 -fomit-frame-pointer -march=native
+  CFLAGS += -DNDEBUG -fomit-frame-pointer -march=native
   LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
 else ifeq ($(build),memento)
   CFLAGS += -pipe -g -DMEMENTO
@@ -55,7 +55,7 @@ else ifeq ($(build),memento)
     LIBS += -ldl
   endif
 else ifeq ($(build),gperf)
-  CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer -DGPERF
+  CFLAGS += -DNDEBUG -fomit-frame-pointer -DGPERF
   LIBS += -lprofiler
 else
   $(error unknown build setting: '$(build)')
@@ -143,7 +143,58 @@ else ifeq ($(OS),Linux)
 	PTHREAD_LIBS := -lpthread
   endif
 
 # Linux uses pkg-config for system libraries.
-else ifeq "$(OS)" "Linux"
+else ifeq "$(OS)" "FreeBSD"
 
 HAVE_PTHREAD := yes
 SYS_PTHREAD_CFLAGS :=
@@ -97,21 +97,15 @@ HAVE_GLUT := yes
 SYS_GLUT_CFLAGS :=
 SYS_GLUT_LIBS := -lglut -lGL
 
-ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
-HAVE_LIBCRYPTO := yes
-SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
-SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
-endif
+else ifeq ($(OS),FreeBSD)
+  PTHREAD_LIBS := -lthr
+# alphabetical order
+  # curl
+  USE_SYSTEM_CURL := yes
+  SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+  SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
+  # freetype
+  USE_SYSTEM_FREETYPE := yes
+  SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
+  SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
+  # glut
+  USE_SYSTEM_GLUT := yes
+  SYS_GLUT_CFLAGS :=
+  SYS_GLUT_LIBS := -lglut -lGL
+  # harfbuzz
+  USE_SYSTEM_HARFBUZZ := yes
+  SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
+  SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
+  # jbig2dec
+  USE_SYSTEM_JBIG2DEC := yes
+  SYS_JBIG2DEC_CFLAGS := 
+  SYS_JIB2DEC_LIBS := -ljbig2dec
+  # lcms2 - needs a patched version of lcms2
+  USE_SYSTEM_LCMS2 := no
+  # libcrypto
+  HAVE_LIBCRYPTO := no
+  SYS_LIBCRYPTO_CFLAGS :=
+  SYS_LIBCRYPTO_LIBS :=
+  # libjpeg
+  USE_SYSTEM_LIBJPEG := yes
+  SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
+  SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg)
+  # openjpeg
+  USE_SYSTEM_OPENJPEG := yes
+  SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
+  SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
+  # openssl
+  HAVE_OPENSSL_SSL := no
+  # pthread
+  HAVE_PTHREAD := yes
+  SYS_PTHREAD_CFLAGS :=
+  SYS_PTHREAD_LIBS := -lpthread
+  # x11
+  HAVE_X11 := yes
+  X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+  X11_LIBS := $(shell pkg-config --libs x11 xext)
+  # zlib
+  USE_SYSTEM_ZLIB := yes
+  SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
+  SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
+endif # FreeBSD
 
 # The following section has various cross compilation configurations.
 #
 SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
 SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
-ifeq "$(shell pkg-config --exists openssl && echo yes)" "yes"
-HAVE_OPENSSL_SSL := yes
-SYS_CURL_CFLAGS += $(shell pkg-config --cflags openssl)
-SYS_CURL_DEPS += $(shell pkg-config --libs openssl)
-endif
+HAVE_OPENSSL_SSL := no
 endif
 SYS_CURL_DEPS += -lpthread -lrt
 




--- thirdparty/lcms2/src/cmsmd5.c.orig	2018-01-23 19:37:31 UTC
+++ thirdparty/lcms2/src/cmsmd5.c
@@ -29,7 +29,7 @@
 #ifdef CMS_USE_BIG_ENDIAN

 {
     do {
 
@@ -42,7 +42,7 @@ void byteReverse(cmsUInt8Number * buf, c
 }
 
 #else

 #endif
 
 
@@ -196,7 +196,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Nu
         }
 
         memmove(p, buf, t);

 
         MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
         buf += t;
@@ -205,7 +205,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Nu
 
     while (len >= 64) {
         memmove(ctx->in, buf, 64);

         MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
         buf += 64;
         len -= 64;
@@ -232,21 +232,21 @@ void MD5finish(cmsProfileID* ProfileID, 
     if (count < 8) {
 
         memset(p, 0, count);




bin/mjsgen
bin/mujstest
bin/mupdf
bin/mupdf-gl
bin/mupdf-x11-curl
bin/muraster
bin/mutool
include/mupdf/fitz.h

include/mupdf/pdf-tools.h
include/mupdf/pdf.h
include/mupdf/pdf/annot.h
include/mupdf/pdf/appearance.h
include/mupdf/pdf/clean.h
include/mupdf/pdf/cmap.h
include/mupdf/pdf/crypt.h

include/mupdf/ucdn.h
lib/libmupdf.so
lib/libmupdf.so.%%SOVERSION%%
lib/libmupdf-third.so
lib/libmupdf-third.so.%%SOVERSION%%
man/man1/mupdf.1.gz
man/man1/mutool.1.gz
%%PORTDOCS%%%%DOCSDIR%%/CHANGES

%%PORTDOCS%%%%DOCSDIR%%/coding-overview.html
%%PORTDOCS%%%%DOCSDIR%%/coding-progressive.html
%%PORTDOCS%%%%DOCSDIR%%/coding-style.html
%%PORTDOCS%%%%DOCSDIR%%/examples/bbox-device.js
%%PORTDOCS%%%%DOCSDIR%%/examples/create-thumbnail.js
%%PORTDOCS%%%%DOCSDIR%%/examples/draw-device.js
%%PORTDOCS%%%%DOCSDIR%%/examples/draw-document.js
%%PORTDOCS%%%%DOCSDIR%%/examples/example.c
%%PORTDOCS%%%%DOCSDIR%%/examples/fix-s22pdf.js
%%PORTDOCS%%%%DOCSDIR%%/examples/jpx-to-pdf.js
%%PORTDOCS%%%%DOCSDIR%%/examples/multi-threaded.c
%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-create-lowlevel.js




# $FreeBSD$

PORTNAME=	zathura-pdf-mupdf
PORTVERSION=	0.3.4
PORTREVISION=	1
CATEGORIES=	graphics
MASTER_SITES=	https://pwmt.org/projects/zathura-pdf-mupdf/download/ \
		http://www.madpilot.net/~mad/pwmt.org/ \
		http://freebsd.uzsolt.hu/src/

MAINTAINER=	uzsolt@uzsolt.hu
COMMENT=	MuPDF render PDF plugin for Zathura PDF viewer

		libmupdf.so:graphics/mupdf \
		libopenjp2.so:graphics/openjpeg

PLIST_FILES=	lib/zathura/libpdf-mupdf.so \
		share/applications/org.pwmt.zathura-pdf-mupdf.desktop \
		share/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml

#MAKE_ARGS=	OPENSSL_INC=-I${OPENSSLINC} OPENSSL_LIB="-L${OPENSSLLIB} -lcrypto"
USES=		compiler:c11 desktop-file-utils gmake gnome jpeg meson pkgconfig tar:xz
MESON_ARGS+=	-Dlink-external=true
USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30
USE_LDCONFIG=	yes

PLIST_FILES=	lib/zathura/libpdf-mupdf.so \
		share/applications/org.pwmt.zathura-pdf-mupdf.desktop \
		share/appdata/org.pwmt.zathura-pdf-mupdf.metainfo.xml

CONFLICTS_INSTALL=	zathura-pdf-poppler-[0-9]*

post-patch:
	${REINPLACE_CMD} "s@\(cc.find_library(.*\))@\1,dirs:'${PREFIX}/lib')@" ${WRKSRC}/meson.build
	${REINPLACE_CMD} "s@join_paths(datadir, 'metainfo')@join_paths(datadir, 'appdata')@" ${WRKSRC}/meson.build

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)graphics/zathura-pdf-mupdf/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1531483831	1	TIMESTAMP = 1543771885
2	SHA256 (zathura-pdf-mupdf-0.3.3.tar.xz) = 52b02ceee272a47f7ef9c2b73cc4f6fb480c02fdce0e7f6b7c8e93ad6ac46dfd	2	SHA256 (zathura-pdf-mupdf-0.3.4.tar.xz) = d64331b9be43e42dce1d113746c62e4e6e9c9a2b4df77889e4bfc743be2dcd98
3	SIZE (zathura-pdf-mupdf-0.3.3.tar.xz) = 7880	3	SIZE (zathura-pdf-mupdf-0.3.4.tar.xz) = 8092

Return to bug 233727

Lines 2-10 Link Here

(-)graphics/mupdf/Makefile (-19 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mupdf	4	PORTNAME= mupdf
5	PORTVERSION= 1.13.0	5	PORTVERSION= 1.14.0
6	DISTVERSIONSUFFIX= -source	6	DISTVERSIONSUFFIX= -source
7	PORTREVISION= 3
8	PORTEPOCH= 1	7	PORTEPOCH= 1
9	CATEGORIES= graphics	8	CATEGORIES= graphics
10	MASTER_SITES= http://www.mupdf.com/downloads/ \	9	MASTER_SITES= http://www.mupdf.com/downloads/ \
Lines 20-37 Link Here
20	libfreetype.so:print/freetype2 \	19	libfreetype.so:print/freetype2 \
21	libharfbuzz.so:print/harfbuzz \	20	libharfbuzz.so:print/harfbuzz \
22	libjbig2dec.so:graphics/jbig2dec \	21	libjbig2dec.so:graphics/jbig2dec \
		22	libjpeg.so:graphics/jpeg-turbo \
23	libopenjp2.so:graphics/openjpeg	23	libopenjp2.so:graphics/openjpeg
24		24
25	USES= cpe compiler:c++11-lang gmake jpeg pkgconfig	25	USES= cpe compiler:c++11-lang gl gmake jpeg pkgconfig
26	MAKE_ARGS= build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes \
27	SOVERSION=${PORTVERSION}
28	ALL_TARGET= all extra
29	USE_XORG= x11 xcursor xext xinerama xrandr	26	USE_XORG= x11 xcursor xext xinerama xrandr
30	USE_GL= gl glut	27	USE_GL= gl glut
31	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
32		29
33	CFLAGS+= `pkg-config --cflags libopenjp2` -I${WRKSRC}/include/mupdf -fPIC # pkg-config to avoid the conflict with openjpeg15	30	MAKE_ARGS= build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes \
34	LIBS+= -L${LOCALBASE}/lib	31	XCFLAGS+="-I${WRKSRC}/include/mupdf -fPIC" \
		32	XLIBS+="-L${LOCALBASE}/lib -L${WRKSRC}/build/release" \
		33	SOVERSION=${PORTVERSION}
		34	ALL_TARGET= all extra
35		35
36	CPE_VENDOR= artifex	36	CPE_VENDOR= artifex
37		37
Lines 51-64 Link Here
51	@${REINPLACE_CMD} -e 's/-pipe -O2 //' \	51	@${REINPLACE_CMD} -e 's/-pipe -O2 //' \
52	${WRKSRC}/Makerules	52	${WRKSRC}/Makerules
53	@${REINPLACE_CMD} -e 's/-ldl //' ${WRKSRC}/Makerules ${WRKSRC}/Makethird	53	@${REINPLACE_CMD} -e 's/-ldl //' ${WRKSRC}/Makerules ${WRKSRC}/Makethird
54	@${RM} -r ${WRKSRC}/thirdparty/curl \
55	${WRKSRC}/thirdparty/freetype \
56	${WRKSRC}/thirdparty/freeglut \
57	${WRKSRC}/thirdparty/harfbuzz \
58	${WRKSRC}/thirdparty/jbig2dec \
59	${WRKSRC}/thirdparty/libjpeg \
60	${WRKSRC}/thirdparty/openjpeg \
61	${WRKSRC}/thirdparty/zlib
62		54
63	post-install:	55	post-install:
64	${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 ${STAGEDIR}${PREFIX}/bin/mupdf	56	${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 ${STAGEDIR}${PREFIX}/bin/mupdf
Lines 65-76 Link Here
65	${INSTALL_PROGRAM} \	57	${INSTALL_PROGRAM} \
66	${WRKSRC}/build/release/mjsgen \	58	${WRKSRC}/build/release/mjsgen \
67	${WRKSRC}/build/release/mujstest \	59	${WRKSRC}/build/release/mujstest \
68	${WRKSRC}/build/release/mupdf-x11-curl \
69	${WRKSRC}/build/release/muraster \	60	${WRKSRC}/build/release/muraster \
70	${STAGEDIR}${PREFIX}/bin	61	${STAGEDIR}${PREFIX}/bin
71	${LN} -s libmupdf.so.${PORTVERSION} \	62	${LN} -s libmupdf.so.${PORTVERSION} \
72	${STAGEDIR}${PREFIX}/lib/libmupdf.so	63	${STAGEDIR}${PREFIX}/lib/libmupdf.so
73	${LN} -s libmupdfthird.so.${PORTVERSION} \	64	${LN} -s libmupdf-third.so.${PORTVERSION} \
74	${STAGEDIR}${PREFIX}/lib/libmupdfthird.so	65	${STAGEDIR}${PREFIX}/lib/libmupdf-third.so
75		66
76	.include <bsd.port.mk>	67	.include <bsd.port.mk>

Lines 1-27 Link Here

(-)graphics/mupdf/files/patch-Makefile (-15 / +10 lines)
1	$OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $	1	$OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $
2	--- Makefile.orig 2017-12-13 14:00:30 UTC	2	--- Makefile.orig 2018-10-04 09:19:28 UTC
3	+++ Makefile	3	+++ Makefile
4	@@ -312,8 +312,8 @@ generate: $(JAVASCRIPT_GEN)	4	@@ -190,13 +190,15 @@ generate: source/pdf/js/util.js.h
5		5
6	# --- Library ---	6	# --- Library ---
7		7
8	-MUPDF_LIB = $(OUT)/libmupdf.a	8	-MUPDF_LIB = $(OUT)/libmupdf.a
9	-THIRD_LIB = $(OUT)/libmupdfthird.a	9	-THIRD_LIB = $(OUT)/libmupdf-third.a
10	+MUPDF_LIB = libmupdf.so.$(SOVERSION)	10	+MUPDF_LIB = $(OUT)/libmupdf.so.$(SOVERSION)
11	+THIRD_LIB = libmupdfthird.so.$(SOVERSION)	11	+THIRD_LIB = $(OUT)/libmupdf-third.so.$(SOVERSION)
12	THREAD_LIB = $(OUT)/libmuthreads.a	12	THREAD_LIB = $(OUT)/libmupdf-threads.a
		13	PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
13		14
14	MUPDF_OBJ := \
15	@@ -344,7 +344,11 @@ THIRD_OBJ := \
16	THREAD_OBJ := $(THREAD_OBJ)
17
18	-$(MUPDF_LIB) : $(MUPDF_OBJ)	15	-$(MUPDF_LIB) : $(MUPDF_OBJ)
19	+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB)	16	+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB)
20	+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -Wl,--no-undefined -o $@ $^ $(LIBS)	17	+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so.$(SOVERSION)
21	+
22	$(THIRD_LIB) : $(THIRD_OBJ)	18	$(THIRD_LIB) : $(THIRD_OBJ)
23	+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -Wl,--no-undefined -o $@ $^ $(LIBS)	19	+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so.$(SOVERSION)
24	+
25	$(THREAD_LIB) : $(THREAD_OBJ)	20	$(THREAD_LIB) : $(THREAD_OBJ)
		21	$(PKCS7_LIB) : $(PKCS7_OBJ)
26		22
27	INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)

Lines 1-37 Link Here

(-)graphics/mupdf/files/patch-Makerules (-33 / +101 lines)
1	--- Makerules.orig 2018-06-18 11:40:10 UTC	1	--- Makerules.orig 2018-10-04 09:19:28 UTC
2	+++ Makerules	2	+++ Makerules
3	@@ -87,7 +87,7 @@ LD = xcrun ld	3	@@ -24,28 +24,28 @@ ifeq ($(build),debug)
4	RANLIB_CMD = xcrun ranlib $@	4	CFLAGS += -pipe -g
		5	LDFLAGS += -g $(LDREMOVEUNREACH)
		6	else ifeq ($(build),release)
		7	- CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
		8	+ CFLAGS += -DNDEBUG -fomit-frame-pointer
		9	LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
		10	else ifeq ($(build),small)
		11	CFLAGS += -pipe -Os -DNDEBUG -fomit-frame-pointer
		12	LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
		13	else ifeq ($(build),valgrind)
		14	- CFLAGS += -pipe -O2 -DNDEBUG -DPACIFY_VALGRIND -fno-omit-frame-pointer
		15	+ CFLAGS += -DNDEBUG -DPACIFY_VALGRIND -fno-omit-frame-pointer
		16	LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
		17	else ifeq ($(build),sanitize)
		18	CFLAGS += -pipe -g -fno-omit-frame-pointer $(SANITIZE_FLAGS)
		19	LDFLAGS += -g $(SANITIZE_FLAGS)
		20	else ifeq ($(build),sanitize-release)
		21	- CFLAGS += -pipe -O2 -DNDEBUG -fno-omit-frame-pointer $(SANITIZE_FLAGS)
		22	+ CFLAGS += -DNDEBUG -fno-omit-frame-pointer $(SANITIZE_FLAGS)
		23	LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s $(SANITIZE_FLAGS)
		24	else ifeq ($(build),profile)
		25	- CFLAGS += -pipe -O2 -DNDEBUG -pg
		26	+ CFLAGS += -DNDEBUG -pg
		27	LDFLAGS += -pg
		28	else ifeq ($(build),coverage)
		29	CFLAGS += -pipe -g -pg -fprofile-arcs -ftest-coverage
		30	LIBS += -lgcov
		31	else ifeq ($(build),native)
		32	- CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer -march=native
		33	+ CFLAGS += -DNDEBUG -fomit-frame-pointer -march=native
		34	LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
		35	else ifeq ($(build),memento)
		36	CFLAGS += -pipe -g -DMEMENTO
		37	@@ -55,7 +55,7 @@ else ifeq ($(build),memento)
		38	LIBS += -ldl
		39	endif
		40	else ifeq ($(build),gperf)
		41	- CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer -DGPERF
		42	+ CFLAGS += -DNDEBUG -fomit-frame-pointer -DGPERF
		43	LIBS += -lprofiler
		44	else
		45	$(error unknown build setting: '$(build)')
		46	@@ -143,7 +143,58 @@ else ifeq ($(OS),Linux)
		47	PTHREAD_LIBS := -lpthread
		48	endif
5		49
6	# Linux uses pkg-config for system libraries.
7	-else ifeq "$(OS)" "Linux"
8	+else ifeq "$(OS)" "FreeBSD"
9
10	HAVE_PTHREAD := yes
11	SYS_PTHREAD_CFLAGS :=
12	@@ -97,21 +97,15 @@ HAVE_GLUT := yes
13	SYS_GLUT_CFLAGS :=
14	SYS_GLUT_LIBS := -lglut -lGL
15
16	-ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
17	-HAVE_LIBCRYPTO := yes
18	-SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
19	-SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
20	-endif	50	-endif
21	+HAVE_LIBCRYPTO := no	51	+else ifeq ($(OS),FreeBSD)
22	+SYS_LIBCRYPTO_CFLAGS :=	52	+ PTHREAD_LIBS := -lthr
23	+SYS_LIBCRYPTO_LIBS :=	53	+# alphabetical order
		54	+ # curl
		55	+ USE_SYSTEM_CURL := yes
		56	+ SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
		57	+ SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
		58	+ # freetype
		59	+ USE_SYSTEM_FREETYPE := yes
		60	+ SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
		61	+ SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
		62	+ # glut
		63	+ USE_SYSTEM_GLUT := yes
		64	+ SYS_GLUT_CFLAGS :=
		65	+ SYS_GLUT_LIBS := -lglut -lGL
		66	+ # harfbuzz
		67	+ USE_SYSTEM_HARFBUZZ := yes
		68	+ SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
		69	+ SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
		70	+ # jbig2dec
		71	+ USE_SYSTEM_JBIG2DEC := yes
		72	+ SYS_JBIG2DEC_CFLAGS :=
		73	+ SYS_JIB2DEC_LIBS := -ljbig2dec
		74	+ # lcms2 - needs a patched version of lcms2
		75	+ USE_SYSTEM_LCMS2 := no
		76	+ # libcrypto
		77	+ HAVE_LIBCRYPTO := no
		78	+ SYS_LIBCRYPTO_CFLAGS :=
		79	+ SYS_LIBCRYPTO_LIBS :=
		80	+ # libjpeg
		81	+ USE_SYSTEM_LIBJPEG := yes
		82	+ SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
		83	+ SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg)
		84	+ # openjpeg
		85	+ USE_SYSTEM_OPENJPEG := yes
		86	+ SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
		87	+ SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
		88	+ # openssl
		89	+ HAVE_OPENSSL_SSL := no
		90	+ # pthread
		91	+ HAVE_PTHREAD := yes
		92	+ SYS_PTHREAD_CFLAGS :=
		93	+ SYS_PTHREAD_LIBS := -lpthread
		94	+ # x11
		95	+ HAVE_X11 := yes
		96	+ X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
		97	+ X11_LIBS := $(shell pkg-config --libs x11 xext)
		98	+ # zlib
		99	+ USE_SYSTEM_ZLIB := yes
		100	+ SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
		101	+ SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
		102	+endif # FreeBSD
24		103
25	ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"	104	# The following section has various cross compilation configurations.
26	HAVE_CURL := yes	105	#
27	SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
28	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
29	-ifeq "$(shell pkg-config --exists openssl && echo yes)" "yes"
30	-HAVE_OPENSSL_SSL := yes
31	-SYS_CURL_CFLAGS += $(shell pkg-config --cflags openssl)
32	-SYS_CURL_DEPS += $(shell pkg-config --libs openssl)
33	-endif
34	+HAVE_OPENSSL_SSL := no
35	endif
36	SYS_CURL_DEPS += -lpthread -lrt
37

Lines 1-4 Link Here

(-)graphics/mupdf/files/patch-thirdparty_lcms2_src_cmsmd5.c (-5 / +5 lines)
1	--- thirdparty/lcms2/src/cmsmd5.c.orig 2018-10-31 19:49:39 UTC	1	--- thirdparty/lcms2/src/cmsmd5.c.orig 2018-01-23 19:37:31 UTC
2	+++ thirdparty/lcms2/src/cmsmd5.c	2	+++ thirdparty/lcms2/src/cmsmd5.c
3	@@ -29,7 +29,7 @@	3	@@ -29,7 +29,7 @@
4	#ifdef CMS_USE_BIG_ENDIAN	4	#ifdef CMS_USE_BIG_ENDIAN
Lines 9-15 Link Here
9	{	9	{
10	do {	10	do {
11		11
12	@@ -42,7 +42,7 @@ void byteReverse(cmsUInt8Number * buf, cmsUInt32Number	12	@@ -42,7 +42,7 @@ void byteReverse(cmsUInt8Number * buf, c
13	}	13	}
14		14
15	#else	15	#else
Lines 18-24 Link Here
18	#endif	18	#endif
19		19
20		20
21	@@ -196,7 +196,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cms	21	@@ -196,7 +196,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Nu
22	}	22	}
23		23
24	memmove(p, buf, t);	24	memmove(p, buf, t);
Lines 27-33 Link Here
27		27
28	MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);	28	MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
29	buf += t;	29	buf += t;
30	@@ -205,7 +205,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cms	30	@@ -205,7 +205,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Nu
31		31
32	while (len >= 64) {	32	while (len >= 64) {
33	memmove(ctx->in, buf, 64);	33	memmove(ctx->in, buf, 64);
Lines 36-42 Link Here
36	MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);	36	MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
37	buf += 64;	37	buf += 64;
38	len -= 64;	38	len -= 64;
39	@@ -232,21 +232,21 @@ void MD5finish(cmsProfileID* ProfileID, cmsHANDLE Han	39	@@ -232,21 +232,21 @@ void MD5finish(cmsProfileID* ProfileID,
40	if (count < 8) {	40	if (count < 8) {
41		41
42	memset(p, 0, count);	42	memset(p, 0, count);

Lines 1-8 Link Here

(-)graphics/mupdf/pkg-plist (-5 / +4 lines)
1	bin/mjsgen	1	bin/mjsgen
2	bin/mujstest	2	bin/mujstest
3	bin/mupdf	3	bin/mupdf
4	bin/mupdf-gl
5	bin/mupdf-x11-curl
6	bin/muraster	4	bin/muraster
7	bin/mutool	5	bin/mutool
8	include/mupdf/fitz.h	6	include/mupdf/fitz.h
Lines 64-70 Link Here
64	include/mupdf/pdf-tools.h	62	include/mupdf/pdf-tools.h
65	include/mupdf/pdf.h	63	include/mupdf/pdf.h
66	include/mupdf/pdf/annot.h	64	include/mupdf/pdf/annot.h
67	include/mupdf/pdf/appearance.h
68	include/mupdf/pdf/clean.h	65	include/mupdf/pdf/clean.h
69	include/mupdf/pdf/cmap.h	66	include/mupdf/pdf/cmap.h
70	include/mupdf/pdf/crypt.h	67	include/mupdf/pdf/crypt.h
Lines 85-92 Link Here
85	include/mupdf/ucdn.h	82	include/mupdf/ucdn.h
86	lib/libmupdf.so	83	lib/libmupdf.so
87	lib/libmupdf.so.%%SOVERSION%%	84	lib/libmupdf.so.%%SOVERSION%%
88	lib/libmupdfthird.so	85	lib/libmupdf-third.so
89	lib/libmupdfthird.so.%%SOVERSION%%	86	lib/libmupdf-third.so.%%SOVERSION%%
90	man/man1/mupdf.1.gz	87	man/man1/mupdf.1.gz
91	man/man1/mutool.1.gz	88	man/man1/mutool.1.gz
92	%%PORTDOCS%%%%DOCSDIR%%/CHANGES	89	%%PORTDOCS%%%%DOCSDIR%%/CHANGES
Lines 98-107 Link Here
98	%%PORTDOCS%%%%DOCSDIR%%/coding-overview.html	95	%%PORTDOCS%%%%DOCSDIR%%/coding-overview.html
99	%%PORTDOCS%%%%DOCSDIR%%/coding-progressive.html	96	%%PORTDOCS%%%%DOCSDIR%%/coding-progressive.html
100	%%PORTDOCS%%%%DOCSDIR%%/coding-style.html	97	%%PORTDOCS%%%%DOCSDIR%%/coding-style.html
		98	%%PORTDOCS%%%%DOCSDIR%%/examples/bbox-device.js
101	%%PORTDOCS%%%%DOCSDIR%%/examples/create-thumbnail.js	99	%%PORTDOCS%%%%DOCSDIR%%/examples/create-thumbnail.js
102	%%PORTDOCS%%%%DOCSDIR%%/examples/draw-device.js	100	%%PORTDOCS%%%%DOCSDIR%%/examples/draw-device.js
103	%%PORTDOCS%%%%DOCSDIR%%/examples/draw-document.js	101	%%PORTDOCS%%%%DOCSDIR%%/examples/draw-document.js
104	%%PORTDOCS%%%%DOCSDIR%%/examples/example.c	102	%%PORTDOCS%%%%DOCSDIR%%/examples/example.c
		103	%%PORTDOCS%%%%DOCSDIR%%/examples/fix-s22pdf.js
105	%%PORTDOCS%%%%DOCSDIR%%/examples/jpx-to-pdf.js	104	%%PORTDOCS%%%%DOCSDIR%%/examples/jpx-to-pdf.js
106	%%PORTDOCS%%%%DOCSDIR%%/examples/multi-threaded.c	105	%%PORTDOCS%%%%DOCSDIR%%/examples/multi-threaded.c
107	%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-create-lowlevel.js	106	%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-create-lowlevel.js

Lines 2-12 Link Here

(-)graphics/zathura-pdf-mupdf/Makefile (-8 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= zathura-pdf-mupdf	4	PORTNAME= zathura-pdf-mupdf
5	PORTVERSION= 0.3.3	5	PORTVERSION= 0.3.4
6	PORTREVISION= 1
7	CATEGORIES= graphics	6	CATEGORIES= graphics
8	MASTER_SITES= https://pwmt.org/projects/zathura-pdf-mupdf/download/ \	7	MASTER_SITES= https://pwmt.org/projects/zathura-pdf-mupdf/download/ \
9	http://www.madpilot.net/~mad/pwmt.org/	8	http://www.madpilot.net/~mad/pwmt.org/ \
		9	http://freebsd.uzsolt.hu/src/
10		10
11	MAINTAINER= uzsolt@uzsolt.hu	11	MAINTAINER= uzsolt@uzsolt.hu
12	COMMENT= MuPDF render PDF plugin for Zathura PDF viewer	12	COMMENT= MuPDF render PDF plugin for Zathura PDF viewer
Lines 23-40 Link Here
23	libmupdf.so:graphics/mupdf \	23	libmupdf.so:graphics/mupdf \
24	libopenjp2.so:graphics/openjpeg	24	libopenjp2.so:graphics/openjpeg
25		25
26	PLIST_FILES= lib/zathura/libpdf-mupdf.so \
27	share/applications/org.pwmt.zathura-pdf-mupdf.desktop \
28	share/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml
29
30	#MAKE_ARGS= OPENSSL_INC=-I${OPENSSLINC} OPENSSL_LIB="-L${OPENSSLLIB} -lcrypto"	26	#MAKE_ARGS= OPENSSL_INC=-I${OPENSSLINC} OPENSSL_LIB="-L${OPENSSLLIB} -lcrypto"
31	USES= compiler:c11 desktop-file-utils gmake jpeg meson pkgconfig tar:xz	27	USES= compiler:c11 desktop-file-utils gmake gnome jpeg meson pkgconfig tar:xz
		28	MESON_ARGS+= -Dlink-external=true
32	USE_GNOME= cairo gdkpixbuf2 glib20 gtk30	29	USE_GNOME= cairo gdkpixbuf2 glib20 gtk30
33	USE_LDCONFIG= yes	30	USE_LDCONFIG= yes
34		31
		32	PLIST_FILES= lib/zathura/libpdf-mupdf.so \
		33	share/applications/org.pwmt.zathura-pdf-mupdf.desktop \
		34	share/appdata/org.pwmt.zathura-pdf-mupdf.metainfo.xml
		35
35	CONFLICTS_INSTALL= zathura-pdf-poppler-[0-9]*	36	CONFLICTS_INSTALL= zathura-pdf-poppler-[0-9]*
36		37
37	post-patch:	38	post-patch:
38	${REINPLACE_CMD} "s@\(cc.find_library(.*\))@\1,dirs:'${PREFIX}/lib')@" ${WRKSRC}/meson.build	39	${REINPLACE_CMD} "s@\(cc.find_library(.*\))@\1,dirs:'${PREFIX}/lib')@" ${WRKSRC}/meson.build
		40	${REINPLACE_CMD} "s@join_paths(datadir, 'metainfo')@join_paths(datadir, 'appdata')@" ${WRKSRC}/meson.build
39		41
40	.include <bsd.port.mk>	42	.include <bsd.port.mk>