Index: head/graphics/jpeg-turbo/Makefile
===================================================================
--- head/graphics/jpeg-turbo/Makefile	(revision 399278)
+++ head/graphics/jpeg-turbo/Makefile	(revision 399279)
@@ -1,50 +1,50 @@
 # Created by: Denis Podolskiy <bytestore@yandex.ru>
 # $FreeBSD$
 
 PORTNAME=	jpeg-turbo
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 PORTREVISION?=	0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/lib${PORTNAME}/${PORTVERSION}
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	portmgr@FreeBSD.org
 COMMENT?=	SIMD-accelerated JPEG codec which replaces libjpeg
 
 USES=		cpe libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-jpeg8
 USE_LDCONFIG=	yes
 ALL_TARGET=	test
 INSTALL_TARGET=	install-strip
 CPE_VENDOR=	d.r.commander
 CPE_PRODUCT=	libjpeg-turbo
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 DOCS_MAKE_ARGS=		docdir="${DOCSDIR}"
 DOCS_MAKE_ARGS_OFF=	dist_doc_DATA=""
 
 EXAMPLES_MAKE_ARGS=	exampledir="${EXAMPLESDIR}"
 EXAMPLES_MAKE_ARGS_OFF=	dist_example_DATA=""
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == i386 || ${ARCH} == amd64
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 .endif
 
 .if ${SLAVE_PORT} == yes
 # libturbojpeg.a has to be built with PIC for virtualgl
 CONFIGURE_ARGS+=--with-pic
 PLIST_SUB+=	JPEG="@comment " LIBTURBOJPEG=""
 .else
 CONFIGURE_ARGS+=--without-turbojpeg
 CONFLICTS_INSTALL=	jpeg-[0-9]*
 PLIST_SUB+=	JPEG="" LIBTURBOJPEG="@comment "
 .endif
 
 .include <bsd.port.mk>
Index: head/graphics/jpeg-turbo/distinfo
===================================================================
--- head/graphics/jpeg-turbo/distinfo	(revision 399278)
+++ head/graphics/jpeg-turbo/distinfo	(revision 399279)
@@ -1,2 +1,2 @@
-SHA256 (libjpeg-turbo-1.4.1.tar.gz) = 4bf5bad4ce85625bffbbd9912211e06790e00fb982b77724af7211034efafb08
-SIZE (libjpeg-turbo-1.4.1.tar.gz) = 1529614
+SHA256 (libjpeg-turbo-1.4.2.tar.gz) = 521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e
+SIZE (libjpeg-turbo-1.4.2.tar.gz) = 1569306
Index: head/graphics/jpeg-turbo/files/patch-jcdctmgr.c
===================================================================
--- head/graphics/jpeg-turbo/files/patch-jcdctmgr.c	(revision 399278)
+++ head/graphics/jpeg-turbo/files/patch-jcdctmgr.c	(nonexistent)
@@ -1,41 +0,0 @@
---- jcdctmgr.c.orig	2014-11-06 09:32:38 UTC
-+++ jcdctmgr.c
-@@ -6,7 +6,7 @@
-  * libjpeg-turbo Modifications:
-  * Copyright (C) 1999-2006, MIYASAKA Masaru.
-  * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-- * Copyright (C) 2011, 2014 D. R. Commander
-+ * Copyright (C) 2011, 2014-2015 D. R. Commander
-  * For conditions of distribution and use, see the accompanying README file.
-  *
-  * This file contains the forward-DCT management logic.
-@@ -175,6 +175,19 @@ compute_reciprocal (UINT16 divisor, DCTE
-   UDCTELEM c;
-   int b, r;
- 
-+  if (divisor == 1) {
-+    /* divisor == 1 means unquantized, so these reciprocal/correction/shift
-+     * values will cause the C quantization algorithm to act like the
-+     * identity function.  Since only the C quantization algorithm is used in
-+     * these cases, the scale value is irrelevant.
-+     */
-+    dtbl[DCTSIZE2 * 0] = (DCTELEM) 1;                       /* reciprocal */
-+    dtbl[DCTSIZE2 * 1] = (DCTELEM) 0;                       /* correction */
-+    dtbl[DCTSIZE2 * 2] = (DCTELEM) 1;                       /* scale */
-+    dtbl[DCTSIZE2 * 3] = (DCTELEM) (-sizeof(DCTELEM) * 8);  /* shift */
-+    return 0;
-+  }
-+
-   b = flss(divisor) - 1;
-   r  = sizeof(DCTELEM) * 8 + b;
- 
-@@ -395,7 +408,8 @@ quantize (JCOEFPTR coef_block, DCTELEM *
- 
- #if BITS_IN_JSAMPLE == 8
- 
--  UDCTELEM recip, corr, shift;
-+  UDCTELEM recip, corr;
-+  int shift;
-   UDCTELEM2 product;
- 
-   for (i = 0; i < DCTSIZE2; i++) {

Property changes on: head/graphics/jpeg-turbo/files/patch-jcdctmgr.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property