aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2010-04-28 06:18:17 +0000
committerRene Ladan <rene@FreeBSD.org>2010-04-28 06:18:17 +0000
commitf45a192c12a4c8075f0957cae1f70f463a2488c3 (patch)
treee3a7908303cbc26e0d50d83eb30f1bf554409abb
parent3176e12adb2f311f3ef781e18608073edaa41ec1 (diff)
downloadports-f45a192c12a4c8075f0957cae1f70f463a2488c3.tar.gz
ports-f45a192c12a4c8075f0957cae1f70f463a2488c3.zip
Notes
-rw-r--r--graphics/jpeg/Makefile1
-rw-r--r--graphics/libjpeg-turbo/Makefile1
2 files changed, 2 insertions, 0 deletions
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index ec937b72895e..f10b41559ba0 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -20,6 +20,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= IJG's jpeg compression utilities
+CONFLICTS= libjpeg-turbo-[0-9]*
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}a
USE_AUTOTOOLS= libtool:22
diff --git a/graphics/libjpeg-turbo/Makefile b/graphics/libjpeg-turbo/Makefile
index e9aeda9a2c5c..221e957c0f3c 100644
--- a/graphics/libjpeg-turbo/Makefile
+++ b/graphics/libjpeg-turbo/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= http://openmoko.spb.ru/repository/ \
MAINTAINER= bytestore@yandex.ru
COMMENT= Uses MMX, SSE, and SSE2 to accelerate baseline JPEG (de)compression
+CONFLICTS= jpeg-[0-9]*
ONLY_FOR_ARCH= amd64 i386
USE_AUTOTOOLS= autoconf:262 automake:19 libtool:22
GNU_CONFIGURE= yes