svn commit: r320206 - in head/net/openmpi: . files

[Brooks Davis]

Author: brooks
Date: Fri Jun  7 14:38:46 2013
New Revision: 320206
URL: http://svnweb.freebsd.org/changeset/ports/320206

Log:
  Revert the pkgconfig change in r320019.  It didn't work and my initial
  efforts to fix it didn't work.  The result wouldn't have been useful
  enough to spend more effor on it.

Deleted:
  head/net/openmpi/files/patch-ompi_tools_wrappers_Makefile.in
  head/net/openmpi/files/patch-orte_tools_wrappers_Makefile.in
Modified:
  head/net/openmpi/Makefile
  head/net/openmpi/pkg-plist

Modified: head/net/openmpi/Makefile
==============================================================================
--- head/net/openmpi/Makefile	Fri Jun  7 14:36:48 2013	(r320205)
+++ head/net/openmpi/Makefile	Fri Jun  7 14:38:46 2013	(r320206)
@@ -5,7 +5,7 @@
 
 PORTNAME=	openmpi
 DISTVERSION=	1.6.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.open-mpi.org/software/ompi/v1.6/downloads/
 

Modified: head/net/openmpi/pkg-plist
==============================================================================
--- head/net/openmpi/pkg-plist	Fri Jun  7 14:36:48 2013	(r320205)
+++ head/net/openmpi/pkg-plist	Fri Jun  7 14:38:46 2013	(r320206)
@@ -296,12 +296,12 @@
 %%MPIDIR%%/lib/openmpi/mca_topo_unity.so
 %%MPIDIR%%/lib/openmpi/mca_vprotocol_pessimist.la
 %%MPIDIR%%/lib/openmpi/mca_vprotocol_pessimist.so
-%%MPIDIR%%/libdata/pkgconfig/ompi-c.pc
-%%MPIDIR%%/libdata/pkgconfig/ompi-cxx.pc
-%%MPIDIR%%/libdata/pkgconfig/ompi-f77.pc
-%%MPIDIR%%/libdata/pkgconfig/ompi-f90.pc
-%%MPIDIR%%/libdata/pkgconfig/ompi.pc
-%%MPIDIR%%/libdata/pkgconfig/orte.pc
+%%MPIDIR%%/lib/pkgconfig/ompi-c.pc
+%%MPIDIR%%/lib/pkgconfig/ompi-cxx.pc
+%%MPIDIR%%/lib/pkgconfig/ompi-f77.pc
+%%MPIDIR%%/lib/pkgconfig/ompi-f90.pc
+%%MPIDIR%%/lib/pkgconfig/ompi.pc
+%%MPIDIR%%/lib/pkgconfig/orte.pc
 %%MPIDIR%%/share/openmpi/amca-param-sets/example.conf
 %%MPIDIR%%/share/openmpi/help-coll-sync.txt
 %%MPIDIR%%/share/openmpi/help-dash-host.txt
@@ -469,6 +469,7 @@
 @dirrm %%MPIDIR%%/man/man1
 @dirrm %%MPIDIR%%/man
 @dirrm %%MPIDIR%%/lib/openmpi
+ at dirrm %%MPIDIR%%/lib/pkgconfig
 @dirrm %%MPIDIR%%/lib
 @dirrm %%MPIDIR%%/include/vampirtrace
 @dirrm %%MPIDIR%%/include/openmpi/ompi/mpi/cxx