From owner-svn-ports-all@FreeBSD.ORG  Sun Sep  9 15:49:18 2012
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 61A6C1065672;
	Sun,  9 Sep 2012 15:49:18 +0000 (UTC)
	(envelope-from adamw@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D8A58FC0C;
	Sun,  9 Sep 2012 15:49:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q89FnINB001091;
	Sun, 9 Sep 2012 15:49:18 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q89FnIFN001089;
	Sun, 9 Sep 2012 15:49:18 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201209091549.q89FnIFN001089@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Sun, 9 Sep 2012 15:49:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303974 - head/mail/squirrelmail
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Sun, 09 Sep 2012 15:49:18 -0000

Author: adamw
Date: Sun Sep  9 15:49:17 2012
New Revision: 303974
URL: http://svn.freebsd.org/changeset/ports/303974

Log:
  Remove WITHOUT_WWWDIR. This was a tunable to install into a nonstandard
  location. It came with a pre-everything message warning you of the change.
  This happened 8.5 years ago, so I am hoping people have converted over by
  now. If not, just set SQUIRRELDIR to whatever path you please. This is
  noted also in the Makefile.

Modified:
  head/mail/squirrelmail/Makefile

Modified: head/mail/squirrelmail/Makefile
==============================================================================
--- head/mail/squirrelmail/Makefile	Sun Sep  9 15:44:26 2012	(r303973)
+++ head/mail/squirrelmail/Makefile	Sun Sep  9 15:49:17 2012	(r303974)
@@ -28,11 +28,8 @@ USE_GETTEXT=	yes
 OPTIONS_DEFINE=	DATABASE LDAP
 DATABASE_DESC=	PEAR database support (must also intall a driver)
 
-.ifndef WITHOUT_WWWDIR
+# if you were using WITHOUT_WWWDIR, use SQUIRRELDIR=${PREFIX}/${PORTNAME}
 SQUIRRELDIR?=	${PREFIX}/www/${PORTNAME}
-.else
-SQUIRRELDIR?=	${PREFIX}/${PORTNAME}
-.endif
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 		SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}"
@@ -55,10 +52,6 @@ USE_PHP+=	ldap
 .endif
 
 pre-everything::
-	@${ECHO_CMD} "SquirrelMail is installed into ${SQUIRRELDIR}"
-	@${ECHO_CMD} "To use the old location ${PREFIX}/${PORTNAME} define"
-	@${ECHO_CMD} "WITHOUT_WWWDIR when patching or installing"
-	@${ECHO_CMD}
 .if ${PORT_OPTIONS:MDATABASE}
 	@${ECHO_CMD} "Note that the PEAR database framework still requires you to install a"
 	@${ECHO_CMD} "database-specific PEAR driver, e.g. MySQL."