From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Nov 5 10:30:40 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47C1016A40F for ; Sun, 5 Nov 2006 10:30:40 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C1F0043D64 for ; Sun, 5 Nov 2006 10:30:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kA5AUN1s058586 for ; Sun, 5 Nov 2006 10:30:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kA5AUN20058585; Sun, 5 Nov 2006 10:30:23 GMT (envelope-from gnats) Resent-Date: Sun, 5 Nov 2006 10:30:23 GMT Resent-Message-Id: <200611051030.kA5AUN20058585@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Beech Rintoul Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 65C5C16A492 for ; Sun, 5 Nov 2006 10:25:41 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB76D43DA6 for ; Sun, 5 Nov 2006 10:24:34 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id kA5AOJc0034761 for ; Sun, 5 Nov 2006 10:24:19 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id kA5AOJO4034760; Sun, 5 Nov 2006 10:24:19 GMT (envelope-from nobody) Message-Id: <200611051024.kA5AOJO4034760@www.freebsd.org> Date: Sun, 5 Nov 2006 10:24:19 GMT From: Beech Rintoul To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.0 Cc: Subject: 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 10:30:40 -0000 >Number: 105171 >Category: ports >Synopsis: [PATCH] www/cherokee Added Options >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Nov 05 10:30:22 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Beech Rintoul >Release: 7.0-CURRENT >Organization: NorthWind Communications >Environment: FreeBSD stargate.alaskaparadise.com 7.0-CURRENT FreeBSD 7.0-CURRENT #85: Fri Oct 13 07:43:29 AKDT 2006 root@stargate.alaskaparadise.com:/usr/obj/usr/src/sys/STARGATE i386 >Description: * Added Options >How-To-Repeat: >Fix: 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 + +.if !defined(WITHOUT_GNUTLS) LIB_DEPENDS+= gnutls.13:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+= --enable-tls=gnutls .endif -.include +.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="" diff -ruN --exclude=CVS /usr/ports/www/cherokee.orig/Makefile~ /usr/ports/www/cherokee/Makefile~ --- /usr/ports/www/cherokee.orig/Makefile~ Wed Dec 31 14:00:00 1969 +++ /usr/ports/www/cherokee/Makefile~ Sun Nov 5 00:48:40 2006 @@ -0,0 +1,106 @@ +# New ports collection makefile for: cherokee +# Date created: 01 Jun 2002 +# Whom: silence +# +# $FreeBSD: ports/www/cherokee/Makefile,v 1.29 2006/11/05 04:06:56 lawrance Exp $ +# + +PORTNAME= cherokee +PORTVERSION= 0.5.5 +PORTREVISION= 1 +CATEGORIES= www +MASTER_SITES= http://www.cherokee-project.com/download/%SUBDIR%/ \ + http://www.alaskaparadise.com/freebsd/ +MASTER_SITE_SUBDIR= ${PORTVERSION:R}/${PORTVERSION} + +MAINTAINER= beech@alaskaparadise.com +COMMENT= An extremely fast and flexible web server + +LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre + +USE_GNOME= gnomehack gnometarget pkgconfig +USE_RC_SUBR= cherokee.sh +USE_GCC= 3.4+ +USE_BISON= yes +USE_GETOPT_LONG= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes +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 + +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} + +.include + +.if !defined(WITHOUT_GNUTLS) +LIB_DEPENDS+= gnutls.13:${PORTSDIR}/security/gnutls +CONFIGURE_ARGS+= --enable-tls=gnutls +.endif + +.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="" +.else +PLIST_SUB+= PAM="@comment " +.endif + +post-patch: + @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|@mkdir_p@|${MKDIR} --|g' + +pre-build: +.for file in advanced.conf cherokee.conf mods-ssl sites-default sites-example + @cd ${BUILD_WRKSRC} && ${SED} -e \ + 's:%sysconfdir%:${PREFIX}/etc:g ; \ + s:%datadir%:${PREFIX}/share:g ; \ + s:%wwwroot%:${PREFIX}/www:g ; \ + s:%prefix%:${PREFIX}:g' < ${file}.sample.pre > ${file}.sample +.endfor + +pre-install: + @if [ ! -f ${PREFIX}/www ]; then \ + ${MKDIR} ${PREFIX}/www;\ + fi + @if [ ! -f ${PREFIX}/www/data ] ; then \ + ${MKDIR} ${PREFIX}/www/data;\ + fi + @${ECHO_MSG} " `pwd` " + +post-install: +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/images/*.png ${DOCSDIR} +.endif + ${INSTALL_DATA} ${WRKSRC}/doc/develop/Intro.txt ${DATADIR} + @${ECHO_MSG} " " + @${ECHO_MSG} " Dont forget to read the doc " + @${ECHO_MSG} " ${PREFIX}/share/cherokee/Intro.txt" + @${ECHO_MSG} " " + +.include diff -ruN --exclude=CVS /usr/ports/www/cherokee.orig/cherokee-0.5.5.patch /usr/ports/www/cherokee/cherokee-0.5.5.patch --- /usr/ports/www/cherokee.orig/cherokee-0.5.5.patch Sat Nov 4 13:11:40 2006 +++ /usr/ports/www/cherokee/cherokee-0.5.5.patch Wed Dec 31 14:00:00 1969 @@ -1,16 +0,0 @@ -diff -ruN --exclude=CVS /usr/ports/www/cherokee.orig/Makefile /usr/ports/www/cherokee/Makefile ---- /usr/ports/www/cherokee.orig/Makefile Wed Sep 20 11:16:14 2006 -+++ /usr/ports/www/cherokee/Makefile Sat Nov 4 13:02:13 2006 -@@ -8,10 +8,10 @@ - PORTNAME= cherokee - PORTVERSION= 0.5.5 - CATEGORIES= www --MASTER_SITES= http://www.0x50.org/download/%SUBDIR%/ -+MASTER_SITES= http://www.cherokee-project.com/download/%SUBDIR%/ - MASTER_SITE_SUBDIR= ${PORTVERSION:R}/${PORTVERSION} - --MAINTAINER= ports@FreeBSD.org -+MAINTAINER= beech@alaskaparadise.com - COMMENT= An extremely fast and flexible web server - - LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre >Release-Note: >Audit-Trail: >Unformatted: