Index: head/ports-mgmt/pkg/Makefile
===================================================================
--- head/ports-mgmt/pkg/Makefile	(revision 458301)
+++ head/ports-mgmt/pkg/Makefile	(revision 458302)
@@ -1,82 +1,81 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
-DISTVERSION=	1.10.3
-PORTREVISION=	1
+DISTVERSION=	1.10.4
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	\
 		http://files.etoilebsd.net/${PORTNAME}/ \
 		LOCAL/portmgr \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
 
 MAINTAINER=	pkg@FreeBSD.org
 COMMENT=	Package manager
 
 LICENSE=	BSD2CLAUSE
 
 USE_LDCONFIG=	yes
 USES=		libtool tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-maintainer-mode
 INSTALL_TARGET=	install-strip
 PORTDOCS=	NEWS
 PORTSCOUT=	ignore:1
 
 # Use a submake as 'deinstall install' needs to reevaluate PKG_CMD
 # so that pkg-static is used from the wrkdir
 USE_SUBMAKE=	yes
 CFLAGS+=	-Wno-error
 
 .if !exists(/usr/include/jail.h)
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-docs_pkg.8
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_DEBUG)
 MAKE_ARGS+=	DEBUG_FLAGS="${DEBUG_FLAGS}"
 .endif
 
 .if defined(WITH_PKG)
 .if ${WITH_PKG} == devel
 IGNORE=	WITH_PKG is defined to 'devel', this version is the stable one
 .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 && !defined(UPGRADEPKG)
 
 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} "       cd ports-mgmt/pkg && make UPGRADEPKG=1 install clean"; \
 	 ${ECHO_CMD} "    2) Convert your package database by running pkg2ng"; \
 	 ${ECHO_CMD} ""; \
 	exit 1
 
 .endif
 .endif
 .endif
 
 #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :)
 PKG_DEPENDS=
 .undef INSTALLS_DEPENDS
 PKG_BIN=	${WRKSRC}/src/pkg-static
 
 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/distinfo
===================================================================
--- head/ports-mgmt/pkg/distinfo	(revision 458301)
+++ head/ports-mgmt/pkg/distinfo	(revision 458302)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512423062
-SHA256 (pkg-1.10.3.tar.xz) = a5db61522eccc91538b0ac19da56ddbe8eaf8c3bd94868a1753c37c8bade7715
-SIZE (pkg-1.10.3.tar.xz) = 2188196
+TIMESTAMP = 1515282421
+SHA256 (pkg-1.10.4.tar.xz) = 10f767ba6b2e257fef6f1553f74b8602b6fba9de382ee8f2bb6966bcc03696fa
+SIZE (pkg-1.10.4.tar.xz) = 2184588
Index: head/ports-mgmt/pkg/files/patch-src_version.c
===================================================================
--- head/ports-mgmt/pkg/files/patch-src_version.c	(revision 458301)
+++ head/ports-mgmt/pkg/files/patch-src_version.c	(nonexistent)
@@ -1,28 +0,0 @@
-diff --git src/version.c src/version.c
-index d265776b..92c18060 100644
---- src/version.c
-+++ src/version.c
-@@ -601,6 +601,8 @@ exec_buf(UT_string *res, char **argv) {
- 		if (errno != EINTR)
- 			return (-1);
- 	}
-+	if (WEXITSTATUS(pstat) != 0)
-+		return (-1);
- 
- 	return (utstring_len(res));
- }
-@@ -716,11 +718,13 @@ port_version(UT_string *cmd, const char *portsdir, const char *origin,
- 		argv[3] = "flavors-package-names";
- 		argv[4] = NULL;
- 
--		if (exec_buf(cmd, argv) != 0) {
-+		if (exec_buf(cmd, argv) > 0) {
- 			output = utstring_body(cmd);
- 			while ((walk = strsep(&output, "\n")) != NULL) {
- 				name = walk;
- 				walk = strrchr(walk, '-');
-+				if (walk == NULL)
-+					continue;
- 				walk[0] = '\0';
- 				walk++;
- 				if (strcmp(name, pkgname) == 0) {

Property changes on: head/ports-mgmt/pkg/files/patch-src_version.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property