Attachment 148049 Details for Bug 193531 – cleanups wrt to the committed version

[patch] cleanups wrt to the committed version

elmerfem.diff (text/plain), 4.46 KB, created by Pedro F. Giffuni on 2014-10-06 22:38:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2014-10-06 22:38:39 UTC

Size: 4.46 KB

patch

obsolete

>Index: elmerfem/Makefile
>===================================================================
>--- elmerfem/Makefile	(revision 370236)
>+++ elmerfem/Makefile	(working copy)
>@@ -2,9 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	elmerfem
>-PORTVERSION=	7.0.20140925
>-CATEGORIES=	cad science
>-#DISTNAME=	${PORTNAME}-devel
>+PORTVERSION=	7.0.20141002
>+CATEGORIES=	science cad
> 
> MAINTAINER=	pfg@FreeBSD.org
> COMMENT=	ELMER FEM package
>@@ -13,13 +12,13 @@
> 
> LIB_DEPENDS=	liblapack.so:${PORTSDIR}/math/lapack		\
> 		libparpack.so:${PORTSDIR}/math/arpack-ng-mpich	\
>-		libmpich.so.8:${PORTSDIR}/net/mpich2
>+		libmpich.so:${PORTSDIR}/net/mpich2
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	ElmerCSC
> GH_PROJECT=	elmerfem
> GH_TAGNAME=	${GH_COMMIT}
>-GH_COMMIT=	bc00ab5
>+GH_COMMIT=	78cf1f8
> 
> USES=		cmake fortran gmake tcl
> 
>@@ -42,12 +41,6 @@
> FCPPFLAGS+=	-ansi
> 
> post-install:
>-	# To avoid conflict with SuiteSparse
>-.for mod in amd umfpack
>-	${RM} ${STAGEDIR}/${PREFIX}/lib/lib${mod}.a
>-.endfor
>-	cd  ${STAGEDIR}${PREFIX}/bin	\
>-	&& ${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver
> 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/ElmerGrid
> 
> .if defined(MAINTAINER_MODE)
>Index: elmerfem/distinfo
>===================================================================
>--- elmerfem/distinfo	(revision 370236)
>+++ elmerfem/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (elmerfem-7.0.20140925.tar.gz) = e1db18873060080809fa7835f09a6f7b5ef09b17b1d5b8d7fc5d6321760c9d02
>-SIZE (elmerfem-7.0.20140925.tar.gz) = 42990927
>+SHA256 (elmerfem-7.0.20141002.tar.gz) = 0138006646f5adcf8d5775515be058cadf2056c7a71013ef55b1d88de8d82693
>+SIZE (elmerfem-7.0.20141002.tar.gz) = 42990289
>Index: elmerfem/files/patch-fem-acx_elmer.m4
>===================================================================
>--- elmerfem/files/patch-fem-acx_elmer.m4	(revision 370236)
>+++ elmerfem/files/patch-fem-acx_elmer.m4	(working copy)
>@@ -1,10 +0,0 @@
>---- fem/acx_elmer.m4.orig	2014-09-06 21:01:43.000000000 -0500
>-+++ fem/acx_elmer.m4	2014-09-06 21:02:07.000000000 -0500
>-@@ -851,7 +851,6 @@
>- dnl run it
>- dnl printf "running: $CXX $acx_cxx_verbose_flag test.cpp 2>&1 |grep -e ' -l'\n"
>- acx_cxx_verbose_out=`$CXX $acx_cxx_verbose_flag test.cpp 2>&1 |grep -e ' -l'`
>--acx_cxx_verbose_out=${acx_cxx_verbose_out//\"/
>- acx_cxx_libs=""
>- 
>- dnl get only the -l -L -R flags
>Index: elmerfem/files/patch-fem-configure
>===================================================================
>--- elmerfem/files/patch-fem-configure	(revision 370236)
>+++ elmerfem/files/patch-fem-configure	(working copy)
>@@ -1,11 +0,0 @@
>---- fem/configure.orig	2014-09-06 21:42:30.000000000 -0500
>-+++ fem/configure	2014-09-06 21:43:51.000000000 -0500
>-@@ -6325,7 +6325,7 @@
>- printf "int main(int argc, char **argv) { return(1); }" > test.cpp
>- 
>- acx_cxx_verbose_out=`$CXX $acx_cxx_verbose_flag test.cpp 2>&1 |grep -e ' -l'`
>--acx_cxx_verbose_out=${acx_cxx_verbose_out//\"/
>-+#acx_cxx_verbose_out=${acx_cxx_verbose_out//\"/
>- acx_cxx_libs=""
>- 
>- for acx_cxx_ldflag in $acx_cxx_verbose_out; do
>Index: elmerfem/files/patch-fem-src-Makefile.in
>===================================================================
>--- elmerfem/files/patch-fem-src-Makefile.in	(revision 370236)
>+++ elmerfem/files/patch-fem-src-Makefile.in	(working copy)
>@@ -1,11 +0,0 @@
>---- fem/src/Makefile.in.orig	2014-09-09 15:04:27.000000000 -0500
>-+++ fem/src/Makefile.in	2014-09-09 15:28:20.000000000 -0500
>-@@ -1119,7 +1119,7 @@
>- @USE_WINDOWS_COMPILER_TRUE@	      -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) $(BLAS_LIBS)
>- @USE_WINDOWS_COMPILER_FALSE@	$(FC) $(SH_LINKING_TO_FLAGS) $(RPATH_ELMER) $(B64FLAGS) $(LDFLAGS) \
>- @USE_WINDOWS_COMPILER_FALSE@	      -o ViewFactors$(EXE_EXT) ViewFactors$(OBJ_EXT) mpi_stubs$(OBJ_EXT) \
>--@USE_WINDOWS_COMPILER_FALSE@	      -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) $(BLAS_LIBS) $(STDCXX_LIBS)
>-+@USE_WINDOWS_COMPILER_FALSE@	      -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) $(BLAS_LIBS)
>- 
>- GebhardtFactors$(EXE_EXT): libelmersolver$(SHL_EXT) GebhardtFactors$(OBJ_EXT) mpi_stubs$(OBJ_EXT)
>- 	$(FC) $(SH_LINKING_TO_FLAGS) $(RPATH_ELMER) $(B64FLAGS) $(LDFLAGS) \
>Index: elmerfem/pkg-descr
>===================================================================
>--- elmerfem/pkg-descr	(revision 370236)
>+++ elmerfem/pkg-descr	(working copy)
>@@ -12,6 +12,3 @@
> Finite Element Method (FEM).
> 
> WWW: http://www.csc.fi/elmer/elmersolve/
>-
>-Note: This package installs in it's own ELMER_HOME path, so you usually
>-have to add /usr/local/elmer/bin/ to your shell path.

Actions: View | Diff

Attachments on bug 193531: 147181 | 147503 | 147525 | 147703 | 147859 | 147865 | 147866 | 148047 | 148049 | 148050