--- Makefile (revision 326655) +++ Makefile (working copy) @@ -4,17 +4,16 @@ # - etc/*.sample support PORTNAME= openmpi -DISTVERSION= 1.6.1 -PORTREVISION= 5 +DISTVERSION= 1.6.5 CATEGORIES= net parallel MASTER_SITES= http://www.open-mpi.org/software/ompi/v1.6/downloads/ -MAINTAINER= ports@FreeBSD.org -COMMENT= A High Performance Message Passing Library +MAINTAINER= danilogondolfo@gmail.com +COMMENT= High Performance Message Passing Library -LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ - hwloc:${PORTSDIR}/devel/hwloc \ - ltdl:${PORTSDIR}/devel/libltdl +LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ + libhwloc.so:${PORTSDIR}/devel/hwloc \ + libltdl.so:${PORTSDIR}/devel/libltdl USE_BZIP2= yes HAS_CONFIGURE= yes @@ -23,7 +22,6 @@ MPIBASE?= mpi MPIDIR?= ${MPIBASE}/${UNIQUENAME} -PLIST_SUB+= CONFIGURE_TARGET=${CONFIGURE_TARGET} PLIST_SUB+= MPIBASE=${MPIBASE} PLIST_SUB+= MPIDIR=${MPIDIR} @@ -31,8 +29,7 @@ --mandir=${PREFIX}/${MPIDIR}/man \ --program-prefix= \ --with-hwloc=${LOCALBASE} \ - --with-libltdl=${LOCALBASE} \ - ${CONFIGURE_TARGET} + --with-libltdl=${LOCALBASE} USE_LDCONFIG= ${PREFIX}/${MPIDIR}/lib \ ${PREFIX}/${MPIDIR}/lib/openmpi @@ -41,36 +38,27 @@ .include "${.CURDIR}/Makefile.man" OPTIONS_DEFINE= IPV6 TORQUE - TORQUE_DESC= Enable Torque support - OPTIONS_DEFAULT= IPV6 +IPV6_CONFIGURE_ENABLE= ipv6 +TORQUE_CONFIGURE_ON= --with-tm=${LOCALBASE} +TORQUE_CONFIGURE_OFF= --without-tm + .include -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif - -CONFIGURE_ARGS+= --without-sge - .if ${PORT_OPTIONS:MTORQUE} -LIB_DEPENDS+= torque:${PORTSDIR}/sysutils/torque -CONFIGURE_ARGS+= --with-tm=${LOCALBASE} +LIB_DEPENDS+= libtorque.so:${PORTSDIR}/sysutils/torque PLIST_FILES+= ${MPIDIR}/lib/openmpi/mca_plm_tm.so \ ${MPIDIR}/lib/openmpi/mca_plm_tm.la \ ${MPIDIR}/lib/openmpi/mca_ras_tm.la \ ${MPIDIR}/lib/openmpi/mca_ras_tm.so \ + ${MPIDIR}/lib/openmpi/mca_ess_tm.so \ + ${MPIDIR}/lib/openmpi/mca_ess_tm.la \ ${MPIDIR}/share/openmpi/help-plm-tm.txt \ ${MPIDIR}/share/openmpi/help-ras-tm.txt -.else -CONFIGURE_ARGS+= --without-tm .endif -.include - .if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .endif @@ -111,4 +99,4 @@ ${SED} -e 's|.*man\([0-9LN]\)/\(.*\)|MAN\1+=\2|' -e 's/\.gz$$//' | \ ${SORT} >> ${.CURDIR}/Makefile.man -.include +.include --- distinfo (revision 326655) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (openmpi-1.6.1.tar.bz2) = 077240dd1ab10f0caf26931e585db73848e9815c7119b993f91d269da5901e3a -SIZE (openmpi-1.6.1.tar.bz2) = 10194684 +SHA256 (openmpi-1.6.5.tar.bz2) = fe37bab89b5ef234e0ac82dc798282c2ab08900bf564a1ec27239d3f1ad1fc85 +SIZE (openmpi-1.6.5.tar.bz2) = 10943881 --- files/patch-configure (revision 326655) +++ files/patch-configure (working copy) @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- configure.orig -+++ configure -@@ -125045,8 +125045,8 @@ - ;; - *bsd*) - case "$host" in -- *freebsd7*) -- # FreeBSD 7 has SCTP in an unpatched default kernel with -+ **freebsd[789]*|*freebsd1[0-9]*) -+ # FreeBSD >= 7 has SCTP in an unpatched default kernel with - # the SCTP API contained within libc. - ompi_sctp_api_libname="c" - ;; --- pkg-plist (revision 326655) +++ pkg-plist (working copy) @@ -1,13 +1,3 @@ -%%MPIDIR%%/bin/%%CONFIGURE_TARGET%%-otfaux -%%MPIDIR%%/bin/%%CONFIGURE_TARGET%%-otfcompress -%%MPIDIR%%/bin/%%CONFIGURE_TARGET%%-otfconfig -%%MPIDIR%%/bin/%%CONFIGURE_TARGET%%-otfdump -%%MPIDIR%%/bin/%%CONFIGURE_TARGET%%-otfinfo -%%MPIDIR%%/bin/%%CONFIGURE_TARGET%%-otfmerge -%%MPIDIR%%/bin/%%CONFIGURE_TARGET%%-otfmerge-mpi -%%MPIDIR%%/bin/%%CONFIGURE_TARGET%%-otfprofile -%%MPIDIR%%/bin/%%CONFIGURE_TARGET%%-otfprofile-mpi -%%MPIDIR%%/bin/%%CONFIGURE_TARGET%%-otfshrink %%MPIDIR%%/bin/ompi-probe %%MPIDIR%%/bin/ompi-profiler %%MPIDIR%%/bin/ompi-server @@ -22,6 +12,16 @@ %%MPIDIR%%/bin/orte_wrapper_script %%MPIDIR%%/bin/orted %%MPIDIR%%/bin/orterun +%%MPIDIR%%/bin/otfaux +%%MPIDIR%%/bin/otfconfig +%%MPIDIR%%/bin/otfprint +%%MPIDIR%%/bin/otfinfo +%%MPIDIR%%/bin/otfmerge +%%MPIDIR%%/bin/otfmerge-mpi +%%MPIDIR%%/bin/otfprofile +%%MPIDIR%%/bin/otfprofile-mpi +%%MPIDIR%%/bin/otfshrink +%%MPIDIR%%/bin/otfcompress %%MPIDIR%%/bin/vtfilter %%MPIDIR%%/bin/vtfilter-mpi %%MPIDIR%%/bin/vtrun @@ -69,32 +69,32 @@ %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/topology_inln.h %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/win.h %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/win_inln.h -%%MPIDIR%%/include/vampirtrace/OTFAUX_MsgMatching.h -%%MPIDIR%%/include/vampirtrace/OTFAUX_State.h -%%MPIDIR%%/include/vampirtrace/OTFAUX_Thumbnail.h -%%MPIDIR%%/include/vampirtrace/OTF_CopyHandler.h -%%MPIDIR%%/include/vampirtrace/OTF_CopyHandler_stream.h -%%MPIDIR%%/include/vampirtrace/OTF_Definitions.h -%%MPIDIR%%/include/vampirtrace/OTF_Errno.h -%%MPIDIR%%/include/vampirtrace/OTF_File.h -%%MPIDIR%%/include/vampirtrace/OTF_FileManager.h -%%MPIDIR%%/include/vampirtrace/OTF_File_iofsl.h -%%MPIDIR%%/include/vampirtrace/OTF_Filenames.h -%%MPIDIR%%/include/vampirtrace/OTF_HandlerArray.h -%%MPIDIR%%/include/vampirtrace/OTF_KeyValue.h -%%MPIDIR%%/include/vampirtrace/OTF_MasterControl.h -%%MPIDIR%%/include/vampirtrace/OTF_RBuffer.h -%%MPIDIR%%/include/vampirtrace/OTF_RStream.h -%%MPIDIR%%/include/vampirtrace/OTF_Reader.h -%%MPIDIR%%/include/vampirtrace/OTF_Version.h -%%MPIDIR%%/include/vampirtrace/OTF_WBuffer.h -%%MPIDIR%%/include/vampirtrace/OTF_WStream.h -%%MPIDIR%%/include/vampirtrace/OTF_Writer.h -%%MPIDIR%%/include/vampirtrace/OTF_inttypes.h -%%MPIDIR%%/include/vampirtrace/OTF_inttypes_unix.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/otf.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_CopyHandler.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_CopyHandler_stream.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Definitions.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Errno.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_File.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_File_iofsl.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_FileManager.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Filenames.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_HandlerArray.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_inttypes.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_KeyValue.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_MasterControl.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_RBuffer.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_RStream.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Reader.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Version.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_WBuffer.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_WStream.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Writer.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_inttypes_unix.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/otfaux.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTFAUX_State.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTFAUX_MsgMatching.h +%%MPIDIR%%/include/vampirtrace/open-trace-format/OTFAUX_Thumbnail.h %%MPIDIR%%/include/vampirtrace/opari_omp.h -%%MPIDIR%%/include/vampirtrace/otf.h -%%MPIDIR%%/include/vampirtrace/otfaux.h %%MPIDIR%%/include/vampirtrace/pomp_lib.h %%MPIDIR%%/include/vampirtrace/vt_inttypes.h %%MPIDIR%%/include/vampirtrace/vt_user.h @@ -121,7 +121,7 @@ %%MPIDIR%%/lib/libmpi_f77.la %%MPIDIR%%/lib/libmpi_f77.so.1 %%MPIDIR%%/lib/libmpi_f90.la -%%MPIDIR%%/lib/libmpi_f90.so.2 +%%MPIDIR%%/lib/libmpi_f90.so.4 %%MPIDIR%%/lib/libompitrace.la %%MPIDIR%%/lib/libompitrace.so.0 %%MPIDIR%%/lib/libopen-pal.la @@ -128,12 +128,13 @@ %%MPIDIR%%/lib/libopen-pal.so.4 %%MPIDIR%%/lib/libopen-rte.la %%MPIDIR%%/lib/libopen-rte.so.4 -%%MPIDIR%%/lib/libotf.a -%%MPIDIR%%/lib/libotf.la -%%MPIDIR%%/lib/libotf.so.6 +%%MPIDIR%%/lib/libopen-trace-format.so %%MPIDIR%%/lib/libotfaux.a %%MPIDIR%%/lib/libotfaux.la %%MPIDIR%%/lib/libotfaux.so.0 +%%MPIDIR%%/lib/libopen-trace-format.so.1 +%%MPIDIR%%/lib/libopen-trace-format.la +%%MPIDIR%%/lib/libopen-trace-format.a %%MPIDIR%%/lib/libvt-hyb.a %%MPIDIR%%/lib/libvt-hyb.la %%MPIDIR%%/lib/libvt-hyb.so.0 @@ -160,8 +161,6 @@ %%MPIDIR%%/lib/openmpi/mca_allocator_bucket.so %%MPIDIR%%/lib/openmpi/mca_bml_r2.la %%MPIDIR%%/lib/openmpi/mca_bml_r2.so -%%MPIDIR%%/lib/openmpi/mca_btl_sctp.la -%%MPIDIR%%/lib/openmpi/mca_btl_sctp.so %%MPIDIR%%/lib/openmpi/mca_btl_self.la %%MPIDIR%%/lib/openmpi/mca_btl_self.so %%MPIDIR%%/lib/openmpi/mca_btl_sm.la @@ -441,7 +440,6 @@ %%MPIDIR%%/lib/libompitrace.so %%MPIDIR%%/lib/libopen-pal.so %%MPIDIR%%/lib/libopen-rte.so -%%MPIDIR%%/lib/libotf.so %%MPIDIR%%/lib/libotfaux.so %%MPIDIR%%/lib/libvt-hyb.so %%MPIDIR%%/lib/libvt-mpi-unify.so @@ -471,6 +469,7 @@ @dirrm %%MPIDIR%%/lib/openmpi @dirrm %%MPIDIR%%/lib/pkgconfig @dirrm %%MPIDIR%%/lib +@dirrm %%MPIDIR%%/include/vampirtrace/open-trace-format @dirrm %%MPIDIR%%/include/vampirtrace @dirrm %%MPIDIR%%/include/openmpi/ompi/mpi/cxx @dirrm %%MPIDIR%%/include/openmpi/ompi/mpi