Page MenuHomeFreeBSD
Files F108340302

D45023.id137867.diff
No OneTemporary
Actions

D45023.id137867.diff
View Options

diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -53,8 +53,6 @@
..
ports
..
- portsnap
- ..
zfsd tags=package=zfs
cases
..
diff --git a/libexec/phttpget/phttpget.8 b/libexec/phttpget/phttpget.8
--- a/libexec/phttpget/phttpget.8
+++ b/libexec/phttpget/phttpget.8
@@ -49,9 +49,7 @@
.Pp
The
.Xr freebsd-update 8
-and
-.Xr portsnap 8
-tools use
+tool uses
.Nm
to download binary patch files.
.Sh ENVIRONMENT
@@ -69,17 +67,16 @@
.El
.Sh SEE ALSO
.Xr fetch 1 ,
-.Xr freebsd-update 8 ,
-.Xr portsnap 8
+.Xr freebsd-update 8
.Sh AUTHORS
.An -nosplit
The
.Nm
utility was written by
.An Colin Percival Aq Mt cperciva@FreeBSD.org
-for use with
+initially for use with
.Xr portsnap 8
-and later with
+(now removed) and has been used by
.Xr freebsd-update 8 .
This manual page was written by
.An Xin LI Aq Mt delphij@FreeBSD.org .
diff --git a/tools/regression/iscsi/initiator-instructions.txt b/tools/regression/iscsi/initiator-instructions.txt
--- a/tools/regression/iscsi/initiator-instructions.txt
+++ b/tools/regression/iscsi/initiator-instructions.txt
@@ -3,9 +3,9 @@
1. Install operating systems.
- - FreeBSD: Use default settings for everything. Don't install
- ports from the system installer, use "portsnap fetch extract"
- after installation instead.
+ - FreeBSD: Use default settings for everything. Don't install ports
+ from the system installer, fetch a new ports tree after
+ installation instead.
- Fedora: Change the environment to "Minimal install".
diff --git a/usr.bin/locate/locate/locate.rc b/usr.bin/locate/locate/locate.rc
--- a/usr.bin/locate/locate/locate.rc
+++ b/usr.bin/locate/locate/locate.rc
@@ -15,7 +15,7 @@
#SEARCHPATHS="/"
# paths unwanted in output
-#PRUNEPATHS="/tmp /usr/tmp /var/tmp /var/db/portsnap /var/db/freebsd-update"
+#PRUNEPATHS="/tmp /usr/tmp /var/tmp /var/db/freebsd-update"
# directories unwanted in output
#PRUNEDIRS=".zfs"
diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh
--- a/usr.bin/locate/locate/updatedb.sh
+++ b/usr.bin/locate/locate/updatedb.sh
@@ -52,7 +52,7 @@
: ${mklocatedb:=locate.mklocatedb} # make locate database program
: ${FCODES:=/var/db/locate.database} # the database
: ${SEARCHPATHS="/"} # directories to be put in the database
-: ${PRUNEPATHS="/tmp /usr/tmp /var/tmp /var/db/portsnap /var/db/freebsd-update"} # unwanted directories
+: ${PRUNEPATHS="/tmp /usr/tmp /var/tmp /var/db/freebsd-update"} # unwanted directories
: ${PRUNEDIRS=".zfs"} # unwanted directories, in any parent
: ${FILESYSTEMS="$(lsvfs | tail -n +3 | \
egrep -vw "loopback|network|synthetic|read-only|0" | \
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@@ -1105,10 +1105,10 @@
# a useful answer, use the server name specified by the user.
# Put another way... look up _http._tcp.${SERVERNAME} and pick a server
# from that; or if no servers are returned, use ${SERVERNAME}.
-# This allows a user to specify "portsnap.freebsd.org" (in which case
-# portsnap will select one of the mirrors) or "portsnap5.tld.freebsd.org"
-# (in which case portsnap will use that particular server, since there
-# won't be an SRV entry for that name).
+# This allows a user to specify "update.FreeBSD.org" (in which case
+# freebsd-update will select one of the mirrors) or "update1.freebsd.org"
+# (in which case freebsd-update will use that particular server, since
+# there won't be an SRV entry for that name).
#
# We ignore the Port field, since we are always going to use port 80.

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 25, 12:25 AM (6 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16105505
Default Alt Text
D45023.id137867.diff (3 KB)

Event Timeline