Import of pkgsrc-2013Q2

parallel/openmpi/patches/patch-aa

@@ -0,0 +1,23 @@
+$NetBSD: patch-aa,v 1.3 2012/05/28 18:38:18 asau Exp $
+
+Missing RPATH support.
+
+--- opal/tools/wrappers/opal_wrapper.c.orig	2011-12-14 05:43:59.000000000 +0400
++++ opal/tools/wrappers/opal_wrapper.c	2012-02-16 18:10:03.000000000 +0400
+@@ -61,6 +61,7 @@
+ #else
+ #define OPAL_INCLUDE_FLAG  "-I"
+ #define OPAL_LIBDIR_FLAG   "-L"
++#define OPAL_RPATH_FLAG    "-R"
+ #endif  /* !defined(__WINDOWS__) && defined(_MSC_VER) */
+ 
+ struct options_data_t {
+@@ -363,6 +364,8 @@
+ #else
+             asprintf(&line, OPAL_LIBDIR_FLAG"%s", 
+                      options_data[parse_options_idx].path_libdir);
++            asprintf(&line, OPAL_RPATH_FLAG"%s", 
++                     options_data[parse_options_idx].path_libdir);
+ #endif  /* defined(__WINDOWS__) */
+             opal_argv_append_nosize(&options_data[parse_options_idx].link_flags, line);
+             free(line);

parallel/openmpi/patches/patch-ai

@@ -0,0 +1,55 @@
+$NetBSD: patch-ai,v 1.4 2012/10/17 23:27:35 asau Exp $
+
+Install configuration files into example directory.
+
+--- orte/etc/Makefile.in.orig	2012-08-22 14:26:19.000000000 +0000
++++ orte/etc/Makefile.in
+@@ -1085,6 +1085,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
++sysconfexampledir = $(pkgdatadir)/examples
+ sysinfo_solaris_CFLAGS = @sysinfo_solaris_CFLAGS@
+ sysinfo_solaris_CPPFLAGS = @sysinfo_solaris_CPPFLAGS@
+ sysinfo_solaris_LDFLAGS = @sysinfo_solaris_LDFLAGS@
+@@ -1303,19 +1304,19 @@ uninstall-am: uninstall-local
+ # details why the mkdir is in install-data-local.
+ 
+ install-data-local:
+-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
++	$(MKDIR_P) $(DESTDIR)$(sysconfexampledir)
+ 	@ p="$(orte_config_files)"; \
+ 	for file in $$p; do \
+-	  if test -f $(DESTDIR)$(sysconfdir)/$$file; then \
++	  if test -f $(DESTDIR)$(sysconfexampledir)/$$file; then \
+ 	    echo "******************************* WARNING ************************************"; \
+ 	    echo "*** Not installing new $$file over existing file in:"; \
+-	    echo "***   $(DESTDIR)$(sysconfdir)/$$file"; \
++	    echo "***   $(DESTDIR)$(sysconfexampledir)/$$file"; \
+ 	    echo "******************************* WARNING ************************************"; \
+ 	  else \
+ 	    if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \
+ 	    f="`echo $$file | sed -e 's|^.*/||'`"; \
+-	    echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f"; \
+-	    $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f; \
++	    echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfexampledir)/$$f"; \
++	    $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfexampledir)/$$f; \
+ 	  fi; \
+ 	done
+ 
+@@ -1326,11 +1327,11 @@ install-data-local:
+ uninstall-local:
+ 	@ p="$(orte_config_files)"; \
+ 	for file in $$p; do \
+-	  if test -f "$(DESTDIR)$(sysconfdir)/$$file"; then \
++	  if test -f "$(DESTDIR)$(sysconfexampledir)/$$file"; then \
+ 	  	if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \
+-	    if diff "$(DESTDIR)$(sysconfdir)/$$file" "$$d$$file" > /dev/null 2>&1 ; then \
+-	      echo "rm -f $(DESTDIR)$(sysconfdir)/$$file" ; \
+-	      rm -f "$(DESTDIR)$(sysconfdir)/$$file" ; \
++	    if diff "$(DESTDIR)$(sysconfexampledir)/$$file" "$$d$$file" > /dev/null 2>&1 ; then \
++	      echo "rm -f $(DESTDIR)$(sysconfexampledir)/$$file" ; \
++	      rm -f "$(DESTDIR)$(sysconfexampledir)/$$file" ; \
+ 	    fi ; \
+ 	  fi ; \
+ 	done

parallel/openmpi/patches/patch-aj

