diff options
| -rw-r--r-- | Mk/bsd.options.desc.mk | 27 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 3 |
2 files changed, 16 insertions, 14 deletions
diff --git a/Mk/bsd.options.desc.mk b/Mk/bsd.options.desc.mk index 84634457eb15..d283f118fa9f 100644 --- a/Mk/bsd.options.desc.mk +++ b/Mk/bsd.options.desc.mk @@ -5,15 +5,18 @@ Options_Desc_MAINTAINER= ports@FreeBSD.org -CURL_DESC?= Enable CURL support -DBUS_DESC?= Enable DBUS support -DOCS_DESC?= Build and install the documentation -FLAC_DESC?= Enable support for flac -ID3_DESC?= Enable support for id3 tags -LDAP_DESC?= Enable LDAP support -MP4_DESC?= Enable support for mp4 -NLS_DESC?= Build and install the localisation data -PNG_DESC?= Enable PNG support -SSL_DESC?= Enable SSL support -TIDY_DESC?= Enable tidy html cleaner support -VORBIS_DESC?= Enable support for ogg vorbis +CURL_DESC?= Enable CURL support +DBUS_DESC?= Enable DBUS support +DOCS_DESC?= Build and install the documentation +FLAC_DESC?= Enable support for flac +ID3_DESC?= Enable support for id3 tags +LDAP_DESC?= Enable LDAP support +MP4_DESC?= Enable support for mp4 +MULTIBYTE_DESC?= Enable multibyte character support +NLS_DESC?= Build and install the localisation data +PCRE_DESC?= Enable regular expressions using libpcre +PNG_DESC?= Enable PNG support +SSL_DESC?= Enable SSL support +STATIC_DESC?= Build static executable/libraries +TIDY_DESC?= Enable tidy html cleaner support +VORBIS_DESC?= Enable support for ogg vorbis diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index a209e5b7713d..005d52f2b35a 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -6045,11 +6045,10 @@ config: pre-config ${MKDIR} $${optionsdir} 2> /dev/null) || \ (${ECHO_MSG} "===> Cannot create $${optionsdir}, check permissions"; exit 1) .endif - TMPOPTIONSFILE=$$(mktemp -t portoptions); \ + @TMPOPTIONSFILE=$$(mktemp -t portoptions); \ trap "${RM} -f $${TMPOPTIONSFILE}; exit 1" 1 2 3 5 10 13 15; \ ${SH} -c '${DIALOG} --checklist "Options for ${PKGNAME:C/-([^-]+)$/ \1/}" 21 70 15 ${DEFOPTIONS}' 2> $${TMPOPTIONSFILE}; \ status=$$?; \ - echo $$status; \ if [ $${status} -ne 0 ]; then \ ${RM} -f $${TMPOPTIONSFILE}; \ ${ECHO_MSG} "===> Options unchanged"; \ |