summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrecht <recht>2005-07-10 16:46:37 +0000
committerrecht <recht>2005-07-10 16:46:37 +0000
commitf9b5d72ade29928cf7b6387db2a57a4e5f0ec3a4 (patch)
treefc4e965c8a9a3f3d99f715926ff3e5b38b5c3b27
parentccc3cb6904c399a64a65284c433fe12960119068 (diff)
downloadpkgsrc-f9b5d72ade29928cf7b6387db2a57a4e5f0ec3a4.tar.gz
Add a conflict on acroread7 since both versions install bin/acroread.
patch provided by smb in PR 30688
-rw-r--r--print/acroread5/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile
index 43c4a0ff943..ed898a4634b 100644
--- a/print/acroread5/Makefile
+++ b/print/acroread5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/06/17 03:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/07/10 16:46:37 recht Exp $
DISTNAME= acroread5 # Overridden below
PKGNAME= acroread5-5.10
@@ -11,6 +11,9 @@ HOMEPAGE= http://www.adobe.com/prodindex/acrobat/readstep.html
COMMENT= View, distribute and print PDF documents
CONFLICTS+= acroread-5.*
+# conflict with acroread7 due to bin/acroread
+CONFLICTS+= acroread-7.*
+CONFLICTS+= acroread7-7.*
RESTRICTED= "Original installer required to redistribute."
NO_SRC_ON_CDROM= ${RESTRICTED}