From 9b5b3baef7283c740e5ff007bad51e1f8496151a Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Fri, 24 Aug 2012 07:05:51 +0000
Subject: [PATCH] Update to ipcalc-1.4.

from robert at peichaer dot org
---
 net/ipcalc/Makefile               |  9 ++++-----
 net/ipcalc/distinfo               |  7 ++-----
 net/ipcalc/patches/patch-ipcalc_1 | 16 ----------------
 net/ipcalc/patches/patch-ipcalc_c | 12 ------------
 4 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 net/ipcalc/patches/patch-ipcalc_1
 delete mode 100644 net/ipcalc/patches/patch-ipcalc_c

diff --git a/net/ipcalc/Makefile b/net/ipcalc/Makefile
index 69c01eb0930..7ce90d6fff3 100644
--- a/net/ipcalc/Makefile
+++ b/net/ipcalc/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2011/06/23 22:50:28 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2012/08/24 07:05:51 ajacoutot Exp $
 
 COMMENT=	small network calculator
 
-DISTNAME=	ipcalc-1.3
-REVISION=	2
+DISTNAME=	ipcalc-1.4
 CATEGORIES=	net
 
-HOMEPAGE=	http://spootnik.org/ipcalc/
+HOMEPAGE=	https://github.com/pyr/ipcalc 
 
 MAINTAINER=	Pierre-Yves Ritschard <pyr@spootnik.org>
 
@@ -16,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	${HOMEPAGE}
+MASTER_SITES=	https://github.com/downloads/pyr/ipcalc/
 
 FAKE_FLAGS=	MANDIR="${PREFIX}/man/man"
 
diff --git a/net/ipcalc/distinfo b/net/ipcalc/distinfo
index 859792a0ec5..fbe22edce84 100644
--- a/net/ipcalc/distinfo
+++ b/net/ipcalc/distinfo
@@ -1,5 +1,2 @@
-MD5 (ipcalc-1.3.tar.gz) = C6bKBaBbYsa0KEJ6KiMFVg==
-RMD160 (ipcalc-1.3.tar.gz) = QirN8iyD91mjXj0ZnI7MWwA46DI=
-SHA1 (ipcalc-1.3.tar.gz) = wi500ensIW/e5uAzAQHyevK6HiQ=
-SHA256 (ipcalc-1.3.tar.gz) = rQ3pbHkuORkzx8nayvIumyFcTM6IaSrqkJEwQrsxNtQ=
-SIZE (ipcalc-1.3.tar.gz) = 4298
+SHA256 (ipcalc-1.4.tar.gz) = b5ikwAXdYNjJkNyeadzH4Z1HShr3V5N/DJoQ/RfvTLc=
+SIZE (ipcalc-1.4.tar.gz) = 4965
diff --git a/net/ipcalc/patches/patch-ipcalc_1 b/net/ipcalc/patches/patch-ipcalc_1
deleted file mode 100644
index 417457f526a..00000000000
--- a/net/ipcalc/patches/patch-ipcalc_1
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-ipcalc_1,v 1.1 2010/04/03 21:54:54 sthen Exp $
---- ipcalc.1.orig	Sat Apr  3 22:43:17 2010
-+++ ipcalc.1	Sat Apr  3 22:43:18 2010
-@@ -67,6 +67,7 @@ Operates only on network finding and splitting in whic
- detailed information for each network.
- .It Fl c
- Includes the cisco wildcard syntax in the output where applicable.
-+.El
- .Sh NETMASKS
- Netmasks can be specified in one of three ways:
- .Bl -tag -width Ds
-@@ -77,3 +78,4 @@ set in the address.
- A traditionnal IPv4 address such as 255.255.255.0
- .It Cm hex notation address
- An address in hex notation such as 0xffffff00
-+.El
diff --git a/net/ipcalc/patches/patch-ipcalc_c b/net/ipcalc/patches/patch-ipcalc_c
deleted file mode 100644
index b2e2e0cef82..00000000000
--- a/net/ipcalc/patches/patch-ipcalc_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ipcalc_c,v 1.1 2011/01/14 09:53:24 eric Exp $
---- ipcalc.c.orig	Thu Jan 13 15:24:39 2011
-+++ ipcalc.c	Thu Jan 13 15:27:10 2011
-@@ -233,7 +233,7 @@ split(in_addr_t add, u_char pfxlen, char *masktab, int
- 				err(1, "out of memory");
- 			tab[0] = i;
- 		} else {
--			if ((tab = realloc(tab, sz + 1)) == NULL)
-+			if ((tab = realloc(tab, (sz + 1) * sizeof(int))) == NULL)
- 				err(1, "out of memory");
- 			tab[sz] = i;
- 		}