diff options
| -rw-r--r-- | net/httping/Makefile | 10 | ||||
| -rw-r--r-- | net/httping/distinfo | 4 | ||||
| -rw-r--r-- | net/httping/files/extrapatch-mssl.c | 20 | ||||
| -rw-r--r-- | net/httping/files/patch-Makefile | 15 |
4 files changed, 13 insertions, 36 deletions
diff --git a/net/httping/Makefile b/net/httping/Makefile index 95ea9e02b5c5..e650a39c2fe6 100644 --- a/net/httping/Makefile +++ b/net/httping/Makefile @@ -6,7 +6,7 @@ # PORTNAME= httping -PORTVERSION= 1.4.4 +PORTVERSION= 1.5.1 CATEGORIES= net MASTER_SITES= http://www.vanheusden.com/httping/ \ CRITICAL @@ -21,16 +21,10 @@ MAKE_JOBS_SAFE= yes MAN1= httping.1 PLIST_FILES= bin/httping -.include <bsd.port.pre.mk> - -.if(${OSVERSION} >= 701101) CFLAGS+= -D_GNU_SOURCE -.else -EXTRA_PATCHES= ${FILESDIR}/extrapatch-mssl.c -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/httping/distinfo b/net/httping/distinfo index 3712f2d553b4..4610c3f8fb9c 100644 --- a/net/httping/distinfo +++ b/net/httping/distinfo @@ -1,2 +1,2 @@ -SHA256 (httping-1.4.4.tgz) = f00da30e0744d86ed832f6a49ae455b9447570af3589e1111a1c6210a51cafee -SIZE (httping-1.4.4.tgz) = 14372 +SHA256 (httping-1.5.1.tgz) = a5496515883a7708c348d7f124eaac5bf7039feba2a3c8a7c30fd3a80a042504 +SIZE (httping-1.5.1.tgz) = 15342 diff --git a/net/httping/files/extrapatch-mssl.c b/net/httping/files/extrapatch-mssl.c deleted file mode 100644 index 13ca1822ba0b..000000000000 --- a/net/httping/files/extrapatch-mssl.c +++ /dev/null @@ -1,20 +0,0 @@ ---- ./mssl.c.orig 2010-07-31 15:40:14.760757000 +0200 -+++ ./mssl.c 2010-07-31 15:40:31.439062000 +0200 -@@ -28,6 +28,17 @@ - extern char last_error[]; - BIO *bio_err=0; - -+char * strndup(const char *str, size_t len){ -+ size_t l=strlen(str); -+ char *r; -+ if(len<l){ -+ l=len; -+ } -+ r=malloc(l); -+ memcpy(r, str, l); -+ return r; -+} -+ - char close_ssl_connection(SSL *ssl_h, int socket_h) - { - int rc = SSL_shutdown(ssl_h); diff --git a/net/httping/files/patch-Makefile b/net/httping/files/patch-Makefile index 622e8d442761..545e0db26521 100644 --- a/net/httping/files/patch-Makefile +++ b/net/httping/files/patch-Makefile @@ -1,12 +1,15 @@ ---- ./Makefile.orig 2010-01-10 22:58:57.000000000 +0100 -+++ ./Makefile 2010-01-10 22:59:30.000000000 +0100 -@@ -17,8 +17,7 @@ +--- ./Makefile.orig 2011-07-27 21:33:34.000000000 +0200 ++++ ./Makefile 2011-07-27 21:42:40.000000000 +0200 +@@ -16,9 +16,9 @@ + TARGET=httping - WFLAGS=-Wall -W +-WFLAGS=-Wall -W -OFLAGS=-O2 --CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" -+CFLAGS+=$(WFLAGS) -DVERSION=\"$(VERSION)\" +-CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" -g ++#WFLAGS=-Wall -W ++#OFLAGS=-O2 ++CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" PACKAGE=$(TARGET)-$(VERSION) PREFIX=/usr |