diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-12-08 16:48:38 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-12-08 16:48:38 +0000 |
| commit | 60945f027780c21c987e0c642404a8383407edad (patch) | |
| tree | fd2d9471767ad6e92fff12ef08f1cb015017f9f8 /graphics/jpeg-turbo | |
| parent | e59096e905f88c35da2fdfb21e14d87a51cc6c9b (diff) | |
| download | ports-60945f027780c21c987e0c642404a8383407edad.tar.gz ports-60945f027780c21c987e0c642404a8383407edad.zip | |
Replace USES=libtool:oldver with USES=libtool or USES=libtool:keepla in
the 32 ports that still use it. Bump PORTREVISION on their dependent
ports except the ones that depend on these:
audio/libogg
audio/libvorbis
devel/pcre
ftp/curl
graphics/jpeg
graphics/libart_lgpl
graphics/tiff
textproc/expat2
textproc/libxslt
In these cases the same trick as in the recent gettext update is used.
The ports install a symlink with the old library version. When enough
of their dependent ports have had regular updates the remaining ones can
get a PORTREVISION bump and the links can be removed.
Also remove the devel/pcre dependency from USE_GNOME=glib20. It causes
over 2200 packages to depend on devel/pcre while less than 200 actually
link with it. The glib20 package still depends on devel/pcre so this
should not make a difference for ports with USE_GNOME=glib20. Also,
libdata/pkgconfig/glib-2.0.pc lists pcre as a private library so
USE_GNOME=glib20 should not propagate it.
PR: 195724
Exp-run by: antoine
Approved by: portmgr (antoine)
Notes
Notes:
svn path=/head/; revision=374303
Diffstat (limited to 'graphics/jpeg-turbo')
| -rw-r--r-- | graphics/jpeg-turbo/Makefile | 15 | ||||
| -rw-r--r-- | graphics/jpeg-turbo/pkg-plist | 4 |
2 files changed, 8 insertions, 11 deletions
diff --git a/graphics/jpeg-turbo/Makefile b/graphics/jpeg-turbo/Makefile index b1b8418d0de3..a097aec2eada 100644 --- a/graphics/jpeg-turbo/Makefile +++ b/graphics/jpeg-turbo/Makefile @@ -3,6 +3,7 @@ PORTNAME= jpeg-turbo PORTVERSION= 1.3.1 +PORTREVISION?= 1 CATEGORIES= graphics MASTER_SITES= SF/lib${PORTNAME}/${PORTVERSION} DISTNAME= lib${PORTNAME}-${PORTVERSION} @@ -15,7 +16,6 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm ONLY_FOR_ARCHS= amd64 i386 USES= libtool GNU_CONFIGURE= yes -CONFIGURE_ENV= SO_MAJOR_VERSION=62 CONFIGURE_ARGS= --with-jpeg8 USE_LDCONFIG= yes ALL_TARGET= test @@ -24,8 +24,7 @@ INSTALL_TARGET= install-strip PORTDOCS= * PORTEXAMPLES= * -OPTIONS_DEFINE= DOCS EXAMPLES PIC -PIC_DESC= Static library with PIC (required for VirtualGL) +OPTIONS_DEFINE= DOCS EXAMPLES DOCS_MAKE_ARGS= docdir="${DOCSDIR}" DOCS_MAKE_ARGS_OFF= dist_doc_DATA="" @@ -33,18 +32,16 @@ DOCS_MAKE_ARGS_OFF= dist_doc_DATA="" EXAMPLES_MAKE_ARGS= exampledir="${EXAMPLESDIR}" EXAMPLES_MAKE_ARGS_OFF= dist_example_DATA="" -PIC_CONFIGURE_ON= --with-pic - .if defined(SLAVE_PORT) +CONFIGURE_ARGS+=--with-pic PLIST_SUB+= JPEG="@comment " LIBTURBOJPEG="" .else -CONFIGURE_ARGS+= --program-suffix=-turbo +CONFIGURE_ARGS+=--program-suffix=-turbo --without-libturbojpeg PLIST_SUB+= JPEG="" LIBTURBOJPEG="@comment " -#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 + @${ECHO_CMD} "libjpeg.so.8 libjpeg.so.8.0.2" \ + > ${STAGEDIR}${PREFIX}/etc/libmap.d/${PORTNAME}.conf .endif .include <bsd.port.mk> diff --git a/graphics/jpeg-turbo/pkg-plist b/graphics/jpeg-turbo/pkg-plist index c0e4cc66e8d3..bc57a4b58bd6 100644 --- a/graphics/jpeg-turbo/pkg-plist +++ b/graphics/jpeg-turbo/pkg-plist @@ -10,8 +10,8 @@ @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 +@comment %%JPEG%%lib/libjpeg.so.8 +%%JPEG%%lib/libjpeg.so.8.0.2 %%JPEG%%man/man1/cjpeg-turbo.1.gz %%JPEG%%man/man1/djpeg-turbo.1.gz %%JPEG%%man/man1/jpegtran-turbo.1.gz |