3 files changed, 45 insertions, 22 deletions

diff --git a/devel/hwloc/Makefile b/devel/hwloc/Makefile
index ac9313401e6b..bd009ec48403 100644
--- a/devel/hwloc/Makefile
+++ b/devel/hwloc/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	hwloc
-PORTVERSION=	1.7.2
+PORTVERSION=	1.8
 CATEGORIES=	devel
-MASTER_SITES=	http://www.open-mpi.org/software/hwloc/v${PORTVERSION:R}/downloads/ \
-		http://icl.cs.utk.edu/open-mpi/software/hwloc/v${PORTVERSION:R}/downloads/
+MASTER_SITES=	http://www.open-mpi.org/software/hwloc/v${PORTVERSION}/downloads/ \
+		http://icl.cs.utk.edu/open-mpi/software/hwloc/v${PORTVERSION}/downloads/
 
 MAINTAINER=	phd_kimberlite@yahoo.co.jp
 COMMENT=	Portable Hardware Locality software package
@@ -24,10 +24,10 @@ USE_GNOME=	libxml2
 
 PORTDOCS=	*
 
-ONLY_FOR_ARCHS=		i386 amd64
+ONLY_FOR_ARCHS=		i386 amd64 armv6
 ONLY_FOR_ARCHS_REASON=	has not been ported to this architecture
 
-OPTIONS_DEFINE=	DOCS CAIRO
+OPTIONS_DEFINE=	CAIRO
 
 CAIRO_CONFIGURE_OFF=	--disable-cairo --without-x
 CAIRO_CONFIGURE_ON=	--enable-cairo --with-x
diff --git a/devel/hwloc/distinfo b/devel/hwloc/distinfo
index 63649f91cfe9..f664334e3ffa 100644
--- a/devel/hwloc/distinfo
+++ b/devel/hwloc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hwloc-1.7.2.tar.bz2) = a0b40c01eead1d4c254ab87c2ec75b8eeb9877331763fbd1e1b81990ad566848
-SIZE (hwloc-1.7.2.tar.bz2) = 3165052
+SHA256 (hwloc-1.8.tar.bz2) = b278c1a6f846c541f6d92ed66b5702743dc8338b9651cea5f387e57ae4fc390b
+SIZE (hwloc-1.8.tar.bz2) = 3638289
diff --git a/devel/hwloc/pkg-plist b/devel/hwloc/pkg-plist
index b6f2f040dcf5..3063fc9ae478 100644
--- a/devel/hwloc/pkg-plist
+++ b/devel/hwloc/pkg-plist
@@ -3,10 +3,13 @@ bin/hwloc-assembler
 bin/hwloc-assembler-remote
 bin/hwloc-bind
 bin/hwloc-calc
+bin/hwloc-compress-dir
+bin/hwloc-diff
 bin/hwloc-distances
 bin/hwloc-distrib
 bin/hwloc-info
 bin/hwloc-ls
+bin/hwloc-patch
 bin/hwloc-ps
 bin/lstopo
 bin/lstopo-no-graphics
@@ -15,8 +18,11 @@ include/hwloc/autogen/config.h
 include/hwloc/bitmap.h
 include/hwloc/cuda.h
 include/hwloc/cudart.h
+include/hwloc/deprecated.h
+include/hwloc/diff.h
 include/hwloc/gl.h
 include/hwloc/helper.h
+include/hwloc/inlines.h
 include/hwloc/intel-mic.h
 include/hwloc/myriexpress.h
 include/hwloc/nvml.h
@@ -27,16 +33,19 @@ include/hwloc/rename.h
 lib/libhwloc.a
 lib/libhwloc.la
 lib/libhwloc.so
-lib/libhwloc.so.8
+lib/libhwloc.so.9
 libdata/pkgconfig/hwloc.pc
 man/man1/hwloc-annotate.1.gz
 man/man1/hwloc-assembler-remote.1.gz
 man/man1/hwloc-assembler.1.gz
 man/man1/hwloc-bind.1.gz
 man/man1/hwloc-calc.1.gz
+man/man1/hwloc-compress-dir.1.gz
+man/man1/hwloc-diff.1.gz
 man/man1/hwloc-distances.1.gz
 man/man1/hwloc-distrib.1.gz
 man/man1/hwloc-info.1.gz
+man/man1/hwloc-patch.1.gz
 man/man1/hwloc-ps.1.gz
 man/man1/lstopo.1.gz
 man/man3/HWLOC_API_VERSION.3.gz
@@ -83,6 +92,12 @@ man/man3/HWLOC_OBJ_TYPE_MAX.3.gz
 man/man3/HWLOC_RESTRICT_FLAG_ADAPT_DISTANCES.3.gz
 man/man3/HWLOC_RESTRICT_FLAG_ADAPT_IO.3.gz
 man/man3/HWLOC_RESTRICT_FLAG_ADAPT_MISC.3.gz
+man/man3/HWLOC_TOPOLOGY_DIFF_APPLY_REVERSE.3.gz
+man/man3/HWLOC_TOPOLOGY_DIFF_OBJ_ATTR.3.gz
+man/man3/HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_INFO.3.gz
+man/man3/HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_NAME.3.gz
+man/man3/HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_SIZE.3.gz
+man/man3/HWLOC_TOPOLOGY_DIFF_TOO_COMPLEX.3.gz
 man/man3/HWLOC_TOPOLOGY_FLAG_ICACHES.3.gz
 man/man3/HWLOC_TOPOLOGY_FLAG_IO_BRIDGES.3.gz
 man/man3/HWLOC_TOPOLOGY_FLAG_IO_DEVICES.3.gz
