Page MenuHomeFreeBSD
Files F106101233

D16491.id46077.diff
No OneTemporary
Actions

D16491.id46077.diff
View Options

Index: head/etc/Makefile
===================================================================
--- head/etc/Makefile
+++ head/etc/Makefile
@@ -214,9 +214,6 @@
${_+_}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
Index: head/etc/pkg/FreeBSD.conf
===================================================================
--- head/etc/pkg/FreeBSD.conf
+++ head/etc/pkg/FreeBSD.conf
@@ -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
-}
Index: head/etc/pkg/Makefile
===================================================================
--- head/etc/pkg/Makefile
+++ head/etc/pkg/Makefile
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-NO_OBJ=
-
-FILES= FreeBSD.conf
-
-FILESDIR= /etc/pkg
-FILESMODE= 644
-
-.include <bsd.prog.mk>
Index: head/usr.sbin/pkg/FreeBSD.conf
===================================================================
--- head/usr.sbin/pkg/FreeBSD.conf
+++ head/usr.sbin/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
+}
Index: head/usr.sbin/pkg/Makefile
===================================================================
--- head/usr.sbin/pkg/Makefile
+++ head/usr.sbin/pkg/Makefile
@@ -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

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 26, 10:19 AM (11 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15598866
Default Alt Text
D16491.id46077.diff (2 KB)

Event Timeline