Attachment 146532 Details for Bug 193145 – resolve conflict

[patch] resolve conflict

conflict_resolve.diff (text/plain), 1.60 KB, created by Jan Beich on 2014-08-30 13:05:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2014-08-30 13:05:41 UTC

Size: 1.60 KB

patch

obsolete

>Index: graphics/jpeg-turbo/Makefile
>===================================================================
>--- graphics/jpeg-turbo/Makefile	(revision 366336)
>+++ graphics/jpeg-turbo/Makefile	(working copy)
>@@ -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 " LIBTURBOJPEG=""
> .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>
>Index: graphics/libjpeg-turbo/Makefile
>===================================================================
>--- graphics/libjpeg-turbo/Makefile	(revision 366336)
>+++ graphics/libjpeg-turbo/Makefile	(working copy)
>@@ -1,6 +1,8 @@
> # Created by: Denis Podolskiy <bytestore@yandex.ru>
> # $FreeBSD$
> 
>+PORTREVISION?=	3
>+
> PKGNAMEPREFIX=	lib
> 
> COMMENT=	SIMD-accelerated JPEG codec library, provides libTurboJPEG
>@@ -7,6 +9,7 @@ COMMENT=	SIMD-accelerated JPEG codec library, prov
> 
> MASTERDIR=	${.CURDIR:H}/jpeg-turbo
> SLAVE_PORT=	yes
>+OPTIONS_EXCLUDE=DOCS EXAMPLES
> OPTIONS_SLAVE=	PIC
> 
> .include "${MASTERDIR}/Makefile"

Actions: View | Diff

Attachments on bug 193145: 146531 | 146532 | 146533 | 146534