Attachment 77903 Details for Bug 112103 – file.diff

[patch] file.diff

file.diff (text/plain), 14.17 KB, created by Beech Rintoul on 2007-04-25 03:50:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Beech Rintoul

Created: 2007-04-25 03:50:05 UTC

Size: 14.17 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/www/cherokee.orig/Makefile /usr/ports/www/cherokee/Makefile
>--- /usr/ports/www/cherokee.orig/Makefile	Tue Apr 10 00:23:31 2007
>+++ /usr/ports/www/cherokee/Makefile	Tue Apr 24 18:04:12 2007
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	cherokee
> PORTVERSION=	0.5.6
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	www
> MASTER_SITES=	http://www.cherokee-project.com/download/${PORTVERSION:R}/${PORTVERSION}/ \
> 		CENKES http://www.alaskaparadise.com/freebsd/
>@@ -18,31 +18,32 @@
> LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
> 
> CONFLICTS=	cherokee-devel-[0-9]*
>+
> USE_GNOME=	gnomehack gnometarget pkgconfig
>+USE_AUTOTOOLS=	libtool:15
> USE_LDCONFIG=	yes
>-USE_RC_SUBR=	cherokee.sh
>-USE_GCC=	3.4+
>-USE_BISON=	yes
>-USE_GETOPT_LONG=	yes
>+USE_GETOPT_LONG=yes
> USE_GMAKE=	yes
>+USE_BISON=	yes
>+USE_GCC=	3.4+
> GNU_CONFIGURE=	yes
>-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
>-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
>+
>+USE_RC_SUBR=	cherokee.sh
> CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man \
>-		--with-wwwroot=${PREFIX}/www \
>-		--disable-static
>+		--with-wwwroot=${PREFIX}/www/cherokee \
>+		--enable-readdir_r
> 
>-OPTIONS=	GNUTLS	"TLS/SSL Use gnutls"	on \
>-		OPENSSL	"TLS/SSL Use openssl"	off \
>+OPTIONS=	GNUTLS	"TLS/SSL Use gnutls"	off \
>+		OPENSSL	"TLS/SSL Use openssl"	on \
> 		NOTLS	"No TLS/SSL"		off \
>-		NOIPV6	"No IPv6"		off
>+		NOIPV6	"No IPv6"		off \
>+		STATIC	"Build all modules statically"	off
> 
> MAN1=		cget.1 cherokee-config.1 cherokee.1 cherokee_logrotate.1
> 
> .include <bsd.port.pre.mk>
> 
>-.if !defined(WITHOUT_GNUTLS)
>+.if defined(WITH_GNUTLS)
> LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
> CONFIGURE_ARGS+=	--enable-tls=gnutls
> .endif
>@@ -61,30 +62,44 @@
> CONFIGURE_ARGS+=--disable-ipv6
> .endif
> 
>-post-patch:
>-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
>-		's|@mkdir_p@|${MKDIR} --|g'
>+.if defined(WITH_STATIC)
>+CONFIGURE_ARGS+=	--enable-static-module=all
>+PLIST_SUB+=	STATIC="@comment "
>+.else
>+PLIST_SUB+=	STATIC=""
>+.endif
> 
>-pre-build:
>+post-configure:
> .for file in advanced.conf cherokee.conf mods-ssl sites-default sites-example
>-	@cd ${BUILD_WRKSRC} && ${SED} -e \
>+	@cd ${BUILD_WRKSRC} && ${SED} -E -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
>+		s:%datadir%:${PREFIX}/share:g ; \
>+		s:%wwwroot%:${PREFIX}/www/cherokee:g ; \
>+		s:%prefix%:${PREFIX}:g ; \
>+		s:#.*User.*nobody:User www:g ; \
>+		s:#.*Group.*nogroup:Group www:g ; \
>+		s:#.*PollMethod.*poll:PollMethod kqueue:g' \
>+			< ${file}.sample.pre > ${file}.sample
> .endfor
> 
> post-install:
>+	@${INSTALL_DATA} ${WRKSRC}/advanced.conf.sample ${PREFIX}/etc/cherokee/advanced.conf.default
>+	@${INSTALL_DATA} ${WRKSRC}/cherokee.conf.sample ${PREFIX}/etc/cherokee/cherokee.conf.default
>+	@if [ "`${FIND} ${PREFIX}/etc/cherokee/sites-enabled -type f`" = "" ]; then \
>+		${INSTALL_DATA} ${PREFIX}/etc/cherokee/sites-available/default \
>+			${PREFIX}/etc/cherokee/sites-enabled/default ; \
>+	fi
> .if !defined(NOPORTDOCS)
>-	@${INSTALL} -d ${DOCSDIR}/
>-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/
>-	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}/
>-	${INSTALL_DATA} ${WRKSRC}/doc/images/*.png ${DOCSDIR}/
>+	@${INSTALL} -d ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}
>+	@${INSTALL} -d ${DOCSDIR}/images
>+	${INSTALL_DATA} ${WRKSRC}/doc/images/*.png ${DOCSDIR}/images
> .endif
>-	${INSTALL_DATA} ${WRKSRC}/doc/develop/Intro.txt ${DATADIR}/
>+	${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} " ${DATADIR}/Intro.txt"
> 	@${ECHO_MSG} " "
> 
> .include <bsd.port.post.mk>
>diff -ruN --exclude=CVS /usr/ports/www/cherokee.orig/files/cherokee.sh.in /usr/ports/www/cherokee/files/cherokee.sh.in
>--- /usr/ports/www/cherokee.orig/files/cherokee.sh.in	Wed Jul 19 10:55:37 2006
>+++ /usr/ports/www/cherokee/files/cherokee.sh.in	Tue Apr 24 17:48:16 2007
>@@ -3,7 +3,7 @@
> # $FreeBSD: ports/www/cherokee/files/cherokee.sh.in,v 1.2 2006/07/19 18:55:37 rafan Exp $
> #
> # PROVIDE: cherokee
>-# REQUIRE: %%REQUIRE%%
>+# REQUIRE: DAEMON
> # KEYWORD: shutdown
> #
> # Add the following lines to /etc/rc.conf to enable cherokee:
>@@ -29,13 +29,6 @@
> pidfile=/var/run/cherokee.pid
> required_files=${cherokee_conf}
> stop_postcmd=stop_postcmd
>-restart_precmd="checkconfig"
>-
>-checkconfig()
>-{
>-	echo "Performing sanity check on ${name} configuration:"
>-	eval "${command} ${command_args} -t"
>-}
> 
> stop_postcmd()
> {
>diff -ruN --exclude=CVS /usr/ports/www/cherokee.orig/files/patch-Makefile.in /usr/ports/www/cherokee/files/patch-Makefile.in
>--- /usr/ports/www/cherokee.orig/files/patch-Makefile.in	Sat Apr 15 11:41:36 2006
>+++ /usr/ports/www/cherokee/files/patch-Makefile.in	Tue Apr 24 17:48:16 2007
>@@ -1,6 +1,6 @@
>---- Makefile.in.orig	Tue Apr  4 17:23:41 2006
>-+++ Makefile.in	Tue Apr 11 02:25:14 2006
>-@@ -314,7 +314,7 @@
>+--- Makefile.in.orig	Wed Dec 13 18:38:31 2006
>++++ Makefile.in	Sun Apr 15 09:51:21 2007
>+@@ -315,7 +315,7 @@
>  sharedstatedir = @sharedstatedir@
>  sysconfdir = @sysconfdir@
>  target_alias = @target_alias@
>@@ -9,7 +9,7 @@
>  bin_SCRIPTS = cherokee-config
>  SUFFIXES = .sample.pre .sample
>  
>-@@ -979,7 +979,7 @@
>+@@ -980,7 +980,7 @@
>  
>  
>  .sample.pre.sample:
>@@ -18,13 +18,18 @@
>  
>  install-data-local-config:
>  	@$(mkinstalldirs) $(DESTDIR)$(pkgincludedir);
>-@@ -1022,9 +1022,6 @@
>- 		echo "$@ will not overwrite existing $(cherokeeconfdir)/mime.compression.types"; \
>+@@ -1024,14 +1024,10 @@
>  	else \
>  		$(INSTALL_DATA) $(top_srcdir)/mime.compression.types.sample $(DESTDIR)$(cherokeeconfdir)/mime.compression.types; \
>--	fi
>+ 	fi
> -	@if test -d $(DESTDIR)$(sysconfdir)/pam.d && test ! -d $(DESTDIR)$(sysconfdir)/pam.d/cherokee ; then \
> -		$(INSTALL_DATA) $(top_srcdir)/pam.d_cherokee $(DESTDIR)$(sysconfdir)/pam.d/cherokee; \
>- 	fi
>+-	fi
>  	@if test -f $(DESTDIR)$(cherokeeconfdir)/sites-available/default ; then \
>  		echo "$@ will not overwrite existing $(cherokeeconfdir)/sites-available/default"; \
>+ 	else \
>+ 		$(INSTALL_DATA) $(top_builddir)/sites-default.sample $(DESTDIR)$(cherokeeconfdir)/sites-available/default; \
>+-		$(SHELL) -c "cd $(DESTDIR)$(cherokeeconfdir)/sites-enabled/ && $(LN_S) ../sites-available/default ."; \
>+ 	fi
>+ 	@if test -f $(DESTDIR)$(cherokeeconfdir)/sites-available/example.com ; then \
>+ 		echo "$@ will not overwrite existing $(cherokeeconfdir)/sites-available/example.com"; \
>diff -ruN --exclude=CVS /usr/ports/www/cherokee.orig/pkg-plist /usr/ports/www/cherokee/pkg-plist
>--- /usr/ports/www/cherokee.orig/pkg-plist	Tue Apr 10 00:23:31 2007
>+++ /usr/ports/www/cherokee/pkg-plist	Tue Apr 24 17:48:16 2007
>@@ -2,16 +2,18 @@
> bin/cherokee-config
> bin/cherokee-panic
> bin/cherokee_logrotate
>-etc/cherokee/advanced.conf
>-etc/cherokee/cherokee.conf
>+@unexec if cmp -s %D/etc/cherokee/advanced.conf.default %D/etc/cherokee/advanced.conf; then rm -f %D/etc/cherokee/advanced.conf; fi
>+etc/cherokee/advanced.conf.default
>+@unexec if cmp -s %D/etc/cherokee/cherokee.conf.default %D/etc/cherokee/cherokee.conf; then rm -f %D/etc/cherokee/cherokee.conf; fi
>+etc/cherokee/cherokee.conf.default
> etc/cherokee/icons.conf
> etc/cherokee/mime.compression.types
> etc/cherokee/mime.types
> etc/cherokee/mods-available/admin
> etc/cherokee/mods-available/ssl
>+@unexec if cmp -s %D/etc/cherokee/sites-enabled/default %D/etc/cherokee/sites-available/default; then rm -f %D/etc/cherokee/sites-enabled/default; fi
> etc/cherokee/sites-available/default
> etc/cherokee/sites-available/example.com
>-etc/cherokee/sites-enabled/default
> include/cherokee/admin_client.h
> include/cherokee/buffer.h
> include/cherokee/cherokee-config.h
>@@ -40,55 +42,79 @@
> include/cherokee/typed_table.h
> include/cherokee/url.h
> include/cherokee/util.h
>-lib/cherokee/libplugin_admin.la
>-lib/cherokee/libplugin_admin.so
>-lib/cherokee/libplugin_cgi.la
>-lib/cherokee/libplugin_cgi.so
>-lib/cherokee/libplugin_combined.la
>-lib/cherokee/libplugin_combined.so
>-lib/cherokee/libplugin_common.la
>-lib/cherokee/libplugin_common.so
>-lib/cherokee/libplugin_dirlist.la
>-lib/cherokee/libplugin_dirlist.so
>-lib/cherokee/libplugin_error_redir.la
>-lib/cherokee/libplugin_error_redir.so
>-lib/cherokee/libplugin_fastcgi.la
>-lib/cherokee/libplugin_fastcgi.so
>-lib/cherokee/libplugin_fcgi.la
>-lib/cherokee/libplugin_fcgi.so
>-lib/cherokee/libplugin_file.la
>-lib/cherokee/libplugin_file.so
>-lib/cherokee/libplugin_gzip.la
>-lib/cherokee/libplugin_gzip.so
>-lib/cherokee/libplugin_htdigest.la
>-lib/cherokee/libplugin_htdigest.so
>-lib/cherokee/libplugin_ncsa.la
>-lib/cherokee/libplugin_ncsa.so
>-lib/cherokee/libplugin_nn.la
>-lib/cherokee/libplugin_nn.so
>-lib/cherokee/libplugin_phpcgi.la
>-lib/cherokee/libplugin_phpcgi.so
>-lib/cherokee/libplugin_plain.la
>-lib/cherokee/libplugin_plain.so
>-lib/cherokee/libplugin_read_config.la
>-lib/cherokee/libplugin_read_config.so
>-lib/cherokee/libplugin_redir.la
>-lib/cherokee/libplugin_redir.so
>-lib/cherokee/libplugin_scgi.la
>-lib/cherokee/libplugin_scgi.so
>-lib/cherokee/libplugin_server_info.la
>-lib/cherokee/libplugin_server_info.so
>-lib/cherokee/libplugin_w3c.la
>-lib/cherokee/libplugin_w3c.so
>+%%STATIC%%lib/cherokee/libplugin_admin.a
>+%%STATIC%%lib/cherokee/libplugin_admin.la
>+%%STATIC%%lib/cherokee/libplugin_admin.so
>+%%STATIC%%lib/cherokee/libplugin_cgi.a
>+%%STATIC%%lib/cherokee/libplugin_cgi.la
>+%%STATIC%%lib/cherokee/libplugin_cgi.so
>+%%STATIC%%lib/cherokee/libplugin_combined.a
>+%%STATIC%%lib/cherokee/libplugin_combined.la
>+%%STATIC%%lib/cherokee/libplugin_combined.so
>+%%STATIC%%lib/cherokee/libplugin_common.a
>+%%STATIC%%lib/cherokee/libplugin_common.la
>+%%STATIC%%lib/cherokee/libplugin_common.so
>+%%STATIC%%lib/cherokee/libplugin_dirlist.a
>+%%STATIC%%lib/cherokee/libplugin_dirlist.la
>+%%STATIC%%lib/cherokee/libplugin_dirlist.so
>+%%STATIC%%lib/cherokee/libplugin_error_redir.a
>+%%STATIC%%lib/cherokee/libplugin_error_redir.la
>+%%STATIC%%lib/cherokee/libplugin_error_redir.so
>+%%STATIC%%lib/cherokee/libplugin_fastcgi.a
>+%%STATIC%%lib/cherokee/libplugin_fastcgi.la
>+%%STATIC%%lib/cherokee/libplugin_fastcgi.so
>+%%STATIC%%lib/cherokee/libplugin_fcgi.a
>+%%STATIC%%lib/cherokee/libplugin_fcgi.la
>+%%STATIC%%lib/cherokee/libplugin_fcgi.so
>+%%STATIC%%lib/cherokee/libplugin_file.a
>+%%STATIC%%lib/cherokee/libplugin_file.la
>+%%STATIC%%lib/cherokee/libplugin_file.so
>+%%STATIC%%lib/cherokee/libplugin_gzip.a
>+%%STATIC%%lib/cherokee/libplugin_gzip.la
>+%%STATIC%%lib/cherokee/libplugin_gzip.so
>+%%STATIC%%lib/cherokee/libplugin_htdigest.a
>+%%STATIC%%lib/cherokee/libplugin_htdigest.la
>+%%STATIC%%lib/cherokee/libplugin_htdigest.so
>+%%STATIC%%lib/cherokee/libplugin_ncsa.a
>+%%STATIC%%lib/cherokee/libplugin_ncsa.la
>+%%STATIC%%lib/cherokee/libplugin_ncsa.so
>+%%STATIC%%lib/cherokee/libplugin_nn.a
>+%%STATIC%%lib/cherokee/libplugin_nn.la
>+%%STATIC%%lib/cherokee/libplugin_nn.so
>+%%STATIC%%lib/cherokee/libplugin_phpcgi.a
>+%%STATIC%%lib/cherokee/libplugin_phpcgi.la
>+%%STATIC%%lib/cherokee/libplugin_phpcgi.so
>+%%STATIC%%lib/cherokee/libplugin_plain.a
>+%%STATIC%%lib/cherokee/libplugin_plain.la
>+%%STATIC%%lib/cherokee/libplugin_plain.so
>+%%STATIC%%lib/cherokee/libplugin_read_config.a
>+%%STATIC%%lib/cherokee/libplugin_read_config.la
>+%%STATIC%%lib/cherokee/libplugin_read_config.so
>+%%STATIC%%lib/cherokee/libplugin_redir.a
>+%%STATIC%%lib/cherokee/libplugin_redir.la
>+%%STATIC%%lib/cherokee/libplugin_redir.so
>+%%STATIC%%lib/cherokee/libplugin_scgi.a
>+%%STATIC%%lib/cherokee/libplugin_scgi.la
>+%%STATIC%%lib/cherokee/libplugin_scgi.so
>+%%STATIC%%lib/cherokee/libplugin_server_info.a
>+%%STATIC%%lib/cherokee/libplugin_server_info.la
>+%%STATIC%%lib/cherokee/libplugin_server_info.so
>+%%STATIC%%lib/cherokee/libplugin_w3c.a
>+%%STATIC%%lib/cherokee/libplugin_w3c.la
>+%%STATIC%%lib/cherokee/libplugin_w3c.so
>+lib/libcherokee-base.a
> lib/libcherokee-base.la
> lib/libcherokee-base.so
> lib/libcherokee-base.so.0
>+lib/libcherokee-client.a
> lib/libcherokee-client.la
> lib/libcherokee-client.so
> lib/libcherokee-client.so.0
>+lib/libcherokee-config.a
> lib/libcherokee-config.la
> lib/libcherokee-config.so
> lib/libcherokee-config.so.0
>+lib/libcherokee-server.a
> lib/libcherokee-server.la
> lib/libcherokee-server.so
> lib/libcherokee-server.so.0
>@@ -125,7 +151,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/Behavior_configuration.html
> %%PORTDOCS%%%%DOCSDIR%%/CGI_executing.html
> %%PORTDOCS%%%%DOCSDIR%%/Cget.html
>-%%PORTDOCS%%%%DOCSDIR%%/Cherokee-icono.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/Cherokee-icono.png
> %%PORTDOCS%%%%DOCSDIR%%/Combined_logger.html
> %%PORTDOCS%%%%DOCSDIR%%/Combined_logs.html
> %%PORTDOCS%%%%DOCSDIR%%/Common_behavior.html
>@@ -137,7 +163,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/Directory_configuration.html
> %%PORTDOCS%%%%DOCSDIR%%/Directory_listing.html
> %%PORTDOCS%%%%DOCSDIR%%/Encoders.html
>-%%PORTDOCS%%%%DOCSDIR%%/Exquisite-khelpcenter.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/Exquisite-khelpcenter.png
> %%PORTDOCS%%%%DOCSDIR%%/Extension_configuration.html
> %%PORTDOCS%%%%DOCSDIR%%/FastCGI.html
> %%PORTDOCS%%%%DOCSDIR%%/File_sending.html
>@@ -160,7 +186,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/Request_configuration.html
> %%PORTDOCS%%%%DOCSDIR%%/Ruby_on_Rails_with_SCGI.html
> %%PORTDOCS%%%%DOCSDIR%%/SCGI.html
>-%%PORTDOCS%%%%DOCSDIR%%/Server-conf-small.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/Server-conf-small.png
> %%PORTDOCS%%%%DOCSDIR%%/Server_configuration.html
> %%PORTDOCS%%%%DOCSDIR%%/U-Cherokee.html
> %%PORTDOCS%%%%DOCSDIR%%/Validators.html
>@@ -169,20 +195,22 @@
> %%PORTDOCS%%%%DOCSDIR%%/WebApplications.html
> %%PORTDOCS%%%%DOCSDIR%%/cherokee.png
> %%PORTDOCS%%%%DOCSDIR%%/index.html
>-www/images/cherokee-logo.png
>-www/images/default-bg.png
>-www/images/powered_by_cherokee.png
>-www/index.html
>+www/cherokee/images/cherokee-logo.png
>+www/cherokee/images/default-bg.png
>+www/cherokee/images/powered_by_cherokee.png
>+www/cherokee/index.html
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
> @dirrm %%DATADIR%%/icons
> @dirrm %%DATADIR%%/deps
> @dirrm %%DATADIR%%
> @dirrm lib/cherokee
> @dirrm include/cherokee
>-@dirrm etc/cherokee/ssl
>-@dirrm etc/cherokee/sites-enabled
>+@dirrmtry etc/cherokee/ssl
>+@dirrmtry etc/cherokee/sites-enabled
> @dirrm etc/cherokee/sites-available
>-@dirrm etc/cherokee/mods-enabled
>+@dirrmtry etc/cherokee/mods-enabled
> @dirrm etc/cherokee/mods-available
>-@dirrm etc/cherokee
>-@dirrmtry www/images
>+@dirrmtry etc/cherokee
>+@dirrmtry www/cherokee/images
>+@dirrmtry www/cherokee

Actions: View | Diff

Attachments on bug 112103: 77903