Attachment 110674 Details for Bug 151867 – mpich2.diff

[patch] mpich2.diff

mpich2.diff (text/plain), 5.18 KB, created by Thierry Thomas on 2010-11-01 15:30:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2010-11-01 15:30:12 UTC

Size: 5.18 KB

patch

obsolete

>diff -urN net/mpich2.orig/Makefile net/mpich2/Makefile
>--- net/mpich2.orig/Makefile	2010-03-15 18:45:51.000000000 +0100
>+++ net/mpich2/Makefile	2010-10-27 08:03:47.000000000 +0200
>@@ -6,19 +6,18 @@
> #
> 
> PORTNAME=	mpich2
>-DISTVERSION=	1.2.1p1
>+PORTVERSION=	1.3
> PORTEPOCH=	5
> CATEGORIES=	net parallel
>-MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${DISTVERSION}/
>+MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${PORTVERSION}/
> DIST_SUBDIR=	mpich
>-#PATCH_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/mpich2-patch/
>-#PATCHFILES=
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	A portable implementation of MPI-1 and MPI-2
> 
>+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
> LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
>-#BUILD_DEPENDS=	doctext:${PORTSDIR}/textproc/sowing
>+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
> 
> #-----------------------------------------------------------------------
> # You may define these options:
>@@ -40,7 +39,7 @@
> USE_GNOME=	pkgconfig
> 
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--enable-romio --enable-sharedlibs=gcc	\
>+CONFIGURE_ARGS=	--enable-romio --enable-shared	\
> 		--docdir=${DOCSDIR}
> CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS="-I${LOCALBASE}/include"	\
> 		LDFLAGS="-L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}"			\
>@@ -56,15 +55,16 @@
> CONFLICTS=	lam-7.* mpiexec-0.*
> 
> USE_FORTRAN=	yes
>-F90FLAGS+=	${FFLAGS}
>-CONFIGURE_ENV+=	F90="${FC}" F90FLAGS="${F90FLAGS}"
>+FCFLAGS+=	${FFLAGS}
>+CONFIGURE_ENV+=	FC="${FC}" FCFLAGS="${FCFLAGS}"
> 
> USE_LDCONFIG=	yes
> 
> SUB_FILES=	pkg-message
> 
>-VERSO=		1.2
>-PLIST_SUB=	VER=${VERSO}
>+VERSO=		2.0
>+VERSOM=		${VERSO:R}
>+PLIST_SUB=	VER=${VERSO} VERM=${VERSOM}
> .if defined(WITHOUT_X11)
> CONFIGURE_ARGS+=	--disable-graphics
> WITHOUT_JAVA=	yes
>@@ -95,8 +95,6 @@
> PLIST_SUB+=	PM_MPD="" PM_SMPD="@comment "
> .endif
> 
>-LIBSSO=		fmpich mpich mpichcxx mpichf90
>-
> THREAD2FIX=	configure test/mpi/threads/comm/Makefile.in	\
> 		test/mpi/threads/pt2pt/Makefile.in		\
> 		src/mpe2/src/logging/configure			\
>@@ -107,9 +105,9 @@
> 		src/mpe2/src/graphics/configure
> DOC2PATCH=	Makefile.in src/mpe2/sbin/mpeinstall.in		\
> 		src/openpa/Makefile.in src/mpi/romio/util/romioinstall.in
>-CONFPFX2FIX1=	man/man1/mpd.1 src/pm/mpd/mpd.py
>-CONFPFX2FIX2=	README doc/installguide/install.tex.vin		\
>-		src/pm/mpd/mpdlib.py src/pm/mpd/mpdroot.c
>+CONFPFX2FIX1=	src/pm/mpd/mpd.py
>+CONFPFX2FIX2=	doc/installguide/install.tex.vin		\
>+		src/pm/mpd/mpdroot.c
> 
> .include <bsd.port.pre.mk>
> 
>@@ -182,14 +180,6 @@
> 		${WRKSRC}/src/packaging/pkgconfig/mpich2-ch3.pc
> 
> post-install:
>-.for lib in ${LIBSSO}
>-	${MV} ${PREFIX}/lib/lib${lib}.so.1.2 ${PREFIX}/lib/lib${lib}.so.1
>-	${LN} -sf ${PREFIX}/lib/lib${lib}.so.1 ${PREFIX}/lib/lib${lib}.so
>-	${LN} -sf ${PREFIX}/lib/lib${lib}.so.1 ${PREFIX}/lib/lib${lib}.so.1.2
>-.endfor
>-.if !defined(NOPORTDOCS)
>-	${RM} ${MANPREFIX}/man/man1/mpd.1.bak
>-.endif
> 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/bin
> 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/bin
> 	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${WRKDIR}/mpd.conf.dist
>diff -urN net/mpich2.orig/distinfo net/mpich2/distinfo
>--- net/mpich2.orig/distinfo	2010-03-08 22:29:34.000000000 +0100
>+++ net/mpich2/distinfo	2010-10-23 10:53:52.000000000 +0200
>@@ -1,3 +1,3 @@
>-MD5 (mpich/mpich2-1.2.1p1.tar.gz) = fa7e8dc7c5fb60395ab26c5b239321ca
>-SHA256 (mpich/mpich2-1.2.1p1.tar.gz) = a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964
>-SIZE (mpich/mpich2-1.2.1p1.tar.gz) = 18014859
>+MD5 (mpich/mpich2-1.3.tar.gz) = d19865b6244845198c29fc553a6bb8ad
>+SHA256 (mpich/mpich2-1.3.tar.gz) = c76e869045ce274ee0494b0c72d884f9e2d3176a4689d362e684754ae0430e63
>+SIZE (mpich/mpich2-1.3.tar.gz) = 19394388
>diff -urN net/mpich2.orig/files/manpages net/mpich2/files/manpages
>--- net/mpich2.orig/files/manpages	2009-11-25 18:48:02.000000000 +0100
>+++ net/mpich2/files/manpages	2010-10-23 15:42:47.000000000 +0200
>@@ -1,22 +1,5 @@
> MAN1= \
> MPI.1 \
>-Zeroconf.1 \
>-mpd.1 \
>-mpdallexit.1 \
>-mpdboot.1 \
>-mpdcheck.1 \
>-mpdchkpyver.1 \
>-mpdcleanup.1 \
>-mpdexit.1 \
>-mpdgdbdrv.1 \
>-mpdhelp.1 \
>-mpdkilljob.1 \
>-mpdlib.1 \
>-mpdlistjobs.1 \
>-mpdman.1 \
>-mpdringtest.1 \
>-mpdsigjob.1 \
>-mpdtrace.1 \
> mpicc.1 \
> mpicxx.1 \
> mpiexec.1 \
>diff -urN net/mpich2.orig/pkg-plist net/mpich2/pkg-plist
>--- net/mpich2.orig/pkg-plist	2010-03-14 22:56:15.000000000 +0100
>+++ net/mpich2/pkg-plist	2010-10-23 17:46:39.000000000 +0200
>@@ -1,3 +1,4 @@
>+bin/bt2line
> bin/check_callstack
> @comment SLOG-2 tools are not installed if NOPORTDOCS is set
> %%JAVA%%bin/clog2TOslog2
>@@ -167,7 +168,7 @@
> lib/libampe.a
> lib/libfmpich.a
> lib/libfmpich.so
>-lib/libfmpich.so.1
>+lib/libfmpich.so.%%VERM%%
> lib/libfmpich.so.%%VER%%
> lib/liblmpe.a
> lib/libmpe.a
>@@ -178,17 +179,24 @@
> lib/libmpe_null.a
> lib/libmpich.a
> lib/libmpich.so
>-lib/libmpich.so.1
>+lib/libmpich.so.%%VERM%%
> lib/libmpich.so.%%VER%%
> lib/libmpichcxx.a
> lib/libmpichcxx.so
>-lib/libmpichcxx.so.1
>+lib/libmpichcxx.so.%%VERM%%
> lib/libmpichcxx.so.%%VER%%
> lib/libmpichf90.a
> lib/libmpichf90.so
>-lib/libmpichf90.so.1
>+lib/libmpichf90.so.%%VERM%%
> lib/libmpichf90.so.%%VER%%
>+lib/libmpl.a
>+lib/libmpl.la
>+lib/libmpl.so
>+lib/libmpl.so.1
> lib/libopa.a
>+lib/libopa.la
>+lib/libopa.so
>+lib/libopa.so.1
> lib/libtmpe.a
> %%JAVA%%lib/logconvertor.jar
> lib/mpe_prof.o

Actions: View | Diff

Attachments on bug 151867: 110674 | 110675 | 110676 | 110677