svn commit: r463468 - in head/www/mongrel2: . files
Yuri Victorovich
yuri at FreeBSD.org
Sat Mar 3 08:40:46 UTC 2018
Author: yuri
Date: Sat Mar 3 08:40:45 2018
New Revision: 463468
URL: https://svnweb.freebsd.org/changeset/ports/463468
Log:
www/mongrel2: Update to 1.11.0
Port changes:
* Changed to DISTVERSION
* Updated LIB_DEPENDS
* Changed to GitHub
* GH_TUPLE to unbundle src/mbedtls
* Decoupled build and tests
* Added TEST_xx lines for tests to run separately
* Updated Makefile patches
* Silenced/unsilenced commands
Tests fail on 12: Invalid system call
PR: 226315
Submitted by: Neel Chauhan <neel at neelc.org> (maintainer)
Approved by: tcberner (mentor, implicit)
Added:
head/www/mongrel2/files/patch-src_mbedtls_Makefile (contents, props changed)
Deleted:
head/www/mongrel2/files/patch-src_mem_align.h
head/www/mongrel2/files/patch-src_mem_halloc.c
Modified:
head/www/mongrel2/Makefile
head/www/mongrel2/distinfo
head/www/mongrel2/files/patch-Makefile
head/www/mongrel2/pkg-plist
Modified: head/www/mongrel2/Makefile
==============================================================================
--- head/www/mongrel2/Makefile Sat Mar 3 08:33:04 2018 (r463467)
+++ head/www/mongrel2/Makefile Sat Mar 3 08:40:45 2018 (r463468)
@@ -2,10 +2,9 @@
# $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 at neelc.org
COMMENT= Is an application, language, and network arch
@@ -13,8 +12,7 @@ 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'
@@ -22,33 +20,39 @@ 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 <bsd.port.mk>
Modified: head/www/mongrel2/distinfo
==============================================================================
--- head/www/mongrel2/distinfo Sat Mar 3 08:33:04 2018 (r463467)
+++ head/www/mongrel2/distinfo Sat Mar 3 08:40:45 2018 (r463468)
@@ -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
Modified: head/www/mongrel2/files/patch-Makefile
==============================================================================
--- head/www/mongrel2/files/patch-Makefile Sat Mar 3 08:33:04 2018 (r463467)
+++ head/www/mongrel2/files/patch-Makefile Sat Mar 3 08:40:45 2018 (r463468)
@@ -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
Added: head/www/mongrel2/files/patch-src_mbedtls_Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/mongrel2/files/patch-src_mbedtls_Makefile Sat Mar 3 08:40:45 2018 (r463468)
@@ -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:
Modified: head/www/mongrel2/pkg-plist
==============================================================================
--- head/www/mongrel2/pkg-plist Sat Mar 3 08:33:04 2018 (r463467)
+++ head/www/mongrel2/pkg-plist Sat Mar 3 08:40:45 2018 (r463468)
@@ -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 @@ lib/mongrel2/filters/null.so
%%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 @@ lib/mongrel2/filters/null.so
%%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
More information about the svn-ports-head
mailing list