svn commit: r559259 - in head/science: cgnslib xcrysden

[Thierry Thomas]

Author: thierry
Date: Fri Dec 25 21:58:43 2020
New Revision: 559259
URL: https://svnweb.freebsd.org/changeset/ports/559259

Log:
  Register a conflict.

Modified:
  head/science/cgnslib/Makefile
  head/science/xcrysden/Makefile

Modified: head/science/cgnslib/Makefile
==============================================================================
--- head/science/cgnslib/Makefile	Fri Dec 25 20:46:24 2020	(r559258)
+++ head/science/cgnslib/Makefile	Fri Dec 25 21:58:43 2020	(r559259)
@@ -22,6 +22,8 @@ GH_PROJECT=	CGNS
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
+CONFLICTS_INSTALL=	xcrysden-1.*	# bin/unitconv
+
 TEST_TARGET=	test
 FFLAGS+=	-std=legacy
 

Modified: head/science/xcrysden/Makefile
==============================================================================
--- head/science/xcrysden/Makefile	Fri Dec 25 20:46:24 2020	(r559258)
+++ head/science/xcrysden/Makefile	Fri Dec 25 21:58:43 2020	(r559259)
@@ -24,6 +24,8 @@ USES=		fortran gl gmake localbase:ldflags tcl tk xorg
 USE_GL=		gl glu
 USE_XORG=	x11 xmu
 
+CONFLICTS_INSTALL=	cgnslib-4.*	# bin/unitconv
+
 MAKE_ARGS=	prefix=${STAGEDIR}${PREFIX}
 
 CFLAGS+=	-fcommon # notified xcrysden ML on Sep 20, 2020