cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to mongrel2-1.8.0

Browse Source
This commit is contained in:
jasper 2013-03-08 10:35:15 +00:00
parent b16bb3ff33
commit 8217b15604
6 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
www/mongrel2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2012/05/20 20:48:01 naddy Exp $
# $OpenBSD: Makefile,v 1.7 2013/03/08 10:35:15 jasper Exp $
# Some assembly required
ONLY_FOR_ARCHS =i386 amd64
@ -6,8 +6,7 @@ SHARED_ONLY = Yes
COMMENT = language agnostic asynchronous web server
DISTNAME = mongrel2-1.7.5
REVISION= 2
DISTNAME = mongrel2-1.8.0
CATEGORIES = www
HOMEPAGE = http://mongrel2.org/
@ -18,16 +17,18 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
MASTER_SITES = http://mongrel2.org/static/downloads/
EXTRACT_SUFX = .tar.bz2
MASTER_SITES = http://distfiles.nl/
TAR = ${LOCALBASE}/bin/gtar
WANTLIB += c pthread sqlite3 zmq
LIB_DEPENDS = net/zeromq
BUILD_DEPENDS = archivers/gtar
LIB_DEPENDS = net/zeromq>=3.2.0
USE_GMAKE = Yes
MAKE_ARGS = OPTFLAGS="-I${LOCALBASE}/include" \
OPTLIBS="-L${LOCALBASE}/lib"
OPTLIBS="-L${LOCALBASE}/lib" \
LD="${CC}"
ALL_TARGET = openbsd filters config_modules ${MAKE_ARGS}
EXAMPLE_DIR = ${PREFIX}/share/examples/mongrel2

7
www/mongrel2/distinfo
View File

@ -1,5 +1,2 @@
MD5 (mongrel2-1.7.5.tar.bz2) = wkPvxZ5Zcvo4G9E6fur9xw==
RMD160 (mongrel2-1.7.5.tar.bz2) = 5iO7F6Qt+lCdnRTBIIuPtgR/IqI=
SHA1 (mongrel2-1.7.5.tar.bz2) = RWVh/gTxwO5KmWz8nerauMV+5tw=
SHA256 (mongrel2-1.7.5.tar.bz2) = SOSzuolZvgAeW6x14KP+5ijJF7CPEVvgi81TSKxmOwE=
SIZE (mongrel2-1.7.5.tar.bz2) = 745357
SHA256 (mongrel2-1.8.0.tar.gz) = Z9FfajKhARAQxcf1FIC2l9n3upvs252tSZjcRoEJY3M=
SIZE (mongrel2-1.8.0.tar.gz) = 1214685

21
www/mongrel2/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.2 2011/07/06 01:23:50 jeremy Exp $
--- Makefile.orig Wed Jun 22 09:25:12 2011
+++ Makefile Thu Jun 30 08:50:40 2011
$OpenBSD: patch-Makefile,v 1.3 2013/03/08 10:35:15 jasper Exp $
--- Makefile.orig Fri Mar 1 09:51:04 2013
+++ Makefile Fri Mar 1 09:52:00 2013
@@ -1,5 +1,5 @@
CFLAGS=-g -O2 -Wall -Wextra -Isrc -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
-LIBS=-lzmq -ldl -lsqlite3 $(OPTLIBS)
@ -12,19 +12,20 @@ $OpenBSD: patch-Makefile,v 1.2 2011/07/06 01:23:50 jeremy Exp $
TESTS=$(patsubst %.c,%,${TEST_SRC})
MAKEOPTS=OPTFLAGS="${NOEXTCFLAGS} ${OPTFLAGS}" OPTLIBS="${OPTLIBS}" LIBS="${LIBS}" DESTDIR="${DESTDIR}" PREFIX="${PREFIX}"
-all: bin/mongrel2 tests m2sh
+all: bin/mongrel2 m2sh
-all: bin/mongrel2 tests m2sh procer
+all: bin/mongrel2 m2sh procer
dev: CFLAGS=-g -Wall -Isrc -Wall -Wextra $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
dev: all
@@ -93,9 +93,9 @@ filters: build/libm2.a
config_modules: build/libm2.a
@@ -99,10 +99,9 @@ config_modules: build/libm2.a
${MAKE} ${MAKEOPTS} -C tools/config_modules all
# Try to install first before creating target directory and trying again
-install: all
- install -d $(DESTDIR)/$(PREFIX)/bin/
- install bin/mongrel2 $(DESTDIR)/$(PREFIX)/bin/
+install:
- install bin/mongrel2 $(DESTDIR)/$(PREFIX)/bin/ \
- || ( install -d $(DESTDIR)/$(PREFIX)/bin/ \
- && install bin/mongrel2 $(DESTDIR)/$(PREFIX)/bin/ )
+install:
+ install -d $(PREFIX)/bin/
+ install bin/mongrel2 $(PREFIX)/bin/
${MAKE} ${MAKEOPTS} -C tools/m2sh install

