svn commit: r300949 - in head: . Mk www/lighttpd

[Martin Matuska]

Author: mm
Date: Mon Jul 16 12:57:18 2012
New Revision: 300949
URL: http://svn.freebsd.org/changeset/ports/300949

Log:
  Reorganize options of www/lighttpd
  Add two new default options

Modified:
  head/Mk/bsd.options.desc.mk
  head/UPDATING
  head/www/lighttpd/Makefile

Modified: head/Mk/bsd.options.desc.mk
==============================================================================
--- head/Mk/bsd.options.desc.mk	Mon Jul 16 12:12:14 2012	(r300948)
+++ head/Mk/bsd.options.desc.mk	Mon Jul 16 12:57:18 2012	(r300949)
@@ -57,6 +57,7 @@ EXAMPLES_DESC?=		Build and install the e
 EXPAT_DESC?=		Expat support
 FAAC_DESC?=		FAAC encoder support
 FAAD_DESC?=		FAAD aac decoder support
+FAM_DESC?=		File Alteration Monitor support
 FASTCGI_DESC?=		FastCGI support
 FFMPEG_DESC?=		Support FFMPEG (wma aiff ac3 ape...)
 FLAC_DESC?=		FLAC support
@@ -130,6 +131,7 @@ LDAPS_DESC?=		LDAPS support
 LFS_DESC?=		Large Files Support
 LIBBLURAY_DESC?=	libbluray support
 LIBEDIT_DESC?=		readline support
+LIBEV_DESC?=		libev support
 LIBEXIF_DESC?=		libexif support
 LIBEXTRACTOR_DESC?=	libextractor support
 LIBMNG_DESC?=		libmng support

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Mon Jul 16 12:12:14 2012	(r300948)
+++ head/UPDATING	Mon Jul 16 12:57:18 2012	(r300949)
@@ -6,6 +6,14 @@ You should get into the habit of checkin
 you update your ports collection, before attempting any port upgrades.
 
 20120716:
+  AFFECTS: users of www/lighttpd
+  AUTHOR: mm at FreeBSD.org
+
+  The following port options have been reorganized:
+  The OPENLDAP option has been renamed to LDAP.
+  The MAGNET and CML options have been withdrawn in favor of new LUA option.
+
+20120716:
   AFFECTS: users of mail/postfix-current
   AUTHOR: sahil at FreeBSD.org
 

Modified: head/www/lighttpd/Makefile
==============================================================================
--- head/www/lighttpd/Makefile	Mon Jul 16 12:12:14 2012	(r300948)
+++ head/www/lighttpd/Makefile	Mon Jul 16 12:57:18 2012	(r300949)
@@ -7,7 +7,7 @@
 
 PORTNAME?=	lighttpd
 PORTVERSION=	1.4.31
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	www
 MASTER_SITES?=	http://download.lighttpd.net/lighttpd/releases-1.4.x/
 
@@ -45,22 +45,19 @@ USE_RC_SUBR=	lighttpd.sh
 
 MAN8=		lighttpd.8
 
-OPTIONS_DEFINE=	BZIP2 CML FAM GDBM IPV6 LIBEV MAGNET MEMCACHE MYSQL MYSQLAUTH \
-		NODELAY OPENLDAP OPENSSL SPAWNFCGI VALGRIND WEBDAV REMOTEUSER
+OPTIONS_DEFINE=	BZIP2 FAM GDBM IPV6 LIBEV LUA MEMCACHE MYSQL MYSQLAUTH \
+		NODELAY LDAP OPENSSL SPAWNFCGI VALGRIND WEBDAV REMOTEUSER
 
 OPTIONS_DEFAULT=	IPV6 OPENSSL 
 
-BZIP2_DESC=	bzip2 support
-CML_DESC=	Cache Meta Language support
-FAM_DESC=	fam/gamin support
-GDBM_DESC=	gdbm storage support
-LIBEV_DESC=	libev support
-MAGNET_DESC=	magnet support
-MEMCACHE_DESC=	Memory caching support
-MYSQL_DESC=	MySQL support
+BZIP2_DESC=	bzip2 support (mod_compress)
+GDBM_DESC=	gdbm storage (mod_trigger_b4_dl)
+LDAP_DESC=	LDAP authentication
+LUA_DESC=	lua support (mod_cml, mod_magnet)
+MEMCACHE_DESC=	memcached storage (mod_trigger_b4_dl)
+MYSQL_DESC=	MySQL support (mod_mysql_vhost)
 MYSQLAUTH_DESC=	MySQL authentication (requires WITH_MYSQL)
 NODELAY_DESC=	Set TCP_NODELAY on listening sockets
-OPENLDAP_DESC=	LDAP support
 SPAWNFCGI_DESC=	Depend on spawn-fcgi utility
 VALGRIND_DESC=	valgrind support
 WEBDAV_DESC=	WebDAV support
@@ -112,12 +109,6 @@ CONFIGURE_ARGS+=	--with-openssl \
 CONFIGURE_ARGS+=	--with-bzip2
 .endif
 
-.if ${PORT_OPTIONS:MCML}
-USE_LUA=		yes
-CONFIGURE_ARGS+=	--with-lua
-CONFIGURE_ENV+=		LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua"
-.endif
-
 .if ${PORT_OPTIONS:MFAM}
 USE_FAM=		yes
 CONFIGURE_ARGS+=	--with-fam
@@ -138,8 +129,8 @@ CONFIGURE_ARGS+=	--with-libev=${LOCALBAS
 LIB_DEPENDS+=		ev.4:${PORTSDIR}/devel/libev
 .endif
 
-.if ${PORT_OPTIONS:MMAGNET}
-USE_LUA=		5.1+
+.if ${PORT_OPTIONS:MLUA}
+USE_LUA=		5.1
 CONFIGURE_ARGS+=	--with-lua
 CONFIGURE_ENV+=		LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua"
 .endif
@@ -168,7 +159,7 @@ PORTDOCS+=		README.mysqlauth mysql_auth.
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-nodelay
 .endif
 
-.if ${PORT_OPTIONS:MOPENLDAP}
+.if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=		yes
 CONFIGURE_ARGS+=	--with-ldap
 _REQUIRE+=		slapd