Update to 2.3.3

* Use distfile's install target, remove pkgsrc one.

Changelog:
unknown.

7 files changed, 39 insertions, 88 deletions

diff --git a/net/httping/Makefile b/net/httping/Makefile
index b9f5c874d71..6dafcb92216 100644
--- a/net/httping/Makefile
+++ b/net/httping/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2013/02/06 23:23:15 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2013/06/26 12:39:24 ryoon Exp $
 
-DISTNAME=	httping-1.5.2
-PKGREVISION=	1
+DISTNAME=	httping-2.3.3
 CATEGORIES=	net
 MASTER_SITES=	http://www.vanheusden.com/httping/
 EXTRACT_SUFX=	.tgz
@@ -11,23 +10,16 @@ HOMEPAGE=	http://www.vanheusden.com/httping/
 COMMENT=	Like 'ping' but for http-requests
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=		gmake
+HAS_CONFIGURE=		yes
+USE_TOOLS+=		gmake msgfmt
+
+CONFIGURE_ARGS+=	--with-openssl
 
 .include "../../mk/bsd.prefs.mk"
 
+LDFLAGS.NetBSD=		-lintl
 LDFLAGS.SunOS=		-lnsl -lsocket
 
-.if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[123]*)) || \
-    ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS"
-.else
-CFLAGS+=	-DHAVE_STRNDUP
-.endif
-
-INSTALLATION_DIRS=	${PKGMANDIR}/man1 bin
-
-do-install:
-	${INSTALL_MAN} ${WRKSRC}/httping.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_PROGRAM} ${WRKSRC}/httping ${DESTDIR}${PREFIX}/bin
-
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/httping/PLIST b/net/httping/PLIST
index 17166cc5cce..fdb700c795d 100644
--- a/net/httping/PLIST
+++ b/net/httping/PLIST
@@ -1,3 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/09/05 18:02:42 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/06/26 12:39:24 ryoon Exp $
 bin/httping
 man/man1/httping.1
+man/nl/man1/httping-nl.1
+share/doc/httping/license.OpenSSL
+share/doc/httping/license.txt
+share/doc/httping/readme.txt
+share/locale/nl/LC_MESSAGES/httping.mo
diff --git a/net/httping/distinfo b/net/httping/distinfo
index 1c91bf321fa..ec98ca6650e 100644
--- a/net/httping/distinfo
+++ b/net/httping/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.9 2012/02/18 10:06:56 shattered Exp $
+$NetBSD: distinfo,v 1.10 2013/06/26 12:39:24 ryoon Exp $
 
-SHA1 (httping-1.5.2.tgz) = 79f8b78a9a2c8c8f176a622e87385cd35f52f595
-RMD160 (httping-1.5.2.tgz) = 689ef695af6b1d6396bc7212795f73ee15661134
-Size (httping-1.5.2.tgz) = 15355 bytes
-SHA1 (patch-aa) = 516a025ce558792a0579468db6b38e1b10f014b5
-SHA1 (patch-ab) = e1bd44e049073224fdc96a98333a09f1fac52ff0
-SHA1 (patch-ac) = 3f3c9a31a985c3b000bdce7acc5380da8a7af0dc
-SHA1 (patch-ad) = 123e66058929a210779edd458114c2614a17e6d9
+SHA1 (httping-2.3.3.tgz) = 6b9e77039346388e2b02dbb1d60f7422e7133488
+RMD160 (httping-2.3.3.tgz) = 204a9ddff58086434c1f5c608a0f5360747fb9bb
+Size (httping-2.3.3.tgz) = 54376 bytes
+SHA1 (patch-aa) = 72c327379b1cbe3cae7436e09ccee53f9277652d
diff --git a/net/httping/patches/patch-aa b/net/httping/patches/patch-aa
index 573f8214ad2..7aa507e68b6 100644
--- a/net/httping/patches/patch-aa
+++ b/net/httping/patches/patch-aa
@@ -1,12 +1,24 @@
-$NetBSD: patch-aa,v 1.3 2012/02/18 10:06:57 shattered Exp $
+$NetBSD: patch-aa,v 1.4 2013/06/26 12:39:24 ryoon Exp $
 
---- Makefile.orig	2011-08-03 16:08:08.000000000 +0000
+* Fix man page directory for pkgsrc.
+* Create nls directory before installation.
+
+--- Makefile.orig	2013-06-07 13:18:52.000000000 +0000
 +++ Makefile
-@@ -17,7 +17,6 @@ include version
- TARGET=httping
+@@ -42,7 +42,7 @@ LDFLAGS+=-lm
+ PACKAGE=$(TARGET)-$(VERSION)
+ PREFIX?=/usr
+ BINDIR=$(PREFIX)/bin
+-MANDIR=$(PREFIX)/share/man
++MANDIR=$(PREFIX)/${PKGMANDIR}
+ DOCDIR=$(PREFIX)/share/doc/$(TARGET)
  
- WFLAGS=-Wall -W
--OFLAGS=-O2
- CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" -g
+ INSTALL=install
+@@ -116,6 +116,7 @@ install: $(TARGET) $(TRANSLATIONS)
+ ifneq ($(DEBUG),yes)
+ 	$(STRIP) $(DESTDIR)/$(BINDIR)/$(TARGET)
+ endif
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/locale/nl/LC_MESSAGES
+ 	cp nl.mo $(DESTDIR)/$(PREFIX)/share/locale/nl/LC_MESSAGES/httping.mo
  
- PACKAGE=$(TARGET)-$(VERSION)
+ makefile.inc:
diff --git a/net/httping/patches/patch-ab b/net/httping/patches/patch-ab
deleted file mode 100644
index 54ee7f65205..00000000000
--- a/net/httping/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2011/07/09 07:45:09 adam Exp $
-
---- str.c.orig	2010-07-24 10:32:07.000000000 +0000
-+++ str.c
-@@ -18,10 +18,8 @@
- #include "mem.h"
- #include "utils.h"
- 
--/*
--Most unixes have this function already.
- 
--#ifndef _GNU_SOURCE
-+#ifndef HAVE_STRNDUP
- char *strndup(char *in, int size)
- {
- 	char *out = mymalloc(size + 1, "strndup");
-@@ -32,4 +30,3 @@ char *strndup(char *in, int size)
- 	return out;
- }
- #endif
--*/
diff --git a/net/httping/patches/patch-ac b/net/httping/patches/patch-ac
deleted file mode 100644
index 5afd73d5b0e..00000000000
--- a/net/httping/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2011/07/09 07:45:09 adam Exp $
-
---- str.h.orig	2010-07-24 10:32:07.000000000 +0000
-+++ str.h
-@@ -15,8 +15,6 @@
- 
- #include <string.h>
- 
--/*
--#ifndef _GNU_SOURCE
-+#ifndef HAVE_STRNDUP
- char *strndup(char *in, int size);
- #endif
--*/
diff --git a/net/httping/patches/patch-ad b/net/httping/patches/patch-ad
deleted file mode 100644
index 1702da536cd..00000000000
--- a/net/httping/patches/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2012/02/18 10:06:57 shattered Exp $
-
---- mem.c.orig	2011-08-03 16:08:08.000000000 +0000
-+++ mem.c
-@@ -1,6 +1,7 @@
- /* (C) 2007-2011 by folkert@vanheusden.com
-  * The GPL (GNU public license) applies to this sourcecode.
-  */
-+#include <sys/types.h>
- #include <errno.h>
- #include <regex.h>
- #include <signal.h>
-@@ -8,7 +9,6 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/types.h>
- #include <time.h>
- #include <unistd.h>
-