svn commit: r395633 - head/ports-mgmt/pkg-devel

[Baptiste Daroussin]

Author: bapt
Date: Sun Aug 30 18:23:02 2015
New Revision: 395633
URL: https://svnweb.freebsd.org/changeset/ports/395633

Log:
  Update to 1.5.99.11
  Changes:
  - Fix 3 way merge
  - Properly apply credentials on merged files (@config)

Modified:
  head/ports-mgmt/pkg-devel/Makefile
  head/ports-mgmt/pkg-devel/distinfo

Modified: head/ports-mgmt/pkg-devel/Makefile
==============================================================================
--- head/ports-mgmt/pkg-devel/Makefile	Sun Aug 30 18:01:10 2015	(r395632)
+++ head/ports-mgmt/pkg-devel/Makefile	Sun Aug 30 18:23:02 2015	(r395633)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
-DISTVERSION=	1.5.99.10
+DISTVERSION=	1.5.99.11
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	\

Modified: head/ports-mgmt/pkg-devel/distinfo
==============================================================================
--- head/ports-mgmt/pkg-devel/distinfo	Sun Aug 30 18:01:10 2015	(r395632)
+++ head/ports-mgmt/pkg-devel/distinfo	Sun Aug 30 18:23:02 2015	(r395633)
@@ -1,2 +1,2 @@
-SHA256 (pkg-1.5.99.10.tar.xz) = dcec7917ae54122c0b8afea84aeb607e17eaca67c6357b6ab6beaf8643754bdf
-SIZE (pkg-1.5.99.10.tar.xz) = 1930384
+SHA256 (pkg-1.5.99.11.tar.xz) = 28019d5a5d25356900d6990a7258965a04c6f851f66ca5468a573585e2675724
+SIZE (pkg-1.5.99.11.tar.xz) = 1925948