summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornovel <novel@FreeBSD.org>2005-09-29 11:07:19 +0000
committernovel <novel@FreeBSD.org>2005-09-29 11:07:19 +0000
commit2bbe2ae8c8e49b7aee15d28fe7cc92a4544a5258 (patch)
treeaa59beb985dc3fecdb17bd42c6847d1bd85c0092
parentf68b019289fd25bb7358e6d62836062eaf45d143 (diff)
downloadFreeBSD-ports-2bbe2ae8c8e49b7aee15d28fe7cc92a4544a5258.zip
FreeBSD-ports-2bbe2ae8c8e49b7aee15d28fe7cc92a4544a5258.tar.gz
Mark CONFLICTS - both install bin/jls and jls.1 man.
PR: 86698 Submitted by: Fumiyoshi TAOKA <fmysh@iijmio-mail.jp>
-rw-r--r--japanese/jls/Makefile2
-rw-r--r--sysutils/sleuthkit/Makefile2
2 files changed, 4 insertions, 0 deletions
diff --git a/japanese/jls/Makefile b/japanese/jls/Makefile
index da1c0bc..9a985c2 100644
--- a/japanese/jls/Makefile
+++ b/japanese/jls/Makefile
@@ -18,6 +18,8 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= kazami@angels.vg
COMMENT= Japanized ls
+CONFLICTS= sleuthkit-[0-9]*
+
MAN1= jls.1
MANCOMPRESSED= yes
PLIST_FILES= bin/jls
diff --git a/sysutils/sleuthkit/Makefile b/sysutils/sleuthkit/Makefile
index d45f4a1..932aaca 100644
--- a/sysutils/sleuthkit/Makefile
+++ b/sysutils/sleuthkit/Makefile
@@ -14,6 +14,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= opr@bsdaemon.be
COMMENT= The @stake Sleuth Kit for forensic analysis
+CONFLICTS= ja-ls-[0-9]*
+
USE_PERL5= yes
USE_REINPLACE= yes
OpenPOWER on IntegriCloud