Attachment 183649 Details for Bug 220157 – mbdyn-1.7.2.diff

[patch] mbdyn-1.7.2.diff

mbdyn-1.7.2.diff (text/plain), 3.82 KB, created by Jov on 2017-06-20 10:57:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jov

Created: 2017-06-20 10:57:11 UTC

Size: 3.82 KB

patch

obsolete

>diff --git a/Makefile b/Makefile
>index e7711b3..9ad52c5 100644
>--- a/Makefile
>+++ b/Makefile
>@@ -2,12 +2,11 @@
> # $FreeBSD: head/science/mbdyn/Makefile 437439 2017-04-01 15:23:30Z gerald $
> 
> PORTNAME=	mbdyn
>-PORTVERSION=	1.7.1
>-PORTREVISION=	2
>+PORTVERSION=	1.7.2
> CATEGORIES=	science
> MASTER_SITES=	https://www.mbdyn.org/userfiles/downloads/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	amutu@amutu.com
> COMMENT=	MultiBody Dynamics analysis system
> 
> LICENSE=	GPLv2
>@@ -15,12 +14,13 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libltdl.so:devel/libltdl \
> 		libarpack.so:math/arpack \
>-		libumfpack.so:math/suitesparse
>+		libumfpack.so:math/suitesparse \
>+		libgcc_s.so:lang/gcc5
> 
> BROKEN_powerpc=	Does not compile on powerpc
> 
> GNU_CONFIGURE=	yes
>-USES=		compiler:c++11-lib fortran gmake libtool localbase
>+USES=		compiler:c++11-lib fortran gmake libtool:build localbase
> USE_LDCONFIG=	yes
> CPPFLAGS+=	-fpermissive -I${LOCALBASE}/include/suitesparse
> CONFIGURE_ARGS+=	--program-prefix=''
>diff --git a/distinfo b/distinfo
>index 0906a63..83925c5 100644
>--- a/distinfo
>+++ b/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1473272629
>-SHA256 (mbdyn-1.7.1.tar.gz) = 2c1f21a6459c58103778cb5d771fc49f972baaa57866329ecd1e90dcf04b4ccf
>-SIZE (mbdyn-1.7.1.tar.gz) = 2834562
>+TIMESTAMP = 1497778371
>+SHA256 (mbdyn-1.7.2.tar.gz) = 383977c988ce0a3ebb40ecc62cae8a6276bf42f1aa34e80bd9f2f78d792cd4ff
>+SIZE (mbdyn-1.7.2.tar.gz) = 2915000
>diff --git a/files/patch-mbdyn__base__invsolver.cc b/files/patch-mbdyn__base__invsolver.cc
>deleted file mode 100644
>index 654d1aa..0000000
>--- a/files/patch-mbdyn__base__invsolver.cc
>+++ /dev/null
>@@ -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"
>diff --git a/files/patch-mbdyn__base__solver.cc b/files/patch-mbdyn__base__solver.cc
>deleted file mode 100644
>index f0111db..0000000
>--- a/files/patch-mbdyn__base__solver.cc
>+++ /dev/null
>@@ -1,42 +0,0 @@
>---- mbdyn/base/solver.cc.orig	2016-04-24 19:10:43 UTC
>-+++ mbdyn/base/solver.cc
>-@@ -109,10 +109,17 @@ enum {
>- };
>- 
>- volatile sig_atomic_t mbdyn_keep_going = MBDYN_KEEP_GOING;
>-+#if defined(__FreeBSD__)
>-+__sighandler_t *mbdyn_sh_term = SIG_DFL;
>-+__sighandler_t *mbdyn_sh_int = SIG_DFL;
>-+__sighandler_t *mbdyn_sh_hup = SIG_DFL;
>-+__sighandler_t *mbdyn_sh_pipe = SIG_DFL;
>-+#else
>- __sighandler_t mbdyn_sh_term = SIG_DFL;
>- __sighandler_t mbdyn_sh_int = SIG_DFL;
>- __sighandler_t mbdyn_sh_hup = SIG_DFL;
>- __sighandler_t mbdyn_sh_pipe = SIG_DFL;
>-+#endif
>- 
>- extern "C" void
>- mbdyn_really_exit_handler(int signum)
>-@@ -200,7 +207,11 @@ extern "C" void
>- mbdyn_signal_init(int pre)
>- {
>- #ifdef HAVE_SIGNAL
>-+#if defined(__FreeBSD__)
>-+	__sighandler_t *hdl;
>-+#else
>- 	__sighandler_t hdl;
>-+#endif
>- 	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"
>diff --git a/files/patch-mbdyn__mbdyn.h b/files/patch-mbdyn__mbdyn.h
>deleted file mode 100644
>index 2690e90..0000000
>--- a/files/patch-mbdyn__mbdyn.h
>+++ /dev/null
>@@ -1,18 +0,0 @@
>---- mbdyn/mbdyn.h.orig	2015-10-30 05:05:37 UTC
>-+++ mbdyn/mbdyn.h
>-@@ -50,6 +50,7 @@ typedef long int      Lint;
>- typedef double        Real;
>- 
>- /* signal types */
>-+#if !defined(__FreeBSD__)
>- #ifdef HAVE_SIGNAL
>- #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

Actions: View | Diff

Attachments on bug 220157: 183649 | 184055 | 184064 | 184065