Attachment 177625 Details for Bug 215018 – port cleanup

[patch] port cleanup

science-mbdyn.diff (text/plain), 5.07 KB, created by Pedro F. Giffuni on 2016-12-03 01:53:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2016-12-03 01:53:38 UTC

Size: 5.07 KB

patch

obsolete

>Index: science/mbdyn/Makefile
>===================================================================
>--- science/mbdyn/Makefile	(revision 427539)
>+++ science/mbdyn/Makefile	(working copy)
>@@ -12,6 +12,7 @@
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>+BUILD_DEPENDS=	libatomic_ops>0:devel/libatomic_ops
> LIB_DEPENDS=	libltdl.so:devel/libltdl \
> 		libarpack.so:math/arpack \
> 		libumfpack.so:math/suitesparse
>@@ -25,7 +26,7 @@
> CONFIGURE_ARGS+=	--program-prefix=''
> INSTALL_TARGET=	install-strip
> 
>-OPTIONS_DEFINE=	MPI METIS CHACO GINAC
>+OPTIONS_DEFINE=	METIS CHACO GINAC
> OPTIONS_RADIO=	BLAS
> OPTIONS_RADIO_BLAS=	REFERENCE GOTOBLAS ATLAS
> OPTIONS_DEFAULT=	REFERENCE
>@@ -42,12 +43,7 @@
> GOTOBLAS_USES=	blaslapack:gotoblas
> GOTOBLAS_CONFIGURE_ON=	--with-blas=goto --with-goto=goto2
> 
>-MPI_DESC=		Enable mpich-support (Requires Metis or Chaco, broken)
>-MPI_IGNORE=		you enabled MPI support, which is broken
>-MPI_BUILD_DEPENDS_OFF=	libatomic_ops>0:devel/libatomic_ops
>-MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
>-MPI_CONFIGURE_ON=	--with-mpi=yes --enable-schur
>-MPI_CONFIGURE_OFF=	--with-mpi=no --enable-multithread
>+CONFIGURE_ARGS+=	--enable-multithread
> 
> METIS_DESC=		Enable metis-support
> METIS_LIB_DEPENDS=	libmetis.so:math/metis4
>@@ -61,7 +57,6 @@
> CHACO_CONFIGURE_OFF=	--with-chaco=no
> 
> GINAC_DESC=		Enable GiNaC-support (not implemented yet)
>-GINAC_IGNORE=		you enabled GiNaC-support, which is broken
> GINAC_LIB_DEPENDS=	libmetis.so:math/metis4 \
> 			libginac.so:math/GiNaC
> GINAC_CONFIGURE_ON=	--with-ginac=yes
>@@ -70,10 +65,6 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${PORT_OPTIONS:MMPI} && ! ${PORT_OPTIONS:MMETIS}
>-WITH_CHACO=	yes
>-.endif
>-
> pre-configure:
> 	${REINPLACE_CMD} -e '/try_lapack_LIBS=/s/-llapack/${LAPACKLIB}/' \
> 		-e 's/ -lxerbla//; s/-lcholmod/-lcholmod ${BLASLIB} ${LAPACKLIB} -lsuitesparseconfig/'	\
>Index: science/mbdyn/files/patch-include__ac__mpi.h
>===================================================================
>--- science/mbdyn/files/patch-include__ac__mpi.h	(revision 427539)
>+++ science/mbdyn/files/patch-include__ac__mpi.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- include/ac/mpi.h.orig	2015-10-30 05:05:33 UTC
>-+++ include/ac/mpi.h
>-@@ -35,7 +35,7 @@
>- #ifdef HAVE_MPI___H
>- #include <mpi++.h>
>- #elif defined HAVE_MPICXX_H
>--#include <mpicxx.h>
>-+#include <mpi.h>
>- #endif /* ! HAVE_MPI___H && ! HAVE_MPICXX_H */
>- 
>- #endif /* MPI_H */
>
>Property changes on: science/mbdyn/files/patch-include__ac__mpi.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: science/mbdyn/files/patch-mbdyn__base__invsolver.cc
>===================================================================
>--- science/mbdyn/files/patch-mbdyn__base__invsolver.cc	(revision 427539)
>+++ science/mbdyn/files/patch-mbdyn__base__invsolver.cc	(nonexistent)
>@@ -1,12 +0,0 @@
>---- mbdyn/base/invsolver.cc.orig	2016-04-24 19:10:43 UTC
>-+++ mbdyn/base/invsolver.cc
>-@@ -114,8 +114,8 @@ InverseSolver::Prepare(void)
>- 		pRTSolver->Setup();
>- 	}
>- 
>--#ifdef USE_SCHUR
>- 	int mpi_finalize = 0;
>-+#ifdef USE_SCHUR
>- 
>- 	if (bParallel) {
>- 		DEBUGLCOUT(MYDEBUG_MEM, "creating parallel SchurDataManager"
>
>Property changes on: science/mbdyn/files/patch-mbdyn__base__invsolver.cc
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: science/mbdyn/files/patch-mbdyn__base__solver.cc
>===================================================================
>--- science/mbdyn/files/patch-mbdyn__base__solver.cc	(revision 427539)
>+++ science/mbdyn/files/patch-mbdyn__base__solver.cc	(working copy)
>@@ -30,13 +30,3 @@
>  	if (pre) {
>  		hdl = mbdyn_really_exit_handler;
>  
>-@@ -406,8 +417,8 @@ Solver::Prepare(void)
>- 		pRTSolver->Setup();
>- 	}
>- 
>--#ifdef USE_SCHUR
>- 	int mpi_finalize = 0;
>-+#ifdef USE_SCHUR
>- 
>- 	if (bParallel) {
>- 		DEBUGLCOUT(MYDEBUG_MEM, "creating parallel SchurDataManager"
>Index: science/mbdyn/files/patch-mbdyn__mbdyn.h
>===================================================================
>--- science/mbdyn/files/patch-mbdyn__mbdyn.h	(revision 427539)
>+++ science/mbdyn/files/patch-mbdyn__mbdyn.h	(working copy)
>@@ -1,18 +1,11 @@
> --- mbdyn/mbdyn.h.orig	2015-10-30 05:05:37 UTC
> +++ mbdyn/mbdyn.h
>-@@ -50,6 +50,7 @@ typedef long int      Lint;
>+@@ -50,7 +50,7 @@ typedef long int      Lint;
>  typedef double        Real;
>  
>  /* signal types */
>-+#if !defined(__FreeBSD__)
>- #ifdef HAVE_SIGNAL
>+-#ifdef HAVE_SIGNAL
>++#if defined(HAVE_SIGNAL) && !defined(__FreeBSD__)
>  #ifndef HAVE___SIGHANDLER_T
>  #ifndef HAVE_SIGHANDLER_T
>-@@ -59,6 +60,7 @@ typedef sighandler_t __sighandler_t;
>- #endif /* HAVE_SIGHANDLER_T */
>- #endif /* !HAVE___SIGHANDLER_T */
>- #endif /* HAVE_SIGNAL */
>-+#endif
>- 
>- /* sig_atomic_t */
>- #ifndef HAVE_SIG_ATOMIC_T
>+ typedef void (*__sighandler_t)(int);

Actions: View | Diff

Attachments on bug 215018: 177624 | 177625