Update jpeg to 9b.

Comment two patches while here.

Version 9b  17-Jan-2016
-----------------------

Improvements and optimizations in DCT and color calculations.
Normalize range limit array composition and access pattern.
Thank to Sia Furler and Maddie Ziegler for inspiration.

Use merged upsample with scaled DCT sizes larger than 8.
Thank to Taylor Hatala for inspiration.

Check for excessive comment lengths in argument parsing in wrjpgcom.c.
Thank to Julian Cohen for hint.

Add makefile.b32 for use with Borland C++ 32-bit (bcc32).
Thank to Joe Slater for contribution.

Document 'f' specifier for jpegtran -crop specification.
Thank to Michele Martone for suggestion.

Use defined value from header instead of hardwired number in rdswitch.c.
Thank to Robert Sprowson for hint.

4 files changed, 24 insertions, 21 deletions

diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index c62b4a1a261..2e2dd733074 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2014/10/09 14:06:36 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2016/02/01 09:22:53 wiz Exp $
 
-DISTNAME=	jpegsrc.v9a
+DISTNAME=	jpegsrc.v9b
 PKGNAME=	${DISTNAME:S/src.v/-/}
-PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.ijg.org/files/
 
diff --git a/graphics/jpeg/distinfo b/graphics/jpeg/distinfo
index de87a140435..76d38944b7b 100644
--- a/graphics/jpeg/distinfo
+++ b/graphics/jpeg/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.20 2015/11/03 21:34:04 agc Exp $
+$NetBSD: distinfo,v 1.21 2016/02/01 09:22:53 wiz Exp $
 
-SHA1 (jpegsrc.v9a.tar.gz) = d65ed6f88d318f7380a3a5f75d578744e732daca
-RMD160 (jpegsrc.v9a.tar.gz) = 885898b3db086ad3b65169d0149bf1f270dff1b5
-SHA512 (jpegsrc.v9a.tar.gz) = 9b21cc115e22c68bea46db462263c5c7a0d10beb192a919ecccbd801a25982b518ce44d8c301dd582ecaba1850e0e0f20e322be82b0e24ae917b9949b4f10d3b
-Size (jpegsrc.v9a.tar.gz) = 1000034 bytes
-SHA1 (patch-af) = aba44e1e3520d2a232f6bd949a82c150e0b3e0f4
-SHA1 (patch-ag) = 4fc698186d149f1152d30bf65a96461bc331c812
+SHA1 (jpegsrc.v9b.tar.gz) = 15dd867617a88abd07573e06a86ace9bdb998ac2
+RMD160 (jpegsrc.v9b.tar.gz) = 7e261205cc653b8a0fafb3bd2267204c6bae8c42
+SHA512 (jpegsrc.v9b.tar.gz) = 74ea5af3545657d4ac03f8f7933913112cc2d982f0e379d0e5647f1acac21931468e53806297c30ebe180c7bcf84919a0ac20a4195afb03db03060d57904ef6c
+Size (jpegsrc.v9b.tar.gz) = 1022609 bytes
+SHA1 (patch-af) = 925604706574009aacd452dab2d736039b0654e9
+SHA1 (patch-ag) = 46164c00386d1968356f1b61d144bc9168410654
 SHA1 (patch-jmorecfg.h) = c00f81ba94e2ad6b55ca9892553eedbe4eca3ad1
 SHA1 (patch-jpeglib.h) = 635453c5a2b1223ef5af729edcbfcfa3ed78a8b5
diff --git a/graphics/jpeg/patches/patch-af b/graphics/jpeg/patches/patch-af
index fdfca90ee0d..44f8ae64d54 100644
--- a/graphics/jpeg/patches/patch-af
+++ b/graphics/jpeg/patches/patch-af
@@ -1,4 +1,6 @@
-$NetBSD: patch-af,v 1.5 2013/01/24 21:49:18 adam Exp $
+$NetBSD: patch-af,v 1.6 2016/02/01 09:22:53 wiz Exp $
+
+Build and install jpegexiforient.
 
 --- Makefile.am.orig	2012-05-09 13:13:36.000000000 +0000
 +++ Makefile.am
