Attachment 72335 Details for Bug 105171 – file.diff

[patch] file.diff

file.diff (text/plain), 5.57 KB, created by Beech Rintoul on 2006-11-05 10:30:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Beech Rintoul

Created: 2006-11-05 10:30:22 UTC

Size: 5.57 KB

patch

obsolete

>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=""
>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 <oksala@videotron.ca>
>+#
>+# $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 <bsd.port.pre.mk>
>+
>+.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 <bsd.port.post.mk>
>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

Actions: View | Diff

Attachments on bug 105171: 72335