From toni@shaolin.selfdestruct.net  Sun Oct  9 21:04:59 2005
Return-Path: <toni@shaolin.selfdestruct.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9237316A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Oct 2005 21:04:59 +0000 (GMT)
	(envelope-from toni@shaolin.selfdestruct.net)
Received: from shaolin.selfdestruct.net (shaolin.selfdestruct.net [193.65.195.200])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3F91943D45
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Oct 2005 21:04:59 +0000 (GMT)
	(envelope-from toni@shaolin.selfdestruct.net)
Received: by shaolin.selfdestruct.net (Postfix, from userid 1002)
	id 68BBEAC836; Mon, 10 Oct 2005 00:04:57 +0300 (EEST)
Message-Id: <20051009210457.68BBEAC836@shaolin.selfdestruct.net>
Date: Mon, 10 Oct 2005 00:04:57 +0300 (EEST)
From: Toni Viemero <toni.viemero@iki.fi>
To: FreeBSD-gnats-submit@freebsd.org
Cc: hendrik@scholz.net
Subject: [PATCH] www/lighttpd: Add knob for CML support
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         87178
>Category:       ports
>Synopsis:       [PATCH] www/lighttpd: Add knob for CML support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ehaupt
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 09 21:10:05 GMT 2005
>Closed-Date:    Mon Oct 10 20:02:08 CEST 2005
>Last-Modified:  Mon Oct 10 20:02:08 CEST 2005
>Originator:     Toni Viemero
>Release:        FreeBSD 6.0-BETA5 i386
>Organization:
>Environment:
System: FreeBSD shaolin.selfdestruct.net 6.0-BETA5 FreeBSD 6.0-BETA5 #1: Sun Oct  9 20:24:22 EEST
>Description:
Add knob for CML support

http://www.lighttpd.net/documentation/cml.html

Port maintainer (hendrik@scholz.net) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- lighttpd-1.4.5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/lighttpd/Makefile /home/toni/ports/lighttpd/Makefile
--- /usr/ports/www/lighttpd/Makefile	Sun Oct  9 17:57:26 2005
+++ /home/toni/ports/lighttpd/Makefile	Mon Oct 10 00:00:50 2005
@@ -29,6 +29,7 @@
 MAN1=		lighttpd.1 spawn-fcgi.1
 
 OPTIONS=	OPENSSL		"Enable SSL support"	on \
+		CML			"Enable Cache Meta Language support"	off \
 		OPENLDAP	"Enable LDAP support"	off \
 		MYSQL		"Enable MYSQL support"	off \
 		IPV6		"Disable IPV6 support"	off
@@ -38,6 +39,11 @@
 .if !defined(WITHOUT_OPENSSL)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 CONFIGURE_ARGS+=	--with-openssl
+.endif
+
+.if defined(WITH_CML)
+LIB_DEPENDS+=	lua.5:${PORTSDIR}/lang/lua
+CONFIGURE_ARGS+=	--with-lua
 .endif
 
 .if defined(WITH_OPENLDAP)
--- lighttpd-1.4.5.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ehaupt 
Responsible-Changed-By: ehaupt 
Responsible-Changed-When: Sun Oct 9 23:39:24 CEST 2005 
Responsible-Changed-Why:  
I will take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=87178 
State-Changed-From-To: open->feedback 
State-Changed-By: ehaupt 
State-Changed-When: Sun Oct 9 23:40:56 CEST 2005 
State-Changed-Why:  
Asked maintainer for approval. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=87178 

From: Emanuel Haupt <ehaupt@FreeBSD.org>
To: bug-followup@FreeBSD.org, hendrik@scholz.net
Cc:  
Subject: Re: ports/87178: [PATCH] www/lighttpd: Add knob for CML support
Date: Sun, 9 Oct 2005 23:40:40 +0200

 --Signature=_Sun__9_Oct_2005_23_40_40_+0200_cgsrj7Xv6JDibo6n
 Content-Type: text/plain; charset=US-ASCII
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 Dear maintainer,
 =20
 Do you approve this update?
 =20
 http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dports/87178
 =20
 Thanks
 
 --=20
 GnuPG key id: 0x55E67774         Download: http://pgp.mit.edu:11371
 Key fingerprint: 17B3 FD8F BA68 4AB4 10FD  A9D1 AD52 6588 55E6 7774
 
 --Signature=_Sun__9_Oct_2005_23_40_40_+0200_cgsrj7Xv6JDibo6n
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (FreeBSD)
 
 iD8DBQFDSY5YrVJliFXmd3QRAoI5AJ9HDMWMyQulLJkjVPUw7FDNCQiTqACgxpiv
 bTbxVwIB6jukusyyge3/dp4=
 =8PFW
 -----END PGP SIGNATURE-----
 
 --Signature=_Sun__9_Oct_2005_23_40_40_+0200_cgsrj7Xv6JDibo6n--

