summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorhubertf <hubertf>1999-02-20 22:48:24 +0000
committerhubertf <hubertf>1999-02-20 22:48:24 +0000
commita4cbe4cb0445443d02c5d3c6f788d17367537b92 (patch)
treef0ac98b899382f539e1e39385f1316edd18626bd /print
parent878b71762a717be3626e0baac746b75c52f812b6 (diff)
downloadpkgsrc-a4cbe4cb0445443d02c5d3c6f788d17367537b92.tar.gz
Fix CONFLICTS (remove redundancy, mostly)
Diffstat (limited to 'print')
-rw-r--r--print/a2ps/Makefile4
-rw-r--r--print/enscript/Makefile4
-rw-r--r--print/ghostscript5/Makefile4
-rw-r--r--print/magicfilter/Makefile4
-rw-r--r--print/psutils/Makefile4
-rw-r--r--print/transfig/Makefile4
6 files changed, 6 insertions, 18 deletions
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 0388d21c6d7..3b9eaa63fbb 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 1999/02/19 01:02:14 tv Exp $
+# $NetBSD: Makefile,v 1.21 1999/02/20 22:48:38 hubertf Exp $
# FreeBSD Id: Makefile,v 1.12 1998/02/15 21:24:42 steve Exp
#
@@ -11,8 +11,6 @@ HOMEPAGE= http://www-inf.enst.fr/~demaille/a2ps/
DEPENDS= papersize-1.0:../../print/papersize
-CONFLICTS= a2ps-[AL]*
-
STRIP=
GNU_CONFIGURE= yes
CONFIGURE_ENV+= LPR=lpr
diff --git a/print/enscript/Makefile b/print/enscript/Makefile
index f7e5747e913..fd44eb78808 100644
--- a/print/enscript/Makefile
+++ b/print/enscript/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1999/02/19 00:45:23 tv Exp $
+# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:39 hubertf Exp $
# FreeBSD Id: Makefile,v 1.4 1997/11/27 08:10:30 tg Exp
#
@@ -11,8 +11,6 @@ HOMEPAGE= http://www.ngs.fi/mtr/genscript/
DEPENDS+= papersize-1.0:../../print/papersize
-CONFLICTS= enscript-[AL]*
-
GNU_CONFIGURE= yes
CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index d016556f89d..fb818bea9a2 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 1999/01/04 21:44:47 frueauf Exp $
+# $NetBSD: Makefile,v 1.32 1999/02/20 22:48:39 hubertf Exp $
#
DISTNAME= ghostscript-5.50
@@ -17,8 +17,6 @@ BUILD_DEPENDS= ${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b:../../graphics/jp
unzip:../../archivers/unzip
DEPENDS= png-1.0.2:../../graphics/png
-CONFLICTS= ghostscript-5.10
-
EXTRACT_ONLY= ${GS_SOURCES}
WRKSRC= ${WRKDIR}/gs5.50
MAKEFILE= unix-gcc.mak
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index 18c124f66f6..0342f93bae3 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/11/11 11:28:02 agc Exp $
+# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:39 hubertf Exp $
DISTNAME= magicfilter-1.2
CATEGORIES= print
@@ -13,8 +13,6 @@ DEPENDS+= a2ps-4.10.3:../../print/a2ps \
teTeX-0.4p8:../../print/teTeX \
papersize-1.0:../../print/papersize
-CONFLICTS= magicfilter-A4-1.2 magicfilter-Letter-1.2
-
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index 3ceec0139e8..c4ceea2f76b 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/11/10 14:08:16 agc Exp $
+# $NetBSD: Makefile,v 1.13 1999/02/20 22:48:42 hubertf Exp $
# FreeBSD Id: Makefile,v 1.15 1998/01/08 18:52:13 fenner Exp
#
@@ -14,8 +14,6 @@ DEPENDS+= papersize-1.0:../../print/papersize
WRKSRC= ${WRKDIR}/psutils
USE_PERL5= yes
-CONFLICTS+= psutils-A4-1.17 psutils-Letter-1.17
-
.include "../../mk/bsd.prefs.mk"
PAPERSIZE?= A4
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 4401d66a5e2..aaa5ad31b53 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/08/27 13:46:00 garbled Exp $
+# $NetBSD: Makefile,v 1.11 1999/02/20 22:48:42 hubertf Exp $
#
DISTNAME= transfig.3.2.1
@@ -13,8 +13,6 @@ MAINTAINER= root@garbled.net
DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= jpeg-6b:../../graphics/jpeg
-CONFLICTS= transfig-3.2
-
USE_IMAKE= yes
.include "../../mk/bsd.pkg.mk"