Update to 0.15.4. Reword pkg-descr for clarity. Mention conflict

with devel/bcc, which also provides as86 and ld86.

PR:		23731 (update to 0.15.4)
Submitted by:	George Reid <greid@ukug.uk.freebsd.org>

4 files changed, 8 insertions, 6 deletions

diff --git a/devel/bin86/Makefile b/devel/bin86/Makefile
index e72825db9596..c4bced154cb7 100644
--- a/devel/bin86/Makefile
+++ b/devel/bin86/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bin86
-PORTVERSION=	0.15.3
+PORTVERSION=	0.15.4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cix.co.uk/~mayday/
 
diff --git a/devel/bin86/distinfo b/devel/bin86/distinfo
index 054734c36024..d26544947c0c 100644
--- a/devel/bin86/distinfo
+++ b/devel/bin86/distinfo
@@ -1 +1 @@
-MD5 (bin86-0.15.3.tar.gz) = 37338c39b6461f5c7fd745ef9c88484f
+MD5 (bin86-0.15.4.tar.gz) = 8ac305eeb5cb0cb6ce90e7e30f7c11f0
diff --git a/devel/bin86/pkg-comment b/devel/bin86/pkg-comment
index a24cbf3f06da..f28a66fe3b5e 100644
--- a/devel/bin86/pkg-comment
+++ b/devel/bin86/pkg-comment
@@ -1 +1 @@
-16-bit assembler and loader
+16-bit assembler and loader (conflicts with devel/bcc)
diff --git a/devel/bin86/pkg-descr b/devel/bin86/pkg-descr
index c1f474ae9800..250a281abdf8 100644
--- a/devel/bin86/pkg-descr
+++ b/devel/bin86/pkg-descr
@@ -1,7 +1,9 @@
 This consists of a 16-bit assembler and loader for x86 or 6809
-CPUs.  Since they use Intel syntax, they are incompatible with the
-GNU binutils in the base system (recent versions of which can also
-generate 16-bit code).
+CPUs.  Unlike the GNU binutils in the base system (recent versions
+of which have 16-bit capability), these are for code written with
+Intel syntax.
+
+This port/package conflicts with devel/bcc.
 
 WWW:  http://www.cix.co.uk/~mayday