Index: head/sysutils/less/Makefile
===================================================================
--- head/sysutils/less/Makefile	(revision 568685)
+++ head/sysutils/less/Makefile	(revision 568686)
@@ -1,48 +1,42 @@
 # Created by: Andrey A. Chernov <ache@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	less
 PORTVERSION=	551
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.greenwoodsoftware.com/less/
 
 MAINTAINER=	jharris@widomaker.com
 COMMENT=	Better pager utility
 
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE=	GPLv3+ MIT
+LICENSE_COMB=	dual
+LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING
+LICENSE_FILE_MIT=	${WRKSRC}/LICENSE
 
 USES=		cpe ncurses
 
 CPE_VENDOR=	gnu
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/less \
 		bin/lessecho \
 		bin/lesskey \
 		man/man1/less.1.gz \
 		man/man1/lessecho.1.gz \
 		man/man1/lesskey.1.gz
 
 OPTIONS_DEFINE=		COLORS PCRE
 OPTIONS_DEFAULT=	COLORS PCRE
 
 PCRE_USES=		localbase
+PCRE_CONFIGURE_ON=	--with-regex=pcre
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
+PCRE_LDFLAGS=		-L${LOCALBASE}/lib -lpcre
+PCRE_CONFIGURE_OFF=	--with-regex=posix
 
-COLORS_DESC=	Enable colors support via escape sequence
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCOLORS}
-CPPFLAGS+=	-DCOLOR_LESS
-.endif
-
-.if ${PORT_OPTIONS:MPCRE}
-CONFIGURE_ARGS+=	--with-regex=pcre
-LDFLAGS+=		-L${LOCALBASE}/lib -lpcre
-.else
-CONFIGURE_ARGS+=	--with-regex=posix
-.endif
+COLORS_DESC=		Enable colors support via escape sequence
+COLORS_CPPFLAGS=	-DCOLOR_LESS
 
 .include <bsd.port.mk>
Index: head/sysutils/less/files/patch-charset.c
===================================================================
--- head/sysutils/less/files/patch-charset.c	(revision 568685)
+++ head/sysutils/less/files/patch-charset.c	(nonexistent)
@@ -1,42 +0,0 @@
---- charset.c.orig	2013-04-04 16:55:05 UTC
-+++ charset.c
-@@ -407,6 +407,10 @@ binary_char(c)
- control_char(c)
- 	LWCHAR c;
- {
-+#ifdef COLOR_LESS
-+	if (c == ESC)
-+		return 0;
-+#endif
- 	c &= 0377;
- 	return (chardef[c] & IS_CONTROL_CHAR);
- }
-@@ -422,6 +426,20 @@ prchar(c)
- 	/* {{ This buffer can be overrun if LESSBINFMT is a long string. }} */
- 	static char buf[32];
- 
-+#ifdef COLOR_LESS
-+	if(c == ESC)
-+		sprintf(buf, "%c", ESC);
-+	else
-+	{
-+		c &= 0377;
-+		if (!control_char(c))
-+			sprintf(buf, "%c", c);
-+		else if (!control_char(c ^ 0100))
-+			sprintf(buf, "^%c", c ^ 0100);
-+		else
-+			sprintf(buf, binfmt, c);
-+	}
-+#else
- 	c &= 0377;
- 	if ((c < 128 || !utf_mode) && !control_char(c))
- 		SNPRINTF1(buf, sizeof(buf), "%c", (int) c);
-@@ -445,6 +463,7 @@ prchar(c)
- #endif
- 	else
- 		SNPRINTF1(buf, sizeof(buf), binfmt, c);
-+#endif
- 	return (buf);
- }
- 

Property changes on: head/sysutils/less/files/patch-charset.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property