diff -ruN ucarp.orig/Makefile ucarp/Makefile
--- ucarp.orig/Makefile	2014-07-30 01:43:17.000000000 +0400
+++ ucarp/Makefile	2018-03-27 19:33:56.000000000 +0300
@@ -2,16 +2,18 @@
 # $FreeBSD: head/net/ucarp/Makefile 363399 2014-07-29 21:43:17Z adamw $
 
 PORTNAME=	ucarp
-PORTVERSION=	1.5.2
-PORTREVISION=	2
+PORTVERSION=	1.5.2.20171201
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/ucarp/ \
-		http://download.pureftpd.org/pub/ucarp/
 
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Userlevel Common Address Redundancy Protocol
 
-USES=	tar:bzip2
+USES=		autoreconf
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	jedisct1
+GH_PROJECT=	UCarp
+GH_TAGNAME=	4f339d4
 
 OPTIONS_DEFINE=	SCRIPTS
 OPTIONS_DEFAULT=SCRIPTS
@@ -23,6 +25,10 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls
 
+pre-configure:
+		touch ${WRKSRC}/config.rpath
+		touch ${WRKSRC}/ABOUT-NLS
+
 USE_RC_SUBR=	ucarp
 
 PLIST_FILES=	sbin/ucarp
diff -ruN ucarp.orig/distinfo ucarp/distinfo
--- ucarp.orig/distinfo	2014-01-22 19:30:13.000000000 +0400
+++ ucarp/distinfo	2018-03-23 02:01:39.431481000 +0300
@@ -1,2 +1,3 @@
-SHA256 (ucarp-1.5.2.tar.bz2) = f2e013653484cabd616d812648c83a490ae7b2968b4d446da5dd969275f92d62
-SIZE (ucarp-1.5.2.tar.bz2) = 315414
+TIMESTAMP = 1521759699
+SHA256 (jedisct1-UCarp-1.5.2-4f339d4_GH0.tar.gz) = 37ef77add1eea4a6b1b71d1c30ec4edc7f4a51d5ec8f5641ccb643439abb1e60
+SIZE (jedisct1-UCarp-1.5.2-4f339d4_GH0.tar.gz) = 79950
diff -ruN ucarp.orig/files/patch-l2vlan ucarp/files/patch-l2vlan
--- ucarp.orig/files/patch-l2vlan	2013-04-29 02:31:32.000000000 +0400
+++ ucarp/files/patch-l2vlan	2018-03-23 02:06:21.000000000 +0300
@@ -5,7 +5,7 @@
 @@ -86,7 +86,8 @@
              if (strcmp(ifa->ifa_name, interface) == 0 &&
                  ifa->ifa_addr->sa_family == AF_LINK) {
-                 sadl = (struct sockaddr_dl *) ifa->ifa_addr;
+                 sadl = (struct sockaddr_dl *) (void *) ifa->ifa_addr;
 -                if (sadl == NULL || sadl->sdl_type != IFT_ETHER ||
 +                if (sadl == NULL || ((sadl->sdl_type != IFT_ETHER) && 
 +                    (sadl->sdl_type != IFT_L2VLAN)) ||