Index: head/graphics/mupdf/Makefile =================================================================== --- head/graphics/mupdf/Makefile (revision 481605) +++ head/graphics/mupdf/Makefile (revision 481606) @@ -1,78 +1,78 @@ # Created by: Martin Dieringer # $FreeBSD$ PORTNAME= mupdf PORTVERSION= 1.13.0 DISTVERSIONSUFFIX= -source -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://www.mupdf.com/downloads/ \ http://www.mupdf.com/downloads/archive/ MAINTAINER= uzsolt@uzsolt.hu COMMENT= Lightweight PDF viewer and toolkit LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_powerpc64= fails to compile: cmsmd5.c:36:51: 'ContextID' undeclared LIB_DEPENDS= libcurl.so:ftp/curl \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libjbig2dec.so:graphics/jbig2dec \ libopenjp2.so:graphics/openjpeg USES= cpe compiler:c++11-lang 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 CFLAGS+= `pkg-config --cflags libopenjp2` -I${WRKSRC}/include/mupdf -fPIC # pkg-config to avoid the conflict with openjpeg15 LIBS+= -L${LOCALBASE}/lib CPE_VENDOR= artifex OPTIONS_DEFINE= DOCS JS SCROLL OPTIONS_DEFAULT=SCROLL JS_DESC= JavaScript support (V8 engine) SCROLL_DESC= Build with scroll hacks JS_LIB_DEPENDS= libv8.so:lang/v8 JS_MAKE_ARGS= V8_PRESENT=1 V8LIBS=-lv8 SCROLL_EXTRA_PATCHES= ${FILESDIR}/scroll_hack-platform__x11__pdfapp.c PLIST_SUB= SOVERSION=${PORTVERSION} post-patch: @${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 libmupdfthird.so.${PORTVERSION} \ ${STAGEDIR}${PREFIX}/lib/libmupdfthird.so .include Index: head/graphics/mupdf/files/patch-Makefile =================================================================== --- head/graphics/mupdf/files/patch-Makefile (revision 481605) +++ head/graphics/mupdf/files/patch-Makefile (revision 481606) @@ -1,26 +1,27 @@ $OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $ --- Makefile.orig 2017-12-13 14:00:30 UTC +++ Makefile @@ -312,8 +312,8 @@ generate: $(JAVASCRIPT_GEN) # --- Library --- -MUPDF_LIB = $(OUT)/libmupdf.a -THIRD_LIB = $(OUT)/libmupdfthird.a +MUPDF_LIB = libmupdf.so.$(SOVERSION) +THIRD_LIB = libmupdfthird.so.$(SOVERSION) THREAD_LIB = $(OUT)/libmuthreads.a MUPDF_OBJ := \ @@ -344,7 +344,11 @@ THIRD_OBJ := \ THREAD_OBJ := $(THREAD_OBJ) - $(MUPDF_LIB) : $(MUPDF_OBJ) -+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -o $@ $^ $(LIBS) +-$(MUPDF_LIB) : $(MUPDF_OBJ) ++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) ++ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -Wl,--no-undefined -o $@ $^ $(LIBS) + $(THIRD_LIB) : $(THIRD_OBJ) -+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -o $@ $^ $(LIBS) ++ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -Wl,--no-undefined -o $@ $^ $(LIBS) + $(THREAD_LIB) : $(THREAD_OBJ) INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)