@@ -0,0 +1,62 @@
+$NetBSD: patch-aj,v 1.3 2012/10/17 23:27:35 asau Exp $
+
+Install configuration files into example directory.
+
+--- opal/etc/Makefile.in.orig	2012-08-22 14:25:33.000000000 +0000
++++ opal/etc/Makefile.in
+@@ -35,6 +35,7 @@
+ #
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
++sysconfexampledir = $(pkgdatadir)/examples
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
+@@ -1302,24 +1303,24 @@ uninstall-am: uninstall-local
+ # details why the mkdir is in install-data-local.
+ 
+ install-data-local:
+-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
++	$(MKDIR_P) $(DESTDIR)$(sysconfexampledir)
+ 	@ p="$(opal_config_files)"; \
+         if test "$(opal_file_from_platform)" = "yes"; then \
+ 	    if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	    echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfdir)/openmpi-mca-params.conf"; \
+-	    $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfdir)/openmpi-mca-params.conf; \
++	    echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfexampledir)/openmpi-mca-params.conf"; \
++	    $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfexampledir)/openmpi-mca-params.conf; \
+         else \
+             for file in $$p; do \
+-	        if test -f $(DESTDIR)$(sysconfdir)/openmpi-mca-params.conf; then \
++	        if test -f $(DESTDIR)$(sysconfexampledir)/openmpi-mca-params.conf; then \
+ 	            echo "******************************* WARNING ************************************"; \
+ 	            echo "*** Not installing new $$file over existing file in:"; \
+-	            echo "***   $(DESTDIR)$(sysconfdir)/$$file"; \
++	            echo "***   $(DESTDIR)$(sysconfexampledir)/$$file"; \
+ 	            echo "******************************* WARNING ************************************"; \
+ 	        else \
+ 	            if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \
+ 	            f="`echo $$file | sed -e 's|^.*/||'`"; \
+-	            echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f"; \
+-	            $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f; \
++	            echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfexampledir)/$$f"; \
++	            $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfexampledir)/$$f; \
+ 	        fi; \
+ 	    done \
+         fi;
+@@ -1331,11 +1332,11 @@ install-data-local:
+ uninstall-local:
+ 	@ p="$(opal_config_files)"; \
+ 	for file in $$p; do \
+-	  if test -f "$(DESTDIR)$(sysconfdir)/$$file"; then \
++	  if test -f "$(DESTDIR)$(sysconfexampledir)/$$file"; then \
+ 	  	if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \
+-	    if diff "$(DESTDIR)$(sysconfdir)/$$file" "$$d$$file" > /dev/null 2>&1 ; then \
+-	      echo "rm -f $(DESTDIR)$(sysconfdir)/$$file" ; \
+-	      rm -f "$(DESTDIR)$(sysconfdir)/$$file" ; \
++	    if diff "$(DESTDIR)$(sysconfexampledir)/$$file" "$$d$$file" > /dev/null 2>&1 ; then \
++	      echo "rm -f $(DESTDIR)$(sysconfexampledir)/$$file" ; \
++	      rm -f "$(DESTDIR)$(sysconfexampledir)/$$file" ; \
+ 	    fi ; \
+ 	  fi ; \
+ 	done

parallel/openmpi/patches/patch-ak

@@ -0,0 +1,55 @@
+$NetBSD: patch-ak,v 1.3 2012/10/17 23:27:35 asau Exp $
+
+Install configuration files into example directory.
+
+--- ompi/etc/Makefile.in.orig	2012-08-22 14:24:34.000000000 +0000
++++ ompi/etc/Makefile.in
+@@ -35,6 +35,7 @@
+ #
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
++sysconfexampledir = $(pkgdatadir)/examples
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
+@@ -1303,19 +1304,19 @@ uninstall-am: uninstall-local
+ # details why the mkdir is in install-data-local.
+ 
+ install-data-local:
+-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
++	$(MKDIR_P) $(DESTDIR)$(sysconfexampledir)
+ 	@ p="$(ompi_config_files)"; \
+ 	for file in $$p; do \
+-	  if test -f $(DESTDIR)$(sysconfdir)/$$file; then \
++	  if test -f $(DESTDIR)$(sysconfexampledir)/$$file; then \
+ 	    echo "******************************* WARNING ************************************"; \
+ 	    echo "*** Not installing new $$file over existing file in:"; \
+-	    echo "***   $(DESTDIR)$(sysconfdir)/$$file"; \
++	    echo "***   $(DESTDIR)$(sysconfexampledir)/$$file"; \
+ 	    echo "******************************* WARNING ************************************"; \
+ 	  else \
+ 	    if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \
+ 	    f="`echo $$file | sed -e 's|^.*/||'`"; \
+-	    echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f"; \
+-	    $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f; \
++	    echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfexampledir)/$$f"; \
++	    $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfexampledir)/$$f; \
+ 	  fi; \
+ 	done
+ 
+@@ -1326,11 +1327,11 @@ install-data-local:
+ uninstall-local:
+ 	@ p="$(ompi_config_files)"; \
+ 	for file in $$p; do \
+-	  if test -f "$(DESTDIR)$(sysconfdir)/$$file"; then \
++	  if test -f "$(DESTDIR)$(sysconfexampledir)/$$file"; then \
+ 	  	if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \
+-	    if diff "$(DESTDIR)$(sysconfdir)/$$file" "$$d$$file" > /dev/null 2>&1 ; then \
+-	      echo "rm -f $(DESTDIR)$(sysconfdir)/$$file" ; \
+-	      rm -f "$(DESTDIR)$(sysconfdir)/$$file" ; \
++	    if diff "$(DESTDIR)$(sysconfexampledir)/$$file" "$$d$$file" > /dev/null 2>&1 ; then \
++	      echo "rm -f $(DESTDIR)$(sysconfexampledir)/$$file" ; \
++	      rm -f "$(DESTDIR)$(sysconfexampledir)/$$file" ; \
+ 	    fi ; \
+ 	  fi ; \
+ 	done