diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2020-09-09 00:39:47 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2020-09-09 00:39:47 +0000 |
| commit | 6703731d6e6a14771b76002087f4d84d8f66e82a (patch) | |
| tree | 5f297ec6378479069c021a8e5989797467ea8863 | |
| parent | d9052fccdf6533dcd6723739e44cd3bad5cc480b (diff) | |
Notes
| -rw-r--r-- | libexec/Makefile | 5 | ||||
| -rw-r--r-- | libexec/phttpget/Makefile (renamed from usr.sbin/portsnap/phttpget/Makefile) | 2 | ||||
| -rw-r--r-- | libexec/phttpget/Makefile.depend (renamed from usr.sbin/portsnap/phttpget/Makefile.depend) | 0 | ||||
| -rw-r--r-- | libexec/phttpget/phttpget.8 (renamed from usr.sbin/portsnap/phttpget/phttpget.8) | 0 | ||||
| -rw-r--r-- | libexec/phttpget/phttpget.c (renamed from usr.sbin/portsnap/phttpget/phttpget.c) | 0 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 7 | ||||
| -rw-r--r-- | usr.sbin/portsnap/Makefile | 2 |
7 files changed, 11 insertions, 5 deletions
diff --git a/libexec/Makefile b/libexec/Makefile index 9c9ffd4ec1fc..1b41ae81565c 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -13,6 +13,7 @@ SUBDIR= ${_atf} \ ${_mail.local} \ ${_makewhatis.local} \ ${_mknetid} \ + ${_phttpget} \ ${_pppoed} \ rc \ revnetgroup \ @@ -48,6 +49,10 @@ SUBDIR+= bootpd SUBDIR+= fingerd .endif +.if ${MK_FREEBSD_UPDATE} != "no" || ${MK_PORTSNAP} != "no" +_phttpget= phttpget +.endif + .if ${MK_FTP} != "no" SUBDIR+= ftpd .endif diff --git a/usr.sbin/portsnap/phttpget/Makefile b/libexec/phttpget/Makefile index 51c5b994fcac..c16bdea71ec7 100644 --- a/usr.sbin/portsnap/phttpget/Makefile +++ b/libexec/phttpget/Makefile @@ -3,6 +3,4 @@ PROG= phttpget MAN= phttpget.8 -BINDIR= ${LIBEXECDIR} - .include <bsd.prog.mk> diff --git a/usr.sbin/portsnap/phttpget/Makefile.depend b/libexec/phttpget/Makefile.depend index 6cfaab1c3644..6cfaab1c3644 100644 --- a/usr.sbin/portsnap/phttpget/Makefile.depend +++ b/libexec/phttpget/Makefile.depend diff --git a/usr.sbin/portsnap/phttpget/phttpget.8 b/libexec/phttpget/phttpget.8 index e012c394fedc..e012c394fedc 100644 --- a/usr.sbin/portsnap/phttpget/phttpget.8 +++ b/libexec/phttpget/phttpget.8 diff --git a/usr.sbin/portsnap/phttpget/phttpget.c b/libexec/phttpget/phttpget.c index 17935b122535..17935b122535 100644 --- a/usr.sbin/portsnap/phttpget/phttpget.c +++ b/libexec/phttpget/phttpget.c diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 00d0dece967e..7d759aa2fac7 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -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 diff --git a/usr.sbin/portsnap/Makefile b/usr.sbin/portsnap/Makefile index 0f77bcb04872..169befd6e726 100644 --- a/usr.sbin/portsnap/Makefile +++ b/usr.sbin/portsnap/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= portsnap make_index phttpget +SUBDIR= portsnap make_index .include <bsd.subdir.mk> |