Date: Tue, 26 Nov 2013 03:48:13 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334916 - in head/benchmarks/wrk: . files Message-ID: <201311260348.rAQ3mDC8078995@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Tue Nov 26 03:48:13 2013 New Revision: 334916 URL: http://svnweb.freebsd.org/changeset/ports/334916 Log: Upgrade from 2.2.2 to 3.0.4. Stagefy. Added: head/benchmarks/wrk/files/ head/benchmarks/wrk/files/patch-Makefile (contents, props changed) Modified: head/benchmarks/wrk/Makefile head/benchmarks/wrk/distinfo Modified: head/benchmarks/wrk/Makefile ============================================================================== --- head/benchmarks/wrk/Makefile Tue Nov 26 03:35:32 2013 (r334915) +++ head/benchmarks/wrk/Makefile Tue Nov 26 03:48:13 2013 (r334916) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wrk -PORTVERSION= 2.2.2 +PORTVERSION= 3.0.4 CATEGORIES= benchmarks www MASTER_SITES= https://github.com/wg/wrk/archive/ DISTNAME= ${PORTVERSION} @@ -14,6 +14,7 @@ COMMENT= The modern HTTP benchmarking to LICENSE= AL2 FETCH_ARGS= -pRr +LIB_DEPENDS+= libluajit-5.1.so:${PORTSDIR}/lang/luajit WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USES= gmake CFLAGS+= -std=c99 -D_DECLARE_C99_LDBL_MATH @@ -28,9 +29,9 @@ BROKEN= does not link on FreeBSD 7.x .endif post-patch: - @${REINPLACE_CMD} '1d;2s/-lpthread/${PTHREAD_LIBS}/' ${WRKSRC}/Makefile + @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g;' ${WRKSRC}/Makefile do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.post.mk> Modified: head/benchmarks/wrk/distinfo ============================================================================== --- head/benchmarks/wrk/distinfo Tue Nov 26 03:35:32 2013 (r334915) +++ head/benchmarks/wrk/distinfo Tue Nov 26 03:48:13 2013 (r334916) @@ -1,2 +1,2 @@ -SHA256 (wrk/2.2.2.tar.gz) = c33e0d6dbb49819f41b46a65974203988401ee893d8bf64ad9836484a0d3b897 -SIZE (wrk/2.2.2.tar.gz) = 44112 +SHA256 (wrk/3.0.4.tar.gz) = 9d0b58b6123dd61bf1b00c180e39e80ea92cc90e14c758e899e0e7772c647661 +SIZE (wrk/3.0.4.tar.gz) = 897909 Added: head/benchmarks/wrk/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/benchmarks/wrk/files/patch-Makefile Tue Nov 26 03:48:13 2013 (r334916) @@ -0,0 +1,41 @@ +--- Makefile.bak 2013-11-16 07:06:29.000000000 +0400 ++++ Makefile 2013-11-26 07:17:32.000000000 +0400 +@@ -1,5 +1,4 @@ +-CFLAGS := -std=c99 -Wall -O2 -D_REENTRANT +-LIBS := -lpthread -lm -lcrypto -lssl ++LIBS := -pthread -lm -lcrypto -lssl + + TARGET := $(shell uname -s | tr [A-Z] [a-z] 2>/dev/null || echo unknown) + +@@ -23,10 +22,10 @@ + ODIR := obj + OBJ := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o + +-LDIR = deps/luajit/src +-LIBS := -lluajit $(LIBS) +-CFLAGS += -I $(LDIR) +-LDFLAGS += -L $(LDIR) ++#LDIR = deps/luajit/src ++LIBS := -lluajit-5.1 $(LIBS) ++CFLAGS += -I %%PREFIX%%/include/luajit-2.0 ++LDFLAGS += -L %%PREFIX%%/lib + + all: $(BIN) + +@@ -38,14 +37,14 @@ + @echo LINK $(BIN) + @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + +-$(OBJ): config.h Makefile $(LDIR)/libluajit.a | $(ODIR) ++$(OBJ): config.h Makefile | $(ODIR) + + $(ODIR): + @mkdir -p $@ + + $(ODIR)/bytecode.o: scripts/wrk.lua + @echo LUAJIT $< +- @$(SHELL) -c 'cd $(LDIR) && ./luajit -b $(CURDIR)/$< $(CURDIR)/$@' ++ @$(SHELL) -c 'cd $(LDIR) && %%PREFIX%%/bin/luajit -b $(CURDIR)/$< $(CURDIR)/$@' + + $(ODIR)/%.o : %.c + @echo CC $<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311260348.rAQ3mDC8078995>