Index: Makefile
===================================================================
--- Makefile	(revision 367806)
+++ Makefile	(working copy)
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	jpeg-turbo
-PORTVERSION=	1.3.0
-PORTREVISION?=	2
+PORTVERSION=	1.3.1
 CATEGORIES=	graphics
-MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/lib${PORTNAME}/${PORTVERSION}
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	bytestore@yandex.ru
@@ -16,20 +15,16 @@
 ONLY_FOR_ARCHS=	amd64 i386
 USES=		libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	SO_MAJOR_VERSION=${SOVERSION}
+CONFIGURE_ENV=	SO_MAJOR_VERSION=62
 CONFIGURE_ARGS=	--with-jpeg8
 USE_LDCONFIG=	yes
 ALL_TARGET=	test
 INSTALL_TARGET=	install-strip
 
-PLIST_SUB=	SOVERSION=${SOVERSION}
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-# chase graphics/jpeg
-SOVERSION=	11
-
-OPTIONS_DEFINE=	DOCS EXAMPLES PIC 
+OPTIONS_DEFINE=	DOCS EXAMPLES PIC
 PIC_DESC=	Static library with PIC (required for VirtualGL)
 
 DOCS_MAKE_ARGS=		docdir="${DOCSDIR}"
@@ -43,9 +38,13 @@
 .if defined(SLAVE_PORT)
 PLIST_SUB+=	JPEG="@comment " LIBTURBOJPEG=""
 .else
+CONFIGURE_ARGS+=	--program-suffix=-turbo
 PLIST_SUB+=	JPEG="" LIBTURBOJPEG="@comment "
-CONFLICTS_INSTALL=	jpeg-[0-9]*
+#CONFLICTS_INSTALL=	jpeg-[0-9]*
 CONFIGURE_ARGS+=--without-libturbojpeg
+
+post-install:
+	@${ECHO_CMD} "libjpeg.so.11 libjpeg.so.62" >> ${STAGEDIR}${PREFIX}/etc/libmap.d/${PORTNAME}.conf
 .endif
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 367806)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (libjpeg-turbo-1.3.0.tar.gz) = 2657008cfc08aadbaca065bd9f8964b8a2c0abd03e73da5b5f09c1216be31234
-SIZE (libjpeg-turbo-1.3.0.tar.gz) = 1361603
+SHA256 (libjpeg-turbo-1.3.1.tar.gz) = c132907417ddc40ed552fe53d6b91d5fecbb14a356a60ddc7ea50d6be9666fb9
+SIZE (libjpeg-turbo-1.3.1.tar.gz) = 1390282
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 367806)
+++ pkg-plist	(working copy)
@@ -1,21 +1,23 @@
-%%JPEG%%bin/cjpeg
-%%JPEG%%bin/djpeg
-%%JPEG%%bin/jpegtran
-%%JPEG%%bin/rdjpgcom
-%%JPEG%%bin/wrjpgcom
-%%JPEG%%include/jconfig.h
-%%JPEG%%include/jerror.h
-%%JPEG%%include/jmorecfg.h
-%%JPEG%%include/jpeglib.h
-%%JPEG%%lib/libjpeg.a
-%%JPEG%%lib/libjpeg.so
-%%JPEG%%lib/libjpeg.so.%%SOVERSION%%
-%%JPEG%%lib/libjpeg.so.%%SOVERSION%%.0.2
-%%JPEG%%man/man1/cjpeg.1.gz
-%%JPEG%%man/man1/djpeg.1.gz
-%%JPEG%%man/man1/jpegtran.1.gz
-%%JPEG%%man/man1/rdjpgcom.1.gz
-%%JPEG%%man/man1/wrjpgcom.1.gz
+%%JPEG%%etc/libmap.d/jpeg-turbo.conf
+%%JPEG%%bin/cjpeg-turbo
+%%JPEG%%bin/djpeg-turbo
+%%JPEG%%bin/jpegtran-turbo
+%%JPEG%%bin/rdjpgcom-turbo
+%%JPEG%%bin/wrjpgcom-turbo
+@comment %%JPEG%%include/jconfig.h
+@comment %%JPEG%%include/jerror.h
+@comment %%JPEG%%include/jmorecfg.h
+@comment %%JPEG%%include/jpeglib.h
+@comment %%JPEG%%lib/libjpeg.a
+@comment %%JPEG%%lib/libjpeg.so
+%%JPEG%%lib/libjpeg.so.62
+%%JPEG%%lib/libjpeg.so.62.0.2
+%%JPEG%%man/man1/cjpeg-turbo.1.gz
+%%JPEG%%man/man1/djpeg-turbo.1.gz
+%%JPEG%%man/man1/jpegtran-turbo.1.gz
+%%JPEG%%man/man1/rdjpgcom-turbo.1.gz
+%%JPEG%%man/man1/wrjpgcom-turbo.1.gz
+@comment bin/tjbench-turbo
 %%LIBTURBOJPEG%%bin/tjbench
 %%LIBTURBOJPEG%%include/turbojpeg.h
 %%LIBTURBOJPEG%%lib/libturbojpeg.a