Bug 105171

Please use this patch:


diff -ruN --exclude=3DCVS /usr/ports/www/cherokee.orig/Makefile /usr/ports/=
www/cherokee/Makefile
=2D-- /usr/ports/www/cherokee.orig/Makefile=A0=A0=A0=A0=A0=A0=A0Sat Nov =A0=
4 22:08:11 2006
+++ /usr/ports/www/cherokee/Makefile=A0=A0=A0=A0Sun Nov =A05 00:49:15 2006
@@ -7,8 +7,10 @@
=A0
=A0PORTNAME=3D=A0=A0=A0=A0=A0=A0cherokee
=A0PORTVERSION=3D=A0=A0=A00.5.5
+PORTREVISION=3D=A0=A01
=A0CATEGORIES=3D=A0=A0=A0=A0www
=2DMASTER_SITES=3D=A0=A0http://www.cherokee-project.com/download/%SUBDIR%/
+MASTER_SITES=3D=A0=A0http://www.cherokee-project.com/download/%SUBDIR%/ \
+=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0http://www.alaskaparadise.com=
/freebsd/
=A0MASTER_SITE_SUBDIR=3D=A0=A0=A0=A0${PORTVERSION:R}/${PORTVERSION}
=A0
=A0MAINTAINER=3D=A0=A0=A0=A0beech@alaskaparadise.com
@@ -26,6 +28,12 @@
=A0CONFIGURE_ENV=3D=A0CPPFLAGS=3D"${CPPFLAGS}" LDFLAGS=3D"${LDFLAGS}"
=A0CONFIGURE_ARGS=3D=A0=A0=A0=A0=A0=A0=A0=A0--mandir=3D${MANPREFIX}/man \
=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0--with-wwwroot=3D${PREFIX}/=
www
+
+OPTIONS=3D=A0=A0=A0=A0=A0=A0=A0GNUTLS=A0=A0"TLS/SSL Use gnutls"=A0=A0=A0=
=A0on \
+=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0OPENSSL=A0"TLS/SSL Use openss=
l"=A0=A0=A0off \
+=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0NOTLS=A0=A0=A0"No TLS/SSL"=A0=
=A0=A0=A0off \
+=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0NOIPV6=A0=A0"No IPv6"=A0=A0=
=A0=A0=A0=A0=A0off
+
=A0USE_LDCONFIG=3D=A0=A0yes
=A0
=A0MAN1=3D=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0cget.1 cherokee-config.1 cherokee.1=
 cherokee_logrotate.1
@@ -33,16 +41,26 @@
=A0CPPFLAGS=3D=A0=A0=A0=A0=A0=A0-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
=A0LDFLAGS=3D=A0=A0=A0=A0=A0=A0=A0-L${LOCALBASE}/lib ${PTHREAD_LIBS}
=A0
=2D.if defined(WITHOUT_GNUTLS)
=2DUSE_OPENSSL=3D=A0=A0=A0yes
=2DCONFIGURE_ARGS+=3D=A0=A0=A0=A0=A0=A0=A0--enable-tls=3Dopenssl
=2DLDFLAGS+=3D=A0=A0=A0=A0=A0=A0-lssl -lcrypto
=2D.else
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_GNUTLS)
=A0LIB_DEPENDS+=3D=A0=A0gnutls.13:${PORTSDIR}/security/gnutls
=A0CONFIGURE_ARGS+=3D=A0=A0=A0=A0=A0=A0=A0--enable-tls=3Dgnutls
=A0.endif
=A0
=2D.include <bsd.port.pre.mk>
+.if defined(WITH_OPENSSL)
+CFLAGS+=3D=A0=A0=A0=A0=A0=A0=A0-DHAVE_OPENSSL
+CONFIGURE_ARGS+=3D=A0=A0=A0=A0=A0=A0=A0--enable-tls=3Dopenssl
+LDFLAGS+=3D=A0=A0=A0=A0=A0=A0-lssl -lcrypto
+.endif
+
+.if defined(WITH_NOTLS)
+CONFIGURE_ARGS+=3D=A0=A0=A0=A0=A0=A0=A0--disable-tls
+.endif
+
+.if defined(WITH_NOIPV6)
+CONFIGURE_ARGS+=3D=A0=A0=A0=A0=A0=A0=A0--disable-ipv6
+.endif
=A0
=A0.if ${OSVERSION} < 500000
=A0PLIST_SUB+=3D=A0=A0=A0=A0PAM=3D""
=2D-=20
=2D------------------------------------------------------------------------=
=2D-------------
Beech Rintoul - Sys. Administrator - beech@alaskaparadise.com
/"\   ASCII Ribbon Campaign  | Alaska Paradise Travel
\ / - NO HTML/RTF in e-mail  | 201 East 9Th Avenue Ste.310
 X  - NO Word docs in e-mail | Anchorage, AK 99501
/ \  - Please visit Alaska Paradise - http://www.alaskaparadise.com
=2D------------------------------------------------------------------------=
=2D-------------

Comment 2 Alejandro Pulver 2006-11-06 01:55:50 UTC

Responsible Changed
From-To: freebsd-ports-bugs->alepulver

I'll take it.

Comment 3 dfilter service 2006-11-07 16:54:55 UTC

alepulver    2006-11-07 16:54:49 UTC

  FreeBSD ports repository

  Modified files:
    www/cherokee         Makefile 
  Log:
  - Added options.
  
  PR:             ports/105171
  Submitted by:   Beech Rintoul <beech@alaskaparadise.com> (maintainer)
  
  Revision  Changes    Path
  1.30      +25 -7     ports/www/cherokee/Makefile
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"

Comment 4 Alejandro Pulver 2006-11-07 16:55:04 UTC

State Changed
From-To: open->closed

Committed. Thanks!