Mon May 21 16:08:52 2012 UTC ()
parallel/openmpi: Fix PLIST for DragonFly


(marino)
diff -r1.12 -r1.13 pkgsrc/parallel/openmpi/Makefile
diff -r1.3 -r1.4 pkgsrc/parallel/openmpi/PLIST.vt
cvs diff -r1.12 -r1.13 pkgsrc/parallel/openmpi/Makefile (expand / switch to unified diff)

--- pkgsrc/parallel/openmpi/Makefile 2011/12/27 23:15:35 1.12
+++ pkgsrc/parallel/openmpi/Makefile 2012/05/21 16:08:51 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.12 2011/12/27 23:15:35 asau Exp $ 1# $NetBSD: Makefile,v 1.13 2012/05/21 16:08:51 marino Exp $
2 2
3DISTNAME= openmpi-1.5.4 3DISTNAME= openmpi-1.5.4
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= parallel 5CATEGORIES= parallel
6MASTER_SITES= http://www.open-mpi.org/software/ompi/v1.5/downloads/ 6MASTER_SITES= http://www.open-mpi.org/software/ompi/v1.5/downloads/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= asau@inbox.ru 9MAINTAINER= asau@inbox.ru
10HOMEPAGE= http://www.open-mpi.org/ 10HOMEPAGE= http://www.open-mpi.org/
11COMMENT= Open source MPI-2 implementation 11COMMENT= Open source MPI-2 implementation
12 12
13CONFLICTS+= mpich-[0-9]* # installs bin/mpicc & other wrappers 13CONFLICTS+= mpich-[0-9]* # installs bin/mpicc & other wrappers
14CONFLICTS+= mpich2-[0-9]* # installs bin/mpicc & other wrappers 14CONFLICTS+= mpich2-[0-9]* # installs bin/mpicc & other wrappers
@@ -26,26 +26,33 @@ SHLIBTOOL_OVERRIDE= ${WRKSRC}/config/lib @@ -26,26 +26,33 @@ SHLIBTOOL_OVERRIDE= ${WRKSRC}/config/lib
26 ${WRKSRC}/opal/libltdl/m4/libtool.m4 26 ${WRKSRC}/opal/libltdl/m4/libtool.m4
27 27
28CONFIGURE_ARGS+= --disable-mpi-f90 28CONFIGURE_ARGS+= --disable-mpi-f90
29CONFIGURE_ARGS+= --with-libltdl=external # use our libltdl 29CONFIGURE_ARGS+= --with-libltdl=external # use our libltdl
30CONFIGURE_ARGS+= --with-wrapper-ldflags="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib" 30CONFIGURE_ARGS+= --with-wrapper-ldflags="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib"
31CONFIGURE_ENV+= ompi_cv_f77_have_INTEGERp8=no # no "INTEGER*8"?? 31CONFIGURE_ENV+= ompi_cv_f77_have_INTEGERp8=no # no "INTEGER*8"??
32CONFIGURE_ARGS+= OPAL_HAVE_LTDL_ADVISE=0 32CONFIGURE_ARGS+= OPAL_HAVE_LTDL_ADVISE=0
33 33
34# Prevent detection of OpenMP support in order to make PLIST consistent: 34# Prevent detection of OpenMP support in order to make PLIST consistent:
35BUILDLINK_TRANSFORM= rm:-fopenmp 35BUILDLINK_TRANSFORM= rm:-fopenmp
36 36
37USE_TOOLS+= perl:run 37USE_TOOLS+= perl:run
38 38
 39PLIST_VARS+= vtlwraph
 40.include "../../mk/bsd.prefs.mk"
 41.if ${OPSYS} == "DragonFly"
 42PLIST.vtlwraph= yes
 43.endif
 44
 45
39.include "options.mk" 46.include "options.mk"
40 47
41TEST_TARGET= check 48TEST_TARGET= check
42 49
43## Just in case you'll need it... 50## Just in case you'll need it...
44# USE_TOOLS+= aclocal autoconf automake bash perl 51# USE_TOOLS+= aclocal autoconf automake bash perl
45# REPLACE_BASH= autogen.sh 52# REPLACE_BASH= autogen.sh
46 53
47# pre-configure: replace-interpreter 54# pre-configure: replace-interpreter
48# cd $(WRKSRC) && $(BASH) autogen.sh 55# cd $(WRKSRC) && $(BASH) autogen.sh
49 56
50.include "../../devel/libltdl/buildlink3.mk" 57.include "../../devel/libltdl/buildlink3.mk"
51.include "../../mk/bsd.pkg.mk" 58.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/parallel/openmpi/Attic/PLIST.vt (expand / switch to unified diff)

