summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authortsarna <tsarna@pkgsrc.org>1998-07-26 18:05:57 +0000
committertsarna <tsarna@pkgsrc.org>1998-07-26 18:05:57 +0000
commita2b252fb100a50ca9e4ee33f477052cbd9b10905 (patch)
tree5f4df3c05b51ffedcb26a3efac8674e7566cbefe /graphics
parent3b3ed2376b06668f3e3622f4c6d6a1b4670ce785 (diff)
downloadpkgsrc-a2b252fb100a50ca9e4ee33f477052cbd9b10905.tar.gz
Conflicts with jpeg-6a
Diffstat (limited to 'graphics')
-rw-r--r--graphics/jpeg/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index a54281638b9..1106dfb9e45 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/07/24 01:57:00 tv Exp $
+# $NetBSD: Makefile,v 1.12 1998/07/26 18:05:57 tsarna Exp $
#
DISTNAME= jpegsrc.v6b
@@ -8,6 +8,8 @@ MASTER_SITES= ftp://ftp.uu.net/graphics/jpeg/
MAINTAINER= mycroft@netbsd.org
+CONFLICTS= jpeg-6a
+
USE_LIBTOOL= yes
GNU_CONFIGURE= yes