From owner-svn-ports-all@FreeBSD.ORG  Wed Apr  2 15:33:19 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1E0F5F5F;
 Wed,  2 Apr 2014 15:33:19 +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 0A42CF35;
 Wed,  2 Apr 2014 15:33:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s32FXIvP038421;
 Wed, 2 Apr 2014 15:33:18 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s32FXI7W038420;
 Wed, 2 Apr 2014 15:33:18 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201404021533.s32FXI7W038420@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 2 Apr 2014 15:33:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r349925 - 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-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Apr 2014 15:33:19 -0000

Author: bdrewery
Date: Wed Apr  2 15:33:18 2014
New Revision: 349925
URL: http://svnweb.freebsd.org/changeset/ports/349925
QAT: https://qat.redports.org/buildarchive/r349925/

Log:
  - Add NO_PREFIX_RMDIR to allow not removing PREFIX at deinstall if it does
    not match LOCALBASE. This is needed for qmail ports where they install
    to a different PREFIX (/var/qmail), but only the main qmail port should
    remove and own the dir. Otherwise permissions are incorrectly set when
    using staging.
  
  With hat:	portmgr

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Wed Apr  2 14:42:34 2014	(r349924)
+++ head/Mk/bsd.port.mk	Wed Apr  2 15:33:18 2014	(r349925)
@@ -5702,7 +5702,8 @@ add-plist-info:
 # If we're installing into a non-standard PREFIX, we need to remove that directory at
 # deinstall-time
 .if !target(add-plist-post)
-.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
+.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && \
+    ${PREFIX} != "/usr" && !defined(NO_PREFIX_RMDIR))
 add-plist-post:
 	@${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST}
 .endif