Attachment 61404 Details for Bug 92013 – file.diff

[patch] file.diff

file.diff (text/plain), 5.00 KB, created by tkato432 on 2006-01-19 17:10:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2006-01-19 17:10:09 UTC

Size: 5.00 KB

patch

obsolete

>diff -urN /usr/ports/www/cherokee/Makefile www/cherokee/Makefile
>--- /usr/ports/www/cherokee/Makefile	Tue Jan 10 16:13:00 2006
>+++ www/cherokee/Makefile	Thu Jan 19 18:50:41 2006
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	cherokee
>-PORTVERSION=	0.4.29
>-PORTREVISION=	1
>+PORTVERSION=	0.4.30
> CATEGORIES=	www
> MASTER_SITES=	http://www.0x50.org/download/%SUBDIR%/
> MASTER_SITE_SUBDIR=	${PORTVERSION:R}/${PORTVERSION}
>@@ -18,6 +17,7 @@
> LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
> 
> USE_GNOME=	gnomehack gnometarget pkgconfig
>+USE_GCC=	3.4+
> USE_GETOPT_LONG=	yes
> USE_REINPLACE=	yes
> USE_GMAKE=	yes
>@@ -51,6 +51,7 @@
> post-patch:
> 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
> 		's|@mkdir_p@|${MKDIR} --|g'
>+	@${REINPLACE_CMD} -e '/^if/s|==|=|g' ${WRKSRC}/configure
> 
> pre-build:
> .for file in advanced.conf cherokee.conf mods-ssl sites-default sites-example
>diff -urN /usr/ports/www/cherokee/distinfo www/cherokee/distinfo
>--- /usr/ports/www/cherokee/distinfo	Tue Nov 15 15:41:16 2005
>+++ www/cherokee/distinfo	Thu Jan 19 13:56:46 2006
>@@ -1,3 +1,3 @@
>-MD5 (cherokee-0.4.29.tar.gz) = 854e6e61a69781746496012658d8ef98
>-SHA256 (cherokee-0.4.29.tar.gz) = 7091536ef2a51d2548ac6268cc846dda9c37f7f7348597868c793f42b9be7d78
>-SIZE (cherokee-0.4.29.tar.gz) = 1474498
>+MD5 (cherokee-0.4.30.tar.gz) = bedcf9997928faeb550f54bc6621c13b
>+SHA256 (cherokee-0.4.30.tar.gz) = 336cc7008fc2ee65d0f5f45892e3404e8d5b36a8b903358c45aa2ddc090bc71d
>+SIZE (cherokee-0.4.30.tar.gz) = 1367424
>diff -urN /usr/ports/www/cherokee/files/patch-Makefile.in www/cherokee/files/patch-Makefile.in
>--- /usr/ports/www/cherokee/files/patch-Makefile.in	Tue Jul 12 17:08:20 2005
>+++ www/cherokee/files/patch-Makefile.in	Thu Jan 19 14:02:05 2006
>@@ -1,6 +1,6 @@
>---- Makefile.in.orig	Thu Jul  7 23:03:20 2005
>-+++ Makefile.in	Tue Jul 12 01:18:30 2005
>-@@ -305,7 +305,7 @@
>+--- Makefile.in.orig	Thu Jan 19 03:58:11 2006
>++++ Makefile.in	Thu Jan 19 14:01:55 2006
>+@@ -314,7 +314,7 @@
>  sharedstatedir = @sharedstatedir@
>  sysconfdir = @sysconfdir@
>  target_alias = @target_alias@
>@@ -9,7 +9,7 @@
>  bin_SCRIPTS = cherokee-config
>  SUFFIXES = .sample.pre .sample
>  
>-@@ -961,7 +961,7 @@
>+@@ -978,7 +978,7 @@
>  
>  
>  .sample.pre.sample:
>@@ -18,10 +18,10 @@
>  
>  install-data-local-config:
>  	@$(mkinstalldirs) $(DESTDIR)$(pkgincludedir);
>-@@ -999,9 +999,6 @@
>- 		echo "$@ will not overwrite existing $(cherokeeconfdir)/mime.conf"; \
>+@@ -1021,9 +1021,6 @@
>+ 		echo "$@ will not overwrite existing $(cherokeeconfdir)/mime.compression.types"; \
>  	else \
>- 		$(INSTALL_DATA) $(top_srcdir)/mime.conf.sample $(DESTDIR)$(cherokeeconfdir)/mime.conf; \
>+ 		$(INSTALL_DATA) $(top_srcdir)/mime.compression.types.sample $(DESTDIR)$(cherokeeconfdir)/mime.compression.types; \
> -	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; \
>diff -urN /usr/ports/www/cherokee/files/patch-cherokee-fdpoll-kqueue.c www/cherokee/files/patch-cherokee-fdpoll-kqueue.c
>--- /usr/ports/www/cherokee/files/patch-cherokee-fdpoll-kqueue.c	Sun Sep 18 12:36:43 2005
>+++ www/cherokee/files/patch-cherokee-fdpoll-kqueue.c	Thu Jan 19 14:03:19 2006
>@@ -8,12 +8,3 @@
>  #include <sys/event.h>
>  #include <sys/time.h>
>  #include <unistd.h>
>-@@ -92,7 +93,7 @@
>- 		 */
>- 		index = fdp->nchanges;
>- 		if ( index > FDPOLL(fdp)->nfiles) {
>--			PRINT_ERROR ("ERROR: Maximum number of fd exeeded\n");
>-+			PRINT_ERROR_S ("ERROR: Maximum number of fd exeeded\n");
>- 			return ret_error;
>- 		}
>- 		fdp->idx_fd_chlist[fd] = index;
>diff -urN /usr/ports/www/cherokee/files/patch-cherokee-request.h www/cherokee/files/patch-cherokee-request.h
>--- /usr/ports/www/cherokee/files/patch-cherokee-request.h	Sun Sep 18 05:20:37 2005
>+++ www/cherokee/files/patch-cherokee-request.h	Thu Jan  1 09:00:00 1970
>@@ -1,11 +0,0 @@
>---- cherokee/request.h.orig	Tue Jun 28 01:25:32 2005
>-+++ cherokee/request.h	Sat Sep 17 21:22:39 2005
>-@@ -25,6 +25,8 @@
>- #ifndef CHEROKEE_REQUEST_H
>- #define CHEROKEE_REQUEST_H
>- 
>-+#include <sys/types.h>
>-+
>- #include "common.h"
>- #include "url.h"
>- #include "http.h"
>diff -urN /usr/ports/www/cherokee/pkg-plist www/cherokee/pkg-plist
>--- /usr/ports/www/cherokee/pkg-plist	Tue Nov 15 15:41:17 2005
>+++ www/cherokee/pkg-plist	Thu Jan 19 14:19:47 2006
>@@ -5,7 +5,8 @@
> etc/cherokee/advanced.conf
> etc/cherokee/cherokee.conf
> etc/cherokee/icons.conf
>-etc/cherokee/mime.conf
>+etc/cherokee/mime.compression.types
>+etc/cherokee/mime.types
> etc/cherokee/mods-available/admin
> etc/cherokee/mods-available/ssl
> etc/cherokee/sites-available/default
>@@ -29,6 +30,7 @@
> include/cherokee/logger.h
> include/cherokee/macros.h
> include/cherokee/mime.h
>+include/cherokee/mime_entry.h
> include/cherokee/module.h
> include/cherokee/module_loader.h
> include/cherokee/nonce.h
>@@ -129,8 +131,8 @@
> %%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/images/top-layer.png
> www/index.html
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
> @dirrm %%DATADIR%%/icons

Actions: View | Diff

Attachments on bug 92013: 61404