Index: stable/12/usr.sbin/pkg/FreeBSD.conf
===================================================================
--- stable/12/usr.sbin/pkg/FreeBSD.conf	(revision 346779)
+++ stable/12/usr.sbin/pkg/FreeBSD.conf	(nonexistent)
@@ -1,16 +0,0 @@
-# $FreeBSD$
-#
-# To disable this repository, instead of modifying or removing this file,
-# create a /usr/local/etc/pkg/repos/FreeBSD.conf file:
-#
-#   mkdir -p /usr/local/etc/pkg/repos
-#   echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf
-#
-
-FreeBSD: {
-  url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest",
-  mirror_type: "srv",
-  signature_type: "fingerprints",
-  fingerprints: "/usr/share/keys/pkg",
-  enabled: yes
-}

Property changes on: stable/12/usr.sbin/pkg/FreeBSD.conf
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: stable/12/usr.sbin/pkg/FreeBSD.conf.latest
===================================================================
--- stable/12/usr.sbin/pkg/FreeBSD.conf.latest	(nonexistent)
+++ stable/12/usr.sbin/pkg/FreeBSD.conf.latest	(revision 346780)
@@ -0,0 +1,16 @@
+# $FreeBSD$
+#
+# To disable this repository, instead of modifying or removing this file,
+# create a /usr/local/etc/pkg/repos/FreeBSD.conf file:
+#
+#   mkdir -p /usr/local/etc/pkg/repos
+#   echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf
+#
+
+FreeBSD: {
+  url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest",
+  mirror_type: "srv",
+  signature_type: "fingerprints",
+  fingerprints: "/usr/share/keys/pkg",
+  enabled: yes
+}

Property changes on: stable/12/usr.sbin/pkg/FreeBSD.conf.latest
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: stable/12/usr.sbin/pkg/FreeBSD.conf.quarterly
===================================================================
--- stable/12/usr.sbin/pkg/FreeBSD.conf.quarterly	(nonexistent)
+++ stable/12/usr.sbin/pkg/FreeBSD.conf.quarterly	(revision 346780)
@@ -0,0 +1,16 @@
+# $FreeBSD$
+#
+# To disable this repository, instead of modifying or removing this file,
+# create a /usr/local/etc/pkg/repos/FreeBSD.conf file:
+#
+#   mkdir -p /usr/local/etc/pkg/repos
+#   echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf
+#
+
+FreeBSD: {
+  url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly",
+  mirror_type: "srv",
+  signature_type: "fingerprints",
+  fingerprints: "/usr/share/keys/pkg",
+  enabled: yes
+}

Property changes on: stable/12/usr.sbin/pkg/FreeBSD.conf.quarterly
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: stable/12/usr.sbin/pkg/Makefile
===================================================================
--- stable/12/usr.sbin/pkg/Makefile	(revision 346779)
+++ stable/12/usr.sbin/pkg/Makefile	(revision 346780)
@@ -1,14 +1,16 @@
 # $FreeBSD$
 
-CONFS=	FreeBSD.conf
+PKGCONFBRANCH?=	latest
+CONFS=		FreeBSD.conf.${PKGCONFBRANCH}
+CONFSNAME=	FreeBSD.conf
 CONFSDIR=	/etc/pkg
 CONFSMODE=	644
 PROG=	pkg
 SRCS=	pkg.c dns_utils.c config.c
 MAN=	pkg.7
 
 CFLAGS+=-I${SRCTOP}/contrib/libucl/include
 .PATH:	${SRCTOP}/contrib/libucl/include
 LIBADD=	archive fetch ucl sbuf crypto ssl
 
 .include <bsd.prog.mk>
Index: stable/12
===================================================================
--- stable/12	(revision 346779)
+++ stable/12	(revision 346780)

Property changes on: stable/12
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r346628