Attachment 165073 Details for Bug 205896 – math_sdpara.diff

[patch] math_sdpara.diff

math_sdpara.diff (text/plain), 10.01 KB, created by tkato432 on 2016-01-04 18:34:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2016-01-04 18:34:07 UTC

Size: 10.01 KB

patch

obsolete

>diff -urN /usr/ports/math/sdpara/Makefile math/sdpara/Makefile
>--- /usr/ports/math/sdpara/Makefile	2015-11-09 22:25:37.889760000 +0900
>+++ math/sdpara/Makefile	2016-01-05 00:00:00.000000000 +0900
>@@ -2,95 +2,79 @@
> # $FreeBSD: head/math/sdpara/Makefile 401096 2015-11-09 12:59:03Z antoine $
> 
> PORTNAME=	sdpara
>-PORTVERSION=	7.2.1
>-PORTREVISION=	10
>+PORTVERSION=	7.3.1
> CATEGORIES=	math parallel
>-MASTER_SITES=	http://sdpa.indsys.chuo-u.ac.jp/sdpa/files/
>-DISTFILES=	${SRCFILE}#${MANUALFILE}
>+MASTER_SITES=	SF/sdpa/sdpara
>+DISTNAME=	${PORTNAME}.${PORTVERSION}.src.20100914
> DIST_SUBDIR=	sdpa
>-EXTRACT_ONLY=	${SRCFILE}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	SDPARA parallel version of SDPA (math/sdpa)
> 
>-BROKEN=		unfetchable
>+LICENSE=	GPLv2 # (or later)
> 
>-LIB_DEPENDS=	libscalapack.so:${PORTSDIR}/math/scalapack \
>-		libblacs.so:${PORTSDIR}/math/blacs \
>+LIB_DEPENDS=	libblacs.so:${PORTSDIR}/math/blacs \
>+		libscalapack.so:${PORTSDIR}/math/scalapack \
> 		libmpich.so:${PORTSDIR}/net/mpich2
> 
>-SRCDATE=	20090109
>-MANDATE=	20080618
>-MANUALVER=	7.1.1
>-SRCFILE=	${PORTNAME}.${PORTVERSION}.src.${SRCDATE}.tar.gz
>-#MANUALFILE=	${PORTNAME}.${MANUALVER}.manual.${MANDATE}.pdf
>-USES=		fortran gmake
> WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}
> 
>-.if exists(${LOCALBASE}/lib/libgoto2.so)
>-WITH_BLAS?=	gotoblas
>-.elif exists(${LOCALBASE}/lib/libatlas.so)
>-WITH_BLAS?=	atlas
>-.else
>-WITH_BLAS?=	reference
>-.endif
>-
>-. if ${WITH_BLAS} == reference
>-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
>-LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack
>-BLAS=		-lblas
>-LAPACK=		-llapack
>-.elif ${WITH_BLAS} == gotoblas
>-LIB_DEPENDS+=	libgoto2.so:${PORTSDIR}/math/gotoblas
>-BLAS=		-lgoto2p
>-LAPACK=		-lgoto2p
>-.elif ${WITH_BLAS} == atlas
>-LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
>-BLAS=		-lptf77blas
>-LAPACK=		-lalapack -lptcblas
>-.endif
>-
>-#PLIST_SUB+=	MANUALFILE=${MANUALFILE}
>-
>-SCALAPACK=	-L/usr/local/lib -lscalapack -lblacs -lblacsc
>-FORTRAN_LIBS=	-lgfortran
>-GCCLIBDIR=	-L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
>+USES=		fortran gmake
>+
>+PORTEXAMPLES=	*
>+PLIST_FILES=	bin/sdpara %%DATADIR%%/param.sdpa
>+
>+OPTIONS_DEFINE=		EXAMPLES
>+OPTIONS_SINGLE=		BLAS
>+OPTIONS_SINGLE_BLAS=	ATLAS GOTOBLAS REFERENCE
>+OPTIONS_DEFAULT=	REFERENCE
>+
>+ATLAS_USES=		blaslapack:atlas
>+GOTOBLAS_DESC=		GotoBLAS blas implementation
>+GOTOBLAS_USES=		blaslapack:gotoblas
>+REFERENCE_DESC=		Reference blas implementation
>+REFERENCE_USES=		blaslapack
>+
>+LAPACK_LIBS=	-L${LOCALBASE}/lib ${LAPACKLIB}
>+BLAS_LIBS=	-L${LOCALBASE}/lib ${BLASLIB}
>+SCALAPACK_LIBS=	-L${LOCALBASE}/lib -lscalapack -lblacs -lblacsc
>+FORTRAN_LIBS=	${LDFLAGS} -lgfortran
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|%%MPICC%%|${LOCALBASE}/bin/mpicc|g ; \
>-				s|%%MPICXX%%|${LOCALBASE}/bin/mpicxx|g ; \
>-				s|%%MPIF77%%|${LOCALBASE}/bin/mpif77|g ; \
>-				s|%%CFLAGS%%|${CFLAGS}|g ; \
>-				s|%%CXXFLAGS%%|${CXXFLAGS}|g ; \
>-				s|%%FFLAGS%%|${FFLAGS}|g ; \
>-				s|%%BLAS%%|${BLAS}|g ; \
>-				s|%%LAPACK%%|${LAPACK}|g ; \
>-				s|%%SCALAPACK%%|${SCALAPACK}|g ; \
>-				s|%%FORTRAN_LIBS%%|${GCCLIBDIR} ${FORTRAN_LIBS}|g '  ${WRKSRC}/Makefile
>-	@${REINPLACE_CMD} -e 's|%%MPICC%%|${LOCALBASE}/bin/mpicc|g ; \
>-				s|%%MPICXX%%|${LOCALBASE}/bin/mpicxx|g ; \
>-				s|%%MPIF77%%|${LOCALBASE}/bin/mpif77|g ; \
>-				s|%%CFLAGS%%|${CFLAGS}|g ; \
>-				s|%%CXXFLAGS%%|${CXXFLAGS}|g ; \
>-				s|%%FFLAGS%%|${FFLAGS}|g ; \
>-				s|%%BLAS%%|${BLAS}|g ; \
>-				s|%%LAPACK%%|${LAPACK}|g ' ${WRKSRC}/mumps/Makefile
>+	@${REINPLACE_CMD} -e \
>+		'/^CC /s|=.*|= ${LOCALBASE}/bin/mpicc| ; \
>+		 /^CXX /s|=.*|= ${LOCALBASE}/bin/mpicxx| ; \
>+		 /^FC /s|=.*|= ${LOCALBASE}/bin/mpif77| ; \
>+		 /^CFLAGS /s|=.*|= ${CFLAGS}| ; \
>+		 /^CXXFLAGS /s|=.*|= ${CXXFLAGS}| ; \
>+		 /^FFLAGS /s|=.*|= ${FFLAGS}| ; \
>+		 /^LAPACK_LIBS /s|=.*|= ${LAPACK_LIBS}| ; \
>+		 /^BLAS_LIBS /s|=.*|= ${BLAS_LIBS}| ; \
>+		 /^SCALAPACK_LIBS /s|=.*|= ${SCALAPACK_LIBS}| ; \
>+		 /^FORTRAN_LIBS /s|=.*|= ${FORTRAN_LIBS}|' \
>+		${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} -e \
>+		'/^CC /s|=.*|= ${LOCALBASE}/bin/mpicc| ; \
>+		 /^CFLAGS /s|=.*|= ${CFLAGS}| ; \
>+		 /^CXX /s|=.*|= ${LOCALBASE}/bin/mpicxx| ; \
>+		 /^CXXFLAGS /s|=.*|= ${CXXFLAGS}| ; \
>+		 /^FC /s|=.*|= ${LOCALBASE}/bin/mpif77| ; \
>+		 /^FFLAGS /s|=.*|= ${FFLAGS}|' \
>+		${WRKSRC}/mumps/Makefile
> 
> pre-build:
>-	${DIRNAME} `${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
>-
>-do-build:
>-	cd ${WRKSRC} ; ${MAKE_CMD} mumps
>-	cd ${WRKSRC} ; ${MAKE_CMD}
>+	@(cd ${WRKSRC}/mumps && ${DO_MAKE_BUILD} ${ALL_TARGET})
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/sdpara ${STAGEDIR}${PREFIX}/bin
>+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} sdpara \
>+		${STAGEDIR}${PREFIX}/bin)
> 	@${MKDIR} ${STAGEDIR}${DATADIR}
>-	${INSTALL_DATA}    ${WRKSRC}/param.sdpa ${STAGEDIR}${DATADIR}
>+	(cd ${WRKSRC} && ${INSTALL_DATA} param.sdpa \
>+		${STAGEDIR}${DATADIR})
>+
>+post-install-EXAMPLES-on:
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>-	${INSTALL_DATA}    ${WRKSRC}/example* ${STAGEDIR}${EXAMPLESDIR}
>-	${INSTALL_DATA}    ${WRKSRC}/param.sdpa ${STAGEDIR}${EXAMPLESDIR}
>-#	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-#	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${MANUALFILE} ${STAGEDIR}${DOCSDIR}
>+	(cd ${WRKSRC} && ${INSTALL_DATA} example* \
>+		${STAGEDIR}${EXAMPLESDIR})
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/math/sdpara/distinfo math/sdpara/distinfo
>--- /usr/ports/math/sdpara/distinfo	2015-08-24 03:58:10.547700000 +0900
>+++ math/sdpara/distinfo	2016-01-05 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (sdpa/sdpara.7.2.1.src.20090109.tar.gz) = ee4cdff5f207246bacf8e0e4e3f0d1a607206c19ee762fe410b78d0463ed0206
>-SIZE (sdpa/sdpara.7.2.1.src.20090109.tar.gz) = 2080623
>+SHA256 (sdpa/sdpara.7.3.1.src.20100914.tar.gz) = 76bda5251f4abd304ee365d8c920b76e731e528199f9e57e5a56dbf22345975d
>+SIZE (sdpa/sdpara.7.3.1.src.20100914.tar.gz) = 2090108
>diff -urN /usr/ports/math/sdpara/files/patch-Makefile math/sdpara/files/patch-Makefile
>--- /usr/ports/math/sdpara/files/patch-Makefile	2015-08-24 03:58:10.612378000 +0900
>+++ math/sdpara/files/patch-Makefile	1970-01-01 09:00:00.000000000 +0900
>@@ -1,48 +0,0 @@
>---- Makefile.orig	2009-01-09 02:26:29 UTC
>-+++ Makefile
>-@@ -4,19 +4,19 @@
>- # you edit here along your environment
>- ############################################################
>- 
>--CC       = mpicc
>--CXX      = mpicxx
>--FC       = mpif77
>--CFLAGS   = -O3
>--CXXFLAGS = -O3
>--FFLAGS   = -O3
>--
>--LAPACK_LIBS = /usr/local/lapack/lib/liblapack.a
>--BLAS_LIBS   = /usr/local/lapack/lib/libblas.a
>--
>--SCALAPACK_LIBS  = /usr/local/scalapack/lib/libscalapack.a /usr/local/BLACS/LIB/blacs_MPI-LINUX-0.a /usr/local/BLACS/LIB/blacsCinit_MPI-LINUX-0.a /usr/local/BLACS/LIB/blacs_MPI-LINUX-0.a
>--
>--FORTRAN_LIBS = -lgfortran
>-+CC       = %%MPICC%%
>-+CXX      = %%MPICXX%%
>-+F77      = %%MPIF77%%
>-+CFLAGS   = %%CFLAGS%%
>-+CXXFLAGS = %%CXXFLAGS%%
>-+F77FLAGS = %%FFLAGS%%
>-+
>-+LAPACK_LIBS = %%LAPACK%%
>-+BLAS_LIBS   = %%BLAS%%
>-+  
>-+SCALAPACK_LIBS  = %%SCALAPACK%%
>-+  
>-+FORTRAN_LIBS = %%FORTRAN_LIBS%%
>- PTHERAD_LIBS = -lpthread
>- 
>- # F77_FUNC 
>-@@ -82,10 +82,10 @@ cleanall: clean mumps-clean 
>- force: cleanall all
>- 
>- mumps:
>--	cd mumps; make
>-+	cd mumps; $(MAKE)
>- 
>- mumps-clean:
>--	cd mumps; make distclean
>-+	cd mumps; $(MAKE) distclean
>- 
>- update_make_headers:
>- 	g++ -MM *.cpp > make.headers
>diff -urN /usr/ports/math/sdpara/files/patch-mumps+Makefile math/sdpara/files/patch-mumps+Makefile
>--- /usr/ports/math/sdpara/files/patch-mumps+Makefile	2015-08-24 03:58:10.580794000 +0900
>+++ math/sdpara/files/patch-mumps+Makefile	1970-01-01 09:00:00.000000000 +0900
>@@ -1,21 +0,0 @@
>---- mumps/Makefile~	2009-02-17 14:12:26.000000000 +0900
>-+++ mumps/Makefile	2009-02-17 14:12:54.000000000 +0900
>-@@ -6,12 +6,12 @@
>- # The following variables are set from SDPA_MAKEFILE
>- ###################################################################
>- 
>--CC          = ${shell grep "^CC"       ${SDPA_MAKEFILE} | cut -f2- -d=}
>--CFLAGS      = ${shell grep "^CFLAGS"   ${SDPA_MAKEFILE} | cut -f2- -d=}
>--CXX         = ${shell grep "^CXX"      ${SDPA_MAKEFILE} | cut -f2- -d=}
>--CXXFLAGS    = ${shell grep "^CXXFLAGS" ${SDPA_MAKEFILE} | cut -f2- -d=}
>--FC          = ${shell grep "^FC"       ${SDPA_MAKEFILE} | cut -f2- -d=}
>--FFLAGS      = ${shell grep "^FFLAGS"   ${SDPA_MAKEFILE} | cut -f2- -d=}
>-+CC          = %%MPICC%%
>-+CFLAGS      = %%CFLAGS%%
>-+CXX         = %%MPICXX%%
>-+CXXFLAGS    = %%CXXFLAGS%%
>-+FC          = %%MPIF77%%
>-+FFLAGS      = %%FFLAGS%%
>- 
>- ###################################################################
>- 
>diff -urN /usr/ports/math/sdpara/pkg-descr math/sdpara/pkg-descr
>--- /usr/ports/math/sdpara/pkg-descr	2015-08-24 03:58:10.558447000 +0900
>+++ math/sdpara/pkg-descr	2016-01-05 00:00:00.000000000 +0900
>@@ -1,9 +1,10 @@
>-The SDPARA (SemiDefinite Programming Algorithm PARAllel version) is a parallel
>-version of the SDPA. C++ source codes of the SDPARA are available in
>-this homepage. They form a stand-alone software package for solving SDPs in
>-parallel with the help of MPI (Message Passing Interface) and ScaLAPACK
>-(Scalable LAPACK). However callable libraries of the SDPARA, which could be
>-used combinedly with other C++ programs, are not available.
>-We assume that you know how to use the latest version of the SDPA and MPICH.
>+The SDPARA (SemiDefinite Programming Algorithm PARAllel version) is a
>+parallel version of the SDPA. C++ source codes of the SDPARA are
>+available in this homepage. They form a stand-alone software package for
>+solving SDPs in parallel with the help of MPI (Message Passing
>+Interface) and ScaLAPACK (Scalable LAPACK). However callable libraries
>+of the SDPARA, which could be used combinedly with other C++ programs,
>+are not available. We assume that you know how to use the latest version
>+of the SDPA and MPICH.
> 
>-WWW: http://grid.r.dendai.ac.jp/sdpa/
>+WWW: http://sdpa.sourceforge.net/
>diff -urN /usr/ports/math/sdpara/pkg-plist math/sdpara/pkg-plist
>--- /usr/ports/math/sdpara/pkg-plist	2015-08-24 03:58:10.523301000 +0900
>+++ math/sdpara/pkg-plist	1970-01-01 09:00:00.000000000 +0900
>@@ -1,8 +0,0 @@
>-bin/sdpara
>-share/examples/sdpara/example1.dat
>-share/examples/sdpara/example1.dat-s
>-share/examples/sdpara/example1.ini
>-share/examples/sdpara/example1.ini-s
>-share/examples/sdpara/example2.dat
>-share/examples/sdpara/param.sdpa
>-share/sdpara/param.sdpa

Flags:

vlad-fbsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 205896: 165073