diff --git a/graphics/jpeg/patches/patch-ag b/graphics/jpeg/patches/patch-ag
index 3487a5ec22a..40682782429 100644
--- a/graphics/jpeg/patches/patch-ag
+++ b/graphics/jpeg/patches/patch-ag
@@ -1,17 +1,19 @@
-$NetBSD: patch-ag,v 1.3 2013/01/24 21:49:18 adam Exp $
+$NetBSD: patch-ag,v 1.4 2016/02/01 09:22:53 wiz Exp $
 
---- Makefile.in.orig	2013-01-03 18:58:55.000000000 +0000
+Build and install jpegexiforient.
+
+--- Makefile.in.orig	2015-09-10 08:04:54.000000000 +0000
 +++ Makefile.in
-@@ -61,7 +61,7 @@ host_triplet = @host@
+@@ -99,7 +99,7 @@ host_triplet = @host@
  target_triplet = @target@
  @HAVE_LD_VERSION_SCRIPT_TRUE@am__append_1 = -Wl,--version-script=$(srcdir)/libjpeg.map
  bin_PROGRAMS = cjpeg$(EXEEXT) djpeg$(EXEEXT) jpegtran$(EXEEXT) \
 -	rdjpgcom$(EXEEXT) wrjpgcom$(EXEEXT)
 +	rdjpgcom$(EXEEXT) wrjpgcom$(EXEEXT) jpegexiforient$(EXEEXT)
  subdir = .
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- 	$(top_srcdir)/configure $(am__configure_deps) \
-@@ -148,6 +148,9 @@ rdjpgcom_LDADD = $(LDADD)
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+@@ -184,6 +184,9 @@ rdjpgcom_LDADD = $(LDADD)
  am_wrjpgcom_OBJECTS = wrjpgcom.$(OBJEXT)
  wrjpgcom_OBJECTS = $(am_wrjpgcom_OBJECTS)
  wrjpgcom_LDADD = $(LDADD)
@@ -21,7 +23,7 @@ $NetBSD: patch-ag,v 1.3 2013/01/24 21:49:18 adam Exp $
  AM_V_P = $(am__v_P_@AM_V@)
  am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
  am__v_P_0 = false
-@@ -183,7 +186,8 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V
+@@ -219,7 +222,8 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V
  am__v_CCLD_0 = @echo "  CCLD    " $@;
  am__v_CCLD_1 = 
  SOURCES = $(libjpeg_la_SOURCES) $(cjpeg_SOURCES) $(djpeg_SOURCES) \
@@ -31,7 +33,7 @@ $NetBSD: patch-ag,v 1.3 2013/01/24 21:49:18 adam Exp $
  am__can_run_installinfo = \
    case $$AM_UPDATE_INFO_DIR in \
      n|no|NO) false;; \
-@@ -424,6 +428,8 @@ jpegtran_SOURCES = jpegtran.c rdswitch.c
+@@ -461,6 +465,8 @@ jpegtran_SOURCES = jpegtran.c rdswitch.c
  jpegtran_LDADD = libjpeg.la
  rdjpgcom_SOURCES = rdjpgcom.c
  wrjpgcom_SOURCES = wrjpgcom.c
@@ -40,7 +42,7 @@ $NetBSD: patch-ag,v 1.3 2013/01/24 21:49:18 adam Exp $
  
  # Manual pages to install
  man_MANS = $(DISTMANS)
-@@ -598,6 +603,9 @@ rdjpgcom$(EXEEXT): $(rdjpgcom_OBJECTS) $
+@@ -640,6 +646,9 @@ rdjpgcom$(EXEEXT): $(rdjpgcom_OBJECTS) $
  wrjpgcom$(EXEEXT): $(wrjpgcom_OBJECTS) $(wrjpgcom_DEPENDENCIES) $(EXTRA_wrjpgcom_DEPENDENCIES) 
  	@rm -f wrjpgcom$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(wrjpgcom_OBJECTS) $(wrjpgcom_LDADD) $(LIBS)
@@ -50,7 +52,7 @@ $NetBSD: patch-ag,v 1.3 2013/01/24 21:49:18 adam Exp $
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -651,6 +659,7 @@ distclean-compile:
+@@ -693,6 +702,7 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jidctfst.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jidctint.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmemmgr.Plo@am__quote@