Date: Sat, 30 Aug 2014 14:34:03 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366624 - in head/graphics: jpeg-turbo libjpeg-turbo Message-ID: <201408301434.s7UEY3ST066401@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sat Aug 30 14:34:03 2014 New Revision: 366624 URL: http://svnweb.freebsd.org/changeset/ports/366624 QAT: https://qat.redports.org/buildarchive/r366624/ Log: Fix a docs conflict from libjpeg-turbo not excluding the DOCS option. PR: 193145 Submitted by: Jan Beich Modified: head/graphics/jpeg-turbo/Makefile head/graphics/libjpeg-turbo/Makefile Modified: head/graphics/jpeg-turbo/Makefile ============================================================================== --- head/graphics/jpeg-turbo/Makefile Sat Aug 30 14:29:47 2014 (r366623) +++ head/graphics/jpeg-turbo/Makefile Sat Aug 30 14:34:03 2014 (r366624) @@ -29,9 +29,15 @@ PORTEXAMPLES= * # chase graphics/jpeg SOVERSION= 11 -OPTIONS_DEFINE= PIC +OPTIONS_DEFINE= DOCS EXAMPLES PIC PIC_DESC= Static library with PIC (required for VirtualGL) +DOCS_MAKE_ARGS= docdir="${DOCSDIR}" +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) @@ -39,13 +45,7 @@ PLIST_SUB+= JPEG="@comment " LIBTURBOJPE .else PLIST_SUB+= JPEG="" LIBTURBOJPEG="@comment " CONFLICTS_INSTALL= jpeg-[0-9]* -OPTIONS_DEFINE+=DOCS EXAMPLES CONFIGURE_ARGS+=--without-libturbojpeg .endif -post-patch: - ${REINPLACE_CMD} -e '/^docdir/s,=.*,= ${DOCSDIR},' \ - -e '/^exampledir/s,=.*,= ${EXAMPLESDIR},' \ - ${WRKSRC}/Makefile.in - .include <bsd.port.mk> Modified: head/graphics/libjpeg-turbo/Makefile ============================================================================== --- head/graphics/libjpeg-turbo/Makefile Sat Aug 30 14:29:47 2014 (r366623) +++ head/graphics/libjpeg-turbo/Makefile Sat Aug 30 14:34:03 2014 (r366624) @@ -1,12 +1,15 @@ # Created by: Denis Podolskiy <bytestore@yandex.ru> # $FreeBSD$ +PORTREVISION?= 3 + PKGNAMEPREFIX= lib COMMENT= SIMD-accelerated JPEG codec library, provides libTurboJPEG MASTERDIR= ${.CURDIR:H}/jpeg-turbo SLAVE_PORT= yes +OPTIONS_EXCLUDE=DOCS EXAMPLES OPTIONS_SLAVE= PIC .include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408301434.s7UEY3ST066401>