Date: Sat, 12 Sep 2020 01:47:59 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365649 - in stable/12: libexec libexec/phttpget share/mk tools/build/mk usr.sbin/portsnap usr.sbin/portsnap/phttpget Message-ID: <202009120147.08C1lxGg015891@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Sat Sep 12 01:47:59 2020 New Revision: 365649 URL: https://svnweb.freebsd.org/changeset/base/365649 Log: MFC r365490-r365491: Remove FREEBSD_UPDATE dependency on PORTSNAP r365490: phttpget: move out of portsnap Currently, WITHOUT_PORTSNAP forces WITHOUT_FREEBSD_UPDATE because the latter relies on phttpget, which lives inside the portsnap build bits. Remove the dependency between these two options by moving phttpget out into ^/libexec and building/installing it if either WITH_PORTSNAP or WITH_FREEBSD_UPDATE. Future work could remove the conditional if it's decided that users will use it independently of either the current in-base consumers. r365491: opts: FREEBSD_UPDATE no longer relies on PORTSNAP phttpget is no longer tied to the portsnap build as of r365490. Added: stable/12/libexec/phttpget/ - copied from r365491, head/libexec/phttpget/ Deleted: stable/12/usr.sbin/portsnap/phttpget/ Modified: stable/12/libexec/Makefile stable/12/share/mk/src.opts.mk stable/12/tools/build/mk/OptionalObsoleteFiles.inc stable/12/usr.sbin/portsnap/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/libexec/Makefile ============================================================================== --- stable/12/libexec/Makefile Sat Sep 12 00:33:11 2020 (r365648) +++ stable/12/libexec/Makefile Sat Sep 12 01:47:59 2020 (r365649) @@ -13,6 +13,7 @@ SUBDIR= ${_atf} \ ${_mail.local} \ ${_makewhatis.local} \ ${_mknetid} \ + ${_phttpget} \ ${_pppoed} \ rc \ revnetgroup \ @@ -46,6 +47,10 @@ SUBDIR+= bootpd .if ${MK_FINGER} != "no" SUBDIR+= fingerd +.endif + +.if ${MK_FREEBSD_UPDATE} != "no" || ${MK_PORTSNAP} != "no" +_phttpget= phttpget .endif .if ${MK_FTP} != "no" Modified: stable/12/share/mk/src.opts.mk ============================================================================== --- stable/12/share/mk/src.opts.mk Sat Sep 12 00:33:11 2020 (r365648) +++ stable/12/share/mk/src.opts.mk Sat Sep 12 01:47:59 2020 (r365649) @@ -527,11 +527,6 @@ MK_AUTHPF:= no MK_OFED_EXTRA:= no .endif -.if ${MK_PORTSNAP} == "no" -# freebsd-update depends on phttpget from portsnap -MK_FREEBSD_UPDATE:= no -.endif - .if ${MK_TESTS} == "no" MK_DTRACE_TESTS:= no .endif Modified: stable/12/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/12/tools/build/mk/OptionalObsoleteFiles.inc Sat Sep 12 00:33:11 2020 (r365648) +++ stable/12/tools/build/mk/OptionalObsoleteFiles.inc Sat Sep 12 01:47:59 2020 (r365649) @@ -2851,6 +2851,11 @@ 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 +OLD_FILES+=usr/libexec/phttpget +OLD_FILES+=usr/share/man/man8/phttpget.8.gz +.endif + .if ${MK_GAMES} == no OLD_FILES+=usr/bin/caesar OLD_FILES+=usr/bin/factor @@ -7870,10 +7875,8 @@ OLD_FILES+=usr/share/man/man8/pmcstudy.8.gz .if ${MK_PORTSNAP} == no OLD_FILES+=etc/portsnap.conf OLD_FILES+=usr/libexec/make_index -OLD_FILES+=usr/libexec/phttpget OLD_FILES+=usr/sbin/portsnap OLD_FILES+=usr/share/examples/etc/portsnap.conf -OLD_FILES+=usr/share/man/man8/phttpget.8.gz OLD_FILES+=usr/share/man/man8/portsnap.8.gz .endif Modified: stable/12/usr.sbin/portsnap/Makefile ============================================================================== --- stable/12/usr.sbin/portsnap/Makefile Sat Sep 12 00:33:11 2020 (r365648) +++ stable/12/usr.sbin/portsnap/Makefile Sat Sep 12 01:47:59 2020 (r365649) @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= portsnap make_index phttpget +SUBDIR= portsnap make_index .include <bsd.subdir.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009120147.08C1lxGg015891>