12
www/mongrel2/patches/patch-src_polarssl_net_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_polarssl_net_c,v 1.1 2011/07/06 01:23:50 jeremy Exp $
--- src/polarssl/net.c.orig Thu Jun 30 08:27:01 2011
+++ src/polarssl/net.c Thu Jun 30 08:27:02 2011
@@ -59,7 +59,7 @@ static int wsa_init_done = 0;
#include <netdb.h>
#include <errno.h>
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
#include <sys/endian.h>
#elif defined(__APPLE__)
#include <machine/endian.h>

12
www/mongrel2/patches/patch-tools_procer_Makefile Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-tools_procer_Makefile,v 1.1 2013/03/08 10:35:15 jasper Exp $
--- tools/procer/Makefile.orig Fri Mar 1 09:58:51 2013
+++ tools/procer/Makefile Fri Mar 1 09:59:00 2013
@@ -8,7 +8,7 @@ all: procer
procer: ../../build/libm2.a ${OBJECTS}
- gcc $(OPTFLAGS) $(OPTLIBS) -o $@ ${OBJECTS} ../../build/libm2.a ${LIBS}
+ ${CC} $(OPTFLAGS) $(OPTLIBS) -o $@ ${OBJECTS} ../../build/libm2.a ${LIBS}
clean:
rm -f *.o procer

16
www/mongrel2/pkg/PLIST
View File

@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.2 2011/07/06 01:23:50 jeremy Exp $
@comment $OpenBSD: PLIST,v 1.3 2013/03/08 10:35:15 jasper Exp $
@bin bin/m2sh
@bin bin/mongrel2
@bin bin/procer
lib/mongrel2/
lib/mongrel2/config_modules/
lib/mongrel2/config_modules/null.so
@ -58,8 +59,10 @@ share/examples/mongrel2/chat/static/site.css
share/examples/mongrel2/chat/static/text.css
share/examples/mongrel2/chat/www.py
share/examples/mongrel2/configs/
share/examples/mongrel2/configs/.dexy
share/examples/mongrel2/configs/any.conf
share/examples/mongrel2/configs/complex.conf
share/examples/mongrel2/configs/filters.conf
share/examples/mongrel2/configs/mongrel2.conf
share/examples/mongrel2/configs/multi.conf
share/examples/mongrel2/configs/multi_handler.conf
@ -95,12 +98,6 @@ share/examples/mongrel2/mp3stream/
share/examples/mongrel2/mp3stream/handler.py
share/examples/mongrel2/mp3stream/mp3stream.py
share/examples/mongrel2/mp3stream/stream_conf.py
share/examples/mongrel2/procer/
share/examples/mongrel2/procer/Makefile
share/examples/mongrel2/procer/procer.c
share/examples/mongrel2/procer/procer.h
share/examples/mongrel2/procer/profile.c
share/examples/mongrel2/procer/rampart.c
share/examples/mongrel2/python/
share/examples/mongrel2/python/bin/
share/examples/mongrel2/python/bin/m2shpy
@ -129,6 +126,11 @@ share/examples/mongrel2/tornado/
share/examples/mongrel2/tornado/README
share/examples/mongrel2/tornado/auth_demo.py
share/examples/mongrel2/tornado/authdemo.py
share/examples/mongrel2/ws/
share/examples/mongrel2/ws/mongrel2.conf
share/examples/mongrel2/ws/python/
share/examples/mongrel2/ws/python/echo.py
share/examples/mongrel2/ws/python/wsutil.py
share/examples/mongrel2/zcov/
share/examples/mongrel2/zcov/LICENSE.txt
share/examples/mongrel2/zcov/README.txt