From thierry@pompo.net  Wed May 19 19:09:33 2010
Return-Path: <thierry@pompo.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0385E1065678
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 19 May 2010 19:09:33 +0000 (UTC)
	(envelope-from thierry@pompo.net)
Received: from smtp5-g21.free.fr (smtp5-g21.free.fr [212.27.42.5])
	by mx1.freebsd.org (Postfix) with ESMTP id 8A7B58FC19
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 19 May 2010 19:09:30 +0000 (UTC)
Received: from smtp5-g21.free.fr (localhost [127.0.0.1])
	by smtp5-g21.free.fr (Postfix) with ESMTP id EC751D48079;
	Wed, 19 May 2010 21:09:26 +0200 (CEST)
Received: from graf.pompo.net (graf.pompo.net [78.225.128.39])
	by smtp5-g21.free.fr (Postfix) with ESMTP;
	Wed, 19 May 2010 21:09:25 +0200 (CEST)
Received: by graf.pompo.net (Postfix, from userid 1001)
	id 59D99114B4; Wed, 19 May 2010 21:09:16 +0200 (CEST)
Message-Id: <20100519190916.59D99114B4@graf.pompo.net>
Date: Wed, 19 May 2010 21:09:16 +0200 (CEST)
From: Thierry Thomas <thierry@FreeBSD.org>
Reply-To: Thierry Thomas <thierry@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Stas Timokhin <devel@stasyan.com>
Subject: cad/salome: depends on math/metis-edf by default.
X-Send-Pr-Version: 3.113
X-GNATS-Notify: devel@stasyan.com

>Number:         146738
>Category:       ports
>Synopsis:       cad/salome: depends on math/metis-edf by default.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    thierry
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 19 19:10:08 UTC 2010
>Closed-Date:    Tue May 25 22:04:21 UTC 2010
>Last-Modified:  Tue May 25 22:10:03 UTC 2010
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->thierry 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed May 19 19:10:22 UTC 2010 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146738 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed May 19 19:10:31 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146738 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: devel@stasyan.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/146738: cad/salome: depends on math/metis-edf by default.
Date: Wed, 19 May 2010 19:10:28 UT

 Maintainer of cad/salome,
 
 Please note that PR ports/146738 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/146738
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Stas Timokhin <devel@stasyan.com>
To: bug-followup@freebsd.org,
 thierry@freebsd.org
Cc:  
Subject: Re: ports/146738: cad/salome: depends on math/metis-edf by default.
Date: Thu, 20 May 2010 14:49:00 +0700

 Ok, let's commit it.
State-Changed-From-To: feedback->closed 
State-Changed-By: thierry 
State-Changed-When: Mar 25 mai 2010 22:02:38 UTC 
State-Changed-Why:  
Approved by the maintainer and committed (with a little change, because 
libmetis from metis-edf is not shared on 64 bits platforms). 


http://www.freebsd.org/cgi/query-pr.cgi?pr=146738 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/146738: commit references a PR
Date: Tue, 25 May 2010 22:05:46 +0000 (UTC)

 thierry     2010-05-25 22:02:11 UTC
 
   FreeBSD ports repository
 
   Modified files:
     cad/salome           Makefile Makefile.ext 
   Log:
   Switch from metis to metis-edf by default, so that Salome can be
   installed on a machine where Code_Aster is already installed.
   
   PR:             ports/146738
   Approved by:    maintainer
   
   Revision  Changes    Path
   1.5       +1 -1      ports/cad/salome/Makefile
   1.3       +9 -4      ports/cad/salome/Makefile.ext
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
