Index: libexec/Makefile =================================================================== --- libexec/Makefile +++ libexec/Makefile @@ -13,6 +13,7 @@ ${_mail.local} \ ${_makewhatis.local} \ ${_mknetid} \ + ${_phttpget} \ ${_pppoed} \ rc \ revnetgroup \ @@ -48,6 +49,10 @@ SUBDIR+= fingerd .endif +.if ${MK_FREEBSD_UPDATE} != "no" || ${MK_PORTSNAP} != "no" +_phttpget= phttpget +.endif + .if ${MK_FTP} != "no" SUBDIR+= ftpd .endif Index: libexec/phttpget/Makefile =================================================================== --- libexec/phttpget/Makefile +++ libexec/phttpget/Makefile @@ -3,6 +3,4 @@ PROG= phttpget MAN= phttpget.8 -BINDIR= ${LIBEXECDIR} - .include Index: share/mk/src.opts.mk =================================================================== --- share/mk/src.opts.mk +++ share/mk/src.opts.mk @@ -460,11 +460,6 @@ 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 Index: usr.sbin/portsnap/Makefile =================================================================== --- usr.sbin/portsnap/Makefile +++ usr.sbin/portsnap/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= portsnap make_index phttpget +SUBDIR= portsnap make_index .include