From owner-svn-src-head@freebsd.org Wed Sep 9 00:39:48 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 94B803DE43C; Wed, 9 Sep 2020 00:39:48 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BmNT02wzPz4jdc; Wed, 9 Sep 2020 00:39:48 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 47CD619513; Wed, 9 Sep 2020 00:39:48 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0890dmuA008211; Wed, 9 Sep 2020 00:39:48 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0890dllX008207; Wed, 9 Sep 2020 00:39:47 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202009090039.0890dllX008207@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 9 Sep 2020 00:39:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365490 - in head: libexec libexec/phttpget tools/build/mk usr.sbin/portsnap usr.sbin/portsnap/phttpget X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head: libexec libexec/phttpget tools/build/mk usr.sbin/portsnap usr.sbin/portsnap/phttpget X-SVN-Commit-Revision: 365490 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2020 00:39:48 -0000 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 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