diff options
| author | wiz <wiz@pkgsrc.org> | 2014-06-15 19:15:51 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-06-15 19:15:51 +0000 |
| commit | 5981e6be63e4b8fcbaeed953b5909e77dae0aa70 (patch) | |
| tree | df863e21a5038d0279253003b6c1a7e009e40d5f | |
| parent | 072ab0b9212bdcf85986ec96f94861ab21c64fb0 (diff) | |
| download | pkgsrc-5981e6be63e4b8fcbaeed953b5909e77dae0aa70.tar.gz | |
Cleanup, from Leonardo Taccari.
| -rw-r--r-- | print/mupdf/distinfo | 6 | ||||
| -rw-r--r-- | print/mupdf/options.mk | 3 | ||||
| -rw-r--r-- | print/mupdf/patches/patch-Makethird | 14 | ||||
| -rw-r--r-- | print/mupdf/patches/patch-ab | 3 |
4 files changed, 6 insertions, 20 deletions
diff --git a/print/mupdf/distinfo b/print/mupdf/distinfo index f7f1abfb59c..05d69f8c2cb 100644 --- a/print/mupdf/distinfo +++ b/print/mupdf/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.15 2014/06/15 14:14:18 wiz Exp $ +$NetBSD: distinfo,v 1.16 2014/06/15 19:15:51 wiz Exp $ SHA1 (mupdf-1.5-source.tar.gz) = 628470ed20f9a03c81e90cd5585a31c0fab386ef RMD160 (mupdf-1.5-source.tar.gz) = 0ef207d3b11744fc004999917699dfd2e6873191 Size (mupdf-1.5-source.tar.gz) = 13269193 bytes -SHA1 (patch-Makethird) = cf6cccdd55a2edafb610d1e6d55ce9570922e750 -SHA1 (patch-ab) = 2aab2ce65ce994b4213ad738bf85e250c8e7cbb8 +SHA1 (patch-Makethird) = 5ec66437c5695558f5e6497182d1f0c197ee5299 +SHA1 (patch-ab) = b965020ec098fc1bf8577cb16102ab4c37bb37d3 SHA1 (patch-ac) = 2b0fe5f97df7b6709ba7a3abfbefdf72ee81e0a3 SHA1 (patch-ae) = bad4b6b8c669c752c6318bb564d1176daac30d19 SHA1 (patch-source_fitz_load-jpx.c) = e5271cf60aff104e05ff60333be54712475d5a33 diff --git a/print/mupdf/options.mk b/print/mupdf/options.mk index ac7fbeafb21..2a1ec5f3e85 100644 --- a/print/mupdf/options.mk +++ b/print/mupdf/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2014/04/21 16:14:40 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2014/06/15 19:15:51 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mupdf PKG_SUPPORTED_OPTIONS= curl @@ -9,7 +9,6 @@ PKG_SUPPORTED_OPTIONS= curl # curl support # .if !empty(PKG_OPTIONS:Mcurl) -MAKE_FLAGS+= HAVE_CURL=yes .include "../../www/curl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .endif diff --git a/print/mupdf/patches/patch-Makethird b/print/mupdf/patches/patch-Makethird index 71204a634ac..800d2e70b54 100644 --- a/print/mupdf/patches/patch-Makethird +++ b/print/mupdf/patches/patch-Makethird @@ -1,8 +1,6 @@ -$NetBSD: patch-Makethird,v 1.3 2014/06/15 14:14:18 wiz Exp $ +$NetBSD: patch-Makethird,v 1.4 2014/06/15 19:15:51 wiz Exp $ o mujs building support with libtool -o libcurl (www/curl) support. By default mupdf can be installed with curl - support *only* building it in ${WRKSRC}/thirdparty. --- Makethird.orig 2014-06-10 15:09:28.000000000 +0000 +++ Makethird @@ -24,13 +22,3 @@ o libcurl (www/curl) support. By default mupdf can be installed with curl $(CC_CMD) MUJS_CFLAGS := -I$(MUJS_DIR) -@@ -460,6 +460,9 @@ CURL_CFLAGS := $(SYS_CURL_CFLAGS) - CURL_LIBS := $(SYS_CURL_LIBS) - endif - -+CURL_CFLAGS := $(SYS_CURL_CFLAGS) -+CURL_LIBS := $(SYS_CURL_LIBS) $(SYS_CURL_DEPS) -+ - # --- X11 --- - - ifeq "$(HAVE_X11)" "yes" diff --git a/print/mupdf/patches/patch-ab b/print/mupdf/patches/patch-ab index 3a3a2e32db8..45fb3b9c188 100644 --- a/print/mupdf/patches/patch-ab +++ b/print/mupdf/patches/patch-ab @@ -1,8 +1,7 @@ -$NetBSD: patch-ab,v 1.8 2014/06/15 14:14:18 wiz Exp $ +$NetBSD: patch-ab,v 1.9 2014/06/15 19:15:51 wiz Exp $ o Handle the various operating systems in the same way avoiding hardcoding o Build and link with openjpeg-2.1 -o libcurl (www/curl) support --- Makerules.orig 2014-06-10 15:09:28.000000000 +0000 +++ Makerules |