From 262fe773b3c1dd636b7ec7839bf8262029f27196 Mon Sep 17 00:00:00 2001 From: MANTANI Nobutaka Date: Mon, 12 Jul 2004 16:49:19 +0000 Subject: Register CONFLICTS between w3m ports. Suggested by: Aleksander Fafula --- japanese/w3m-img/Makefile | 1 + japanese/w3m/Makefile | 1 + 2 files changed, 2 insertions(+) (limited to 'japanese') 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" -- cgit v1.2.3