svn commit: r310372 - head/shells/bash

[Emanuel Haupt]

Author: ehaupt
Date: Mon Jan 14 11:48:45 2013
New Revision: 310372
URL: http://svnweb.freebsd.org/changeset/ports/310372

Log:
  Register CONFLICTS

Modified:
  head/shells/bash/Makefile

Modified: head/shells/bash/Makefile
==============================================================================
--- head/shells/bash/Makefile	Mon Jan 14 11:48:19 2013	(r310371)
+++ head/shells/bash/Makefile	Mon Jan 14 11:48:45 2013	(r310372)
@@ -69,10 +69,10 @@ WITHOUT_NLS=yes
 .endif
 CONFIGURE_ARGS+=	--enable-static-link
 PKGNAMESUFFIX=	-static
-CONFLICTS+=	bash-[0-9]* bash3-[0-9]* bash3-static-[0-9]*
+CONFLICTS+=	bash-[0-9]* bash-devel-[0-9]* bash-static-devel-[0-9]*
 .else
 CONFIGURE_ARGS+=	--enable-static-link=no
-CONFLICTS+=	bash-static-[0-9]* bash3-[0-9]* bash3-static-[0-9]*
+CONFLICTS+=	bash-static-[0-9]* bash-devel-[0-9]* bash-static-devel-[0-9]*
 .endif
 
 .if defined(WITHOUT_HELP)