diff options
| -rw-r--r-- | Mk/bsd.port.mk | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 126bf44469de..ea87517bdf45 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2137,7 +2137,7 @@ PTHREAD_LIBS?= -pthread .endif .if exists(/usr/bin/fetch) -FETCH_CMD?= /usr/bin/fetch -ARr +FETCH_CMD?= /usr/bin/fetch -ApRr FETCH_REGET?= 1 .if ${OSVERSION} >= 480000 && !defined(DISABLE_SIZE) # Avoid -S for 4.7 and earlier since it causes fetch errors @@ -2324,8 +2324,12 @@ PKG_VERSION?= ${CHROOT} ${DESTDIR} /usr/sbin/pkg_version # Does the pkg_create tool support conflict checking? # XXX Slow? .if !defined(PKGINSTALLVER) +.if !defined(DESTDIR) +PKGINSTALLVER!= ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //' +.else PKGINSTALLVER!= ${CHROOT} ${DESTDIR} ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //' .endif +.endif .if ${PKGINSTALLVER} < 20030417 DISABLE_CONFLICTS= YES .endif @@ -3871,7 +3875,7 @@ install-ldconfig-file: ${CHROOT} ${DESTDIR} -${LDCONFIG} -m ${USE_LDCONFIG} .endif .endif -.if ${USE_LDCONFIG:L} != "${PREFIX}/lib" +.if ${USE_LDCONFIG} != "${PREFIX}/lib" @${ECHO_MSG} "===> Installing ldconfig configuration file" .if defined(NO_LDCONFIG_MTREE) @${MKDIR} ${PREFIX}/${LDCONFIG_DIR} @@ -3880,7 +3884,7 @@ install-ldconfig-file: > ${PREFIX}/${LDCONFIG_DIR}/${UNIQUENAME} @${ECHO_CMD} ${LDCONFIG_DIR}/${UNIQUENAME} >> ${TMPPLIST} .if defined(NO_LDCONFIG_MTREE) - @${ECHO_CMD} "@unexec rmdir ${LDCONFIG_DIR} >/dev/null 2>&1" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec rmdir ${LDCONFIG_DIR} >/dev/null 2>&1 || true" >> ${TMPPLIST} .endif .endif .endif @@ -3913,7 +3917,7 @@ install-ldconfig-file: @${ECHO_CMD} "@unexec rmdir ${LDCONFIG32_DIR} >/dev/null 2>&1" >> ${TMPPLIST} .endif .endif -# This can be removed once, all ports have been converted to USE_LDCONFIG. +# This can be removed once all ports have been converted to USE_LDCONFIG. .if defined(INSTALLS_SHLIB) .if !defined(INSTALL_AS_USER) .if !defined(DESTDIR) @@ -5571,7 +5575,7 @@ compress-man: @_manpages='${_MANPAGES:S/'/'\''/g}' && [ "$${_manpages}" != "" ] && ( eval ${GZIP_CMD} $${_manpages} ) || ${TRUE} .endif .if defined(_MLINKS) - @set ${_MLINKS}; \ + @set -- ${_MLINKS}; \ while :; do \ [ $$# -eq 0 ] && break || ${TRUE}; \ ${RM} -f $${2%.gz}; ${RM} -f $$2.gz; \ @@ -5701,7 +5705,7 @@ config: -@if [ -e ${_OPTIONSFILE} ]; then \ . ${_OPTIONSFILE}; \ fi; \ - set ${OPTIONS} XXX; \ + set -- ${OPTIONS} XXX; \ while [ $$# -gt 3 ]; do \ OPTIONSLIST="$${OPTIONSLIST} $$1"; \ defaultval=$$3; \ @@ -5781,7 +5785,7 @@ showconfig: -@if [ -e ${_OPTIONSFILE} ]; then \ . ${_OPTIONSFILE}; \ fi; \ - set ${OPTIONS} XXX; \ + set -- ${OPTIONS} XXX; \ while [ $$# -gt 3 ]; do \ defaultval=$$3; \ withvar=WITH_$$1; \ @@ -5914,7 +5918,7 @@ VALID_DESKTOP_CATEGORIES+= Application Core Development Building Debugger IDE \ check-desktop-entries: .if defined(DESKTOP_ENTRIES) - @set ${DESKTOP_ENTRIES} XXX; \ + @set -- ${DESKTOP_ENTRIES} XXX; \ if [ `${EXPR} \( $$# - 1 \) % 6` -ne 0 ]; then \ ${ECHO_MSG} "${PKGNAME}: Makefile error: the DESKTOP_ENTRIES list must contain one or more groups of 6 elements"; \ exit 1; \ @@ -5972,7 +5976,7 @@ install-desktop-entries: .if defined(DESKTOP_ENTRIES) @(${MKDIR} "${DESKTOPDIR}" 2> /dev/null) || \ (${ECHO_MSG} "===> Cannot create ${DESKTOPDIR}, check permissions"; exit 1) - @set ${DESKTOP_ENTRIES} XXX; \ + @set -- ${DESKTOP_ENTRIES} XXX; \ if [ -z "${_DESKTOPDIR_REL}" ]; then \ ${ECHO_CMD} "@cwd ${DESKTOPDIR}" >> ${TMPPLIST}; \ fi; \ |