Attachment 26649 Details for Bug 45452 – file.diff

[patch] file.diff

file.diff (text/plain), 3.74 KB, created by tkato on 2002-11-18 21:30:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-11-18 21:30:14 UTC

Size: 3.74 KB

patch

obsolete

>diff -urN /usr/ports/www/httperf/Makefile www/httperf/Makefile
>--- /usr/ports/www/httperf/Makefile	Mon Nov 11 19:01:21 2002
>+++ www/httperf/Makefile	Wed Nov 13 06:32:44 2002
>@@ -6,28 +6,26 @@
> #
> 
> PORTNAME=	httperf
>-PORTVERSION=	0.6
>+PORTVERSION=	0.8
> CATEGORIES=	www
> MASTER_SITES=	ftp://ftp.hpl.hp.com/pub/httperf/
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>-USE_GMAKE=	yes
>-MAN1=		httperf.1
>+USE_OPENSSL=	yes
>+GNU_CONFIGURE=	yes
>+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
>+		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
> 
>-# there is no "install" target in the Makefile.
>-# chmod'ing httperf as it could be exploited by normal users to overload
>-# a webserver, instead of for its actual purpose.
>+MAN1=		httperf.1
> 
>-do-install:
>-	@${INSTALL_PROGRAM} ${WRKSRC}/httperf ${PREFIX}/bin
>+post-install:
> 	${CHMOD} 750 ${PREFIX}/bin/httperf
>-	@${INSTALL_MAN} ${WRKSRC}/httperf.man ${PREFIX}/man/man1/httperf.1
>-	@${MKDIR} ${PREFIX}/share/doc/httperf
>-	@${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/httperf
>-	@${INSTALL_MAN} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/httperf
>-	@${INSTALL_MAN} ${WRKSRC}/NEWS ${PREFIX}/share/doc/httperf
>-	@${INSTALL_MAN} ${WRKSRC}/TODO ${PREFIX}/share/doc/httperf
>-	@${INSTALL_MAN} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/httperf
>+.if !defined(NOPORTDOCS)
>+	@${MKDIR} ${DOCSDIR}
>+.for file in ChangeLog NEWS README TODO
>+	@${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
>+.endfor
>+.endif
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/www/httperf/distinfo www/httperf/distinfo
>--- /usr/ports/www/httperf/distinfo	Sun Aug  1 12:21:01 1999
>+++ www/httperf/distinfo	Wed Nov 13 06:15:59 2002
>@@ -1 +1 @@
>-MD5 (httperf-0.6.tar.gz) = d67ee49eb06e14d0bf8dbf5bce954c5b
>+MD5 (httperf-0.8.tar.gz) = 2971956d4846349f9e8d3c54acd591a5
>diff -urN /usr/ports/www/httperf/files/patch-Makefile.in www/httperf/files/patch-Makefile.in
>--- /usr/ports/www/httperf/files/patch-Makefile.in	Thu Jan  1 09:00:00 1970
>+++ www/httperf/files/patch-Makefile.in	Wed Nov 13 06:30:37 2002
>@@ -0,0 +1,10 @@
>+--- Makefile.in.orig	Thu Oct 19 16:38:59 2000
>++++ Makefile.in	Wed Nov 13 06:30:08 2002
>+@@ -6,6 +6,7 @@
>+ top_builddir = .
>+ 
>+ prefix = @prefix@
>++exec_prefix = @exec_prefix@
>+ bindir = @bindir@
>+ mandir = @mandir@
>+ 
>diff -urN /usr/ports/www/httperf/files/patch-httperf.c www/httperf/files/patch-httperf.c
>--- /usr/ports/www/httperf/files/patch-httperf.c	Thu Jan  1 09:00:00 1970
>+++ www/httperf/files/patch-httperf.c	Wed Nov 13 06:20:23 2002
>@@ -0,0 +1,13 @@
>+--- httperf.c.orig	Wed Nov  1 05:20:00 2000
>++++ httperf.c	Wed Nov 13 06:19:41 2002
>+@@ -68,6 +68,10 @@
>+ #include <conn.h>
>+ #include <timer.h>
>+ 
>++#ifdef __FreeBSD__
>++#include <machine/floatingpoint.h>
>++#endif
>++
>+ #ifdef HAVE_SSL
>+ #  include <openssl/rand.h>
>+ #endif
>diff -urN /usr/ports/www/httperf/files/patch-lib::ssl_writev.c www/httperf/files/patch-lib::ssl_writev.c
>--- /usr/ports/www/httperf/files/patch-lib::ssl_writev.c	Thu Jan  1 09:00:00 1970
>+++ www/httperf/files/patch-lib::ssl_writev.c	Wed Nov 13 06:23:14 2002
>@@ -0,0 +1,13 @@
>+--- lib/ssl_writev.c.orig	Thu Oct 12 09:09:47 2000
>++++ lib/ssl_writev.c	Wed Nov 13 06:22:01 2002
>+@@ -31,7 +31,10 @@
>+ 
>+ #ifdef HAVE_OPENSSL_SSL_H
>+ 
>++#ifdef HAVE_ALLOCA_H
>+ #include <alloca.h>
>++#endif
>++
>+ #include <string.h>
>+ 
>+ #include <sys/types.h>
>diff -urN /usr/ports/www/httperf/pkg-plist www/httperf/pkg-plist
>--- /usr/ports/www/httperf/pkg-plist	Thu Mar 23 11:21:52 2000
>+++ www/httperf/pkg-plist	Wed Nov 13 06:28:18 2002
>@@ -1,7 +1,6 @@
> bin/httperf
>-share/doc/httperf/COPYRIGHT
>-share/doc/httperf/ChangeLog
>-share/doc/httperf/NEWS
>-share/doc/httperf/README
>-share/doc/httperf/TODO
>-@dirrm share/doc/httperf
>+%%PORTDOCS%%share/doc/httperf/ChangeLog
>+%%PORTDOCS%%share/doc/httperf/NEWS
>+%%PORTDOCS%%share/doc/httperf/README
>+%%PORTDOCS%%share/doc/httperf/TODO
>+%%PORTDOCS%%@dirrm share/doc/httperf

Actions: View | Diff

Attachments on bug 45452: 26649