svn commit: r368069 - in head/benchmarks/wrk: . files

[Sergey A. Osokin]

Author: osa
Date: Fri Sep 12 22:39:11 2014
New Revision: 368069
URL: http://svnweb.freebsd.org/changeset/ports/368069
QAT: https://qat.redports.org/buildarchive/r368069/

Log:
  Upgrade from 3.0.4 to 3.1.1.

Modified:
  head/benchmarks/wrk/Makefile
  head/benchmarks/wrk/distinfo
  head/benchmarks/wrk/files/patch-Makefile

Modified: head/benchmarks/wrk/Makefile
==============================================================================
--- head/benchmarks/wrk/Makefile	Fri Sep 12 21:47:57 2014	(r368068)
+++ head/benchmarks/wrk/Makefile	Fri Sep 12 22:39:11 2014	(r368069)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wrk
-PORTVERSION=	3.0.4
+PORTVERSION=	3.1.1
 CATEGORIES=	benchmarks www
 MASTER_SITES=	https://github.com/wg/wrk/archive/
 DISTNAME=	${PORTVERSION}
@@ -20,9 +20,6 @@ CFLAGS+=	-std=c99 -D_DECLARE_C99_LDBL_MA
 
 PLIST_FILES=	bin/wrk
 
-post-patch:
-	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g;' ${WRKSRC}/Makefile
-
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 

Modified: head/benchmarks/wrk/distinfo
==============================================================================
--- head/benchmarks/wrk/distinfo	Fri Sep 12 21:47:57 2014	(r368068)
+++ head/benchmarks/wrk/distinfo	Fri Sep 12 22:39:11 2014	(r368069)
@@ -1,2 +1,2 @@
-SHA256 (wrk/3.0.4.tar.gz) = 9d0b58b6123dd61bf1b00c180e39e80ea92cc90e14c758e899e0e7772c647661
-SIZE (wrk/3.0.4.tar.gz) = 897909
+SHA256 (wrk/3.1.1.tar.gz) = 3a44bd7c9da2edb80d41105c99c113250330b54bb9c3f80008eb6b088e5842ba
+SIZE (wrk/3.1.1.tar.gz) = 901059

Modified: head/benchmarks/wrk/files/patch-Makefile
==============================================================================
--- head/benchmarks/wrk/files/patch-Makefile	Fri Sep 12 21:47:57 2014	(r368068)
+++ head/benchmarks/wrk/files/patch-Makefile	Fri Sep 12 22:39:11 2014	(r368069)
@@ -1,28 +1,22 @@
---- 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
+--- Makefile.orig	2014-08-05 16:50:32.000000000 +0400
++++ Makefile	2014-09-13 02:29:01.000000000 +0400
+@@ -24,28 +24,28 @@
  OBJ  := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o
  
--LDIR     = deps/luajit/src
+ 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
+ CFLAGS  += -I$(LDIR)
+ LDFLAGS += -L$(LDIR)
++PREFIX	:= ${PREFIX}
++LIBS    := -lluajit-5.1 $(LIBS) -L$(PREFIX)/lib
  
  all: $(BIN)
  
-@@ -38,14 +37,14 @@
+ clean:
+ 	$(RM) $(BIN) obj/*
+-	@$(MAKE) -C deps/luajit clean
+ 
+ $(BIN): $(OBJ)
  	@echo LINK $(BIN)
  	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
  
@@ -32,10 +26,10 @@
  $(ODIR):
  	@mkdir -p $@
  
- $(ODIR)/bytecode.o: scripts/wrk.lua
+ $(ODIR)/bytecode.o: src/wrk.lua
  	@echo LUAJIT $<
 -	@$(SHELL) -c 'cd $(LDIR) && ./luajit -b $(CURDIR)/$< $(CURDIR)/$@'
-+	@$(SHELL) -c 'cd $(LDIR) && %%PREFIX%%/bin/luajit -b $(CURDIR)/$< $(CURDIR)/$@'
++	@$(SHELL) -c 'cd $(LDIR) && ${PREFIX}/bin/luajit -b $(CURDIR)/$< $(CURDIR)/$@'
  
  $(ODIR)/%.o : %.c
  	@echo CC $<