[114698] trunk/dports/www/mongrel2
ryandesign at macports.org
ryandesign at macports.org
Fri Dec 13 17:29:44 PST 2013
Revision: 114698
https://trac.macports.org/changeset/114698
Author: ryandesign at macports.org
Date: 2013-12-13 17:29:44 -0800 (Fri, 13 Dec 2013)
Log Message:
-----------
mongrel2: update to 1.8.1; add universal variant; enable parallel build; turn reinplaces into patchfiles
Modified Paths:
--------------
trunk/dports/www/mongrel2/Portfile
trunk/dports/www/mongrel2/files/patch-Makefile.diff
Added Paths:
-----------
trunk/dports/www/mongrel2/files/patch-tools-procer-Makefile.diff
Removed Paths:
-------------
trunk/dports/www/mongrel2/files/patch-tools_m2sh_Makefile.diff
Modified: trunk/dports/www/mongrel2/Portfile
===================================================================
--- trunk/dports/www/mongrel2/Portfile 2013-12-14 01:13:47 UTC (rev 114697)
+++ trunk/dports/www/mongrel2/Portfile 2013-12-14 01:29:44 UTC (rev 114698)
@@ -4,7 +4,7 @@
PortSystem 1.0
PortGroup github 1.0
-github.setup zedshaw mongrel2 1.8.0 v
+github.setup zedshaw mongrel2 1.8.1 v
license BSD
categories www
platforms darwin
@@ -15,25 +15,23 @@
web server that focuses on web applications using modern browser \
technologies.
-checksums md5 0ec44b3cd3518a8e58c591c932075b52 \
- sha1 27c942b5c3c72c65084b355f6cbafd814f8cd64b \
- rmd160 f3ad949a503d5e9b36abf74333d0af3e0615fd1f
+checksums rmd160 a3c69d86555149a2ced7811d3be3b11bbae4f485 \
+ sha256 271c17f18db432d5d2af450efcefea05833f8eacc7389a5e56856cd92fc643ce
-use_configure no
-use_parallel_build no
depends_lib path:lib/libzmq.dylib:zmq22 \
port:sqlite3
-patch {
- reinplace "s|-rdynamic||" ${worksrcpath}/Makefile
- reinplace "s|gcc|\$(CC)|" ${worksrcpath}/tools/procer/Makefile
-}
+patchfiles patch-Makefile.diff \
+ patch-tools-procer-Makefile.diff
-# override variables in build and destroot phases
+use_configure no
+
+variant universal {}
+
build.args-append PREFIX=${prefix} \
CC=${configure.cc} \
- OPTFLAGS="${configure.cflags} -I${prefix}/include [get_canonical_archflags cc]" \
- OPTLIBS="${configure.ldflags} -L${prefix}/lib [get_canonical_archflags ld]"
+ OPTFLAGS="${configure.cflags} ${configure.cppflags} [get_canonical_archflags cc]" \
+ OPTLIBS="${configure.ldflags} [get_canonical_archflags ld]"
destroot.args-append PREFIX=${prefix}
post-destroot {
@@ -46,4 +44,3 @@
xinstall -m 644 ${worksrcpath}/tests/config.sqlite ${destroot}${prefix}/share/examples/${name}/test-config.sqlite
eval file copy [glob ${worksrcpath}/examples/*] ${destroot}${prefix}/share/examples/${name}
}
-
Modified: trunk/dports/www/mongrel2/files/patch-Makefile.diff
===================================================================
--- trunk/dports/www/mongrel2/files/patch-Makefile.diff 2013-12-14 01:13:47 UTC (rev 114697)
+++ trunk/dports/www/mongrel2/files/patch-Makefile.diff 2013-12-14 01:29:44 UTC (rev 114698)
@@ -1,21 +1,8 @@
---- Makefile.orig 2011-03-25 12:51:07.000000000 +0100
-+++ Makefile 2011-03-25 12:48:43.000000000 +0100
-@@ -1,6 +1,6 @@
- CFLAGS=-g -O2 -Wall -Isrc -DNDEBUG $(OPTFLAGS)
- LIBS=-lzmq -lsqlite3 $(OPTLIBS)
--PREFIX?=/usr/local
-+PREFIX?=@@PREFIX@@
+--- Makefile.orig 2013-05-25 17:53:41.000000000 -0500
++++ Makefile 2013-12-13 19:21:43.000000000 -0600
+@@ -1,4 +1,4 @@
+-CFLAGS=-g -O2 -Wall -Wextra -Isrc -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
++CFLAGS=-g -O2 -Wall -Wextra -Isrc -pthread -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
+ LIBS=-lzmq -ldl -lsqlite3 $(OPTLIBS)
+ PREFIX?=/usr/local
- ASM=$(wildcard src/**/*.S src/*.S)
- RAGEL_TARGETS=src/state.c src/http11/http11_parser.c
-@@ -69,8 +69,8 @@
- install: all install-bin install-m2sh
-
- install-bin:
-- install -d $(PREFIX)/bin/
-- install bin/mongrel2 $(PREFIX)/bin/
-+ install -d $(DESTDIR)/$(PREFIX)/bin/
-+ install bin/mongrel2 $(DESTDIR)/$(PREFIX)/bin/
-
- install-m2sh:
- ${MAKE} -C tools/m2sh install
Added: trunk/dports/www/mongrel2/files/patch-tools-procer-Makefile.diff
===================================================================
--- trunk/dports/www/mongrel2/files/patch-tools-procer-Makefile.diff (rev 0)
+++ trunk/dports/www/mongrel2/files/patch-tools-procer-Makefile.diff 2013-12-14 01:29:44 UTC (rev 114698)
@@ -0,0 +1,11 @@
+--- tools/procer/Makefile.orig 2013-05-25 17:53:41.000000000 -0500
++++ tools/procer/Makefile 2013-12-13 19:20:30.000000000 -0600
+@@ -8,7 +8,7 @@
+
+
+ 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
Deleted: trunk/dports/www/mongrel2/files/patch-tools_m2sh_Makefile.diff
===================================================================
--- trunk/dports/www/mongrel2/files/patch-tools_m2sh_Makefile.diff 2013-12-14 01:13:47 UTC (rev 114697)
+++ trunk/dports/www/mongrel2/files/patch-tools_m2sh_Makefile.diff 2013-12-14 01:29:44 UTC (rev 114698)
@@ -1,20 +0,0 @@
---- tools/m2sh/Makefile.orig 2011-03-25 12:50:46.000000000 +0100
-+++ tools/m2sh/Makefile 2011-03-25 12:49:04.000000000 +0100
-@@ -1,7 +1,7 @@
- CFLAGS=-DNDEBUG -DNO_LINENOS -g -I../../src -Isrc -Wall $(OPTFLAGS)
- LIBS=-lzmq -lsqlite3 ../../build/libm2.a $(OPTLIBS)
-
--PREFIX?=/usr/local
-+PREFIX?=@@PREFIX@@
- SOURCES=$(wildcard src/*.c)
- OBJECTS=$(patsubst %.c,%.o,${SOURCES})
- TEST_SRC=$(wildcard tests/*.c)
-@@ -15,7 +15,7 @@
- dev: all
-
- install: build/m2sh
-- install build/m2sh ${PREFIX}/bin
-+ install build/m2sh $(DESTDIR)/${PREFIX}/bin
-
- build/libm2sh.a: ${LIB_OBJ}
- mkdir -p build
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131213/1a121f07/attachment.html>
More information about the macports-changes
mailing list