Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 14 Jan 2013 11:48:45 +0000 (UTC)
From:      Emanuel Haupt <ehaupt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r310372 - head/shells/bash
Message-ID:  <201301141148.r0EBmjae060343@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301141148.r0EBmjae060343>