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 _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
