Index: head/net/ucarp/Makefile
===================================================================
--- head/net/ucarp/Makefile	(revision 474907)
+++ head/net/ucarp/Makefile	(revision 474908)
@@ -1,38 +1,40 @@
 # Created by: Meno Abels <meno.abels@adviser.com>
 # $FreeBSD$
 
 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=	ports@FreeBSD.org
 COMMENT=	Userlevel Common Address Redundancy Protocol
 
-USES=	tar:bzip2
+LICENSE=	ISC
+LICENSE_NAME=	ISC License
+LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-OPTIONS_DEFINE=	SCRIPTS
-OPTIONS_DEFAULT=SCRIPTS
-
-SCRIPTS_DESC=	Install scripts to manage virtual IP
-
-.include <bsd.port.options.mk>
-
+USES=		autoreconf libtool
+USE_GITHUB=	yes
+GH_ACCOUNT=	jedisct1
+GH_PROJECT=	UCarp
+GH_TAGNAME=	4f339d4
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-nls
 
 USE_RC_SUBR=	ucarp
 
 PLIST_FILES=	sbin/ucarp
 
-.if ${PORT_OPTIONS:MSCRIPTS}
-PLIST_FILES+=	sbin/ucarp-up \
-		sbin/ucarp-down
-post-install:
-		${INSTALL_SCRIPT} ${WRKSRC}/examples/bsd/vip-up.sh ${STAGEDIR}${PREFIX}/sbin/ucarp-up
-		${INSTALL_SCRIPT} ${WRKSRC}/examples/bsd/vip-down.sh ${STAGEDIR}${PREFIX}/sbin/ucarp-down
-.endif
+OPTIONS_DEFINE=		SCRIPTS
+OPTIONS_DEFAULT=	SCRIPTS
+
+SCRIPTS_DESC=		Install scripts to manage virtual IP
+SCRIPTS_PLIST_FILES=	sbin/ucarp-up sbin/ucarp-down
+
+pre-configure:
+	@${TOUCH} ${WRKSRC}/config.rpath ${WRKSRC}/ABOUT-NLS
+
+post-install-SCRIPTS-on:
+	${INSTALL_SCRIPT} ${WRKSRC}/examples/bsd/vip-up.sh ${STAGEDIR}${PREFIX}/sbin/ucarp-up
+	${INSTALL_SCRIPT} ${WRKSRC}/examples/bsd/vip-down.sh ${STAGEDIR}${PREFIX}/sbin/ucarp-down
 
 .include <bsd.port.mk>
Index: head/net/ucarp/distinfo
===================================================================
--- head/net/ucarp/distinfo	(revision 474907)
+++ head/net/ucarp/distinfo	(revision 474908)
@@ -1,2 +1,3 @@
-SHA256 (ucarp-1.5.2.tar.bz2) = f2e013653484cabd616d812648c83a490ae7b2968b4d446da5dd969275f92d62
-SIZE (ucarp-1.5.2.tar.bz2) = 315414
+TIMESTAMP = 1531953060
+SHA256 (jedisct1-UCarp-1.5.2.20171201-4f339d4_GH0.tar.gz) = 37ef77add1eea4a6b1b71d1c30ec4edc7f4a51d5ec8f5641ccb643439abb1e60
+SIZE (jedisct1-UCarp-1.5.2.20171201-4f339d4_GH0.tar.gz) = 79950
Index: head/net/ucarp/files/patch-l2vlan
===================================================================
--- head/net/ucarp/files/patch-l2vlan	(revision 474907)
+++ head/net/ucarp/files/patch-l2vlan	(revision 474908)
@@ -1,14 +1,14 @@
 # http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/164060
 # http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/173543
 --- src/fillmac.c.orig	2007-07-04 15:34:59.000000000 +0200
 +++ src/fillmac.c	2012-11-11 01:50:29.000000000 +0100
 @@ -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)) ||
                      sadl->sdl_alen <= 0) {
                      logfile(LOG_ERR,
                              _("Invalid media / hardware address for [%s]"),