@@ -287,7 +302,6 @@ man/man3/hwloc_obj_memory_s.3.gz
 man/man3/hwloc_obj_memory_s_hwloc_obj_memory_page_type_s.3.gz
 man/man3/hwloc_obj_osdev_type_e.3.gz
 man/man3/hwloc_obj_osdev_type_t.3.gz
-man/man3/hwloc_obj_snprintf.3.gz
 man/man3/hwloc_obj_t.3.gz
 man/man3/hwloc_obj_type_of_string.3.gz
 man/man3/hwloc_obj_type_snprintf.3.gz
@@ -309,7 +323,20 @@ man/man3/hwloc_set_thread_cpubind.3.gz
 man/man3/hwloc_topology_check.3.gz
 man/man3/hwloc_topology_cpubind_support.3.gz
 man/man3/hwloc_topology_destroy.3.gz
+man/man3/hwloc_topology_diff_apply.3.gz
+man/man3/hwloc_topology_diff_apply_flags_e.3.gz
+man/man3/hwloc_topology_diff_build.3.gz
+man/man3/hwloc_topology_diff_destroy.3.gz
+man/man3/hwloc_topology_diff_export_xml.3.gz
+man/man3/hwloc_topology_diff_export_xmlbuffer.3.gz
+man/man3/hwloc_topology_diff_load_xml.3.gz
+man/man3/hwloc_topology_diff_load_xmlbuffer.3.gz
+man/man3/hwloc_topology_diff_obj_attr_type_e.3.gz
+man/man3/hwloc_topology_diff_obj_attr_u.3.gz
+man/man3/hwloc_topology_diff_type_e.3.gz
+man/man3/hwloc_topology_diff_u.3.gz
 man/man3/hwloc_topology_discovery_support.3.gz
+man/man3/hwloc_topology_dup.3.gz
 man/man3/hwloc_topology_export_xml.3.gz
 man/man3/hwloc_topology_export_xmlbuffer.3.gz
 man/man3/hwloc_topology_flags_e.3.gz
@@ -349,42 +376,38 @@ man/man3/hwlocality_advanced_io.3.gz
 man/man3/hwlocality_api_version.3.gz
 man/man3/hwlocality_bitmap.3.gz
 man/man3/hwlocality_configuration.3.gz
-man/man3/hwlocality_conversion.3.gz
 man/man3/hwlocality_cpubinding.3.gz
 man/man3/hwlocality_creation.3.gz
 man/man3/hwlocality_cuda.3.gz
 man/man3/hwlocality_cudart.3.gz
 man/man3/hwlocality_custom.3.gz
+man/man3/hwlocality_diff.3.gz
 man/man3/hwlocality_distances.3.gz
 man/man3/hwlocality_gl.3.gz
 man/man3/hwlocality_glibc_sched.3.gz
-man/man3/hwlocality_helper_binding.3.gz
-man/man3/hwlocality_helper_cpuset.3.gz
+man/man3/hwlocality_helper_ancestors.3.gz
+man/man3/hwlocality_helper_distribute.3.gz
 man/man3/hwlocality_helper_find_cache.3.gz
 man/man3/hwlocality_helper_find_covering.3.gz
-man/man3/hwlocality_helper_find_coverings.3.gz
 man/man3/hwlocality_helper_find_inside.3.gz
-man/man3/hwlocality_helper_nodeset.3.gz
+man/man3/hwlocality_helper_find_misc.3.gz
 man/man3/hwlocality_helper_nodeset_convert.3.gz
-man/man3/hwlocality_helper_traversal.3.gz
-man/man3/hwlocality_helper_traversal_basic.3.gz
-man/man3/hwlocality_helper_types.3.gz
-man/man3/hwlocality_information.3.gz
+man/man3/hwlocality_helper_topology_sets.3.gz
 man/man3/hwlocality_intel_mic.3.gz
+man/man3/hwlocality_levels.3.gz
 man/man3/hwlocality_linux.3.gz
 man/man3/hwlocality_linux_libnuma_bitmask.3.gz
 man/man3/hwlocality_linux_libnuma_ulongs.3.gz
 man/man3/hwlocality_membinding.3.gz
 man/man3/hwlocality_myriexpress.3.gz
 man/man3/hwlocality_nvml.3.gz
+man/man3/hwlocality_object_sets.3.gz
+man/man3/hwlocality_object_strings.3.gz
+man/man3/hwlocality_object_types.3.gz
 man/man3/hwlocality_objects.3.gz
 man/man3/hwlocality_opencl.3.gz
 man/man3/hwlocality_openfabrics.3.gz
-man/man3/hwlocality_sets.3.gz
 man/man3/hwlocality_tinker.3.gz
-man/man3/hwlocality_topology.3.gz
-man/man3/hwlocality_traversal.3.gz
-man/man3/hwlocality_types.3.gz
 man/man3/hwlocality_xmlexport.3.gz
 man/man7/hwloc.7.gz
 share/hwloc/hwloc-valgrind.supp