Index: head/net-mgmt/gnu-ipcalc/Makefile
===================================================================
--- head/net-mgmt/gnu-ipcalc/Makefile	(revision 441051)
+++ head/net-mgmt/gnu-ipcalc/Makefile	(revision 441052)
@@ -1,43 +1,33 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ipcalc
-PORTVERSION=	0.1.8
+PORTVERSION=	0.2.0
 CATEGORIES=	net-mgmt
 PKGNAMEPREFIX=	gnu-
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Modern network address calculation tool for IPv4 and IPv6
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS_INSTALL=	ipcalc-[0-9]*
 
+USES=		gmake localbase
 USE_GITHUB=	yes
 GH_ACCOUNT=	nmav
 
 OPTIONS_DEFINE=	GEOIP
 OPTIONS_DEFAULT=GEOIP
 
 GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
+GEOIP_MAKE_ENV_OFF=	USE_GEOIP=no USE_DYN_GEOIP=no
 
-CFLAGS+=	-I${LOCALBASE}/include \
-		-DLIBPATH="\"${LOCALBASE}/lib\"" \
-		-DVERSION="\"${PORTVERSION}\""
-
-GEOIP_CFLAGS+=	-DUSE_DYN_GEOIP -DUSE_GEOIP
-
 PLIST_FILES=	bin/ipcalc man/man1/ipcalc.1.gz
-
-do-build:
-	${CC} ${CFLAGS} \
-		${WRKSRC}/ipcalc.c \
-		${WRKSRC}/ipcalc-geoip.c \
-		${WRKSRC}/ipcalc-reverse.c \
-			-o ${WRKSRC}/ipcalc
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
Index: head/net-mgmt/gnu-ipcalc/distinfo
===================================================================
--- head/net-mgmt/gnu-ipcalc/distinfo	(revision 441051)
+++ head/net-mgmt/gnu-ipcalc/distinfo	(revision 441052)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473432181
-SHA256 (nmav-ipcalc-0.1.8_GH0.tar.gz) = 760af9c3b34fcbb9c5c4f9adc2dd03458ebc47c184a9656f34963ba9fcbef2cb
-SIZE (nmav-ipcalc-0.1.8_GH0.tar.gz) = 24783
+TIMESTAMP = 1494960838
+SHA256 (nmav-ipcalc-0.2.0_GH0.tar.gz) = c965c1296172a6acc50d54dfe81f7e5d589f9762b5d9ae459eee00349675336b
+SIZE (nmav-ipcalc-0.2.0_GH0.tar.gz) = 31750

Property changes on: head/net-mgmt/gnu-ipcalc/distinfo
___________________________________________________________________
Modified: fbsd:nokeywords
## -1 +1 ##
-on
\ No newline at end of property
+yes
\ No newline at end of property
Index: head/net-mgmt/gnu-ipcalc/files/patch-Makefile
===================================================================
--- head/net-mgmt/gnu-ipcalc/files/patch-Makefile	(nonexistent)
+++ head/net-mgmt/gnu-ipcalc/files/patch-Makefile	(revision 441052)
@@ -0,0 +1,19 @@
+--- Makefile.orig	2017-05-15 12:33:58 UTC
++++ Makefile
+@@ -1,7 +1,7 @@
+ USE_GEOIP?=yes
+ USE_DYN_GEOIP?=yes
+ 
+-LIBPATH?=/usr/lib64
++#LIBPATH?=/usr/lib64
+ #LIBPATH=/usr/lib/x86_64-linux-gnu
+ 
+ LIBS?=
+@@ -12,7 +12,6 @@ LDFLAGS=$(LIBS)
+ 
+ ifeq ($(USE_GEOIP),yes)
+ ifeq ($(USE_DYN_GEOIP),yes)
+-LDFLAGS+=-ldl
+ CFLAGS+=-DUSE_GEOIP -DUSE_DYN_GEOIP -DLIBPATH="\"$(LIBPATH)\""
+ else
+ LDFLAGS+=-lGeoIP

Property changes on: head/net-mgmt/gnu-ipcalc/files/patch-Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
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
Index: head/net-mgmt/gnu-ipcalc/files/patch-netsplit.c
===================================================================
--- head/net-mgmt/gnu-ipcalc/files/patch-netsplit.c	(nonexistent)
+++ head/net-mgmt/gnu-ipcalc/files/patch-netsplit.c	(revision 441052)
@@ -0,0 +1,22 @@
+--- netsplit.c.orig	2017-05-15 12:33:58 UTC
++++ netsplit.c
+@@ -32,9 +32,19 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <stdint.h>
++#include <sys/socket.h>
+ 
+ #include "ipcalc.h"
+ 
++#if defined(__FreeBSD__) || defined(__darwin__) || defined(__APPLE__)
++#ifndef s6_addr16
++#define s6_addr16 __u6_addr.__u6_addr16
++#endif
++#ifndef s6_addr32
++#define s6_addr32 __u6_addr.__u6_addr32
++#endif
++#endif
++
+ static const char *numtoquad(uint32_t num)
+ {
+ 	static char quad[64];

Property changes on: head/net-mgmt/gnu-ipcalc/files/patch-netsplit.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
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