From owner-svn-ports-all@FreeBSD.ORG  Thu Nov  8 18:05:54 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 46D11678;
 Thu,  8 Nov 2012 18:05:54 +0000 (UTC)
 (envelope-from adamw@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2A9DD8FC08;
 Thu,  8 Nov 2012 18:05:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA8I5s7G035207;
 Thu, 8 Nov 2012 18:05:54 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA8I5rNv035206;
 Thu, 8 Nov 2012 18:05:53 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201211081805.qA8I5rNv035206@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Thu, 8 Nov 2012 18:05:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r307193 - branches/RELENG_9_1_0/mail/squirrelmail
X-SVN-Group: ports-branches
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.14
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: Thu, 08 Nov 2012 18:05:54 -0000

Author: adamw
Date: Thu Nov  8 18:05:53 2012
New Revision: 307193
URL: http://svnweb.freebsd.org/changeset/ports/307193

Log:
  Merge r307190:
  
  Prevent PREFIX from making its way into the plist for plugins.
  This broke package builds of squirrelmail plugins.
  
  Feature safe:	yes
  Approved by:	portmgr

Modified:
  branches/RELENG_9_1_0/mail/squirrelmail/bsd.squirrelmail.mk

Modified: branches/RELENG_9_1_0/mail/squirrelmail/bsd.squirrelmail.mk
==============================================================================
--- branches/RELENG_9_1_0/mail/squirrelmail/bsd.squirrelmail.mk	Thu Nov  8 17:57:59 2012	(r307192)
+++ branches/RELENG_9_1_0/mail/squirrelmail/bsd.squirrelmail.mk	Thu Nov  8 18:05:53 2012	(r307193)
@@ -40,7 +40,7 @@ SUB_LIST+=		SQUIRREL_PLUGIN_NAME=${SQUIR
 # As with mail/squirreldir, if you were using WITHOUT_WWWDIR=yes,
 # set SQUIRRELDIR=${PREFIX}/squirrelmail
 SQUIRRELDIR?=	${PREFIX}/www/squirrelmail
-PLIST_SUB+=		SQUIRRELDIR=${SQUIRRELDIR}
+PLIST_SUB+=		SQUIRRELDIR=${SQUIRRELDIR:S,${PREFIX}/,,}
 SUB_LIST+=		SQUIRRELDIR=${SQUIRRELDIR}
 
 .if exists(${FILESDIR}/pkg-message.in)