Index: head/devel/hwloc2/Makefile
===================================================================
--- head/devel/hwloc2/Makefile	(revision 561021)
+++ head/devel/hwloc2/Makefile	(revision 561022)
@@ -1,58 +1,55 @@
 # $FreeBSD$
 
-PORTNAME=	hwloc2
+PORTNAME=	hwloc
 PORTVERSION=	2.3.0
 CATEGORIES=	devel
 MASTER_SITES=	https://download.open-mpi.org/release/hwloc/v${PORTVERSION:R}/ \
 		http://icl.cs.utk.edu/open-mpi/software/hwloc/v${PORTVERSION:R}/downloads/
-DISTNAME=	hwloc-${PORTVERSION}
+PKGNAMESUFFIX=	2
 
 MAINTAINER=	phd_kimberlite@yahoo.co.jp
 COMMENT=	Portable Hardware Locality software package
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess
 
 USES=		iconv libtool gnome pathfix pkgconfig tar:bzip2
 USE_GNOME=	libxml2
 
 CONFLICTS_INSTALL=	hwloc-[0-9]*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static \
 		--disable-opencl \
 		--disable-cuda \
 		--disable-nvml \
 		--disable-gl
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
-
-DATADIR=	${PREFIX}/share/hwloc
-DOCSDIR=	${PREFIX}/share/doc/hwloc
 
 PORTDOCS=	*
 
 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:graphics/cairo
 CAIRO_USES=		xorg
 CAIRO_USE=		XORG=x11
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != amd64 && ${ARCH} != i386
 PLIST_SUB=	X86="@comment "
 .else
 PLIST_SUB=	X86=""
 .endif
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	${INSTALL_DATA} ${WRKSRC}/doc/doxygen-doc/html/* ${STAGEDIR}${DOCSDIR}/html/
 
 .include <bsd.port.post.mk>