Author: kevans Date: Wed Sep 9 00:39:47 2020 New Revision: 365490 URL: https://svnweb.freebsd.org/changeset/base/365490
Log: 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. Reported by: swills Reviewed by: jilles, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D26255 Added: head/libexec/phttpget/ - copied from r365489, head/usr.sbin/portsnap/phttpget/ Deleted: head/usr.sbin/portsnap/phttpget/ Modified: head/libexec/Makefile head/libexec/phttpget/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc head/usr.sbin/portsnap/Makefile Modified: head/libexec/Makefile ============================================================================== --- head/libexec/Makefile Wed Sep 9 00:06:35 2020 (r365489) +++ head/libexec/Makefile Wed Sep 9 00:39:47 2020 (r365490) @@ -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: head/libexec/phttpget/Makefile ============================================================================== --- head/usr.sbin/portsnap/phttpget/Makefile Wed Sep 9 00:06:35 2020 (r365489) +++ head/libexec/phttpget/Makefile Wed Sep 9 00:39:47 2020 (r365490) @@ -3,6 +3,4 @@ PROG= phttpget MAN= phttpget.8 -BINDIR= ${LIBEXECDIR} - .include <bsd.prog.mk> Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Wed Sep 9 00:06:35 2020 (r365489) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Wed Sep 9 00:39:47 2020 (r365490) @@ -2043,6 +2043,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 @@ -7330,10 +7335,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: head/usr.sbin/portsnap/Makefile ============================================================================== --- head/usr.sbin/portsnap/Makefile Wed Sep 9 00:06:35 2020 (r365489) +++ head/usr.sbin/portsnap/Makefile Wed Sep 9 00:39:47 2020 (r365490) @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= portsnap make_index phttpget +SUBDIR= portsnap make_index .include <bsd.subdir.mk> _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
