Remove portsnap(8)

Rather than having a tool in the FreeBSD base system for obtaining
the FreeBSD ports tree, users are encouraged to `pkg install git`
and then `git clone https://git.FreeBSD.org/ports.git /usr/ports`.

The portsnap servers will continue operating until FreeBSD 13 reaches
its End-of-Life, and portsnap is available from the ports tree as
ports-mgmt/portsnap.

Requested by:	portmgr
Relnotes:	yes
Differential Revision:	https://reviews.freebsd.org/D39563
X-MFC:		no

ObsoleteFiles.inc

@@ -52,6 +52,13 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20230420: portsnap.8 removed
+OLD_FILES+=etc/portsnap.conf
+OLD_FILES+=usr/libexec/make_index
+OLD_FILES+=usr/sbin/portsnap
+OLD_FILES+=usr/share/examples/etc/portsnap.conf
+OLD_FILES+=usr/share/man/man8/portsnap.8.gz
+
 # 20230331: libpcap updated to 1.10.3
 OLD_FILES+=usr/include/fmtutils.h
 

UPDATING

@@ -27,6 +27,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW:
 	world, or to merely disable the most expensive debugging functionality
 	at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20230422:
+	Remove portsnap(8).  Users are encouraged to obtain the ports tree
+	using git instead.
+
 20230420:
 	Add jobs.mk to save typing. Enables -j${JOB_MAX} and logging
 	eg.

libexec/Makefile

@@ -49,7 +49,7 @@ SUBDIR+=	bootpd
 SUBDIR+=	fingerd
 .endif
 
-.if ${MK_FREEBSD_UPDATE} != "no" || ${MK_PORTSNAP} != "no"
+.if ${MK_FREEBSD_UPDATE} != "no"
 _phttpget=	phttpget
 .endif
 

share/examples/etc/README.examples

@@ -44,12 +44,11 @@ nsmb.conf	- smbfs lookups configuration file
 pf.conf		- pf(4) example configuration file
 pf.os		- SYN fingerprint database
 phones		- phone number database for tip(1)
-portsnap.conf	- portsnap(8) configuration file
 printcap	- configuration file for lpr(1)
 profile		- system-wide .profile for sh(1)
 protocols	- see protocols(5)
 rc		- system startup script (see init(8))
-rc.bsdextended	- startup policy for the mac_bsdextended(4) security module. 
+rc.bsdextended	- startup policy for the mac_bsdextended(4) security module.
 rc.firewall	- ipfw(8) setup script with basic rulesets
 rc.initdiskless	- configuration file to boot a diskless machine
 rc.resume	- sample run command file for APM Resume Event
@@ -65,7 +64,7 @@ snmpd.config	- example configuration file for bsnmpd(1)
 sysctl.conf	- configuration file for sysctl(8)
 syslog.conf	- configuration file for syslogd(8)
 ttys		- defines port configuration for init(8)
-defaults/bluetooth.device.conf	- 
+defaults/bluetooth.device.conf	-
 defaults/devfs.rules		- default configuration rules for devfs(8)
 defaults/periodic.conf		- default configuration file for periodic(8)
 defaults/rc.conf		- default system configuration info (see rc.conf(5))

share/man/man5/Makefile

@@ -53,7 +53,6 @@ MAN=	acct.5 \
 	periodic.conf.5 \
 	phones.5 \
 	portindex.5 \
-	portsnap.conf.5 \
 	procfs.5 \
 	protocols.5 \
 	quota.user.5 \
@@ -103,7 +102,7 @@ MAN+=	freebsd-update.conf.5
 .endif
 
 .if ${MK_HESIOD} != "no"
-MAN+=	hesiod.conf.5 
+MAN+=	hesiod.conf.5
 .endif
 
 .if ${MK_PF} != "no"

share/man/man5/src.conf.5

@@ -1437,10 +1437,6 @@ bootstrap tool.
 Do not build
 .Xr pmccontrol 8
 and related programs.
-.It Va WITHOUT_PORTSNAP
-Do not build or install
-.Xr portsnap 8
-and related files.
 .It Va WITHOUT_PPP
 Do not build
 .Xr ppp 8

share/mk/src.opts.mk

@@ -155,7 +155,6 @@ __DEFAULT_YES_OPTIONS = \
     PF \
     PKGBOOTSTRAP \
     PMC \
-    PORTSNAP \
     PPP \
     QUOTAS \
     RADIUS_SUPPORT \

targets/pseudo/userland/Makefile.depend

@@ -645,9 +645,6 @@ DIRDEPS+= \
 	usr.sbin/pmccontrol \
 	usr.sbin/pmcstat \
 	usr.sbin/pmcstudy \
-	usr.sbin/portsnap/make_index \
-	usr.sbin/portsnap/phttpget \
-	usr.sbin/portsnap/portsnap \
 	usr.sbin/powerd \
 	usr.sbin/ppp \
 	usr.sbin/pppctl \

tools/build/mk/OptionalObsoleteFiles.inc

@@ -2025,7 +2025,7 @@ OLD_FILES+=usr/share/man/man5/freebsd-update.conf.5.gz
 OLD_FILES+=usr/share/man/man8/freebsd-update.8.gz
 .endif
 
-.if ${MK_FREEBSD_UPDATE} == no && ${MK_PORTSNAP} == no
+.if ${MK_FREEBSD_UPDATE} == no
 OLD_FILES+=usr/libexec/phttpget
 OLD_FILES+=usr/share/man/man8/phttpget.8.gz
 .endif
@@ -6843,14 +6843,6 @@ OLD_FILES+=usr/share/man/man8/pmcstat.8.gz
 OLD_FILES+=usr/share/man/man8/pmcstudy.8.gz
 .endif
 
-.if ${MK_PORTSNAP} == no
-OLD_FILES+=etc/portsnap.conf
-OLD_FILES+=usr/libexec/make_index
-OLD_FILES+=usr/sbin/portsnap
-OLD_FILES+=usr/share/examples/etc/portsnap.conf
-OLD_FILES+=usr/share/man/man8/portsnap.8.gz
-.endif
-
 .if ${MK_PPP} == no
 OLD_FILES+=etc/newsyslog.conf.d/ppp.conf
 OLD_FILES+=etc/ppp/ppp.conf

usr.sbin/Makefile

@@ -187,7 +187,6 @@ SUBDIR.${MK_OPENSSL_KTLS}+=	rpc.tlsservd
 SUBDIR.${MK_PF}+=	ftp-proxy
 SUBDIR.${MK_PKGBOOTSTRAP}+=	pkg
 SUBDIR.${MK_PMC}+=	pmc pmcannotate pmccontrol pmcstat pmcstudy
-SUBDIR.${MK_PORTSNAP}+=	portsnap
 SUBDIR.${MK_PPP}+=	ppp
 SUBDIR.${MK_QUOTAS}+=	edquota
 SUBDIR.${MK_QUOTAS}+=	quotaon