diff options
| author | tota <tota@FreeBSD.org> | 2011-05-06 21:33:17 +0800 |
|---|---|---|
| committer | tota <tota@FreeBSD.org> | 2011-05-06 21:33:17 +0800 |
| commit | ed4cf2145e72af6a9aad3114ecfeb3f64187e061 (patch) | |
| tree | 93326f5502b4e1b69116babaccecc217cca21cf0 /archivers/unzip | |
| parent | e53695732ca04aeb7ae76095986ad7b4c31b1953 (diff) | |
| download | freebsd-ports-gnome-ed4cf2145e72af6a9aad3114ecfeb3f64187e061.tar.gz freebsd-ports-gnome-ed4cf2145e72af6a9aad3114ecfeb3f64187e061.tar.zst freebsd-ports-gnome-ed4cf2145e72af6a9aad3114ecfeb3f64187e061.zip | |
- Set CONFLICTS with unzip-iconv [1]
* Forget to commit on 2011-05-04 23:36:34 UTC
- Bump PORTREVISION
PR: ports/152006 [1]
Submitted by: KOMATSU Shinichiro <koma2_AT_lovepeers_DOT_org> [1]
Diffstat (limited to 'archivers/unzip')
| -rw-r--r-- | archivers/unzip/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile index d7dfe4da7277..ee4a95476e87 100644 --- a/archivers/unzip/Makefile +++ b/archivers/unzip/Makefile @@ -7,6 +7,7 @@ PORTNAME= unzip PORTVERSION= 6.0 +PORTREVISION= 1 CATEGORIES?= archivers MASTER_SITES= SF/infozip/UnZip%206.x%20%28latest%29/UnZip%20${PORTVERSION}/:main \ SF/infozip/UnZip%205.x%20and%20earlier/5.51/:unreduce @@ -21,7 +22,7 @@ LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT} LICENSE_NAME= Info-ZIP license LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS?= zh-unzip-[0-9]* ko-unzip-[0-9]* ru-unzip-[0-9]* +CONFLICTS?= unzip-iconv-[0-9]* zh-unzip-[0-9]* ko-unzip-[0-9]* ru-unzip-[0-9]* MAKEFILE= unix/Makefile .if defined(INSTALL_AS_INFOUNZIP) |