diff options
| -rw-r--r-- | japanese/w3m-img/Makefile | 1 | ||||
| -rw-r--r-- | japanese/w3m/Makefile | 1 | ||||
| -rw-r--r-- | www/w3m-img/Makefile | 1 | ||||
| -rw-r--r-- | www/w3m-m17n-img/Makefile | 1 | ||||
| -rw-r--r-- | www/w3m-m17n/Makefile | 1 | ||||
| -rw-r--r-- | www/w3m/Makefile | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/japanese/w3m-img/Makefile b/japanese/w3m-img/Makefile index c84b27ebdc99..007090066823 100644 --- a/japanese/w3m-img/Makefile +++ b/japanese/w3m-img/Makefile @@ -17,5 +17,6 @@ PLIST= ${MASTERDIR}/pkg-plist JAPANESE= Yes INLINE_IMAGE= yes +CONFLICTS= ja-w3m-0.5.* w3m-0.5.* w3m-m17n-0.5.* w3m-img-0.5.* w3m-m17n-img-0.5.* .include "${MASTERDIR}/Makefile" diff --git a/japanese/w3m/Makefile b/japanese/w3m/Makefile index b90db9d60c15..1cf5de7364ee 100644 --- a/japanese/w3m/Makefile +++ b/japanese/w3m/Makefile @@ -15,5 +15,6 @@ PKGDIR= ${.CURDIR} PLIST= ${MASTERDIR}/pkg-plist JAPANESE= Yes +CONFLICTS= ja-w3m-img-0.5.* w3m-0.5.* w3m-m17n-0.5.* w3m-img-0.5.* w3m-m17n-img-0.5.* .include "${MASTERDIR}/Makefile" diff --git a/www/w3m-img/Makefile b/www/w3m-img/Makefile index b36b7a7a1491..3cdde68ade23 100644 --- a/www/w3m-img/Makefile +++ b/www/w3m-img/Makefile @@ -15,5 +15,6 @@ PKGDIR= ${.CURDIR} PLIST= ${MASTERDIR}/pkg-plist INLINE_IMAGE= yes +CONFLICTS= ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-0.5.* w3m-m17n-0.5.* w3m-m17n-img-0.5.* .include "${MASTERDIR}/Makefile" diff --git a/www/w3m-m17n-img/Makefile b/www/w3m-m17n-img/Makefile index ad1355cd41bb..230c0f0054e6 100644 --- a/www/w3m-m17n-img/Makefile +++ b/www/w3m-m17n-img/Makefile @@ -16,5 +16,6 @@ PLIST= ${MASTERDIR}/pkg-plist M17N= yes INLINE_IMAGE= yes +CONFLICTS= ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-0.5.* w3m-m17n-0.5.* w3m-img-0.5.* .include "${MASTERDIR}/Makefile" diff --git a/www/w3m-m17n/Makefile b/www/w3m-m17n/Makefile index 46917cf72c9d..34fd7c96c569 100644 --- a/www/w3m-m17n/Makefile +++ b/www/w3m-m17n/Makefile @@ -15,5 +15,6 @@ PKGDIR= ${.CURDIR} PLIST= ${MASTERDIR}/pkg-plist M17N= yes +CONFLICTS= ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-0.5.* w3m-img-0.5.* w3m-m17n-img-0.5.* .include "${MASTERDIR}/Makefile" diff --git a/www/w3m/Makefile b/www/w3m/Makefile index c5457b224088..b3fe29205cad 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -19,6 +19,7 @@ LIB_DEPENDS= gc.1:${PORTSDIR}/devel/boehm-gc W3M_VERSION= 0.5.1 +CONFLICTS?= ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-m17n-0.5.* w3m-img-0.5.* w3m-m17n-img-0.5.* GNU_CONFIGURE= yes USE_REINPLACE= yes |