- Fix error with VLAN interfaces on recent FreeBSD versions [1]

- Update port's infrastructure to new OPTIONS [2]
- Make portlint happy with filenames in "files/" [2]

PR:		173543
Submitted by:	Ingo Flaschberger <if@FreeBSD.org>
Patch by:	Ingo Flaschberger <if@FreeBSD.org> [1]
		"Alexey V. Degtyarev" <alexey@renatasystems.org> (maintainer) [2]

net/ucarp/Makefile

@@ -1,13 +1,9 @@
-# New ports collection makefile for:   ucarp
-# Date created:                2005-05-06
-# Whom:                        Meno Abels <meno.abels@adviser.com>
-#
+# Created by: Meno Abels <meno.abels@adviser.com>
 # $FreeBSD$
-#
 
 PORTNAME=	ucarp
 PORTVERSION=	1.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/ucarp/ \
 		http://download.pureftpd.org/pub/ucarp/
@@ -17,9 +13,12 @@ COMMENT=	Userlevel Common Address Redundancy Protocol
 
 USE_BZIP2=	yes
 
-OPTIONS=	UCARP_SCRIPTS "Install scripts to manage virtual IP" on
+OPTIONS_DEFINE=	SCRIPTS
+OPTIONS_DEFAULT=SCRIPTS
 
-.include <bsd.port.pre.mk>
+SCRIPTS_DESC=	Install scripts to manage virtual IP
+
+.include <bsd.port.options.mk>
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls
@@ -28,7 +27,7 @@ USE_RC_SUBR=	ucarp
 
 PLIST_FILES=	sbin/ucarp
 
-.if defined(WITH_UCARP_SCRIPTS)
+.if ${PORT_OPTIONS:MSCRIPTS}
 PLIST_FILES+=	sbin/ucarp-up \
 		sbin/ucarp-down
 post-install:
@@ -36,4 +35,4 @@ post-install:
 		${INSTALL_SCRIPT} ${WRKSRC}/examples/bsd/vip-down.sh ${PREFIX}/sbin/ucarp-down
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

net/ucarp/files/patch-l2vlan

@@ -0,0 +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;
+-                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]"),