diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2013-03-21 10:55:32 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2013-03-21 10:55:32 +0800 |
| commit | 63952f5db7806ba70e37d4daef869de42044baf0 (patch) | |
| tree | a9f176fe24fbf68f2ecbca944e214a0620d8275e /Mk | |
| parent | 9027ea2db3f778ab4acb2e54944e3715d589ea07 (diff) | |
| download | freebsd-ports-gnome-63952f5db7806ba70e37d4daef869de42044baf0.tar.gz freebsd-ports-gnome-63952f5db7806ba70e37d4daef869de42044baf0.tar.zst freebsd-ports-gnome-63952f5db7806ba70e37d4daef869de42044baf0.zip | |
- Remove prompt for dialog4ports. Dialog4Ports is a
required part of ports 'make config' now. This is seen
as not much different than any other dependency.
- Allow dialog4ports to work with INSTALL_AS_USER
by building and using the port's WRKDIR version
through a Tools/scripts wrapper
- Add NO_DIALOG for 'config' as well.
- Fix D4P environment variables not passing to dialog4ports:
D4PHEIGHT, D4PWIDTH, D4PFULLSCREEN
Reviewed by: miwi, bapt, rum1cro@yandex.ru
Tested by: miwi, bapt, rum1cro@yandex.ru
Tested by: bdrewery (small exp-run)
Requested by: many
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 5cda4b6f96b8..b0af8bf49fad 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -6088,7 +6088,13 @@ D4P_ENV= PKGNAME="${PKGNAME}" \ OPTIONS_MULTI="${OPTIONS_MULTI}" \ OPTIONS_SINGLE="${OPTIONS_SINGLE}" \ OPTIONS_RADIO="${OPTIONS_RADIO}" \ - OPTIONS_GROUP="${OPTIONS_GROUP}" + OPTIONS_GROUP="${OPTIONS_GROUP}" \ + DIALOG4PORTS="${DIALOG4PORTS}" \ + PORTSDIR="${PORTSDIR}" \ + MAKE="${MAKE}" \ + D4PHEIGHT="${D4PHEIGHT}" \ + D4PWIDTH="${D4PWIDTH}" \ + D4PFULLSCREEN="${D4PFULLSCREEN}" .if exists(${PKGHELP}) D4P_ENV+= PKGHELP="${PKGHELP}" .endif @@ -6147,11 +6153,12 @@ do-config: .endif @TMPOPTIONSFILE=$$(mktemp -t portoptions); \ trap "${RM} -f $${TMPOPTIONSFILE}; exit 1" 1 2 3 5 10 13 15; \ - ${SETENV} ${D4P_ENV} ${DIALOG4PORTS} > $${TMPOPTIONSFILE} || { \ + ${SETENV} ${D4P_ENV} ${SH} ${PORTSDIR}/Tools/scripts/dialog4ports.sh $${TMPOPTIONSFILE} || { \ ${RM} -f $${TMPOPTIONSFILE}; \ ${ECHO_MSG} "===> Options unchanged"; \ exit 0; \ }; \ + ${ECHO_CMD}; \ if [ ! -e $${TMPOPTIONSFILE} ]; then \ ${ECHO_MSG} "===> No user-specified options to save for ${PKGNAME}"; \ exit 0; \ @@ -6183,21 +6190,13 @@ do-config: .endif .endif # do-config -.if !target(config-depend) -config-depend: -.if !exists(${DIALOG4PORTS}) && !defined(NO_DIALOG) - @echo -n "dialog4ports isn't installed, do you want to install it now? [Y/n] "; \ - read answer; \ - case $$answer in \ - [Nn]|[Nn][Oo]) \ - exit 1; \ - esac; \ - cd ${PORTSDIR}/ports-mgmt/dialog4ports; ${MAKE} install clean -.endif -.endif - .if !target(config) -config: pre-config config-depend do-config +.if !defined(NO_DIALOG) +config: pre-config do-config +.else +config: + @${ECHO_MSG} "===> Skipping 'config' as NO_DIALOG is defined" +.endif .endif # config .if !target(config-recursive) |