From owner-svn-ports-head@FreeBSD.ORG Tue Sep 2 15:03:32 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 403C119D; Tue, 2 Sep 2014 15:03:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2C0A01304; Tue, 2 Sep 2014 15:03:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s82F3WRU083739; Tue, 2 Sep 2014 15:03:32 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s82F3Wmw083738; Tue, 2 Sep 2014 15:03:32 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201409021503.s82F3Wmw083738@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 2 Sep 2014 15:03:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367023 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2014 15:03:32 -0000 Author: bapt Date: Tue Sep 2 15:03:31 2014 New Revision: 367023 URL: http://svnweb.freebsd.org/changeset/ports/367023 QAT: https://qat.redports.org/buildarchive/r367023/ Log: Add home directory creation to pre-install script for USERS/GROUPS Use @dirrmtry instead of @exec rmdir Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Tue Sep 2 14:59:25 2014 (r367022) +++ head/Mk/bsd.port.mk Tue Sep 2 15:03:31 2014 (r367023) @@ -3980,7 +3980,7 @@ create-users-groups: echo \"Creating user '$$login' with uid '$$uid'.\" \n \ ${PW} useradd $$login -u $$uid -g $$gid $$class -c \"$$gecos\" -d $$homedir -s $$shell \n \ else \necho \"Using existing user '$$login'.\" \nfi" >> ${_UG_OUTPUT}; \ - case $$homedir in /|/nonexistent|/var/empty) ;; *) ${ECHO_CMD} "@exec ${INSTALL} -d -g $$gid -o $$uid $$homedir" >> ${TMPPLIST};; esac; \ + case $$homedir in /|/nonexistent|/var/empty) ;; *) ${ECHO_CMD} "${INSTALL} -d -g $$gid -o $$uid $$homedir" >> ${_UG_OUTPUT};; esac; \ done .endfor .if defined(GROUPS) @@ -5461,7 +5461,7 @@ add-plist-info: .if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && \ ${PREFIX} != "/usr" && !defined(NO_PREFIX_RMDIR)) add-plist-post: - @${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrmtry %D" >> ${TMPPLIST} .endif .endif