--- pkgsrc/parallel/openmpi/Attic/PLIST.vt 2010/12/16 21:00:53 1.3
+++ pkgsrc/parallel/openmpi/Attic/PLIST.vt 2012/05/21 16:08:51 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST.vt,v 1.3 2010/12/16 21:00:53 asau Exp $ 1@comment $NetBSD: PLIST.vt,v 1.4 2012/05/21 16:08:51 marino Exp $
2bin/mpiCC-vt 2bin/mpiCC-vt
3bin/mpic++-vt 3bin/mpic++-vt
4bin/mpicc-vt 4bin/mpicc-vt
5bin/mpicxx-vt 5bin/mpicxx-vt
6bin/mpif77-vt 6bin/mpif77-vt
7bin/mpif90-vt 7bin/mpif90-vt
8bin/otfaux 8bin/otfaux
9bin/otfcompress 9bin/otfcompress
10bin/otfconfig 10bin/otfconfig
11bin/otfdecompress 11bin/otfdecompress
12bin/otfdump 12bin/otfdump
13bin/otfinfo 13bin/otfinfo
14bin/otfmerge 14bin/otfmerge
@@ -46,26 +46,27 @@ include/vampirtrace/otf.h @@ -46,26 +46,27 @@ include/vampirtrace/otf.h
46include/vampirtrace/vt_user.h 46include/vampirtrace/vt_user.h
47include/vampirtrace/vt_user.inc 47include/vampirtrace/vt_user.inc
48include/vampirtrace/vt_user_comment.h 48include/vampirtrace/vt_user_comment.h
49include/vampirtrace/vt_user_comment.inc 49include/vampirtrace/vt_user_comment.inc
50include/vampirtrace/vt_user_control.h 50include/vampirtrace/vt_user_control.h
51include/vampirtrace/vt_user_control.inc 51include/vampirtrace/vt_user_control.inc
52include/vampirtrace/vt_user_count.h 52include/vampirtrace/vt_user_count.h
53include/vampirtrace/vt_user_count.inc 53include/vampirtrace/vt_user_count.inc
54include/vampirtrace/vt_user_marker.h 54include/vampirtrace/vt_user_marker.h
55include/vampirtrace/vt_user_marker.inc 55include/vampirtrace/vt_user_marker.inc
56include/vampirtrace/vt_user_region.h 56include/vampirtrace/vt_user_region.h
57include/vampirtrace/vt_user_region.inc 57include/vampirtrace/vt_user_region.inc
58include/vampirtrace/vt_wrap_pthread.h 58include/vampirtrace/vt_wrap_pthread.h
 59${PLIST.vtlwraph}include/vampirtrace/vt_libwrap.h
59lib/libotf.la 60lib/libotf.la
60lib/libvt-hyb.la 61lib/libvt-hyb.la
61lib/libvt-mpi.la 62lib/libvt-mpi.la
62lib/libvt-mt.la 63lib/libvt-mt.la
63lib/libvt.la 64lib/libvt.la
64share/openmpi/mpiCC-vt-wrapper-data.txt 65share/openmpi/mpiCC-vt-wrapper-data.txt
65share/openmpi/mpic++-vt-wrapper-data.txt 66share/openmpi/mpic++-vt-wrapper-data.txt
66share/openmpi/mpicc-vt-wrapper-data.txt 67share/openmpi/mpicc-vt-wrapper-data.txt
67share/openmpi/mpicxx-vt-wrapper-data.txt 68share/openmpi/mpicxx-vt-wrapper-data.txt
68share/openmpi/mpif77-vt-wrapper-data.txt 69share/openmpi/mpif77-vt-wrapper-data.txt
69share/openmpi/mpif90-vt-wrapper-data.txt 70share/openmpi/mpif90-vt-wrapper-data.txt
70share/vampirtrace/FILTER.SPEC 71share/vampirtrace/FILTER.SPEC
71share/vampirtrace/GROUPS.SPEC 72share/vampirtrace/GROUPS.SPEC