summaryrefslogtreecommitdiff
path: root/japanese
diff options
context:
space:
mode:
authorMANTANI Nobutaka <nobutaka@FreeBSD.org>2004-07-12 16:49:19 +0000
committerMANTANI Nobutaka <nobutaka@FreeBSD.org>2004-07-12 16:49:19 +0000
commit262fe773b3c1dd636b7ec7839bf8262029f27196 (patch)
tree35cadf5158401f462c2d43832ce3ce944f1f6cdd /japanese
parentDrop maintainership. (diff)
Register CONFLICTS between w3m ports.
Suggested by: Aleksander Fafula <alex@fafula.com>
Notes
Notes: svn path=/head/; revision=113479
Diffstat (limited to 'japanese')
-rw-r--r--japanese/w3m-img/Makefile1
-rw-r--r--japanese/w3m/Makefile1
2 files changed, 2 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"