Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Sep 2012 15:49:18 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r303974 - head/mail/squirrelmail
Message-ID:  <201209091549.q89FnIFN001089@svn.freebsd.org>

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



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