summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2010-02-11 12:52:37 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2010-02-11 12:52:37 +0000
commitecac0c94c65a0320f66cc5fe77742f2a3d7369c6 (patch)
tree742addde1f6ac30ea3ea8761c8dc179cabbd209e
parentUpdate to 20100211. Assign maintainer to perl@. (diff)
- add CONFLICTS with print/cupsddk
Submitted by: Max Brazhnikov
Notes
Notes: svn path=/head/; revision=249571
-rw-r--r--print/cups-base/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index b194e75d5f53..6160509cfc10 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -85,6 +85,7 @@ USE_LDCONFIG= yes
PKGMESSAGE= ${NONEXISTENT}
DESCR= ${MASTERDIR}/pkg-descr.image
.else
+CONFLICTS+= cupsddk-*
CUPS_SUFFIX= -base
LIB_DEPENDS+= cups.2:${PORTSDIR}/${PKGCATEGORY}/cups-client \
cupsimage.2:${PORTSDIR}/${PKGCATEGORY}/cups-image