From: Hendrik Scholz <hscholz@raisdorf.net>
To: Emanuel Haupt <ehaupt@FreeBSD.org>
Cc: bug-followup@FreeBSD.org,  hendrik@scholz.net
Subject: Re: ports/87178: [PATCH] www/lighttpd: Add knob for CML support
Date: Mon, 10 Oct 2005 09:24:15 +0200

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 Hi!
 
 Emanuel Haupt wrote:
 > Do you approve this update?
 
 Looks ok although I have to do testing.
 lighttpd 1.4.6 will be out later today (european time) and I'll
 post a followup with the upgrade and do testing for both at the same time.
 
 Thanks for the contribution,
  Hendrik
 
 - --
 Hendrik Scholz - <hscholz@raisdorf.net> - http://www.wormulon.net/
 drag me, drop me - treat me like an object
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (FreeBSD)
 Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
 
 iD8DBQFDShcf4Wmz+z2IPqARArVIAKDEtMPaqoV5VsShr1lJCs1YNsQMPgCgh1Nq
 qBd/E4EcGlLijAz/Y6IB+eg=
 =kROB
 -----END PGP SIGNATURE-----

From: Hendrik Scholz <hscholz@raisdorf.net>
To: Hendrik Scholz <hscholz@raisdorf.net>
Cc: Emanuel Haupt <ehaupt@FreeBSD.org>,  bug-followup@FreeBSD.org, 
 hendrik@scholz.net
Subject: Re: ports/87178: [PATCH] www/lighttpd: Add knob for CML support
Date: Mon, 10 Oct 2005 16:59:07 +0200

 This is a multi-part message in MIME format.
 --------------030001030702090507060504
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 Hi!
 
 I've tested the CML knob and it needs a CONFIGURE_ENV helper since
 lighttpd doesn't check in LOCALBASE per default. I fixed this in
 the port Makefile but will change this in lighttpd itself for the
 next release.
 
 In addition to the CML knob I updated the port to 1.4.6 and removed
 the global CONFIGURE_ENV flags.
 
 The patch can be found on
 http://dump.wormulon.net/patches/lighttpd-1.4.5-to-1.4.6.diff
 
 Hendrik
 
 - --
 Hendrik Scholz - <hscholz@raisdorf.net> - http://www.wormulon.net/
 drag me, drop me - treat me like an object
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (FreeBSD)
 Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
 
 iD8DBQFDSoG74Wmz+z2IPqARAlWKAJ49cM+k6D8Sm6JWyD2HaKN7FhZwZgCfYp2k
 vk60Z2Wr93/iI3MOYZ4lx9Y=
 =wrvc
 -----END PGP SIGNATURE-----
 
 --------------030001030702090507060504
 Content-Type: text/x-patch;
  name="lighttpd-1.4.5-to-1.4.6.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="lighttpd-1.4.5-to-1.4.6.diff"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/www/lighttpd/Makefile,v
 retrieving revision 1.28
 diff -u -u -r1.28 Makefile
 --- Makefile	3 Oct 2005 21:36:39 -0000	1.28
 +++ Makefile	10 Oct 2005 14:49:56 -0000
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	lighttpd
 -PORTVERSION=	1.4.5
 +PORTVERSION=	1.4.6
  CATEGORIES=	www
  MASTER_SITES=	http://www.lighttpd.net/download/ \
  		http://dl.fkb.wormulon.net/lighttpd/ \
 @@ -23,7 +23,6 @@
  USE_LIBTOOL_VER=	15
  USE_GNOME=		lthack
  CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 -CONFIGURE_ENV=		CPPFLAGS=-I${PREFIX}/include LIBS=-L${PREFIX}/lib
  CONFIGURE_ARGS=		--libdir=${PREFIX}/lib/lighttpd
  
  MAN1=		lighttpd.1 spawn-fcgi.1
 @@ -31,7 +30,8 @@
  OPTIONS=	OPENSSL		"Enable SSL support"	on \
  		OPENLDAP	"Enable LDAP support"	off \
  		MYSQL		"Enable MYSQL support"	off \
 -		IPV6		"Disable IPV6 support"	off
 +		IPV6		"Disable IPV6 support"	off	\
 +		CML			"Enable Cache Meta Language support" off
  
  .include <bsd.port.pre.mk>
  
 @@ -54,6 +54,12 @@
  CONFIGURE_ARGS+=	--disable-ipv6
  .endif
  
 +.if defined(WITH_CML)
 +LIB_DEPENDS+=	lua.5:${PORTSDIR}/lang/lua
 +CONFIGURE_ARGS+=	--with-lua
 +CONFIGURE_ENV+=	CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L/${LOCALBASE}/lib
 +.endif
 +
  post-install:
  	@${INSTALL_DATA} ${FILESDIR}/lighttpd.conf.sample ${PREFIX}/etc/
  	@${LIBTOOL} --finish ${PREFIX}/lib
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/www/lighttpd/distinfo,v
 retrieving revision 1.21
 diff -u -u -r1.21 distinfo
 --- distinfo	3 Oct 2005 21:36:39 -0000	1.21
 +++ distinfo	10 Oct 2005 14:49:56 -0000
 @@ -1,2 +1,2 @@
 -MD5 (lighttpd-1.4.5.tar.gz) = f2e16caf782b9fc8df634b1ea65b7645
 -SIZE (lighttpd-1.4.5.tar.gz) = 773963
 +MD5 (lighttpd-1.4.6.tar.gz) = dec3ff6ff004868303407165d218bcdf
 +SIZE (lighttpd-1.4.6.tar.gz) = 774879
 
 --------------030001030702090507060504--
State-Changed-From-To: feedback->closed 
State-Changed-By: ehaupt 
State-Changed-When: Mon Oct 10 20:02:06 CEST 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=87178 
>Unformatted:
