summaryrefslogtreecommitdiff
path: root/chinese
diff options
context:
space:
mode:
authorTAKATSU Tomonari <tota@FreeBSD.org>2011-05-04 23:36:34 +0000
committerTAKATSU Tomonari <tota@FreeBSD.org>2011-05-04 23:36:34 +0000
commitc7bf4cf8a9e70a4eecc796274f8c1ebac5fd1b00 (patch)
tree5d21e37dd52fa0d653223ae1ec33c5894345dd2e /chinese
parentLatest round of infrastructure changes. (diff)
- Set CONFLICTS with unzip-iconv upcoming as a new port
PR: ports/152006 Submitted by: KOMATSU Shinichiro <koma2_AT_lovepeers_DOT_org>
Notes
Notes: svn path=/head/; revision=273641
Diffstat (limited to 'chinese')
-rw-r--r--chinese/unzip/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/chinese/unzip/Makefile b/chinese/unzip/Makefile
index 5db2fdea9cbe..161adf93f0f7 100644
--- a/chinese/unzip/Makefile
+++ b/chinese/unzip/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= chinese
MAINTAINER= ports@FreeBSD.org
-CONFLICTS= unzip-[0-9]* ko-unzip-[0-9]* ru-unzip-[0-9]*
+CONFLICTS= unzip-[0-9]* unzip-iconv-[0-9]* ko-unzip-[0-9]* ru-unzip-[0-9]*
MASTERDIR= ${.CURDIR}/../../archivers/unzip