From owner-freebsd-ports-bugs@FreeBSD.ORG  Sun Nov  5 11:44:05 2006
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
X-Original-To: freebsd-ports-bugs@freebsd.org
Delivered-To: freebsd-ports-bugs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D8D2216A47E
	for <freebsd-ports-bugs@freebsd.org>;
	Sun,  5 Nov 2006 11:44:05 +0000 (UTC)
	(envelope-from beech@alaskaparadise.com)
Received: from stargate.alaskaparadise.com (114-103-74-65.gci.net
	[65.74.103.114])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 120CF43DC8
	for <freebsd-ports-bugs@freebsd.org>;
	Sun,  5 Nov 2006 11:43:54 +0000 (GMT)
	(envelope-from beech@alaskaparadise.com)
Received: by stargate.alaskaparadise.com (Postfix, from userid 0)
	id 780D2456F; Sun,  5 Nov 2006 02:43:44 -0900 (AKST)
From: Beech Rintoul <beech@alaskaparadise.com>
Organization: Alaska Paradise Travel
To: freebsd-ports-bugs@freebsd.org
Date: Sun, 5 Nov 2006 02:43:40 -0900
User-Agent: KMail/1.9.4
References: <200611051024.kA5AOJO4034760@www.freebsd.org>
In-Reply-To: <200611051024.kA5AOJO4034760@www.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200611050243.42302.beech@alaskaparadise.com>
Subject: Re: ports/105171: [PATCH]  www/cherokee Added Options
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Nov 2006 11:44:05 -0000

Please use this patch:


diff -ruN --exclude=CVS /usr/ports/www/cherokee.orig/Makefile /usr/ports/www/cherokee/Makefile
--- /usr/ports/www/cherokee.orig/Makefile	Sat Nov  4 22:08:11 2006
+++ /usr/ports/www/cherokee/Makefile	Sun Nov  5 00:49:15 2006
@@ -7,8 +7,10 @@
 
 PORTNAME=	cherokee
 PORTVERSION=	0.5.5
+PORTREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://www.cherokee-project.com/download/%SUBDIR%/
+MASTER_SITES=	http://www.cherokee-project.com/download/%SUBDIR%/ \
+		http://www.alaskaparadise.com/freebsd/
 MASTER_SITE_SUBDIR=	${PORTVERSION:R}/${PORTVERSION}
 
 MAINTAINER=	beech@alaskaparadise.com
@@ -26,6 +28,12 @@
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man \
 		--with-wwwroot=${PREFIX}/www
+
+OPTIONS=	GNUTLS	"TLS/SSL Use gnutls"	on \
+		OPENSSL	"TLS/SSL Use openssl"	off \
+		NOTLS	"No TLS/SSL"	off \
+		NOIPV6	"No IPv6"	off
+
 USE_LDCONFIG=	yes
 
 MAN1=		cget.1 cherokee-config.1 cherokee.1 cherokee_logrotate.1
@@ -33,16 +41,26 @@
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-.if defined(WITHOUT_GNUTLS)
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=	--enable-tls=openssl
-LDFLAGS+=	-lssl -lcrypto
-.else
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_GNUTLS)
 LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--enable-tls=gnutls
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITH_OPENSSL)
+CFLAGS+=	-DHAVE_OPENSSL
+CONFIGURE_ARGS+=	--enable-tls=openssl
+LDFLAGS+=	-lssl -lcrypto
+.endif
+
+.if defined(WITH_NOTLS)
+CONFIGURE_ARGS+=	--disable-tls
+.endif
+
+.if defined(WITH_NOIPV6)
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
 
 .if ${OSVERSION} < 500000
 PLIST_SUB+=	PAM=""