Index: head/ports-mgmt/pkg/Makefile
===================================================================
--- head/ports-mgmt/pkg/Makefile	(revision 363075)
+++ head/ports-mgmt/pkg/Makefile	(revision 363076)
@@ -1,90 +1,91 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
+PORTREVISION=	1
 DISTVERSION=	1.3.1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	\
 		http://files.etoilebsd.net/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
 		LOCAL/portmgr
 
 MAINTAINER=	portmgr@FreeBSD.org
 COMMENT=	Package manager
 
 LICENSE=	BSD2CLAUSE
 
 USES=		tar:xz uidfix
 
 # Disable CCACHE support because of the chicken/egg problem pkg should always
 # With no dependency at all
 NO_CCACHE=	yes
 USE_LDCONFIG=	yes
 USES=		libtool tar:xz
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 # Use a submake as 'deinstall install' needs to reevaluate PKG_CMD
 # 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_DEBUG) && !defined(WITHOUT_DEBUG)
 MAKE_ARGS+=	DEBUG_FLAGS="${DEBUG_FLAGS}"
 .endif
 
 .if defined(WITH_PKGNG)
 .if ${WITH_PKGNG} == devel
 NO_LATEST_LINK=	yes
 IGNORE=	WITH_PKGNG 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
 
 pre-everything::
 	@${ECHO_CMD} "You are about to convert your system to pkgng while you have ports/packages"; \
 	 ${ECHO_CMD} "installed with the old pkg_install tools."; \
 	 ${ECHO_CMD} ""; \
 	 ${ECHO_CMD} "You can choose to: "; \
 	 ${ECHO_CMD} "- keep pkg_install as the package management system by adding this line to /etc/make.conf:"; \
 	 ${ECHO_CMD} ""; \
 	 ${ECHO_CMD} "    WITHOUT_PKGNG=yes" ; \
 	 ${ECHO_CMD} ""; \
 	 ${ECHO_CMD} "- switch to pkgng:"; \
 	 ${ECHO_CMD} "    1) Add WITHOUT_PKGNG to /etc/make.conf"; \
 	 ${ECHO_CMD} "    2) Install ports-mgmt/pkg"; \
 	 ${ECHO_CMD} "    3) Convert your package database by running pkg2ng"; \
 	 ${ECHO_CMD} "    4) Remove WITHOUT_PKGNG from /etc/make.conf"; \
 	 ${ECHO_CMD} ""; \
 	exit 1
 
 .endif
 .endif
 .endif
 
 #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :)
 .if defined(WITH_PKGNG)
 PKG_DEPENDS=
 .undef INSTALLS_DEPENDS
 .if !exists(${LOCALBASE}/sbin/pkg)
 PKG_BIN=	${WRKSRC}/src/pkg-static
 .endif
 .endif
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/lib/libpkg_static.a \
 		${STAGEDIR}${PREFIX}/lib/libpkg.a
 
 .include <bsd.port.post.mk>
Index: head/ports-mgmt/pkg/files/patch-3f56689
===================================================================
--- head/ports-mgmt/pkg/files/patch-3f56689	(nonexistent)
+++ head/ports-mgmt/pkg/files/patch-3f56689	(revision 363076)
@@ -0,0 +1,68 @@
+From 3f56689bff57e3db52ec8fd5c5f730a2aec64d3d Mon Sep 17 00:00:00 2001
+From: Baptiste Daroussin <bapt@FreeBSD.org>
+Date: Sun, 27 Jul 2014 16:12:07 +0200
+Subject: [PATCH] Fix reading pkg.conf
+
+---
+ libpkg/pkg_config.c | 38 +++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 37 insertions(+), 1 deletion(-)
+
+diff --git a/libpkg/pkg_config.c b/libpkg/pkg_config.c
+index 3ba3d0e..692c4dc 100644
+--- libpkg/pkg_config.c
++++ libpkg/pkg_config.c
+@@ -673,6 +673,42 @@ pkg_compiled_for_same_os_major(void)
+ #endif
+ }
+ 
++static ucl_object_t *
++ucl_dup(const ucl_object_t *from)
++{
++	ucl_object_t *ret;
++	const ucl_object_t *cur;
++	ucl_object_iter_t it;
++	const char *key;
++
++	switch (from->type) {
++	case UCL_BOOLEAN:
++		ret = ucl_object_frombool(ucl_object_toboolean(from));
++		break;
++	case UCL_INT:
++		ret = ucl_object_fromint(ucl_object_toint(from));
++		break;
++	case UCL_STRING:
++		ret = ucl_object_fromstring(ucl_object_tostring(from));
++		break;
++	case UCL_ARRAY:
++		ret = ucl_object_typed_new(from->type);
++		it = NULL;
++		while ((cur = ucl_iterate_object(from, &it, true)))
++			ucl_array_append(ret, ucl_object_ref(cur));
++		break;
++	case UCL_OBJECT:
++		ret = ucl_object_typed_new(from->type);
++		it = NULL;
++		while ((cur = ucl_iterate_object(from, &it, true))) {
++			key = ucl_object_key(cur);
++			ucl_object_insert_key(ret, ucl_object_ref(cur), key, strlen(key), true);
++		}
++		break;
++	}
++
++	return (ret);
++}
+ 
+ int
+ pkg_init(const char *path, const char *reposdir)
+@@ -802,7 +838,7 @@ pkg_init(const char *path, const char *reposdir)
+ 
+ 		if (ncfg == NULL)
+ 			ncfg = ucl_object_typed_new(UCL_OBJECT);
+-		ucl_object_insert_key(ncfg, ucl_object_copy(cur), sbuf_data(ukey), sbuf_len(ukey), true);
++		ucl_object_insert_key(ncfg, ucl_dup(cur), sbuf_data(ukey), sbuf_len(ukey), true);
+ 	}
+ 
+ 	if (ncfg != NULL) {
+-- 
+1.9.3
+

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