ports/146738: cad/salome: depends on math/metis-edf by default.

[Thierry Thomas]

>Number:         146738
>Category:       ports
>Synopsis:       cad/salome: depends on math/metis-edf by default.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 19 19:10:08 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 8.0-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 8.0-STABLE FreeBSD 8.0-STABLE #0: Sat Dec 5 19:27:51 CET 2009 thierry at graf.pompo.net:/usr/obj/usr/src/sys/GRAF090829 i386


	
>Description:
	The port cad/salome depends on math/metis by default. So, it's
	impossible to install Code_Aster (french/aster) on the same
	machine, because this ports depends on math/metis-edf, which
	conflicts with the regular metis.

	The proposed patch lets Salome depends on metis-edf by default
	(unless the regular metis is already installed).

	Thus, it becomes possible to port Salome-Meca.

>How-To-Repeat:
	- install Salome;
	- try to install french/aster.

>Fix:
	Please apply the hereunder patch:

--- salome.diff begins here ---
diff -urN cad/salome.orig/Makefile cad/salome/Makefile
--- cad/salome.orig/Makefile	2010-05-15 17:58:34.000000000 +0200
+++ cad/salome/Makefile	2010-05-16 17:24:48.000000000 +0200
@@ -6,7 +6,7 @@
 
 PORTNAME=	salome
 PORTVERSION=	5.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad science
 MASTER_SITES=	http://www.stasyan.com/devel/distfiles/
 DISTNAME=	src5.1.3
diff -urN cad/salome.orig/Makefile.ext cad/salome/Makefile.ext
--- cad/salome.orig/Makefile.ext	2010-05-11 21:47:28.000000000 +0200
+++ cad/salome/Makefile.ext	2010-05-16 17:24:29.000000000 +0200
@@ -201,10 +201,13 @@
 
 #Dependency from metis & scotsch
 .if ${SAL_MODULE} == "med"
-BUILD_DEPENDS+=		kmetis:${PORTSDIR}/math/metis \
-    			gmap:${PORTSDIR}/cad/scotch
-RUN_DEPENDS+=		kmetis:${PORTSDIR}/math/metis \
-    			gmap:${PORTSDIR}/cad/scotch
+. if exists(${LOCALBASE}/bin/graphchk)
+LIB_DEPENDS+=		metis.1:${PORTSDIR}/math/metis
+. else
+LIB_DEPENDS+=		metis.1:${PORTSDIR}/math/metis-edf
+.endif
+BUILD_DEPENDS+=		gmap:${PORTSDIR}/cad/scotch
+RUN_DEPENDS+=		gmap:${PORTSDIR}/cad/scotch
 CONFIGURE_ENV+=		METISDIR=${LOCALBASE} SCOTCHDIR=${LOCALBASE}
 CPPFLAGS+=		-I${LOCALBASE}/include/metis
 .endif
--- salome.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: