From owner-svn-src-all@freebsd.org Tue Jul 31 16:42:05 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A299105E933; Tue, 31 Jul 2018 16:42:05 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0031971BBC; Tue, 31 Jul 2018 16:42:05 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BDD91163D1; Tue, 31 Jul 2018 16:42:04 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6VGg4ve097947; Tue, 31 Jul 2018 16:42:04 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6VGg4jR097943; Tue, 31 Jul 2018 16:42:04 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201807311642.w6VGg4jR097943@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Tue, 31 Jul 2018 16:42:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336978 - in head: etc etc/pkg usr.sbin/pkg X-SVN-Group: head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: in head: etc etc/pkg usr.sbin/pkg X-SVN-Commit-Revision: 336978 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jul 2018 16:42:05 -0000 Author: brd Date: Tue Jul 31 16:42:03 2018 New Revision: 336978 URL: https://svnweb.freebsd.org/changeset/base/336978 Log: Move pkg/FreeBSD.conf to usr.sbin/pkg/ Approved by: bapt (mentor) Differential Revision: https://reviews.freebsd.org/D16491 Added: head/usr.sbin/pkg/FreeBSD.conf - copied unchanged from r336977, head/etc/pkg/FreeBSD.conf Deleted: head/etc/pkg/ Modified: head/etc/Makefile head/usr.sbin/pkg/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Tue Jul 31 16:39:38 2018 (r336977) +++ head/etc/Makefile Tue Jul 31 16:42:03 2018 (r336978) @@ -214,9 +214,6 @@ distribution: ${_+_}cd ${.CURDIR}/ntp; ${MAKE} install .endif ${_+_}cd ${.CURDIR}/periodic; ${MAKE} install -.if ${MK_PKGBOOTSTRAP} != "no" - ${_+_}cd ${.CURDIR}/pkg; ${MAKE} install -.endif ${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap ${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install ${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt Copied: head/usr.sbin/pkg/FreeBSD.conf (from r336977, head/etc/pkg/FreeBSD.conf) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/pkg/FreeBSD.conf Tue Jul 31 16:42:03 2018 (r336978, copy of r336977, head/etc/pkg/FreeBSD.conf) @@ -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 +} Modified: head/usr.sbin/pkg/Makefile ============================================================================== --- head/usr.sbin/pkg/Makefile Tue Jul 31 16:39:38 2018 (r336977) +++ head/usr.sbin/pkg/Makefile Tue Jul 31 16:42:03 2018 (r336978) @@ -1,5 +1,8 @@ # $FreeBSD$ +CONFS= FreeBSD.conf +CONFSDIR= /etc/pkg +CONFSMODE= 644 PROG= pkg SRCS= pkg.c dns_utils.c config.c MAN= pkg.7