Page MenuHomeFreeBSD
Differential D26255

phttpget: move out of portsnap
ClosedPublic
Actions

Authored by kevans on Aug 31 2020, 7:25 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Jul 11, 1:05 PM
Unknown Object (File)
Wed, Jul 9, 3:00 PM
Unknown Object (File)
Wed, Jul 9, 12:00 AM
Unknown Object (File)
Tue, Jul 8, 6:05 PM
Unknown Object (File)
Sat, Jul 5, 4:20 PM
Unknown Object (File)
Tue, Jul 1, 5:32 AM
Unknown Object (File)
Tue, Jul 1, 12:43 AM
Unknown Object (File)
Mon, Jun 30, 2:25 PM
View All Files
Subscribers
bcr
bdrewery
imp

Details

Reviewers
emaste
cperciva
swills
jilles
Group Reviewers
manpages
Commits
rS365491: opts: FREEBSD_UPDATE no longer relies on PORTSNAP
rS365490: phttpget: move out of portsnap
Summary

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. This isn't required at build-time, so it really should be as trivial as moving out.

Future work could remove the conditional if it's decided that users will use it independently of either the current in-base consumers.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 33264

Revision Contents
Changeset List

PathSize
libexec/
5 lines
libexec/
phttpget/
usr.sbin/
portsnap/
phttpget/
2 lines
share/
mk/
5 lines
tools/
build/
mk/
7 lines
usr.sbin/
portsnap/
2 lines
phttpget/

Diff 76428

View Options

libexec/Makefile

