CVS commit: pkgsrc/print/mupdf

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Sun Jul 16 08:29:53 UTC 2017

Modified Files:
        pkgsrc/print/mupdf: Makefile distinfo
        pkgsrc/print/mupdf/patches: patch-ac

Log Message:
Do not possibly (re)initialize LDFLAGS and pass it also to AR_CMD.
This fixes RELRO build.

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/print/mupdf/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/print/mupdf/distinfo
cvs rdiff -u -r1.16 -r1.17 pkgsrc/print/mupdf/patches/patch-ac

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.49 pkgsrc/print/mupdf/Makefile:1.50
--- pkgsrc/print/mupdf/Makefile:1.49    Sun Apr 30 01:21:24 2017
+++ pkgsrc/print/mupdf/Makefile Sun Jul 16 08:29:53 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2017/04/30 01:21:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.50 2017/07/16 08:29:53 leot Exp $
 
 DISTNAME=      mupdf-1.11-source
 PKGNAME=       ${DISTNAME:S/-source//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    print
 MASTER_SITES=  http://mupdf.com/downloads/archive/
 
@@ -18,7 +18,7 @@ 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
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${X11BASE}/lib
 MAKE_FLAGS+=           LDFLAGS=${LDFLAGS:Q}
 MAKE_FLAGS+=           XCFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=           build=release

Index: pkgsrc/print/mupdf/distinfo
diff -u pkgsrc/print/mupdf/distinfo:1.35 pkgsrc/print/mupdf/distinfo:1.36
--- pkgsrc/print/mupdf/distinfo:1.35    Sat Jun 17 19:45:28 2017
+++ pkgsrc/print/mupdf/distinfo Sun Jul 16 08:29:53 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2017/06/17 19:45:28 joerg Exp $
+$NetBSD: distinfo,v 1.36 2017/07/16 08:29:53 leot Exp $
 
 SHA1 (mupdf-1.11-source.tar.gz) = f782d36aaa896319207e81953e5a622201477b5b
 RMD160 (mupdf-1.11-source.tar.gz) = 573307473a1ac81aca4519b0e57a7111aae7803f
@@ -6,7 +6,7 @@ SHA512 (mupdf-1.11-source.tar.gz) = 5016
 Size (mupdf-1.11-source.tar.gz) = 40156070 bytes
 SHA1 (patch-Makethird) = a4d1bb3c8d509a84803c9b60521fd9b6b17b9717
 SHA1 (patch-ab) = a18b1e5b82454bdf06e23185e619b7f8c7a24290
-SHA1 (patch-ac) = 9b0c368d05a436f94118efce517fea69c82898e7
+SHA1 (patch-ac) = c2decf6eae4c6343636439c7d7f6621826fc4e3c
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-scripts_hexdump.c) = 65a029086f429a1f8568066a712c1d8e0106c867
 SHA1 (patch-source_fitz_load-jpx.c) = 773ec1ef6b1632a10ff7c8ff76081e89bdcad593

Index: pkgsrc/print/mupdf/patches/patch-ac
diff -u pkgsrc/print/mupdf/patches/patch-ac:1.16 pkgsrc/print/mupdf/patches/patch-ac:1.17
--- pkgsrc/print/mupdf/patches/patch-ac:1.16    Wed Apr 12 13:03:08 2017
+++ pkgsrc/print/mupdf/patches/patch-ac Sun Jul 16 08:29:53 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.16 2017/04/12 13:03:08 leot Exp $
+$NetBSD: patch-ac,v 1.17 2017/07/16 08:29:53 leot Exp $
 
 o libtool support 
 o Install target cleanup
@@ -9,7 +9,7 @@ o Get rid of unused VERSION variable and
 o Install only one "mupdf" binary, prefer the featureful one and always
   install it as "mupdf"
 
---- Makefile.orig      2017-03-31 14:23:45.000000000 +0000
+--- Makefile.orig      2017-04-05 11:02:21.000000000 +0000
 +++ Makefile
 @@ -57,65 +57,51 @@ ALL_DIR += $(OUT)/platform/gl
  
@@ -37,7 +37,7 @@ o Install only one "mupdf" binary, prefe
 -WINDRES_CMD = $(QUIET_WINDRES) $(WINDRES) $< $@
 +CC_CMD = ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -o $@ -c $<
 +CXX_CMD = ${LIBTOOL} --mode=compile $(CXX) $(CFLAGS) -o $@ -c $<
-+AR_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath ${PREFIX}/lib $^
++AR_CMD = ${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -o $@ -version-info 0:0:0 -rpath ${PREFIX}/lib $^
 +LINK_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
 +MKDIR_CMD = mkdir -p $@
 +RM_CMD = rm -f $@