Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Apr 2014 15:33:18 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r349925 - head/Mk
Message-ID:  <201404021533.s32FXI7W038420@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404021533.s32FXI7W038420>