From c7bf4cf8a9e70a4eecc796274f8c1ebac5fd1b00 Mon Sep 17 00:00:00 2001 From: TAKATSU Tomonari Date: Wed, 4 May 2011 23:36:34 +0000 Subject: [PATCH] - Set CONFLICTS with unzip-iconv upcoming as a new port PR: ports/152006 Submitted by: KOMATSU Shinichiro --- chinese/unzip/Makefile | 2 +- korean/unzip/Makefile | 2 +- russian/unzip/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 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 diff --git a/korean/unzip/Makefile b/korean/unzip/Makefile index 159ffa012685..22963dd088e4 100644 --- a/korean/unzip/Makefile +++ b/korean/unzip/Makefile @@ -9,7 +9,7 @@ CATEGORIES= korean archivers MAINTAINER= ports@FreeBSD.org COMMENT= ZIP archive extractor with localized patches -CONFLICTS= unzip-[0-9]* ru-unzip-[0-9]* zh-unzip-[0-9]* +CONFLICTS= unzip-[0-9]* unzip-iconv-[0-9]* ru-unzip-[0-9]* zh-unzip-[0-9]* EXTRA_PATCHES= ${.CURDIR}/files/patch-* MASTERDIR= ${.CURDIR}/../../archivers/unzip diff --git a/russian/unzip/Makefile b/russian/unzip/Makefile index d6ac21136192..b166f2034754 100644 --- a/russian/unzip/Makefile +++ b/russian/unzip/Makefile @@ -10,7 +10,7 @@ CATEGORIES= russian archivers MAINTAINER= den@FreeBSD.org COMMENT= Unzip with CP866 and KOI8-R support -CONFLICTS= unzip-[0-9]* zh-unzip-[0-9]* ko-unzip-[0-9]* +CONFLICTS= unzip-[0-9]* unzip-iconv-[0-9]* zh-unzip-[0-9]* ko-unzip-[0-9]* EXTRA_PATCHES= ${.CURDIR}/files/patch-ebcdic.h