Attachment #72335 for bug #105171

View | Details | Raw Unified | Return to bug 105171
Collapse All | Expand All

Lines 7-14 Link Here

(-)/usr/ports/www/cherokee/Makefile (-7 / +25 lines)
7		7
8	PORTNAME= cherokee	8	PORTNAME= cherokee
9	PORTVERSION= 0.5.5	9	PORTVERSION= 0.5.5
		10	PORTREVISION= 1
10	CATEGORIES= www	11	CATEGORIES= www
11	MASTER_SITES= http://www.cherokee-project.com/download/%SUBDIR%/	12	MASTER_SITES= http://www.cherokee-project.com/download/%SUBDIR%/ \
		13	http://www.alaskaparadise.com/freebsd/
12	MASTER_SITE_SUBDIR= ${PORTVERSION:R}/${PORTVERSION}	14	MASTER_SITE_SUBDIR= ${PORTVERSION:R}/${PORTVERSION}
13		15
14	MAINTAINER= beech@alaskaparadise.com	16	MAINTAINER= beech@alaskaparadise.com
Lines 26-31 Link Here
26	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	28	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
27	CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \	29	CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \
28	--with-wwwroot=${PREFIX}/www	30	--with-wwwroot=${PREFIX}/www
		31
		32	OPTIONS= GNUTLS "TLS/SSL Use gnutls" on \
		33	OPENSSL "TLS/SSL Use openssl" off \
		34	NOTLS "No TLS/SSL" off \
		35	NOIPV6 "No IPv6" off
		36
29	USE_LDCONFIG= yes	37	USE_LDCONFIG= yes
30		38
31	MAN1= cget.1 cherokee-config.1 cherokee.1 cherokee_logrotate.1	39	MAN1= cget.1 cherokee-config.1 cherokee.1 cherokee_logrotate.1
Lines 33-48 Link Here
33	CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}	41	CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
34	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}	42	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
35		43
36	.if defined(WITHOUT_GNUTLS)	44	.include <bsd.port.pre.mk>
37	USE_OPENSSL= yes	45
38	CONFIGURE_ARGS+= --enable-tls=openssl	46	.if !defined(WITHOUT_GNUTLS)
39	LDFLAGS+= -lssl -lcrypto
40	.else
41	LIB_DEPENDS+= gnutls.13:${PORTSDIR}/security/gnutls	47	LIB_DEPENDS+= gnutls.13:${PORTSDIR}/security/gnutls
42	CONFIGURE_ARGS+= --enable-tls=gnutls	48	CONFIGURE_ARGS+= --enable-tls=gnutls
43	.endif	49	.endif
44		50
45	.include <bsd.port.pre.mk>	51	.if defined(WITH_OPENSSL)
		52	CFLAGS+= -DHAVE_OPENSSL
		53	CONFIGURE_ARGS+= --enable-tls=openssl
		54	LDFLAGS+= -lssl -lcrypto
		55	.endif
		56
		57	.if defined(WITH_NOTLS)
		58	CONFIGURE_ARGS+= --disable-tls
		59	.endif
		60
		61	.if defined(WITH_NOIPV6)
		62	CONFIGURE_ARGS+= --disable-ipv6
		63	.endif
46		64
47	.if ${OSVERSION} < 500000	65	.if ${OSVERSION} < 500000
48	PLIST_SUB+= PAM=""	66	PLIST_SUB+= PAM=""




# 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/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

Return to bug 105171

Line 0 Link Here

