Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 Nov 2012 18:05:53 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
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
Message-ID:  <201211081805.qA8I5rNv035206@svn.freebsd.org>

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



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