Attachment 143378 Details for Bug 188920 – Here is the latest diff(1)/patch(1) again. It's fully staged, and working.

[patch] Here is the latest diff(1)/patch(1) again. It's fully staged, and working.

PR_188920.diff.txt (text/plain), 2.30 KB, created by Chris Hutchinson on 2014-06-04 19:36:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Hutchinson

Created: 2014-06-04 19:36:36 UTC

Size: 2.30 KB

patch

obsolete

>Index: cherokee/Makefile
>===================================================================
>--- cherokee/Makefile	(revision 352718)
>+++ cherokee/Makefile	(working copy)
>@@ -5,14 +5,13 @@
> PORTVERSION=	1.2.101
> PORTREVISION=	4
> CATEGORIES=	www
>-MASTER_SITES=	${MASTER_SITE_SAMBA}
>-MASTER_SITE_SUBDIR=cherokee/1.2/${PORTVERSION}
>+MASTER_SITES=	https://github.com/cherokee/webserver/archive/ \
>+		http://bsdforge.com/projects/source/www/cherokee/
>+DISTNAME=	v${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	portmaster@bsdforge.com
> COMMENT=	Fast and flexible web server
> 
>-BROKEN=		No public distfiles
>-
> USES=		gettext gmake pathfix pkgconfig
> USE_OPENSSL=	yes
> USE_LDCONFIG=	yes
>@@ -56,7 +55,6 @@
> RRDTOOL_DESC=	Usage graphs support
> UWSGI_DESC=	uWSGI support
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MADMIN}
>@@ -167,14 +165,14 @@
> 		${WRKSRC}/qa/run-tests.py
> 
> post-install:
>-	@${INSTALL} -d ${CONFSUBDIRS:S|^|${PREFIX}/etc/cherokee/|}
>+	@${INSTALL} -d ${CONFSUBDIRS:S|^|${STAGEDIR}${PREFIX}/etc/cherokee/|}
> 	@for i in ${DEFCONFS};do\
>-		${INSTALL_DATA} ${WRKSRC}/$$i.sample ${PREFIX}/etc/cherokee/$$i.default;done
>-	@${INSTALL_DATA} ${WRKSRC}/performance.conf.sample ${PREFIX}/etc/cherokee/cherokee.conf.perf_sample
>-	@:>${PREFIX}/etc/cherokee/mods-enabled/.empty
>-	@:>${PREFIX}/etc/cherokee/sites-available/.empty
>-	@:>${PREFIX}/etc/cherokee/sites-enabled/.empty
>-	@:>${PREFIX}/etc/cherokee/ssl/.empty
>+		${INSTALL_DATA} ${WRKSRC}/$$i.sample ${STAGEDIR}${PREFIX}/etc/cherokee/$$i.default;done
>+	@${INSTALL_DATA} ${WRKSRC}/performance.conf.sample ${STAGEDIR}${PREFIX}/etc/cherokee/cherokee.conf.perf_sample
>+	@:>${STAGEDIR}${PREFIX}/etc/cherokee/mods-enabled/.empty
>+	@:>${STAGEDIR}${PREFIX}/etc/cherokee/sites-available/.empty
>+	@:>${STAGEDIR}${PREFIX}/etc/cherokee/sites-enabled/.empty
>+	@:>${STAGEDIR}${PREFIX}/etc/cherokee/ssl/.empty
> 	@for i in `${FIND} ${PREFIX}/etc/cherokee/ -name \*.default`;do\
> 		if [ ! -f $${i%.default} ];then ${CP} $$i $${i%.default};fi;done
> 	@for i in `${FIND} ${PREFIX}/etc/cherokee/ -name \*.sample`;do\
>@@ -181,7 +179,7 @@
> 		if [ ! -f $${i%.sample} ];then ${CP} $$i $${i%.sample};fi;done
> 
> .if ${PORT_OPTIONS:MDOCS}
>-	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
>+	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
> .endif
> 
> .if ${PORT_OPTIONS:MADMIN}

Actions: View | Diff

Attachments on bug 188920: 141985 | 143378