Attachment #191158 for bug #226315

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




# $FreeBSD$

PORTNAME=	mongrel2
PORTVERSION=	1.11.0
DISTVERSIONPREFIX=	v
CATEGORIES=	www
MASTER_SITES=	https://github.com/mongrel2/mongrel2/releases/download/v${PORTVERSION}/

MAINTAINER=	neel@neelc.org
COMMENT=	Is an application, language, and network arch

BROKEN_powerpc64=	does not build (tests segfault)

USES=		gmake tar:bzip2
ALL_TARGET=	freebsd
EXAMPLES_LIST=	bbs \
		configs \
		kegogi \
		python \
		ws \
		chat \
		configs \
		http_0mq \
		kegogi \
		mp3stream \
		procer \
		python \
		tornado \
		zcov
MAKE_JOBS_UNSAFE=yes

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}/tools/filters/*.c

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*

Lines 1-2 Link Here

(-)mongrel2/distinfo (-2 / +3 lines)
1	SHA256 (mongrel2-1.7.5.tar.bz2) = 48e4b3ba8959be001e5bac75e0a3fee628c917b08f115be08bcd5348ac663b01	1	TIMESTAMP = 1520007911
2	SIZE (mongrel2-1.7.5.tar.bz2) = 745357	2	SHA256 (mongrel2-v1.11.0.tar.bz2) = 917f2ce07c0908cae63ac03f3039815839355d46568581902377ba7e41257bed
		3	SIZE (mongrel2-v1.11.0.tar.bz2) = 2513704

Lines 1-10 Link Here

(-)mongrel2/files/patch-Makefile (-10 lines)
1	--- Makefile.orig 2011-06-22 16:25:12 UTC
2	+++ Makefile
3	@@ -1,5 +1,5 @@
4	-CFLAGS=-g -O2 -Wall -Wextra -Isrc -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
5	-LIBS=-lzmq -ldl -lsqlite3 $(OPTLIBS)
6	+CFLAGS+=-Wall -Wextra -Isrc -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
7	+LIBS=-lzmq -lsqlite3 $(OPTLIBS)
8	PREFIX?=/usr/local
9
10	get_objs = $(addsuffix .o,$(basename $(wildcard $(1))))

Lines 1-11 Link Here

(-)mongrel2/files/patch-src_mem_align.h (-11 lines)
1	--- src/mem/align.h.orig 2016-10-31 10:10:23 UTC
2	+++ src/mem/align.h
3	@@ -30,7 +30,7 @@ union max_align
4	void (*q)(void);
5	};
6
7	-typedef union max_align max_align_t;
8	+typedef union max_align h_max_align_t;
9
10	#endif
11

Lines 1-11 Link Here

(-)mongrel2/files/patch-src_mem_halloc.c (-11 lines)
1	--- src/mem/halloc.c.orig 2016-10-31 10:10:30 UTC
2	+++ src/mem/halloc.c
3	@@ -34,7 +34,7 @@ typedef struct hblock
4	#endif
5	hlist_item_t siblings; /* 2 pointers */
6	hlist_head_t children; /* 1 pointer */
7	- max_align_t data[1]; /* not allocated, see below */
8	+ h_max_align_t data[1]; /* not allocated, see below */
9
10	} hblock_t;
11




bin/mongrel2
bin/m2sh
bin/procer
lib/mongrel2/config_modules/null.so
lib/mongrel2/config_modules/zmq.so
lib/mongrel2/filters/null.so
lib/mongrel2/filters/rewrite.so
lib/mongrel2/filters/sendfile.so
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/procer/rampart.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/procer/profile.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/procer/procer.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/site.css
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/app.js
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/text.css

%%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

%%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

Return to bug 226315

Lines 2-11 Link Here

