Page MenuHomeFreeBSD
Files F163500576

D56769.diff
No OneTemporary
Actions

D56769.diff
View Options

diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly-beta1 b/usr.sbin/pkg/FreeBSD.conf.quarterly-beta1
new file mode 100644
--- /dev/null
+++ b/usr.sbin/pkg/FreeBSD.conf.quarterly-beta1
@@ -0,0 +1,32 @@
+#
+# To disable a repository, instead of modifying or removing this file,
+# create or edit /usr/local/etc/pkg/repos/FreeBSD.conf, e.g.:
+#
+# mkdir -p /usr/local/etc/pkg/repos
+# echo "FreeBSD-ports: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
+# echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
+#
+# Note that the FreeBSD-base repository is disabled by default.
+#
+
+FreeBSD-ports: {
+ url: "pkg+https://pkg.FreeBSD.org/${ABI}/quarterly",
+ mirror_type: "srv",
+ signature_type: "fingerprints",
+ fingerprints: "/usr/share/keys/pkg",
+ enabled: yes
+}
+FreeBSD-ports-kmods: {
+ url: "pkg+https://pkg.FreeBSD.org/${ABI}/kmods_quarterly",
+ mirror_type: "srv",
+ signature_type: "fingerprints",
+ fingerprints: "/usr/share/keys/pkg",
+ enabled: yes
+}
+FreeBSD-base: {
+ url: "pkg+https://pkg.FreeBSD.org/${ABI}/base_release_${VERSION_MINOR}",
+ mirror_type: "srv",
+ signature_type: "fingerprints",
+ fingerprints: "/usr/share/keys/pkgbase-${VERSION_MAJOR}",
+ enabled: no
+}
diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile
--- a/usr.sbin/pkg/Makefile
+++ b/usr.sbin/pkg/Makefile
@@ -6,13 +6,16 @@
.if ${BRANCH:MCURRENT} != ""
PKGCONFBRANCH?= latest
.else
-. if ${BRANCH:MBETA*} || ${BRANCH:MRC*} || ${BRANCH:MRELEASE*}
+. if ${BRANCH:MBETA1}
+PKGCONFBRANCH?= quarterly-release-beta1
+. if ${BRANCH:MBETA*} || ${BRANCH:MRC*} || ${BRANCH:MRELEASE*}
PKGCONFBRANCH?= quarterly-release
-. else
-. if ${MACHINE} != "amd64" && ${MACHINE} != "i386" && ${MACHINE} != "arm64"
-PKGCONFBRANCH?= quarterly
. else
+. if ${MACHINE} != "amd64" && ${MACHINE} != "i386" && ${MACHINE} != "arm64"
+PKGCONFBRANCH?= quarterly
+. else
PKGCONFBRANCH?= latest
+. endif
. endif
. endif
.endif

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 24, 8:48 PM (2 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35436362
Default Alt Text
D56769.diff (1 KB)

Event Timeline