summaryrefslogtreecommitdiff
path: root/graphics/jpeg
diff options
context:
space:
mode:
authordsainty <dsainty@pkgsrc.org>2010-12-12 11:50:43 +0000
committerdsainty <dsainty@pkgsrc.org>2010-12-12 11:50:43 +0000
commitcfab177cc4a5f541a114dbeab16e60076487b4f1 (patch)
tree2e4016e2c054d8ddc41e3184ad2c0a7c30db28c0 /graphics/jpeg
parentddb397b62392844542e15732e3a449bf9c300345 (diff)
downloadpkgsrc-cfab177cc4a5f541a114dbeab16e60076487b4f1.tar.gz
Conflicts with libjpeg-turbo
Diffstat (limited to 'graphics/jpeg')
-rw-r--r--graphics/jpeg/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index f87c3114618..827418a1b3f 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2010/05/18 19:59:21 drochner Exp $
+# $NetBSD: Makefile,v 1.43 2010/12/12 11:50:43 dsainty Exp $
#
DISTNAME= jpegsrc.v8b
@@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.ijg.org/
COMMENT= IJG's jpeg compression utilities
+CONFLICTS= libjpeg-turbo-[0-9]*
+
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir