Attachment 9473 Details for Bug 19381 – file.diff

[patch] file.diff

file.diff (text/plain), 3.42 KB, created by tkato on 2000-06-19 20:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2000-06-19 20:30:01 UTC

Size: 3.42 KB

patch

obsolete

>diff -urN /usr/ports/misc/less/Makefile misc/less/Makefile
>--- /usr/ports/misc/less/Makefile	Tue May 23 19:09:26 2000
>+++ misc/less/Makefile	Mon Jun 19 22:57:09 2000
>@@ -1,32 +1,33 @@
>-# New ports collection makefile for:    less
>-# Date created:         8 Nov 1994
>-# Whom:                 ache
>+# New ports collection makefile for:	less
>+# Date created:		8 Nov 1994
>+# Whom:			ache
> #
> # $FreeBSD: ports/misc/less/Makefile,v 1.29 2000/05/23 06:35:25 ache Exp $
> #
> 
>-PORTNAME=       less
>-PORTVERSION=	352
>+PORTNAME=	less
>+PORTVERSION=	354
> CATEGORIES=	misc
>-MASTER_SITES=   http://home.flash.net/~marknu/less/ \
>+MASTER_SITES=	http://home.flash.net/~marknu/less/ \
> 		${MASTER_SITE_GNU}
> MASTER_SITE_SUBDIR=	less
> 
>+MAINTAINER=	ports@FreeBSD.org
>+
> .include <bsd.port.pre.mk>
> 
> .if ${OSVERSION} >= 500003
>-FORBIDDEN=      already is in the base system
>+FORBIDDEN=	already is in the base system
> .endif
> 
>-MAINTAINER=     ports@FreeBSD.org
>-
> GNU_CONFIGURE=	yes
> MAN1=		less.1 lesskey.1
> 
> .if defined(COLOUR_LESS) || defined(COLOR_LESS)
>-pre-patch:
>+MAKE_ENV=	CPPFLAGS="-DCOLOUR_LESS"
>+
>+pre-fetch:
> 	@${ECHO_MSG} "Making a colour version of less."
>-EXTRA_PATCHES=	${FILESDIR}/patch-ab
> .endif
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/misc/less/files/md5 misc/less/files/md5
>--- /usr/ports/misc/less/files/md5	Sat Mar 11 11:05:43 2000
>+++ misc/less/files/md5	Mon Jun 19 21:55:34 2000
>@@ -1 +1 @@
>-MD5 (less-352.tar.gz) = 726fa6004376b67213f14832b38683b4
>+MD5 (less-354.tar.gz) = 48f73bdd8712c35f4e5f65ee878fd805
>diff -urN /usr/ports/misc/less/files/patch-ab misc/less/files/patch-ab
>--- /usr/ports/misc/less/files/patch-ab	Thu Feb 23 11:58:32 1995
>+++ misc/less/files/patch-ab	Thu Jan  1 09:00:00 1970
>@@ -1,37 +0,0 @@
>---- ./charset.c.org	Tue Jan 31 15:55:28 1995
>-+++ ./charset.c	Wed Feb 22 18:34:50 1995
>-@@ -260,6 +260,8 @@
>- control_char(c)
>- 	int c;
>- {
>-+	if (c == ESC)
>-+		return 0;
>- 	c &= 0377;
>- 	return (chardef[c] & IS_CONTROL_CHAR);
>- }
>-@@ -274,14 +276,17 @@
>- {
>- 	static char buf[8];
>- 
>--	c &= 0377;
>--	if (!control_char(c))
>--		sprintf(buf, "%c", c);
>--	else if (c == ESC)
>--		sprintf(buf, "ESC");
>--	else if (c < 128 && !control_char(c ^ 0100))
>--		sprintf(buf, "^%c", c ^ 0100);
>-+	if(c == ESC)
>-+		sprintf(buf, "%c", ESC);
>- 	else
>--		sprintf(buf, binfmt, c);
>-+	{
>-+		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);
>-+	}
>- 	return (buf);
>- }
>diff -urN /usr/ports/misc/less/patches/patch-ab misc/less/patches/patch-ab
>--- /usr/ports/misc/less/patches/patch-ab	Thu Jan  1 09:00:00 1970
>+++ misc/less/patches/patch-ab	Mon Jun 19 22:34:24 2000
>@@ -0,0 +1,41 @@
>+--- charset.c.orig	Thu Mar 23 05:36:33 2000
>++++ charset.c	Mon Jun 19 22:33:43 2000
>+@@ -267,6 +267,10 @@
>+ control_char(c)
>+ 	int c;
>+ {
>++#ifdef COLOR_LESS
>++	if (c == ESC)
>++		return 0;
>++#endif
>+ 	c &= 0377;
>+ 	return (chardef[c] & IS_CONTROL_CHAR);
>+ }
>+@@ -281,6 +285,20 @@
>+ {
>+ 	static char buf[8];
>+ 
>++#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 (!control_char(c))
>+ 		sprintf(buf, "%c", c);
>+@@ -290,5 +308,6 @@
>+ 		sprintf(buf, "^%c", c ^ 0100);
>+ 	else
>+ 		sprintf(buf, binfmt, c);
>++#endif
>+ 	return (buf);
>+ }

Actions: View | Diff

Attachments on bug 19381: 9473