From owner-svn-ports-all@FreeBSD.ORG  Mon Nov  5 21:51:04 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 C7BF2E0C;
 Mon,  5 Nov 2012 21:51:04 +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 940758FC17;
 Mon,  5 Nov 2012 21:51:04 +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 qA5Lp4l6094996;
 Mon, 5 Nov 2012 21:51:04 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA5Lp4x7094994;
 Mon, 5 Nov 2012 21:51:04 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201211052151.qA5Lp4x7094994@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Mon, 5 Nov 2012 21:51:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307035 - head/mail/squirrelmail
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.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: Mon, 05 Nov 2012 21:51:04 -0000

Author: adamw
Date: Mon Nov  5 21:51:04 2012
New Revision: 307035
URL: http://svnweb.freebsd.org/changeset/ports/307035

Log:
  Make sure plugins use the same php version as the main squirrelmail
  port. This is an issue for packages, where dependencies are computed
  before other dependencies are installed.
  
  While we're at it, remove the vestigial WITHOUT_WWWDIR thing. I'm
  just assuming noone uses it, and if you do, then you can set
  SQUIRRELDIR= as noted in the file---this is the same setting used in
  the main squirrelmail port.
  
  Feature safe:	yes

Modified:
  head/mail/squirrelmail/bsd.squirrelmail.mk

Modified: head/mail/squirrelmail/bsd.squirrelmail.mk
==============================================================================
--- head/mail/squirrelmail/bsd.squirrelmail.mk	Mon Nov  5 21:41:07 2012	(r307034)
+++ head/mail/squirrelmail/bsd.squirrelmail.mk	Mon Nov  5 21:51:04 2012	(r307035)
@@ -26,30 +26,24 @@ RUN_DEPENDS+=	${SQUIRRELDIR}/plugins/com
 .endif
 
 NO_BUILD=		yes
-NO_WRKSUBDIR=		yes
+NO_WRKSUBDIR=	yes
 USE_PHP?=		yes
-WANT_PHP_WEB=		yes
+WANT_PHP_WEB=	yes
 
-SQUIRREL_PLUGIN_NAME?=   ${PORTNAME}
+IGNORE_WITH_PHP=5 # known incompatibilities with php-5.4, use 5.3 for now
+DEFAULT_PHP_VER=53
 
-.ifdef SQUIRRELDIR
-PLIST_SUB+=     SQUIRRELDIR=${SQUIRRELDIR}
-SUB_LIST+=      SQUIRRELDIR=${SQUIRRELDIR}
-.else
-.ifndef WITHOUT_WWWDIR
-SQUIRRELDIR=    ${PREFIX}/www/squirrelmail
-PLIST_SUB+=     SQUIRRELDIR=www/squirrelmail
-SUB_LIST+=      SQUIRRELDIR=www/squirrelmail
-.else
-SQUIRRELDIR=    ${PREFIX}/squirrelmail
-PLIST_SUB+=     SQUIRRELDIR=squirrelmail
-SUB_LIST+=      SQUIRRELDIR=squirrelmail
-.endif
-.endif
+SQUIRREL_PLUGIN_NAME?=   ${PORTNAME}
 PLIST_SUB+=     SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME}
+SUB_LIST+=		SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME}
+
+# As with mail/squirreldir, if you were using WITHOUT_WWWDIR=yes,
+# set SQUIRRELDIR=${PREFIX}/squirrelmail
+SQUIRRELDIR?=	${PREFIX}/www/squirrelmail
+PLIST_SUB+=		SQUIRRELDIR=${SQUIRRELDIR}
+SUB_LIST+=		SQUIRRELDIR=${SQUIRRELDIR}
 
 .if exists(${FILESDIR}/pkg-message.in)
-SUB_LIST+=	SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME}
 SUB_FILES=	pkg-message
 .endif