aboutsummaryrefslogtreecommitdiffstats
path: root/graphics/jpeg-turbo
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2014-10-21 01:04:20 +0800
committerbapt <bapt@FreeBSD.org>2014-10-21 01:04:20 +0800
commit8efc1ccdad99ac37ed240c0cdd7bf27a2aececd5 (patch)
treeb7ca5c30bbc58c6aae2286710310a1f14fee2da5 /graphics/jpeg-turbo
parent72c5ac4673ecaa148b5d20de8c899a33daac0fed (diff)
downloadfreebsd-ports-gnome-8efc1ccdad99ac37ed240c0cdd7bf27a2aececd5.tar.gz
freebsd-ports-gnome-8efc1ccdad99ac37ed240c0cdd7bf27a2aececd5.tar.zst
freebsd-ports-gnome-8efc1ccdad99ac37ed240c0cdd7bf27a2aececd5.zip
Cleanup plist
Diffstat (limited to 'graphics/jpeg-turbo')
-rw-r--r--graphics/jpeg-turbo/Makefile19
-rw-r--r--graphics/jpeg-turbo/distinfo4
-rw-r--r--graphics/jpeg-turbo/pkg-plist38
3 files changed, 31 insertions, 30 deletions
diff --git a/graphics/jpeg-turbo/Makefile b/graphics/jpeg-turbo/Makefile
index 10c8e6530b41..b1b8418d0de3 100644
--- a/graphics/jpeg-turbo/Makefile
+++ b/graphics/jpeg-turbo/Makefile
@@ -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 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
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 @@ PIC_CONFIGURE_ON= --with-pic
.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>
diff --git a/graphics/jpeg-turbo/distinfo b/graphics/jpeg-turbo/distinfo
index fb53bf70a8bb..026a871df6b7 100644
--- a/graphics/jpeg-turbo/distinfo
+++ b/graphics/jpeg-turbo/distinfo
@@ -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
diff --git a/graphics/jpeg-turbo/pkg-plist b/graphics/jpeg-turbo/pkg-plist
index b51f17a84ae8..c0e4cc66e8d3 100644
--- a/graphics/jpeg-turbo/pkg-plist
+++ b/graphics/jpeg-turbo/pkg-plist
@@ -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