www/mongrel2: Update to 1.12.0

PR:		229657
Submitted by:	Neel Chauhan <neel@neelc.org> (maintainer)
This commit is contained in:
Steve Wills 2018-07-10 04:46:05 +00:00
parent 40762f0cda
commit af0183ab67
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=474324
3 changed files with 5 additions and 50 deletions

View file

@ -3,7 +3,7 @@
PORTNAME= mongrel2
DISTVERSIONPREFIX= v
DISTVERSION= 1.11.0
DISTVERSION= 1.12.0
CATEGORIES= www
MAINTAINER= neel@neelc.org
@ -35,6 +35,7 @@ EXAMPLES_LIST= bbs \
tornado \
zcov
MAKE_JOBS_UNSAFE= yes
MAKE_ARGS+= -f localmbedtls.mak
TEST_TARGET= tests # tests fail on 12: Invalid system call
TEST_ENV= ${MAKE_ENV} OPTFLAGS=-I${LOCALBASE}/include

View file

@ -1,5 +1,5 @@
TIMESTAMP = 1520062781
SHA256 (mongrel2-mongrel2-v1.11.0_GH0.tar.gz) = dd7accbe4be25ee841b1d73e1fc2e6230e90f5783e1d25527037416e5f519c86
SIZE (mongrel2-mongrel2-v1.11.0_GH0.tar.gz) = 1060770
TIMESTAMP = 1531175682
SHA256 (mongrel2-mongrel2-v1.12.0_GH0.tar.gz) = cef8aeaac27ae61d81a5b7bce023aa3cb8e0e50d4a0fbab84738deb488a889f4
SIZE (mongrel2-mongrel2-v1.12.0_GH0.tar.gz) = 1065961
SHA256 (ARMmbed-mbedtls-8254ed2_GH0.tar.gz) = de500973a2db0bc419ddd7a67360b1f2dd4fe925448539f8ee59ae3e6eafcc9b
SIZE (ARMmbed-mbedtls-8254ed2_GH0.tar.gz) = 1803037

View file

@ -1,46 +0,0 @@
--- Makefile.orig 2015-12-31 09:25:07 UTC
+++ Makefile
@@ -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?=-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