From owner-svn-ports-all@FreeBSD.ORG  Sat Aug 30 14:34:04 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4AAEED06;
 Sat, 30 Aug 2014 14:34:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1CAA210FE;
 Sat, 30 Aug 2014 14:34:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UEY3ia066403;
 Sat, 30 Aug 2014 14:34:03 GMT (envelope-from adamw@FreeBSD.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UEY3ST066401;
 Sat, 30 Aug 2014 14:34:03 GMT (envelope-from adamw@FreeBSD.org)
Message-Id: <201408301434.s7UEY3ST066401@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adamw set sender to
 adamw@FreeBSD.org using -f
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Sat, 30 Aug 2014 14:34:03 +0000 (UTC)
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
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Aug 2014 14:34:04 -0000

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"