Attachment 191158 Details for Bug 226315 – Patch (Revision 1)

[patch] Patch (Revision 1)

mongrel2-1.11.0.patch (text/plain), 6.24 KB, created by Neel Chauhan on 2018-03-03 00:31:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neel Chauhan

Created: 2018-03-03 00:31:03 UTC

Size: 6.24 KB

patch

obsolete

>Index: mongrel2/Makefile
>===================================================================
>--- mongrel2/Makefile	(revision 463454)
>+++ mongrel2/Makefile	(working copy)
>@@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	mongrel2
>-PORTVERSION=	1.7.5
>-PORTREVISION=	3
>+PORTVERSION=	1.11.0
>+DISTVERSIONPREFIX=	v
> CATEGORIES=	www
>-MASTER_SITES=	http://mongrel2.org/static/downloads/
>+MASTER_SITES=	https://github.com/mongrel2/mongrel2/releases/download/v${PORTVERSION}/
> 
> MAINTAINER=	neel@neelc.org
> COMMENT=	Is an application, language, and network arch
>@@ -23,15 +23,15 @@
> BROKEN_powerpc64=	does not build (tests segfault)
> 
> USES=		gmake tar:bzip2
>-MAKE_FLAGS=	freebsd
>+ALL_TARGET=	freebsd
> EXAMPLES_LIST=	bbs \
>+		configs \
>+		kegogi \
>+		python \
>+		ws \
> 		chat \
>-		configs \
> 		http_0mq \
>-		kegogi \
> 		mp3stream \
>-		procer \
>-		python \
> 		tornado \
> 		zcov
> MAKE_JOBS_UNSAFE=yes
>@@ -41,7 +41,8 @@
> post-patch:
> 	@${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' ${WRKSRC}/Makefile
> 	@${REINPLACE_CMD} -e 's#fdclose#my_fdclose#g' ${WRKSRC}/src/*.c \
>-		${WRKSRC}/src/task/*.[ch] ${WRKSRC}/tests/*.c
>+		${WRKSRC}/src/task/*.[ch] ${WRKSRC}/tests/*.c \
>+		${WRKSRC}/tools/filters/*.c
> 
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
>Index: mongrel2/distinfo
>===================================================================
>--- mongrel2/distinfo	(revision 463454)
>+++ mongrel2/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (mongrel2-1.7.5.tar.bz2) = 48e4b3ba8959be001e5bac75e0a3fee628c917b08f115be08bcd5348ac663b01
>-SIZE (mongrel2-1.7.5.tar.bz2) = 745357
>+TIMESTAMP = 1520007911
>+SHA256 (mongrel2-v1.11.0.tar.bz2) = 917f2ce07c0908cae63ac03f3039815839355d46568581902377ba7e41257bed
>+SIZE (mongrel2-v1.11.0.tar.bz2) = 2513704
>Index: mongrel2/files/patch-Makefile
>===================================================================
>--- mongrel2/files/patch-Makefile	(revision 463454)
>+++ mongrel2/files/patch-Makefile	(nonexistent)
>@@ -1,10 +0,0 @@
>---- Makefile.orig	2011-06-22 16:25:12 UTC
>-+++ Makefile
>-@@ -1,5 +1,5 @@
>--CFLAGS=-g -O2 -Wall -Wextra -Isrc -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
>--LIBS=-lzmq -ldl -lsqlite3 $(OPTLIBS)
>-+CFLAGS+=-Wall -Wextra -Isrc -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
>-+LIBS=-lzmq -lsqlite3 $(OPTLIBS)
>- PREFIX?=/usr/local
>- 
>- get_objs = $(addsuffix .o,$(basename $(wildcard $(1))))
>
>Property changes on: mongrel2/files/patch-Makefile
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: mongrel2/files/patch-src_mem_align.h
>===================================================================
>--- mongrel2/files/patch-src_mem_align.h	(revision 463454)
>+++ mongrel2/files/patch-src_mem_align.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/mem/align.h.orig	2016-10-31 10:10:23 UTC
>-+++ src/mem/align.h
>-@@ -30,7 +30,7 @@ union max_align
>- 	void (*q)(void);
>- };
>- 
>--typedef union max_align max_align_t;
>-+typedef union max_align h_max_align_t;
>- 
>- #endif
>- 
>
>Property changes on: mongrel2/files/patch-src_mem_align.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: mongrel2/files/patch-src_mem_halloc.c
>===================================================================
>--- mongrel2/files/patch-src_mem_halloc.c	(revision 463454)
>+++ mongrel2/files/patch-src_mem_halloc.c	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/mem/halloc.c.orig	2016-10-31 10:10:30 UTC
>-+++ src/mem/halloc.c
>-@@ -34,7 +34,7 @@ typedef struct hblock
>- #endif
>- 	hlist_item_t  siblings; /* 2 pointers */
>- 	hlist_head_t  children; /* 1 pointer  */
>--	max_align_t   data[1];  /* not allocated, see below */
>-+	h_max_align_t   data[1];  /* not allocated, see below */
>- 	
>- } hblock_t;
>- 
>
>Property changes on: mongrel2/files/patch-src_mem_halloc.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: mongrel2/pkg-plist
>===================================================================
>--- mongrel2/pkg-plist	(revision 463454)
>+++ mongrel2/pkg-plist	(working copy)
>@@ -1,13 +1,11 @@
> bin/mongrel2
> bin/m2sh
>+bin/procer
> lib/mongrel2/config_modules/null.so
> lib/mongrel2/config_modules/zmq.so
> lib/mongrel2/filters/null.so
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/procer/procer.h
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/procer/Makefile
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/procer/rampart.c
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/procer/profile.c
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/procer/procer.c
>+lib/mongrel2/filters/rewrite.so
>+lib/mongrel2/filters/sendfile.so
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/site.css
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/app.js
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/text.css
>@@ -30,7 +28,11 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/ui.lua
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/mongrel2.conf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/strict.lua
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/configs/.dexy
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/configs/filters.conf
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http_0mq/hello.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/http_0mq/http.py
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http_0mq/sendfile.py
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/http_0mq/xml.py
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/http_0mq/upload.py
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/setup.py
>@@ -101,6 +103,9 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mp3stream/handler.py
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mp3stream/mp3stream.py
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mp3stream/stream_conf.py
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ws/mongrel2.conf
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ws/python/echo.py
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ws/python/wsutil.py
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zcov/setup.py
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zcov/README.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zcov/zcov/data/style.css

Actions: View | Diff

Attachments on bug 226315: 191158