[Midnightbsd-cvs] mports [22527] trunk/benchmarks/siege: update siege

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Sep 25 15:53:20 EDT 2017


Revision: 22527
          http://svnweb.midnightbsd.org/mports/?rev=22527
Author:   laffer1
Date:     2017-09-25 15:53:20 -0400 (Mon, 25 Sep 2017)
Log Message:
-----------
update siege

Modified Paths:
--------------
    trunk/benchmarks/siege/Makefile
    trunk/benchmarks/siege/distinfo
    trunk/benchmarks/siege/pkg-plist

Added Paths:
-----------
    trunk/benchmarks/siege/files/patch-Makefile.am
    trunk/benchmarks/siege/files/patch-configure.ac
    trunk/benchmarks/siege/files/patch-src_init.c
    trunk/benchmarks/siege/files/patch-src_sock.c

Removed Paths:
-------------
    trunk/benchmarks/siege/files/patch-src-sock.c

Modified: trunk/benchmarks/siege/Makefile
===================================================================
--- trunk/benchmarks/siege/Makefile	2017-09-25 19:50:55 UTC (rev 22526)
+++ trunk/benchmarks/siege/Makefile	2017-09-25 19:53:20 UTC (rev 22527)
@@ -1,39 +1,25 @@
 # $MidnightBSD$
 
 PORTNAME=	siege
-PORTVERSION=	2.70
-CATEGORIES=	benchmarks
-MASTER_SITES=	ftp://sid.joedog.org/pub/siege/
+PORTVERSION=	4.0.2
+CATEGORIES=	benchmarks www
+MASTER_SITES=	http://download.joedog.org/siege/ \
+		http://fossies.org/linux/www/
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	A http regression testing and benchmarking utility
+COMMENT=	HTTP regression testing and benchmarking utility
+
 LICENSE=	gpl2
 
+USES=		autoreconf libtool perl5
+USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-USE_OPENSSL=	yes
+CONFIGURE_ENV=	PERL="${PERL}"
+CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE} --disable-shared \
+		--sysconfdir=${ETCDIR}
 
-CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE} --disable-shared
+pre-configure:
+	@${RM} ${WRKSRC}/acinclude.m4
+	@${RM} ${WRKSRC}/utils/missing
 
-MAN1=		siege.1 siege.config.1 bombardment.1 siege2csv.1
-MAN5=		urls_txt.5
-MAN7=		layingsiege.7
-
-.include <bsd.port.pre.mk>
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/siege ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/utils/bombardment ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/utils/siege2csv.pl ${PREFIX}/bin/siege2csv
-.for F in ${MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/doc/${F} ${MAN1PREFIX}/man/man1
-.endfor
-	@${INSTALL_MAN} ${WRKSRC}/doc/${MAN5} ${MAN1PREFIX}/man/man5
-	@${INSTALL_MAN} ${WRKSRC}/doc/${MAN7} ${MAN1PREFIX}/man/man7
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/siegerc ${DATADIR}
-
-post-fake:
-	@${SED} -e "s,%%DATADIR%%,${DATADIR}," ${FILESDIR}/siege.config.in > ${FAKE_DESTDIR}${PREFIX}/bin/siege.config
-	@${CHMOD} 555 ${FAKE_DESTDIR}${PREFIX}/bin/siege.config
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/benchmarks/siege/distinfo
===================================================================
--- trunk/benchmarks/siege/distinfo	2017-09-25 19:50:55 UTC (rev 22526)
+++ trunk/benchmarks/siege/distinfo	2017-09-25 19:53:20 UTC (rev 22527)
@@ -1,2 +1,3 @@
-SHA256 (siege-2.70.tar.gz) = 3cb4bcb52a4bee9b35a6b487492c3a8eb20d911d76131e1283ca73ac5d75dd91
-SIZE (siege-2.70.tar.gz) = 484608
+TIMESTAMP = 1506368952
+SHA256 (siege-4.0.2.tar.gz) = 7efb81f9547bef0e693bdd51348a205ad691e1d72c36041f4608099ba0326c47
+SIZE (siege-4.0.2.tar.gz) = 521228

Added: trunk/benchmarks/siege/files/patch-Makefile.am
===================================================================
--- trunk/benchmarks/siege/files/patch-Makefile.am	                        (rev 0)
+++ trunk/benchmarks/siege/files/patch-Makefile.am	2017-09-25 19:53:20 UTC (rev 22527)
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2016-05-20 11:41:06 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@


Property changes on: trunk/benchmarks/siege/files/patch-Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/benchmarks/siege/files/patch-configure.ac
===================================================================
--- trunk/benchmarks/siege/files/patch-configure.ac	                        (rev 0)
+++ trunk/benchmarks/siege/files/patch-configure.ac	2017-09-25 19:53:20 UTC (rev 22527)
@@ -0,0 +1,18 @@
+--- configure.ac.orig	2016-05-20 11:41:06 UTC
++++ configure.ac
+@@ -12,6 +12,7 @@ AC_CONFIG_AUX_DIR(utils)  
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_SRCDIR([src/setup.h])
+ AC_CONFIG_HEADERS(include/config.h)
++AC_CONFIG_MACRO_DIRS([m4])
+ 
+ dnl canonicalize the host
+ AC_CANONICAL_HOST
+@@ -41,7 +42,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


Property changes on: trunk/benchmarks/siege/files/patch-configure.ac
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/benchmarks/siege/files/patch-src-sock.c
===================================================================
--- trunk/benchmarks/siege/files/patch-src-sock.c	2017-09-25 19:50:55 UTC (rev 22526)
+++ trunk/benchmarks/siege/files/patch-src-sock.c	2017-09-25 19:53:20 UTC (rev 22527)
@@ -1,20 +0,0 @@
---- 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 @@
-       hp = NULL;
-     }
-   }
--#elif defined(sun)
-+#elif defined(sun) || defined(__FreeBSD__)
- # ifdef HAVE_GETIPNODEBYNAME
-   hp = getipnodebyname(hn, AF_INET, 0, &herrno);
- # else /* default use gethostbyname_r*/
-@@ -154,7 +154,7 @@
-   if(hp == NULL){ return -1; } 
-   memset((void*) &cli, 0, sizeof(cli));
-   memcpy(&cli.sin_addr, hp->h_addr, hp->h_length);
--#if defined(sun)
-+#if defined(sun) || defined(__FreeBSD__)
- # ifdef  HAVE_FREEHOSTENT
-   freehostent(hp);
- # endif/*HAVE_FREEHOSTENT*/ 

