- Update to 1.11.1

- Explicitly disable OpenCL, CUDA and NVML for now
- Strip libraries
- Whitespace

PR:		204509
Approved by:	phd_kimberlite@yahoo.co.jp (maintainer)

4 files changed, 25 insertions, 28 deletions

diff --git a/devel/hwloc/Makefile b/devel/hwloc/Makefile
index 81c00f064b53..9e03bd3cfad1 100644
--- a/devel/hwloc/Makefile
+++ b/devel/hwloc/Makefile
@@ -1,11 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	hwloc
-PORTVERSION=	1.9
-PORTREVISION=	1
+PORTVERSION=	1.11.1
 CATEGORIES=	devel
-MASTER_SITES=	http://www.open-mpi.org/software/hwloc/v${PORTVERSION}/downloads/ \
-		http://icl.cs.utk.edu/open-mpi/software/hwloc/v${PORTVERSION}/downloads/
+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/
 
 MAINTAINER=	phd_kimberlite@yahoo.co.jp
 COMMENT=	Portable Hardware Locality software package
@@ -16,10 +15,13 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libpciaccess.so:${PORTSDIR}/devel/libpciaccess
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--enable-static \
-			--enable-libxml2 \
-			--disable-gl
-USES=		pkgconfig pathfix iconv libtool tar:bzip2
+CONFIGURE_ARGS=	--enable-static \
+		--disable-opencl \
+		--disable-cuda \
+		--disable-nvml \
+		--disable-gl
+INSTALL_TARGET=	install-strip
+USES=		iconv libtool pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 
@@ -29,11 +31,12 @@ ONLY_FOR_ARCHS=		i386 amd64 armv6
 ONLY_FOR_ARCHS_REASON=	has not been ported to this architecture
 
 OPTIONS_DEFINE=	CAIRO DOCS
+OPTIONS_SUB=	yes
 
 CAIRO_CONFIGURE_OFF=	--disable-cairo --without-x
 CAIRO_CONFIGURE_ON=	--enable-cairo --with-x
-CAIRO_LIB_DEPENDS=		libcairo.so:${PORTSDIR}/graphics/cairo
-CAIRO_USE=	XORG=x11
+CAIRO_LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
+CAIRO_USE=		XORG=x11
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
diff --git a/devel/hwloc/distinfo b/devel/hwloc/distinfo
index effab77c4af7..1f910ed7d5dc 100644
--- a/devel/hwloc/distinfo
+++ b/devel/hwloc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hwloc-1.9.tar.bz2) = 24a81ff1c3810f16633bf5ad3fb80cbbaf882e466a788af4301b2911698c4f7e
-SIZE (hwloc-1.9.tar.bz2) = 3682256
+SHA256 (hwloc-1.11.1.tar.bz2) = 48614061c4baa44dec7ec078459c3bd1f3ecaa39a39331a7eb857c945cca6c0f
+SIZE (hwloc-1.11.1.tar.bz2) = 3993881
diff --git a/devel/hwloc/files/patch-utils+Makefile.in b/devel/hwloc/files/patch-utils+Makefile.in
deleted file mode 100644
index 3f4bde652ba0..000000000000
--- a/devel/hwloc/files/patch-utils+Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- utils/Makefile.in.orig	2013-04-03 22:42:37.000000000 +0900
-+++ utils/Makefile.in	2013-04-03 22:43:41.000000000 +0900
-@@ -1816,9 +1816,7 @@
- @HWLOC_HAVE_CAIRO_FALSE@@HWLOC_HAVE_WINDOWS_FALSE@	rm -f $(DESTDIR)$(bindir)/lstopo
- @HWLOC_HAVE_CAIRO_FALSE@@HWLOC_HAVE_WINDOWS_FALSE@	cd $(DESTDIR)$(bindir) && $(LN_S) lstopo-no-graphics$(EXEEXT) lstopo$(EXEEXT) || true
- 	rm -f $(DESTDIR)$(man1dir)/hwloc-ls.1
--	cd $(DESTDIR)$(man1dir) && $(LN_S) lstopo.1 hwloc-ls.1
- 	rm -f $(DESTDIR)$(man1dir)/lstopo-no-graphics.1
--	cd $(DESTDIR)$(man1dir) && $(LN_S) lstopo.1 lstopo-no-graphics.1
- 	$(SED) -e 's/HWLOC_top_builddir\/utils/bindir/' -e '/HWLOC_top_builddir/d' $(DESTDIR)$(bindir)/hwloc-assembler-remote > $(DESTDIR)$(bindir)/hwloc-assembler-remote.tmp && mv -f $(DESTDIR)$(bindir)/hwloc-assembler-remote.tmp $(DESTDIR)$(bindir)/hwloc-assembler-remote
- 	chmod +x $(DESTDIR)$(bindir)/hwloc-assembler-remote
- 
diff --git a/devel/hwloc/pkg-plist b/devel/hwloc/pkg-plist
index 2fcb940d6cf5..24fa8ea118b2 100644
--- a/devel/hwloc/pkg-plist
+++ b/devel/hwloc/pkg-plist
@@ -33,7 +33,7 @@ include/hwloc/rename.h
 lib/libhwloc.a
 lib/libhwloc.so
 lib/libhwloc.so.5
