ports/151825: [MAINTAINER] ports/sysutils/less -> 4.36

[Jason Harris]

>Number:         151825
>Category:       ports
>Synopsis:       [MAINTAINER] ports/sysutils/less -> 4.36
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 30 04:10:10 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Jason Harris
>Release:        FreeBSD 7.1-RELEASE i386
>Organization:
not really...
>Environment:
System: FreeBSD laptop 7.1-RELEASE FreeBSD 7.1-RELEASE #0: Thu Jan 1 14:37:25 UTC 2009 root at logan.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386

>Description:
	update ports/sysutils/less -> 4.36

>How-To-Repeat:
	apply patch below

>Fix:

cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/less/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- Makefile	29 Jan 2007 19:05:06 -0000	1.41
+++ Makefile	30 Oct 2010 02:58:22 -0000
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	less
-PORTVERSION=	382
+PORTVERSION=	436
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.greenwoodsoftware.com/%SUBDIR%/ \
-		${MASTER_SITE_GNU}
+MASTER_SITES=	http://www.greenwoodsoftware.com/%SUBDIR%/
+#		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	less
 
 MAINTAINER=	jharris at widomaker.com
@@ -20,13 +20,13 @@
 .include <bsd.port.pre.mk>
 
 GNU_CONFIGURE=	yes
-MAN1=		less.1 lesskey.1
+MAN1=		less.1 lesskey.1 lessecho.1
 
 .if defined(COLOUR_LESS) || defined(COLOR_LESS)
-MAKE_ENV=	CPPFLAGS="-DCOLOUR_LESS"
+MAKE_ENV=	CPPFLAGS="-DCOLOR_LESS"
 
 pre-fetch:
-	@${ECHO_MSG} "Making a colour version of less."
+	@${ECHO_MSG} "Making a color version of less."
 .endif
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/sysutils/less/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo	19 Jul 2007 21:37:13 -0000	1.21
+++ distinfo	30 Oct 2010 02:58:22 -0000
@@ -1,3 +1,3 @@
-MD5 (less-382.tar.gz) = 103fe4aef6297b93f0f73f38cc3b1bd7
-SHA256 (less-382.tar.gz) = d33cc51f220647d015fd526b3782cde03c5d8b18c5233e6388a0047a70446fe7
-SIZE (less-382.tar.gz) = 264414
+MD5 (less-436.tar.gz) = 817bf051953ad2dea825a1cdf460caa4
+SHA256 (less-436.tar.gz) = 57a16ff07431a9af45cf1cd5b374e1066d019304219f0d156e22bb8c4d6734d2
+SIZE (less-436.tar.gz) = 303921
cvs diff: Diffing files
Index: files/patch-aa
===================================================================
RCS file: /home/ncvs/ports/sysutils/less/files/patch-aa,v
retrieving revision 1.7
diff -u -r1.7 patch-aa
--- files/patch-aa	4 Apr 2003 12:40:04 -0000	1.7
+++ files/patch-aa	30 Oct 2010 02:58:22 -0000
@@ -1,7 +1,11 @@
---- Makefile.in.orig	Fri Apr  9 20:02:59 1999
-+++ Makefile.in	Thu Apr 15 23:09:36 1999
-@@ -15,7 +15,7 @@
- LDFLAGS = @LDFLAGS@
+===================================================================
+RCS file: Makefile.in,v
+retrieving revision 1.1
+diff -u -r1.1 Makefile.in
+--- Makefile.in	2010/10/30 02:29:59	1.1
++++ Makefile.in	2010/10/30 02:32:04
+@@ -17,7 +17,7 @@
+ EXEEXT = @EXEEXT@
  O=o
  
 -LIBS = @LIBS@
Index: files/patch-ab
===================================================================
RCS file: /home/ncvs/ports/sysutils/less/files/patch-ab,v
retrieving revision 1.3
diff -u -r1.3 patch-ab
--- files/patch-ab	4 Apr 2003 12:40:04 -0000	1.3
+++ files/patch-ab	30 Oct 2010 02:58:22 -0000
@@ -1,8 +1,12 @@
---- charset.c.orig	Thu Mar 23 05:36:33 2000
-+++ charset.c	Mon Jun 19 22:33:43 2000
-@@ -267,6 +267,10 @@
+===================================================================
+RCS file: charset.c,v
+retrieving revision 1.1
+diff -u -r1.1 charset.c
+--- charset.c	2010/10/30 02:38:17	1.1
++++ charset.c	2010/10/30 02:40:03
+@@ -408,6 +408,10 @@
  control_char(c)
- 	int c;
+ 	LWCHAR c;
  {
 +#ifdef COLOR_LESS
 +	if (c == ESC)
@@ -11,9 +15,9 @@
  	c &= 0377;
  	return (chardef[c] & IS_CONTROL_CHAR);
  }
-@@ -281,6 +285,20 @@
- {
- 	static char buf[8];
+@@ -423,6 +427,20 @@
+ 	/* {{ This buffer can be overrun if LESSBINFMT is a long string. }} */
+ 	static char buf[32];
  
 +#ifdef COLOR_LESS
 +	if(c == ESC)
@@ -30,12 +34,13 @@
 +	}
 +#else
  	c &= 0377;
- 	if (!control_char(c))
- 		sprintf(buf, "%c", c);
-@@ -290,5 +308,6 @@
- 		sprintf(buf, "^%c", c ^ 0100);
+ 	if ((c < 128 || !utf_mode) && !control_char(c))
+ 		SNPRINTF1(buf, sizeof(buf), "%c", (int) c);
+@@ -446,6 +464,7 @@
+ #endif
  	else
- 		sprintf(buf, binfmt, c);
+ 		SNPRINTF1(buf, sizeof(buf), binfmt, c);
 +#endif
  	return (buf);
  }
+ 
>Release-Note:
>Audit-Trail:
>Unformatted: