CVS commit: pkgsrc/graphics/camlimages

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sun Sep 18 05:49:00 UTC 2016

Modified Files:
        pkgsrc/graphics/camlimages: Makefile distinfo
        pkgsrc/graphics/camlimages/patches: patch-OMakefile
            patch-src_jpegread.c

Log Message:
pkglint


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 pkgsrc/graphics/camlimages/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/graphics/camlimages/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/camlimages/patches/patch-OMakefile
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/camlimages/patches/patch-src_jpegread.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/camlimages/Makefile
diff -u pkgsrc/graphics/camlimages/Makefile:1.87 pkgsrc/graphics/camlimages/Makefile:1.88
--- pkgsrc/graphics/camlimages/Makefile:1.87    Wed Aug  3 10:22:49 2016
+++ pkgsrc/graphics/camlimages/Makefile Sun Sep 18 05:48:59 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2016/08/03 10:22:49 adam Exp $
+# $NetBSD: Makefile,v 1.88 2016/09/18 05:48:59 dholland Exp $
 
 VERSION=               4.0.1
 PKGNAME=               camlimages-${VERSION}
@@ -25,7 +25,7 @@ SUBST_STAGE.omf=      post-patch
 SUBST_FILES.omf=       OMakefile
 SUBST_SED.omf=         -e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.omf+=                -e 's,@X11BASE@,${X11BASE},g'
-SUBST_SED.omf+=                -e 's%@LDFLAGS@%${LDFLAGS}%g'
+SUBST_SED.omf+=                -e s%@LDFLAGS@%${LDFLAGS:Q}%g
 SUBST_SED.omf+=                -e 's,@OCAMLFIND_DESTDIR@,${DESTDIR}${PREFIX}/lib/ocaml/site-lib,g'
 SUBST_SED.omf+=                -e 's,@OCAMLFIND_LDCONF@,/dev/null,g'
 SUBST_MESSAGE.omf=     Fixing vars in OMakefile

Index: pkgsrc/graphics/camlimages/distinfo
diff -u pkgsrc/graphics/camlimages/distinfo:1.14 pkgsrc/graphics/camlimages/distinfo:1.15
--- pkgsrc/graphics/camlimages/distinfo:1.14    Sun Sep 18 05:46:31 2016
+++ pkgsrc/graphics/camlimages/distinfo Sun Sep 18 05:48:59 2016
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.14 2016/09/18 05:46:31 dholland Exp $
+$NetBSD: distinfo,v 1.15 2016/09/18 05:48:59 dholland Exp $
 
 SHA1 (camlimages-4.0.1/v4.0.1.tar.gz) = 4c1eee28f02749f53ed8345b448ce11375ce6dce
 RMD160 (camlimages-4.0.1/v4.0.1.tar.gz) = 6ae0f4c2ad3f0a8d7f4d84109d413e0b4bc1a86b
 SHA512 (camlimages-4.0.1/v4.0.1.tar.gz) = 49b1ff8c5e4955f104041b0043c1d610fb79ac3eacae13f50dd4f48105f55d8cb35b1a8ac60e19449a34ef1cd3a9c2ad38060443b91543d6b338b942109b5668
 Size (camlimages-4.0.1/v4.0.1.tar.gz) = 2190252 bytes
-SHA1 (patch-OMakefile) = 3d6343128c8c6d450463e2cf6a2e1f5b75d4285a
+SHA1 (patch-OMakefile) = f650eca9bf8edbc64f9f5352718ee2046c368667
 SHA1 (patch-src_gifread.c) = 63aac1a76e809676f0000f37af63c79c4edbe316
 SHA1 (patch-src_gifwrite.c) = ab92107467b059d9541edacf60a5f73ed71fd687
-SHA1 (patch-src_jpegread.c) = e6aa9279e6efc0c8345b74344d56377ddfe77b74
+SHA1 (patch-src_jpegread.c) = 2b32040ce34218437bb4947d8a87fe2b840223b4
 SHA1 (patch-src_pngread.c) = 00d753b8570b5ff9ffa71e6e62328496b03f9654
 SHA1 (patch-src_pngwrite.c) = 4df4f69851769e0eefc2249a30ac8dd53aa8d755
 SHA1 (patch-src_tiffread.c) = 4dab0fe8da42fe7d0720d5edddf45743c7fa41fd

Index: pkgsrc/graphics/camlimages/patches/patch-OMakefile
diff -u pkgsrc/graphics/camlimages/patches/patch-OMakefile:1.2 pkgsrc/graphics/camlimages/patches/patch-OMakefile:1.3
--- pkgsrc/graphics/camlimages/patches/patch-OMakefile:1.2      Wed Dec 26 10:24:17 2012
+++ pkgsrc/graphics/camlimages/patches/patch-OMakefile  Sun Sep 18 05:48:59 2016
@@ -1,6 +1,7 @@
-$NetBSD: patch-OMakefile,v 1.2 2012/12/26 10:24:17 jaapb Exp $
+$NetBSD: patch-OMakefile,v 1.3 2016/09/18 05:48:59 dholland Exp $
 
 Use pkgsrc build variables, correct detection of libpng
+
 --- OMakefile.orig     2011-06-22 18:04:32.000000000 +0000
 +++ OMakefile  2011-08-06 17:23:47.000000000 +0000
 @@ -25,8 +25,10 @@

Index: pkgsrc/graphics/camlimages/patches/patch-src_jpegread.c
diff -u pkgsrc/graphics/camlimages/patches/patch-src_jpegread.c:1.1 pkgsrc/graphics/camlimages/patches/patch-src_jpegread.c:1.2
--- pkgsrc/graphics/camlimages/patches/patch-src_jpegread.c:1.1 Wed Dec 26 10:24:17 2012
+++ pkgsrc/graphics/camlimages/patches/patch-src_jpegread.c     Sun Sep 18 05:48:59 2016
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_jpegread.c,v 1.1 2012/12/26 10:24:17 jaapb Exp $
+$NetBSD: patch-src_jpegread.c,v 1.2 2016/09/18 05:48:59 dholland Exp $
 
 Make clang happy with proper return value
+
 --- src/jpegread.c.orig        2011-06-22 18:04:32.000000000 +0000
 +++ src/jpegread.c
 @@ -417,7 +417,7 @@ value read_jpeg_scanlines( value jpegh,