Index: head/www/mongrel2/Makefile =================================================================== --- head/www/mongrel2/Makefile (revision 463467) +++ head/www/mongrel2/Makefile (revision 463468) @@ -1,54 +1,58 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= mongrel2 -PORTVERSION= 1.7.5 -PORTREVISION= 3 +DISTVERSIONPREFIX= v +DISTVERSION= 1.11.0 CATEGORIES= www -MASTER_SITES= http://mongrel2.org/static/downloads/ MAINTAINER= neel@neelc.org COMMENT= Is an application, language, and network arch LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libzmq.so:net/libzmq2 \ - libsqlite3.so:databases/sqlite3 +LIB_DEPENDS= libzmq.so:net/libzmq4 BROKEN_armv6= does not build: src/task/task.c:66:11: error: no member named 'arm_r0' in 'mcontext_t' BROKEN_armv7= does not build: src/task/task.c:66:11: error: no member named 'arm_r0' in 'mcontext_t' BROKEN_mips= does not build (tests segfault) BROKEN_mips64= does not build (tests segfault) BROKEN_powerpc64= does not build (tests segfault) -USES= gmake tar:bzip2 -MAKE_FLAGS= freebsd +USES= gmake localbase:ldflags sqlite tar:bzip2 +USE_GITHUB= yes +GH_TUPLE= ARMmbed:mbedtls:8254ed2:x/src/mbedtls +ALL_TARGET= freebsd EXAMPLES_LIST= bbs \ - chat \ configs \ - http_0mq \ kegogi \ - mp3stream \ - procer \ python \ + ws \ + chat \ + http_0mq \ + mp3stream \ tornado \ zcov -MAKE_JOBS_UNSAFE=yes +MAKE_JOBS_UNSAFE= yes +TEST_TARGET= tests # tests fail on 12: Invalid system call +TEST_ENV= ${MAKE_ENV} OPTFLAGS=-I${LOCALBASE}/include +TEST_ARGS= ${MAKE_ARGS} + OPTIONS_DEFINE= EXAMPLES 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/* - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mongrel2/*/*.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mongrel2/*/*.so @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} .for example in ${EXAMPLES_LIST} - @cd ${WRKSRC}/examples && ${COPYTREE_SHARE} ${example} ${STAGEDIR}/${EXAMPLESDIR} + cd ${WRKSRC}/examples && ${COPYTREE_SHARE} ${example} ${STAGEDIR}/${EXAMPLESDIR} .endfor .include Index: head/www/mongrel2/distinfo =================================================================== --- head/www/mongrel2/distinfo (revision 463467) +++ head/www/mongrel2/distinfo (revision 463468) @@ -1,2 +1,5 @@ -SHA256 (mongrel2-1.7.5.tar.bz2) = 48e4b3ba8959be001e5bac75e0a3fee628c917b08f115be08bcd5348ac663b01 -SIZE (mongrel2-1.7.5.tar.bz2) = 745357 +TIMESTAMP = 1520062781 +SHA256 (mongrel2-mongrel2-v1.11.0_GH0.tar.gz) = dd7accbe4be25ee841b1d73e1fc2e6230e90f5783e1d25527037416e5f519c86 +SIZE (mongrel2-mongrel2-v1.11.0_GH0.tar.gz) = 1060770 +SHA256 (ARMmbed-mbedtls-8254ed2_GH0.tar.gz) = de500973a2db0bc419ddd7a67360b1f2dd4fe925448539f8ee59ae3e6eafcc9b +SIZE (ARMmbed-mbedtls-8254ed2_GH0.tar.gz) = 1803037 Index: head/www/mongrel2/files/patch-src_mem_align.h =================================================================== --- head/www/mongrel2/files/patch-src_mem_align.h (revision 463467) +++ head/www/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: head/www/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: head/www/mongrel2/files/patch-src_mem_halloc.c =================================================================== --- head/www/mongrel2/files/patch-src_mem_halloc.c (revision 463467) +++ head/www/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: head/www/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: head/www/mongrel2/files/patch-Makefile =================================================================== --- head/www/mongrel2/files/patch-Makefile (revision 463467) +++ head/www/mongrel2/files/patch-Makefile (revision 463468) @@ -1,10 +1,46 @@ ---- Makefile.orig 2011-06-22 16:25:12 UTC +--- Makefile.orig 2015-12-31 09:25:07 UTC +++ Makefile -@@ -1,5 +1,5 @@ --CFLAGS=-g -O2 -Wall -Wextra -Isrc -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64 +@@ -1,5 +1,6 @@ +-CFLAGS=-g -O2 -Wall -Wextra -Isrc -Isrc/mbedtls/include -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) ++CFLAGS?=-g -O2 ++CFLAGS+=-Wall -Wextra -Isrc -Isrc/mbedtls/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64 ++LIBS=-L${LOCALBASE}/lib -lzmq -lsqlite3 $(OPTLIBS) PREFIX?=/usr/local get_objs = $(addsuffix .o,$(basename $(wildcard $(1)))) +@@ -22,14 +23,14 @@ MAKEOPTS=OPTFLAGS="${NOEXTCFLAGS} ${OPTF + # upon every make invocation, and must be done before the SOURCES variable, above + # is lazily evaluated, or none of the src/mbedtls source files will be found + +-ifdef $($(shell \ +- if git submodule status | grep '^-'; then \ +- echo "mbedtls; init and update git submodule" 1>&2; \ +- git submodule init && git submodule update; \ +- fi )) +-endif ++#ifdef $($(shell \ ++# if git submodule status | grep '^-'; then \ ++# echo "mbedtls; init and update git submodule" 1>&2; \ ++# git submodule init && git submodule update; \ ++# fi )) ++#endif + +-all: builddirs bin/mongrel2 tests m2sh procer ++all: builddirs bin/mongrel2 filters config_modules m2sh procer + + dev: CFLAGS=-g -Wall -Isrc -Wall -Wextra $(OPTFLAGS) -D_FILE_OFFSET_BITS=64 + dev: all +@@ -220,9 +221,9 @@ netbsd: LIBS=-lzmq -lsqlite3 $(OPTLIBS) + netbsd: dev + + +-freebsd: OPTFLAGS += -I/usr/local/include +-freebsd: OPTLIBS += -L/usr/local/lib -pthread +-freebsd: LIBS=-lzmq -lsqlite3 $(OPTLIBS) ++freebsd: OPTFLAGS += -I$(PREFIX)/include ++freebsd: OPTLIBS += -L$(PREFIX)/lib -pthread ++freebsd: LIBS=-L$(PREFIX)/lib -lzmq -lsqlite3 $(OPTLIBS) + freebsd: all + + openbsd: OPTFLAGS += -I/usr/local/include Index: head/www/mongrel2/files/patch-src_mbedtls_Makefile =================================================================== --- head/www/mongrel2/files/patch-src_mbedtls_Makefile (nonexistent) +++ head/www/mongrel2/files/patch-src_mbedtls_Makefile (revision 463468) @@ -0,0 +1,9 @@ +--- src/mbedtls/Makefile.orig 2018-03-03 08:15:18 UTC ++++ src/mbedtls/Makefile +@@ -1,5 +1,5 @@ + +-DESTDIR=/usr/local ++DESTDIR?=/usr/local + PREFIX=mbedtls_ + + .SILENT: Property changes on: head/www/mongrel2/files/patch-src_mbedtls_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/mongrel2/pkg-plist =================================================================== --- head/www/mongrel2/pkg-plist (revision 463467) +++ head/www/mongrel2/pkg-plist (revision 463468) @@ -1,115 +1,120 @@ 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 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/bbs.js %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/js/jsonStringify.js %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/js/jsSocket.js %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/fsm.js %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/index.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/reset.css %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/flash/jsSocket.as %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/flash/jsSocket.swf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/flash/JsSocket.hx %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/flash/Makefile %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/html/flash/jsSocket2.swf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/db.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/bbs.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/engine.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/config.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bbs/client.py %%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%%/python/mongrel2/handler.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/mongrel2/request.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/mongrel2/control.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/mongrel2/__init__.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/mongrel2/config/__init__.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/mongrel2/config/model.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/mongrel2/config/args.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/mongrel2/config/rc.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/mongrel2/config/commands.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/mongrel2/tnetstrings.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/mongrel2/sql/config.sql %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/tests/__init__.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/tests/sample_conf.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/tests/two_servers.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/tests/composite_conf.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/tests/mongrel2_org.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/bin/m2shpy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/lempar.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/lemon.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/src/kegogi_lexer.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/src/httpclient.h %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/src/param.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/src/kegogi.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/src/kegogi_tokens.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/src/kegogi_parser.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/src/kegogi_parser.y %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/src/kegogi_lexer.rl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/src/fuzzrnd.h %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/src/kegogi_parser.h %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/src/kegogi_tokens.h %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/src/param.h %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/src/kegogi.h %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/src/httpclient.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/src/kegogi_parser_extra.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/src/fuzzrnd.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/Makefile %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kegogi/tests/googletest.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/configs/multi.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/configs/sample.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/configs/mongrel2.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/configs/multi_handler.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/configs/any.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/configs/complex.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tornado/auth_demo.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tornado/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tornado/authdemo.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat/static/site.css %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat/static/fsm.js %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat/static/flash/jsSocket.swf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat/static/flash/JsSocket.hx %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat/static/flash/jsSocket2.swf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat/static/flash/jsSocket.as %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat/static/flash/Makefile %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat/static/text.css %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat/static/960.css %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat/static/index.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat/static/js/jsonStringify.js %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat/static/js/jsSocket.js %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat/static/reset.css %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat/static/app.js %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat/static/chat.js %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat/www.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat/idiots %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat/chat.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 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zcov/zcov/data/js/sourceview.js %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zcov/zcov/data/js/sorttable.js %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zcov/zcov/GCovParser.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zcov/zcov/GCovGroup.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zcov/bin/zcov-merge %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zcov/bin/zcov-summarize %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zcov/bin/zcov-scan %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zcov/bin/zcov-genhtml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zcov/LICENSE.txt