benchmarks/siege: Update version 3.0.9=>3.1.0

- Change MASTER_SITES to the newer according to website
- Fix patch files to reflect 'make makepatch'

5 files changed, 38 insertions, 13 deletions

diff --git a/benchmarks/siege/Makefile b/benchmarks/siege/Makefile
index 3f4715f3a813..f8962efccb92 100644
--- a/benchmarks/siege/Makefile
+++ b/benchmarks/siege/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	siege
-PORTVERSION=	3.0.9
+PORTVERSION=	3.1.0
 CATEGORIES=	benchmarks www
-MASTER_SITES=	http://www.joedog.org/pub/siege/ \
+MASTER_SITES=	http://download.joedog.org/siege/ \
 		http://fossies.org/linux/www/
 
 MAINTAINER=	bofh@FreeBSD.org
@@ -19,10 +19,6 @@ CONFIGURE_ENV=	PERL="${PERL}"
 CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE} --disable-shared \
 		--sysconfdir=${ETCDIR}
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|^\(AC_PROG_SHELL\)|dnl \1|' ${WRKSRC}/configure.ac
-
 pre-configure:
 	@${RM} -f ${WRKSRC}/acinclude.m4
 	@${RM} -f ${WRKSRC}/utils/missing
diff --git a/benchmarks/siege/distinfo b/benchmarks/siege/distinfo
index d99129af7289..bbb711c8c172 100644
--- a/benchmarks/siege/distinfo
+++ b/benchmarks/siege/distinfo
@@ -1,2 +1,2 @@
-SHA256 (siege-3.0.9.tar.gz) = 82376eb466414ef4872a979a372972658df9813778ee8572341d4736ed30cb8f
-SIZE (siege-3.0.9.tar.gz) = 524125
+SHA256 (siege-3.1.0.tar.gz) = 518759b3dc384d9960b8aa048ae32d9f04a62b9c248ae796812b6cb76681a514
+SIZE (siege-3.1.0.tar.gz) = 502461
diff --git a/benchmarks/siege/files/patch-Makefile.am b/benchmarks/siege/files/patch-Makefile.am
new file mode 100644
index 000000000000..f4eface21c57
--- /dev/null
+++ b/benchmarks/siege/files/patch-Makefile.am
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2015-06-04 10:45:57 UTC
++++ Makefile.am
+@@ -20,6 +20,8 @@
+ ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ ##
+ 
++ACLOCAL_AMFLAGS   =    -I m4
++
+ AUTOMAKE_OPTIONS  =    foreign no-dependencies  
+ 
+ WARN_CFLAGS       =    @WARN_CFLAGS@
diff --git a/benchmarks/siege/files/patch-configure.ac b/benchmarks/siege/files/patch-configure.ac
new file mode 100644
index 000000000000..6024a02876f5
--- /dev/null
+++ b/benchmarks/siege/files/patch-configure.ac
@@ -0,0 +1,18 @@
+--- configure.ac.orig	2015-06-04 10:43:01 UTC
++++ configure.ac
+@@ -7,6 +7,7 @@ dnl
+ AC_INIT
+ AC_CONFIG_SRCDIR([src/setup.h]) 
+ AC_CONFIG_HEADERS(include/config.h)
++AC_CONFIG_MACRO_DIRS([m4])
+ 
+ dnl
+ dnl Define the utils directory
+@@ -44,7 +45,6 @@ dnl
+ dnl Program support
+ dnl
+ AC_PATH_PROG( PERL, perl, false )
+-AC_PROG_SHELL
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+ case "$host_os" in
diff --git a/benchmarks/siege/files/patch-src-sock.c b/benchmarks/siege/files/patch-src-sock.c
index 202c63c073b2..e33f15ef76df 100644
--- a/benchmarks/siege/files/patch-src-sock.c
+++ b/benchmarks/siege/files/patch-src-sock.c
@@ -1,6 +1,6 @@
---- src/sock.c.orig	2010-05-17 15:57:59.000000000 +0200
-+++ src/sock.c	2012-05-25 15:55:21.743780806 +0200
-@@ -126,7 +126,7 @@
+--- src/sock.c.orig	2015-06-03 19:01:21 UTC
++++ src/sock.c
+@@ -148,7 +148,7 @@ new_socket(CONN *C, const char *hostpara
        hp = NULL;
      }
    }
@@ -9,8 +9,8 @@
  # ifdef HAVE_GETIPNODEBYNAME
    hp = getipnodebyname(hn, AF_INET, 0, &herrno);
  # else /* default use gethostbyname_r*/
-@@ -154,7 +154,7 @@
-   if(hp == NULL){ return -1; } 
+@@ -190,7 +190,7 @@ new_socket(CONN *C, const char *hostpara
+ 
    memset((void*) &cli, 0, sizeof(cli));
    memcpy(&cli.sin_addr, hp->h_addr, hp->h_length);
 -#if defined(sun)