diff options
| author | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2012-06-08 18:35:41 +0800 |
|---|---|---|
| committer | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2012-06-08 18:35:41 +0800 |
| commit | 02a4671a6c85dd64b9b85fbfba885c26d9e86130 (patch) | |
| tree | 2640e9629415b6b569f79a264b0e73748afcc659 /Mk | |
| parent | ed3f1e0df3323d861c9e8c5bc15c7d3cc1554752 (diff) | |
| download | xorg-devel-ports-02a4671a6c85dd64b9b85fbfba885c26d9e86130.tar xorg-devel-ports-02a4671a6c85dd64b9b85fbfba885c26d9e86130.tar.gz xorg-devel-ports-02a4671a6c85dd64b9b85fbfba885c26d9e86130.tar.bz2 xorg-devel-ports-02a4671a6c85dd64b9b85fbfba885c26d9e86130.tar.lz xorg-devel-ports-02a4671a6c85dd64b9b85fbfba885c26d9e86130.tar.xz xorg-devel-ports-02a4671a6c85dd64b9b85fbfba885c26d9e86130.tar.zst xorg-devel-ports-02a4671a6c85dd64b9b85fbfba885c26d9e86130.zip | |
Sync with regular ports tree.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@519 058c260c-8361-11dd-a0ac-aa2bafec7d09
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 44030e3..3be3268 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1,7 +1,7 @@ #-*- tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.724 2012/05/31 14:27:23 bapt Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.725 2012/06/06 14:23:17 bapt Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -6164,7 +6164,7 @@ showconfig-recursive: .if !target(rmconfig) rmconfig: -.if defined(OPTIONS) && exists(${OPTIONSFILE}) +.if exists(${OPTIONSFILE}) -@${ECHO_MSG} "===> Removing user-configured options for ${PKGNAME}"; \ optionsdir=${OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \ if [ ${UID} != 0 -a "x${INSTALL_AS_USER}" = "x" ]; then \ @@ -6174,7 +6174,7 @@ rmconfig: ${ECHO_MSG} "===> Returning to user credentials"; \ else \ ${RM} -f ${OPTIONSFILE}; \ - ${RMDIR} $${optionsdir} || return 0; \ + ${RMDIR} $${optionsdir} 2>/dev/null || return 0; \ fi .else @${ECHO_MSG} "===> No user-specified options configured for ${PKGNAME}" |