-lib/libhwloc.so.5.5.0
+lib/libhwloc.so.5.6.7
 libdata/pkgconfig/hwloc.pc
 man/man1/hwloc-annotate.1.gz
 man/man1/hwloc-assembler-remote.1.gz
@@ -45,9 +45,11 @@ 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-ls.1.gz
 man/man1/hwloc-patch.1.gz
 man/man1/hwloc-ps.1.gz
 man/man1/lstopo.1.gz
+man/man1/lstopo-no-graphics.1.gz
 man/man3/HWLOC_API_VERSION.3.gz
 man/man3/HWLOC_CPUBIND_NOMEMBIND.3.gz
 man/man3/HWLOC_CPUBIND_PROCESS.3.gz
@@ -77,7 +79,7 @@ man/man3/HWLOC_OBJ_CORE.3.gz
 man/man3/HWLOC_OBJ_GROUP.3.gz
 man/man3/HWLOC_OBJ_MACHINE.3.gz
 man/man3/HWLOC_OBJ_MISC.3.gz
-man/man3/HWLOC_OBJ_NODE.3.gz
+man/man3/HWLOC_OBJ_NUMANODE.3.gz
 man/man3/HWLOC_OBJ_OSDEV_BLOCK.3.gz
 man/man3/HWLOC_OBJ_OSDEV_COPROC.3.gz
 man/man3/HWLOC_OBJ_OSDEV_DMA.3.gz
@@ -85,9 +87,9 @@ man/man3/HWLOC_OBJ_OSDEV_GPU.3.gz
 man/man3/HWLOC_OBJ_OSDEV_NETWORK.3.gz
 man/man3/HWLOC_OBJ_OSDEV_OPENFABRICS.3.gz
 man/man3/HWLOC_OBJ_OS_DEVICE.3.gz
+man/man3/HWLOC_OBJ_PACKAGE.3.gz
 man/man3/HWLOC_OBJ_PCI_DEVICE.3.gz
 man/man3/HWLOC_OBJ_PU.3.gz
-man/man3/HWLOC_OBJ_SOCKET.3.gz
 man/man3/HWLOC_OBJ_SYSTEM.3.gz
 man/man3/HWLOC_OBJ_TYPE_MAX.3.gz
 man/man3/HWLOC_RESTRICT_FLAG_ADAPT_DISTANCES.3.gz
@@ -339,6 +341,7 @@ 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_synthetic.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,9 +352,9 @@ man/man3/hwloc_topology_get_complete_nodeset.3.gz
 man/man3/hwloc_topology_get_depth.3.gz
 man/man3/hwloc_topology_get_flags.3.gz
 man/man3/hwloc_topology_get_online_cpuset.3.gz
-man/man3/hwloc_topology_get_support.3.gz
 man/man3/hwloc_topology_get_topology_cpuset.3.gz
 man/man3/hwloc_topology_get_topology_nodeset.3.gz
+man/man3/hwloc_topology_get_userdata.3.gz
 man/man3/hwloc_topology_ignore_all_keep_structure.3.gz
 man/man3/hwloc_topology_ignore_type.3.gz
 man/man3/hwloc_topology_ignore_type_keep_structure.3.gz
@@ -368,6 +371,7 @@ man/man3/hwloc_topology_set_flags.3.gz
 man/man3/hwloc_topology_set_fsroot.3.gz
 man/man3/hwloc_topology_set_pid.3.gz
 man/man3/hwloc_topology_set_synthetic.3.gz
+man/man3/hwloc_topology_set_userdata.3.gz
 man/man3/hwloc_topology_set_userdata_export_callback.3.gz
 man/man3/hwloc_topology_set_userdata_import_callback.3.gz
 man/man3/hwloc_topology_set_xml.3.gz
@@ -409,8 +413,10 @@ 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_syntheticexport.3.gz
 man/man3/hwlocality_tinker.3.gz
 man/man3/hwlocality_xmlexport.3.gz
 man/man7/hwloc.7.gz
+%%CAIRO%%share/applications/lstopo.desktop
 share/hwloc/hwloc-valgrind.supp
 share/hwloc/hwloc.dtd