From owner-svn-ports-head@FreeBSD.ORG Thu May 16 05:30:11 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 16DDA6D1; Thu, 16 May 2013 05:30:11 +0000 (UTC) (envelope-from matthew@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 E3816F40; Thu, 16 May 2013 05:30:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4G5UAnD080561; Thu, 16 May 2013 05:30:10 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4G5UAYQ080560; Thu, 16 May 2013 05:30:10 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201305160530.r4G5UAYQ080560@svn.freebsd.org> From: Matthew Seaman Date: Thu, 16 May 2013 05:30:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318276 - head/www/rt40 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 May 2013 05:30:11 -0000 Author: matthew Date: Thu May 16 05:30:10 2013 New Revision: 318276 URL: http://svnweb.freebsd.org/changeset/ports/318276 Log: Delete some dead code, left over from pre-OPTIONSNG days. Clarify comments about choosing a web platform option: you don't need to choose any of the four options show, but can use the built-in plack webserver. Submitted by: G.halse@ru.ac.za Modified: head/www/rt40/Makefile Modified: head/www/rt40/Makefile ============================================================================== --- head/www/rt40/Makefile Thu May 16 05:29:15 2013 (r318275) +++ head/www/rt40/Makefile Thu May 16 05:30:10 2013 (r318276) @@ -14,9 +14,15 @@ LATEST_LINK= rt40 # See doc/web_deployment.pod for info on the choices of webserver / # webapp combinations. Note: if using apache, apache-2.2+ is -# recommended. For deployment with nginx, use the SPAWN_FCGI method. -# A standalone PSGI based webserver is always available, but this is -# really only suitable for development usage. +# recommended. For deployment with nginx, use the SPAWN_FCGI method +# or the builtin webserver with a FCGI handler. +# +# The builtin standalone PSGI based webserver is always available, no +# mater what choice of web deployment platform, or none, that you +# make. Best Practical state that this is really only suitable for +# development usage, although I have heard reports of people using it +# successfully for medium sized deployments. If you only want the +# builtin webserver, simply deselect all of the web options. # # See doc/full_text_indexing.pod if you need to set up full text # indexes on your ticket database. PostgreSQL or Oracle are @@ -34,7 +40,6 @@ OPTIONS_DEFAULT= AP_MODPERL GD GPG MYSQL AP_MODFASTCGI_DESC= Deploy with apache and mod_fastcgi AP_MODPERL_DESC= Deploy with apache and mod_perl -BUILTIN_DESC= Deploy with built-in web server (not for production) DEV_DESC= Configure for Developers GD_DESC= Enable GD Graphs and Charts GPG_DESC= Enable GnuPG support @@ -69,12 +74,6 @@ USE_AUTOTOOLS= autoconf EXTRA_PATCHES+= ${FILESDIR}/extra-patch-noportdocs-Makefile.in .endif -.if !${PORT_OPTIONS:MAP_MODPERL} && !${PORT_OPTIONS:MAP_MODFASTCGI} && \ - !${PORT_OPTIONS:MLIGHTTPD} && !${PORT_OPTIONS:MSPAWN_FCGI} && \ - !${PORT_OPTIONS:MBUILTIN} -IGNORE= please select one of AP_MODPERL, AP_MODFASTCGI, LIGHTTPD, SPAWN_FCGI or BUILTIN -.endif - .if ${PORT_OPTIONS:MAP_MODPERL} BUILD_DEPENDS+= ${MODPERL2_DEPS} RUN_DEPENDS+= ${MODPERL2_DEPS}