(-)/usr/ports/www/cherokee/Makefile~ (+106 lines)
		1	# New ports collection makefile for: cherokee
		2	# Date created: 01 Jun 2002
		3	# Whom: silence <oksala@videotron.ca>
		4	#
		5	# $FreeBSD: ports/www/cherokee/Makefile,v 1.29 2006/11/05 04:06:56 lawrance Exp $
		6	#
		7
		8	PORTNAME= cherokee
		9	PORTVERSION= 0.5.5
		10	PORTREVISION= 1
		11	CATEGORIES= www
		12	MASTER_SITES= http://www.cherokee-project.com/download/%SUBDIR%/ \
		13	http://www.alaskaparadise.com/freebsd/
		14	MASTER_SITE_SUBDIR= ${PORTVERSION:R}/${PORTVERSION}
		15
		16	MAINTAINER= beech@alaskaparadise.com
		17	COMMENT= An extremely fast and flexible web server
		18
		19	LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
		20
		21	USE_GNOME= gnomehack gnometarget pkgconfig
		22	USE_RC_SUBR= cherokee.sh
		23	USE_GCC= 3.4+
		24	USE_BISON= yes
		25	USE_GETOPT_LONG= yes
		26	USE_GMAKE= yes
		27	GNU_CONFIGURE= yes
		28	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
		29	CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \
		30	--with-wwwroot=${PREFIX}/www
		31
		32	OPTIONS= GNUTLS "TLS/SSL Use gnutls" on \
		33	OPENSSL "TLS/SSL Use openssl" off \
		34	NOTLS "No TLS/SSL" off \
		35	NOIPV6 "No IPv6" off
		36
		37	USE_LDCONFIG= yes
		38
		39	MAN1= cget.1 cherokee-config.1 cherokee.1 cherokee_logrotate.1
		40
		41	CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
		42	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
		43
		44	.include <bsd.port.pre.mk>
		45
		46	.if !defined(WITHOUT_GNUTLS)
		47	LIB_DEPENDS+= gnutls.13:${PORTSDIR}/security/gnutls
		48	CONFIGURE_ARGS+= --enable-tls=gnutls
		49	.endif
		50
		51	.if defined(WITH_OPENSSL)
		52	CFLAGS+= -DHAVE_OPENSSL
		53	CONFIGURE_ARGS+= --enable-tls=openssl
		54	LDFLAGS+= -lssl -lcrypto
		55	.endif
		56
		57	.if defined(WITH_NOTLS)
		58	CONFIGURE_ARGS+= --disable-tls
		59	.endif
		60
		61	.if defined(WITH_NOIPV6)
		62	CONFIGURE_ARGS+= --disable-ipv6
		63	.endif
		64
65	.if ${OSVERSION} < 500000
66	PLIST_SUB+= PAM=""
67	.else
68	PLIST_SUB+= PAM="@comment "
69	.endif
70
71	post-patch:
72	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \
73	's\|@mkdir_p@\|${MKDIR} --\|g'
74
75	pre-build:
76	.for file in advanced.conf cherokee.conf mods-ssl sites-default sites-example
77	@cd ${BUILD_WRKSRC} && ${SED} -e \
78	's:%sysconfdir%:${PREFIX}/etc:g ; \
79	s:%datadir%:${PREFIX}/share:g ; \
80	s:%wwwroot%:${PREFIX}/www:g ; \
81	s:%prefix%:${PREFIX}:g' < ${file}.sample.pre > ${file}.sample
82	.endfor
83
84	pre-install:
85	@if [ ! -f ${PREFIX}/www ]; then \
86	${MKDIR} ${PREFIX}/www;\
87	fi
88	@if [ ! -f ${PREFIX}/www/data ] ; then \
89	${MKDIR} ${PREFIX}/www/data;\
90	fi
91	@${ECHO_MSG} " `pwd` "
92
93	post-install:
94	.if !defined(NOPORTDOCS)
95	@${MKDIR} ${DOCSDIR}
96	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
97	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}
98	${INSTALL_DATA} ${WRKSRC}/doc/images/*.png ${DOCSDIR}
99	.endif
100	${INSTALL_DATA} ${WRKSRC}/doc/develop/Intro.txt ${DATADIR}
101	@${ECHO_MSG} " "
102	@${ECHO_MSG} " Dont forget to read the doc "
103	@${ECHO_MSG} " ${PREFIX}/share/cherokee/Intro.txt"
104	@${ECHO_MSG} " "
105
106	.include <bsd.port.post.mk>

Lines 1-16 Link Here

(-)/usr/ports/www/cherokee/cherokee-0.5.5.patch (-16 lines)
1	diff -ruN --exclude=CVS /usr/ports/www/cherokee.orig/Makefile /usr/ports/www/cherokee/Makefile
2	--- /usr/ports/www/cherokee.orig/Makefile Wed Sep 20 11:16:14 2006
3	+++ /usr/ports/www/cherokee/Makefile Sat Nov 4 13:02:13 2006
4	@@ -8,10 +8,10 @@
5	PORTNAME= cherokee
6	PORTVERSION= 0.5.5
7	CATEGORIES= www
8	-MASTER_SITES= http://www.0x50.org/download/%SUBDIR%/
9	+MASTER_SITES= http://www.cherokee-project.com/download/%SUBDIR%/
10	MASTER_SITE_SUBDIR= ${PORTVERSION:R}/${PORTVERSION}
11
12	-MAINTAINER= ports@FreeBSD.org
13	+MAINTAINER= beech@alaskaparadise.com
14	COMMENT= An extremely fast and flexible web server
15
16	LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre