Index: head/ports-mgmt/pkg-devel/Makefile
===================================================================
--- head/ports-mgmt/pkg-devel/Makefile	(revision 477662)
+++ head/ports-mgmt/pkg-devel/Makefile	(revision 477663)
@@ -1,83 +1,80 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
-DISTVERSION=	1.10.99.7
+DISTVERSION=	1.10.99.8
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
-MASTER_SITES=	\
-		http://files.etoilebsd.net/pkg/ \
-		http://mirror.shatow.net/freebsd/${PORTNAME}/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	pkg@FreeBSD.org
 COMMENT=	Package manager
 
 LICENSE=	BSD2CLAUSE
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	freebsd
+GH_TAGNAME=	f35a78cb
+
 WITH_DEBUG=	yes
 CFLAGS+=	-O0 -g -Wno-error
 USE_LDCONFIG=	yes
-USES=		libtool tar:xz
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-maintainer-mode
-INSTALL_TARGET=	install-strip
+HAS_CONFIGURE=	yes
 PORTDOCS=	NEWS
 PORTSCOUT=	ignore:1
+CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 
 # Use a submake as 'deinstall install' needs to reevaluate PKG_REGISTER
 # so that pkg-static is used from the wrkdir
 USE_SUBMAKE=	yes
 
 .if !exists(/usr/include/jail.h)
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-docs_pkg.8
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_PKG)
 .if ${WITH_PKG} != devel
 .	if !defined(PACKAGE_BUILDING)
 IGNORE=	WITH_PKG is not defined to 'devel', this version is the devel one
 .	endif
 .else
 PKGNAMESUFFIX=
 #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :)
 PKG_DEPENDS=
 .endif
 .if exists(${LOCALBASE}/sbin/pkg_info) || exists(/usr/sbin/pkg_info)
 NB_OLDPKGS!=	pkg_info 2>/dev/null | wc -l
 .if exists(${PKG_BIN})
 NB_NEWPKGS!=	${PKG_INFO} -aq | wc -l
 .else
 NB_NEWPKGS=	0
 .endif
 # Only show the pre-everything notice if they have not already
 # converted any packages
 .if ${NB_OLDPKGS} > 0 && ${NB_NEWPKGS} == 0
 
 pre-everything::
 	@${ECHO_CMD} "You are about to convert your system to pkg while you have ports/packages"; \
 	 ${ECHO_CMD} "installed with the old pkg_install tools."; \
 	 ${ECHO_CMD} ""; \
 	 ${ECHO_CMD} "To switch to pkg:"; \
 	 ${ECHO_CMD} "    1) Install ports-mgmt/pkg"; \
 	 ${ECHO_CMD} "    2) Convert your package database by running pkg2ng"; \
 	 ${ECHO_CMD} ""; \
 	exit 1
 
 .endif
 .endif
 .endif
 
 .undef INSTALLS_DEPENDS
 .if !exists(${LOCALBASE}/sbin/pkg) || !defined(CROSS_TOOLCHAIN)
 PKG_BIN=	${WRKSRC}/src/pkg-static
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS
-	@${MV} ${STAGEDIR}${PREFIX}/lib/libpkg_static.a \
-		${STAGEDIR}${PREFIX}/lib/libpkg.a
 
 .include <bsd.port.post.mk>
Index: head/ports-mgmt/pkg-devel/distinfo
===================================================================
--- head/ports-mgmt/pkg-devel/distinfo	(revision 477662)
+++ head/ports-mgmt/pkg-devel/distinfo	(revision 477663)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515280391
-SHA256 (pkg-1.10.99.7.tar.xz) = b3ab9ad53af53dbdc4ba800c204c8b55537dcae72ba2f1eebf5df4198e6da5b8
-SIZE (pkg-1.10.99.7.tar.xz) = 2217824
+TIMESTAMP = 1534784004
+SHA256 (freebsd-pkg-1.10.99.8-f35a78cb_GH0.tar.gz) = 771a12c36dd2315d5775d2b0a148e779d0ed602e5b1d4845fd9071afb155b68f
+SIZE (freebsd-pkg-1.10.99.8-f35a78cb_GH0.tar.gz) = 3552620
Index: head/ports-mgmt/pkg-devel/pkg-plist
===================================================================
--- head/ports-mgmt/pkg-devel/pkg-plist	(revision 477662)
+++ head/ports-mgmt/pkg-devel/pkg-plist	(revision 477663)
@@ -1,54 +1,53 @@
 etc/bash_completion.d/_pkg.bash
 etc/periodic/daily/411.pkg-backup
 etc/periodic/daily/490.status-pkg-changes
 etc/periodic/security/410.pkg-audit
 etc/periodic/security/460.pkg-checksum
 etc/periodic/weekly/400.status-pkg
 @sample etc/pkg.conf.sample
 include/pkg.h
 lib/libpkg.a
 lib/libpkg.so
 lib/libpkg.so.4
-lib/libpkg.so.4.0.0
 libdata/pkgconfig/pkg.pc
 man/man3/pkg_printf.3.gz
 man/man3/pkg_repos.3.gz
 man/man5/pkg-repository.5.gz
 man/man5/pkg.conf.5.gz
 man/man8/pkg-add.8.gz
 man/man8/pkg-alias.8.gz
 man/man8/pkg-annotate.8.gz
 man/man8/pkg-audit.8.gz
 man/man8/pkg-autoremove.8.gz
 man/man8/pkg-backup.8.gz
 man/man8/pkg-check.8.gz
 man/man8/pkg-clean.8.gz
 man/man8/pkg-config.8.gz
 man/man8/pkg-create.8.gz
 man/man8/pkg-delete.8.gz
 man/man8/pkg-fetch.8.gz
 man/man8/pkg-info.8.gz
 man/man8/pkg-install.8.gz
 man/man8/pkg-lock.8.gz
 man/man8/pkg-query.8.gz
 man/man8/pkg-register.8.gz
 man/man8/pkg-remove.8.gz
 man/man8/pkg-repo.8.gz
 man/man8/pkg-rquery.8.gz
 man/man8/pkg-search.8.gz
 man/man8/pkg-set.8.gz
 man/man8/pkg-shell.8.gz
 man/man8/pkg-shlib.8.gz
 man/man8/pkg-ssh.8.gz
 man/man8/pkg-static.8.gz
 man/man8/pkg-stats.8.gz
 man/man8/pkg-unlock.8.gz
 man/man8/pkg-update.8.gz
 man/man8/pkg-updating.8.gz
 man/man8/pkg-upgrade.8.gz
 man/man8/pkg-version.8.gz
 man/man8/pkg-which.8.gz
 man/man8/pkg.8.gz
 sbin/pkg
 sbin/pkg-static
 share/zsh/site-functions/_pkg