Show All 22 Lines
USES= gmake lua:51,run mono openal:soft USES= gmake lua:51,run mono openal:soft
USE_SDL= sdl2 USE_SDL= sdl2
INSTALLS_ICONS= yes INSTALLS_ICONS= yes
MAKE_ENV= prefix="${PREFIX}" MAKE_ENV= prefix="${PREFIX}"
MAKE_ARGS= VERSION="${GH_TAGNAME}" MAKE_ARGS= VERSION="${GH_TAGNAME}"
INSTALL_TARGET= install-all install-linux-shortcuts INSTALL_TARGET= install-all install-linux-shortcuts
DATADIR= ${PREFIX}/lib/${PORTNAME} DATADIR= ${PREFIX}/lib/${PORTNAME}
PORTDATA= * PORTDATA= *
PORTDOCS= * PORTDOCS= *.html
OPTIONS_DEFINE= DOCS TEST ZENITY OPTIONS_DEFINE= DOCS TEST ZENITY
OPTIONS_DEFAULT=ZENITY OPTIONS_DEFAULT=ZENITY
DOCS_BUILD_DEPENDS=markdown:${PORTSDIR}/textproc/markdown DOCS_BUILD_DEPENDS=markdown:${PORTSDIR}/textproc/markdown
DOCS_ALL_TARGET=docs DOCS_ALL_TARGET=docs
TEST_MAKE_ENV= HOME="${WRKDIR}" TEST_MAKE_ENV= HOME="${WRKDIR}"
Show All 27 Lines.if ${PORT_OPTIONS:MDOCS}
@for f in ${WRKSRC}/*.md; do \ @for f in ${WRKSRC}/*.md; do \
markdown $$f >$${f%.md}.html; \ markdown $$f >$${f%.md}.html; \
done done
.endif .endif
post-install: post-install:
.if ${PORT_OPTIONS:MDOCS} .if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
.endif .endif
.include <bsd.port.mk> .include <bsd.port.mk>
View Options

libexec/phttpget/Makefile

Show All 22 Lines
USES= gmake lua:51,run mono openal:soft USES= gmake lua:51,run mono openal:soft
USE_SDL= sdl2 USE_SDL= sdl2
INSTALLS_ICONS= yes INSTALLS_ICONS= yes
MAKE_ENV= prefix="${PREFIX}" MAKE_ENV= prefix="${PREFIX}"
MAKE_ARGS= VERSION="${GH_TAGNAME}" MAKE_ARGS= VERSION="${GH_TAGNAME}"
INSTALL_TARGET= install-all install-linux-shortcuts INSTALL_TARGET= install-all install-linux-shortcuts
DATADIR= ${PREFIX}/lib/${PORTNAME} DATADIR= ${PREFIX}/lib/${PORTNAME}
PORTDATA= * PORTDATA= *
PORTDOCS= * PORTDOCS= *.html
OPTIONS_DEFINE= DOCS TEST ZENITY OPTIONS_DEFINE= DOCS TEST ZENITY
OPTIONS_DEFAULT=ZENITY OPTIONS_DEFAULT=ZENITY
DOCS_BUILD_DEPENDS=markdown:${PORTSDIR}/textproc/markdown DOCS_BUILD_DEPENDS=markdown:${PORTSDIR}/textproc/markdown
DOCS_ALL_TARGET=docs DOCS_ALL_TARGET=docs
TEST_MAKE_ENV= HOME="${WRKDIR}" TEST_MAKE_ENV= HOME="${WRKDIR}"
Show All 27 Lines.if ${PORT_OPTIONS:MDOCS}
@for f in ${WRKSRC}/*.md; do \ @for f in ${WRKSRC}/*.md; do \
markdown $$f >$${f%.md}.html; \ markdown $$f >$${f%.md}.html; \
done done
.endif .endif
post-install: post-install:
.if ${PORT_OPTIONS:MDOCS} .if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
.endif .endif
.include <bsd.port.mk> .include <bsd.port.mk>
View Options

libexec/phttpget/Makefile.depend

Show All 22 Lines
USES= gmake lua:51,run mono openal:soft USES= gmake lua:51,run mono openal:soft
USE_SDL= sdl2 USE_SDL= sdl2
INSTALLS_ICONS= yes INSTALLS_ICONS= yes
MAKE_ENV= prefix="${PREFIX}" MAKE_ENV= prefix="${PREFIX}"
MAKE_ARGS= VERSION="${GH_TAGNAME}" MAKE_ARGS= VERSION="${GH_TAGNAME}"
INSTALL_TARGET= install-all install-linux-shortcuts INSTALL_TARGET= install-all install-linux-shortcuts
DATADIR= ${PREFIX}/lib/${PORTNAME} DATADIR= ${PREFIX}/lib/${PORTNAME}
PORTDATA= * PORTDATA= *
PORTDOCS= * PORTDOCS= *.html
OPTIONS_DEFINE= DOCS TEST ZENITY OPTIONS_DEFINE= DOCS TEST ZENITY
OPTIONS_DEFAULT=ZENITY OPTIONS_DEFAULT=ZENITY
DOCS_BUILD_DEPENDS=markdown:${PORTSDIR}/textproc/markdown DOCS_BUILD_DEPENDS=markdown:${PORTSDIR}/textproc/markdown
DOCS_ALL_TARGET=docs DOCS_ALL_TARGET=docs
TEST_MAKE_ENV= HOME="${WRKDIR}" TEST_MAKE_ENV= HOME="${WRKDIR}"
Show All 27 Lines.if ${PORT_OPTIONS:MDOCS}
@for f in ${WRKSRC}/*.md; do \ @for f in ${WRKSRC}/*.md; do \
markdown $$f >$${f%.md}.html; \ markdown $$f >$${f%.md}.html; \
done done
.endif .endif
post-install: post-install:
.if ${PORT_OPTIONS:MDOCS} .if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
.endif .endif
.include <bsd.port.mk> .include <bsd.port.mk>
View Options

libexec/phttpget/phttpget.8

Show All 22 Lines
USES= gmake lua:51,run mono openal:soft USES= gmake lua:51,run mono openal:soft
USE_SDL= sdl2 USE_SDL= sdl2
INSTALLS_ICONS= yes INSTALLS_ICONS= yes
MAKE_ENV= prefix="${PREFIX}" MAKE_ENV= prefix="${PREFIX}"
MAKE_ARGS= VERSION="${GH_TAGNAME}" MAKE_ARGS= VERSION="${GH_TAGNAME}"
INSTALL_TARGET= install-all install-linux-shortcuts INSTALL_TARGET= install-all install-linux-shortcuts
DATADIR= ${PREFIX}/lib/${PORTNAME} DATADIR= ${PREFIX}/lib/${PORTNAME}
PORTDATA= * PORTDATA= *
PORTDOCS= * PORTDOCS= *.html
OPTIONS_DEFINE= DOCS TEST ZENITY OPTIONS_DEFINE= DOCS TEST ZENITY
OPTIONS_DEFAULT=ZENITY OPTIONS_DEFAULT=ZENITY
DOCS_BUILD_DEPENDS=markdown:${PORTSDIR}/textproc/markdown DOCS_BUILD_DEPENDS=markdown:${PORTSDIR}/textproc/markdown
DOCS_ALL_TARGET=docs DOCS_ALL_TARGET=docs
TEST_MAKE_ENV= HOME="${WRKDIR}" TEST_MAKE_ENV= HOME="${WRKDIR}"
Show All 27 Lines.if ${PORT_OPTIONS:MDOCS}
@for f in ${WRKSRC}/*.md; do \ @for f in ${WRKSRC}/*.md; do \
markdown $$f >$${f%.md}.html; \ markdown $$f >$${f%.md}.html; \
done done
.endif .endif
post-install: post-install:
.if ${PORT_OPTIONS:MDOCS} .if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
.endif .endif
.include <bsd.port.mk> .include <bsd.port.mk>
View Options

libexec/phttpget/phttpget.c

Loading...
View Options

share/mk/src.opts.mk

Loading...
View Options

tools/build/mk/OptionalObsoleteFiles.inc

Loading...
View Options

usr.sbin/portsnap/Makefile

Loading...
View Options

usr.sbin/portsnap/phttpget/Makefile

Loading...
View Options

usr.sbin/portsnap/phttpget/Makefile.depend

Loading...
View Options

usr.sbin/portsnap/phttpget/phttpget.8

Loading...
View Options

usr.sbin/portsnap/phttpget/phttpget.c

Loading...