diff options
Diffstat (limited to 'print/mupdf/patches/patch-ab')
| -rw-r--r-- | print/mupdf/patches/patch-ab | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/print/mupdf/patches/patch-ab b/print/mupdf/patches/patch-ab index e11a04123f5..5215a04e9f1 100644 --- a/print/mupdf/patches/patch-ab +++ b/print/mupdf/patches/patch-ab @@ -1,21 +1,23 @@ -$NetBSD: patch-ab,v 1.5 2014/01/09 14:25:23 mef Exp $ +$NetBSD: patch-ab,v 1.6 2014/04/21 16:14:40 wiz Exp $ o Handle the various operating systems in the same way avoiding hardcoding o Build and link with openjpeg-2.0 o libcurl (www/curl) support ---- Makerules.orig 2013-08-14 12:41:20.000000000 +0000 +--- Makerules.orig 2014-04-11 15:10:41.000000000 +0000 +++ Makerules -@@ -24,52 +24,26 @@ else +@@ -25,37 +25,6 @@ else $(error unknown build setting: '$(build)') endif -# Windows (MINGW) build doesn't use system libraries. -ifeq "$(OS)" "MINGW" --NOX11 ?= yes - -# Mac OS X doesn't have pkg-config so we hard code paths. --else ifeq "$(OS)" "Darwin" +-else ifeq "$(OS)" "MACOS" +- +-HAVE_X11 ?= yes +- -SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL -SYS_OPENSSL_LIBS = -lcrypto - @@ -31,16 +33,22 @@ o libcurl (www/curl) support -SYS_JPEG_LIBS = -ljpeg -SYS_ZLIB_LIBS = -lz - --RANLIB_CMD = ranlib $@ +-CC = xcrun cc +-AR = xcrun ar +-LD = xcrun ld +-RANLIB_CMD = xcrun ranlib $@ - --# Other Unixes use pkg-config for system libraries. --else +-# Linux uses pkg-config for system libraries. +-else ifeq "$(OS)" "Linux" - + HAVE_X11 ?= yes + ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes" - SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL $(shell pkg-config --cflags libcrypto) +@@ -63,22 +32,21 @@ SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL $(sh SYS_OPENSSL_LIBS = $(shell pkg-config --libs libcrypto) endif +-# TODO: use pkg-config for system CURL +SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl) SYS_CURL_DEPS = -lpthread -lrt +SYS_CURL_LIBS = $(shell pkg-config --libs libcurl) @@ -52,7 +60,7 @@ o libcurl (www/curl) support SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2) -SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1) -SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjpeg1) -+SYS_OPENJPEG_CFLAGS = -I@PREFIX@/include/openjpeg-2.0 ++SYS_OPENJPEG_CFLAGS = -I/usr/pkg/include/openjpeg-2.0 +SYS_OPENJPEG_LIBS = -lopenjp2 SYS_JBIG2DEC_LIBS = -ljbig2dec SYS_JPEG_LIBS = -ljpeg |