(-)mongrel2/Makefile (-9 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mongrel2	4	PORTNAME= mongrel2
5	PORTVERSION= 1.7.5	5	PORTVERSION= 1.11.0
6	PORTREVISION= 3	6	DISTVERSIONPREFIX= v
7	CATEGORIES= www	7	CATEGORIES= www
8	MASTER_SITES= http://mongrel2.org/static/downloads/	8	MASTER_SITES= https://github.com/mongrel2/mongrel2/releases/download/v${PORTVERSION}/
9		9
10	MAINTAINER= neel@neelc.org	10	MAINTAINER= neel@neelc.org
11	COMMENT= Is an application, language, and network arch	11	COMMENT= Is an application, language, and network arch
Lines 23-37 Link Here
23	BROKEN_powerpc64= does not build (tests segfault)	23	BROKEN_powerpc64= does not build (tests segfault)
24		24
25	USES= gmake tar:bzip2	25	USES= gmake tar:bzip2
26	MAKE_FLAGS= freebsd	26	ALL_TARGET= freebsd
27	EXAMPLES_LIST= bbs \	27	EXAMPLES_LIST= bbs \
		28	configs \
		29	kegogi \
		30	python \
		31	ws \
28	chat \	32	chat \
29	configs \
30	http_0mq \	33	http_0mq \
31	kegogi \
32	mp3stream \	34	mp3stream \
33	procer \
34	python \
35	tornado \	35	tornado \
36	zcov	36	zcov
37	MAKE_JOBS_UNSAFE=yes	37	MAKE_JOBS_UNSAFE=yes
Lines 41-47 Link Here
41	post-patch:	41	post-patch:
42	@${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' ${WRKSRC}/Makefile	42	@${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' ${WRKSRC}/Makefile
43	@${REINPLACE_CMD} -e 's#fdclose#my_fdclose#g' ${WRKSRC}/src/*.c \	43	@${REINPLACE_CMD} -e 's#fdclose#my_fdclose#g' ${WRKSRC}/src/*.c \
44	${WRKSRC}/src/task/.[ch] ${WRKSRC}/tests/.c	44	${WRKSRC}/src/task/.[ch] ${WRKSRC}/tests/.c \
		45	${WRKSRC}/tools/filters/*.c
45		46
46	post-install:	47	post-install:
47	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*	48	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*

Lines 1-13 Link Here

(-)mongrel2/pkg-plist (-5 / +10 lines)
1	bin/mongrel2	1	bin/mongrel2
2	bin/m2sh	2	bin/m2sh
		3	bin/procer
3	lib/mongrel2/config_modules/null.so	4	lib/mongrel2/config_modules/null.so
4	lib/mongrel2/config_modules/zmq.so	5	lib/mongrel2/config_modules/zmq.so
5	lib/mongrel2/filters/null.so	6	lib/mongrel2/filters/null.so
6	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/procer/procer.h	7	lib/mongrel2/filters/rewrite.so
7	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/procer/Makefile	8	lib/mongrel2/filters/sendfile.so
8	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/procer/rampart.c
9	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/procer/profile.c
10	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/procer/procer.c
11	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/site.css	9	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/site.css
12	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/app.js	10	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/app.js
13	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/text.css	11	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/text.css
Lines 30-36 Link Here
30	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/ui.lua	28	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/ui.lua
31	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/mongrel2.conf	29	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/mongrel2.conf
32	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/strict.lua	30	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/strict.lua
		31	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/configs/.dexy
		32	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/configs/filters.conf
		33	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http_0mq/hello.txt
33	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http_0mq/http.py	34	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http_0mq/http.py
		35	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http_0mq/sendfile.py
34	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http_0mq/xml.py	36	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http_0mq/xml.py
35	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http_0mq/upload.py	37	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http_0mq/upload.py
36	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/setup.py	38	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/setup.py
Lines 101-106 Link Here
101	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mp3stream/handler.py	103	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mp3stream/handler.py
102	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mp3stream/mp3stream.py	104	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mp3stream/mp3stream.py
103	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mp3stream/stream_conf.py	105	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mp3stream/stream_conf.py
		106	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ws/mongrel2.conf
		107	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ws/python/echo.py
		108	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ws/python/wsutil.py
104	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zcov/setup.py	109	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zcov/setup.py
105	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zcov/README.txt	110	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zcov/README.txt
106	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zcov/zcov/data/style.css	111	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zcov/zcov/data/style.css