Added: trunk/benchmarks/siege/files/patch-src_init.c
===================================================================
--- trunk/benchmarks/siege/files/patch-src_init.c	                        (rev 0)
+++ trunk/benchmarks/siege/files/patch-src_init.c	2017-09-25 19:53:20 UTC (rev 22527)
@@ -0,0 +1,12 @@
+--- src/init.c.orig	2016-05-20 11:41:06 UTC
++++ src/init.c
+@@ -39,6 +39,9 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#include <signal.h>
++#endif
+ 
+ #define LINESZ 1024
+ 


Property changes on: trunk/benchmarks/siege/files/patch-src_init.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/benchmarks/siege/files/patch-src_sock.c
===================================================================
--- trunk/benchmarks/siege/files/patch-src_sock.c	                        (rev 0)
+++ trunk/benchmarks/siege/files/patch-src_sock.c	2017-09-25 19:53:20 UTC (rev 22527)
@@ -0,0 +1,20 @@
+--- src/sock.c.orig	2016-05-20 11:41:06 UTC
++++ src/sock.c
+@@ -149,7 +149,7 @@ new_socket(CONN *C, const char *hostpara
+       hp = NULL;
+     }
+   }
+-#elif defined(sun)
++#elif defined(sun) || defined(__FreeBSD__)
+ # ifdef HAVE_GETIPNODEBYNAME
+   hp = getipnodebyname(hn, AF_INET, 0, &herrno);
+ # else /* default use gethostbyname_r*/
+@@ -191,7 +191,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)
++#if defined(sun) || defined(__FreeBSD__)
+ # ifdef  HAVE_FREEHOSTENT
+   freehostent(hp);
+ # endif/*HAVE_FREEHOSTENT*/ 


Property changes on: trunk/benchmarks/siege/files/patch-src_sock.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/benchmarks/siege/pkg-plist
===================================================================
--- trunk/benchmarks/siege/pkg-plist	2017-09-25 19:50:55 UTC (rev 22526)
+++ trunk/benchmarks/siege/pkg-plist	2017-09-25 19:53:20 UTC (rev 22527)
@@ -1,6 +1,10 @@
+bin/bombardment
 bin/siege
-bin/bombardment
-bin/siege2csv
 bin/siege.config
-%%DATADIR%%/siegerc
- at dirrm %%DATADIR%%
+bin/siege2csv.pl
+%%ETCDIR%%/siegerc
+%%ETCDIR%%/urls.txt
+man/man1/bombardment.1.gz
+man/man1/siege.1.gz
+man/man1/siege.config.1.gz
+man/man1/siege2csv.1.gz



More information about the Midnightbsd-cvs mailing list