summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/ImageMagick/Makefile4
-rw-r--r--graphics/Mesa/Makefile4
-rw-r--r--graphics/fly/Makefile4
-rw-r--r--graphics/imlib/Makefile4
-rw-r--r--graphics/jpeg/Makefile4
-rw-r--r--graphics/magicpoint/Makefile4
-rw-r--r--graphics/netpbm/Makefile4
-rw-r--r--graphics/png/Makefile4
-rw-r--r--graphics/tgif/Makefile4
-rw-r--r--graphics/xfig/Makefile4
-rw-r--r--graphics/xpaint/Makefile4
-rw-r--r--graphics/xpdf/Makefile4
-rw-r--r--graphics/xpm/Makefile4
13 files changed, 13 insertions, 39 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 0ee1cf2e72b..01d386feb13 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 1999/01/02 20:57:28 tron Exp $
+# $NetBSD: Makefile,v 1.34 1999/02/20 22:48:29 hubertf Exp $
#
DISTNAME= ImageMagick-4.1.7
@@ -13,8 +13,6 @@ DEPENDS+= mpeg2codec-1.2:../../graphics/mpeg2codec
DEPENDS+= png-1.0.2:../../graphics/png
DEPENDS+= tiff-3.4:../../graphics/tiff
-CONFLICTS= ImageMagick-*
-
pre-configure:
.if exists(/usr/lib/libbz2.a)
@echo >${WRKSRC}/bzlib.tmpl "#define HasBZLIB"
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index db34150475b..553d1e2874f 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 1999/01/30 23:18:50 agc Exp $
+# $NetBSD: Makefile,v 1.23 1999/02/20 22:48:30 hubertf Exp $
#
DISTNAME= MesaLib-3.0
@@ -13,8 +13,6 @@ DISTFILES= MesaLib-${MESA_VERSION}${EXTRACT_SUFX} \
MAINTAINER= mycroft@netbsd.org
HOMEPAGE= http://www.ssec.wisc.edu/~brianp/Mesa.html
-CONFLICTS= Mesa-2.4 Mesa-2.6
-
NOT_FOR_ARCHS= alpha #gcc lossage
WRKSRC= ${WRKDIR}/${PKGNAME}
diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile
index d8a75836eae..eaf2c13146a 100644
--- a/graphics/fly/Makefile
+++ b/graphics/fly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/08/20 15:17:00 tsarna Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/20 22:48:30 hubertf Exp $
#
DISTNAME= fly-1.6.1
@@ -10,8 +10,6 @@ HOMEPAGE= http://www.unimelb.edu.au/fly/fly.html
DEPENDS+= gd-1.3:../../graphics/gd
-CONFLICTS= fly-1.6.0
-
pre-install:
${MKDIR} ${PREFIX}/share/doc/fly
${MKDIR} ${PREFIX}/share/examples/fly
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 1a13a10c074..086b60f0715 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1999/01/30 23:18:50 agc Exp $
+# $NetBSD: Makefile,v 1.15 1999/02/20 22:48:30 hubertf Exp $
#
DISTNAME= imlib-1.9.0
@@ -16,8 +16,6 @@ DEPENDS+= tiff-3.4:../../graphics/tiff
DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= giflib-3.0:../../graphics/giflib
-CONFLICTS= imlib-*
-
USE_X11BASE= yes
USE_LIBTOOL= yes
USE_GMAKE= yes
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 54b5ad3b96c..415357f2d16 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1998/11/30 18:58:09 tv Exp $
+# $NetBSD: Makefile,v 1.14 1999/02/20 22:48:30 hubertf Exp $
#
DISTNAME= jpegsrc.v6b
@@ -9,8 +9,6 @@ MASTER_SITES= ftp://ftp.uu.net/graphics/jpeg/
MAINTAINER= mycroft@netbsd.org
HOMEPAGE= http://www.ijg.org/
-CONFLICTS= jpeg-6a
-
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index dd3c11054a9..b8062ad42a3 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/11/11 06:28:40 garbled Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/20 22:48:30 hubertf Exp $
DISTNAME= magicpoint-1.04a
PKGNAME= mgp-1.04a
@@ -8,8 +8,6 @@ MASTER_SITES= ftp://ftp.mew.org/pub/MagicPoint/
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.Mew.org/mgp/
-CONFLICTS= mgp-1.03a
-
GNU_CONFIGURE= yes
USE_IMAKE= yes
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 6562ebd1bea..93ace2d3734 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 1999/01/10 23:52:15 tron Exp $
+# $NetBSD: Makefile,v 1.24 1999/02/20 22:48:31 hubertf Exp $
#
DISTNAME= netpbm
@@ -18,8 +18,6 @@ DEPENDS+= tiff-3.4:../../graphics/tiff
DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= png-1.0.2:../../graphics/png
-CONFLICTS= netpbm-*
-
WRKSRC= ${WRKDIR}/netpbm
MAKE_ENV += PREFIX=${PREFIX} MANCP="${INSTALL_MAN}"
NO_CONFIGURE= yes
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index f8c7cd6eab7..f27b31bf8fb 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/08/20 15:17:01 tsarna Exp $
+# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:31 hubertf Exp $
# FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:44 max Exp
#
@@ -12,8 +12,6 @@ HOMEPAGE= http://www.cdrom.com/pub/png/
USE_LIBTOOL= yes
-CONFLICTS= png-0.96
-
MAKEFILE= scripts/makefile.std
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index 081f9c904d4..c9de23278e9 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1999/01/24 12:02:17 frueauf Exp $
+# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:31 hubertf Exp $
#
DISTNAME= tgif-4.0.9
@@ -9,8 +9,6 @@ MASTER_SITES= ftp://bourbon.cs.umd.edu/pub/tgif/ \
MAINTAINER= mcmahill@alum.mit.edu
HOMEPAGE= http://bourbon.cs.umd.edu:8001/tgif/tgif.html
-CONFLICTS= tgif-*
-
USE_IMAKE= yes
post-patch::
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 1bf7e0fc955..42565dafcc4 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1998/10/15 19:51:07 agc Exp $
+# $NetBSD: Makefile,v 1.17 1999/02/20 22:48:31 hubertf Exp $
#
DISTNAME= xfig.3.2.2
@@ -16,8 +16,6 @@ DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= Xaw3d-1.5:../../x11/Xaw3d
-CONFLICTS= xfig-3.2
-
USE_IMAKE= yes
post-install:
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index b20aa91d331..2a6c1d07a1d 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1998/12/20 15:09:30 frueauf Exp $
+# $NetBSD: Makefile,v 1.14 1999/02/20 22:48:31 hubertf Exp $
# FreeBSD Id: Makefile,v 1.14 1997/08/29 12:17:50 tg Exp
#
@@ -15,8 +15,6 @@ DEPENDS+= tiff-3.4:../../graphics/tiff
DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= png-1.0.2:../../graphics/png
-CONFLICTS= xpaint-2.5
-
USE_IMAKE= yes
pre-configure:
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 55abe784905..97fffa27924 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/01/30 23:18:51 agc Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/20 22:48:32 hubertf Exp $
# FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp
#
@@ -12,8 +12,6 @@ HOMEPAGE= http://www.foolabs.com/xpdf/
DEPENDS= xpm-3.4k:../../graphics/xpm
-CONFLICTS= xpdf-0.7a
-
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include"
CONFIGURE_ARGS= --with-gzip
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index c2a59e1350d..af3882c105f 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/08/20 15:17:03 tsarna Exp $
+# $NetBSD: Makefile,v 1.13 1999/02/20 22:48:32 hubertf Exp $
#
DISTNAME= xpm-3.4k
@@ -8,8 +8,6 @@ MASTER_SITES= ftp://avahi.inria.fr/pub/xpm/
MAINTAINER= mycroft@netbsd.org
HOMEPAGE= http://www.inria.fr/koala/lehors/xpm.html
-CONFLICTS= xpm-3.4j
-
USE_IMAKE= yes
.include "../../mk/bsd.pkg.mk"
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 20:28:17 +0000