From 26b65560a71c32989f822dfa6bbca8137053ae6a Mon Sep 17 00:00:00 2001
From: Satoshi Asami <asami@FreeBSD.org>
Date: Wed, 6 Mar 1996 23:08:52 +0000
Subject: [PATCH] (1) Remove FETCH_DEPENDS to ncftp2.  Regular ncftp can't
 fetch it     from the master site but the backup site should work.  This will
     all be fine when we start using the new ftpget that I am now     testing.

(2) Move the manpage rename from patch to Makefile.
---
 misc/colorls/Makefile       | 9 ++++-----
 misc/colorls/files/patch-aa | 9 +++------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/misc/colorls/Makefile b/misc/colorls/Makefile
index 8a3d4bf9cd0a..60db61a438d1 100644
--- a/misc/colorls/Makefile
+++ b/misc/colorls/Makefile
@@ -3,7 +3,7 @@
 # Date created:		8 March 1995
 # Whom:			Satoshi Asami
 #
-# $Id: Makefile,v 1.7 1995/10/04 09:41:18 asami Exp $
+# $Id: Makefile,v 1.8 1995/11/26 10:47:32 asami Exp $
 #
 
 DISTNAME=	colorls
@@ -14,10 +14,9 @@ DISTFILES=	ls.tar.gz
 
 MAINTAINER=	asami@FreeBSD.ORG
 
-FETCH_DEPENDS=	ncftp2:${PORTSDIR}/net/ncftp2
+WRKSRC=		${WRKDIR}/ls
 
-WRKSRC=		${WRKDIR}/pub/FreeBSD/FreeBSD-current/src/bin/ls
-NCFTP=		ncftp2
-NCFTPFLAGS=	
+pre-patch:
+	cp ${WRKSRC}/ls.1 ${WRKSRC}/colorls.1
 
 .include <bsd.port.mk>
diff --git a/misc/colorls/files/patch-aa b/misc/colorls/files/patch-aa
index c093ff93aeed..60f24bf482b0 100644
--- a/misc/colorls/files/patch-aa
+++ b/misc/colorls/files/patch-aa
@@ -218,7 +218,7 @@
  	FTSENT *p;
 --- ./Makefile.org	Wed Mar  8 02:14:10 1995
 +++ ./Makefile	Wed Mar  8 02:20:01 1995
-@@ -1,7 +1,12 @@
+@@ -1,7 +1,9 @@
  #	@(#)Makefile	8.1 (Berkeley) 6/2/93
  #	Makefile,v 1.2 1994/09/24 02:55:51 davidg Exp
  
@@ -227,13 +227,10 @@
  SRCS=	cmp.c stat_flags.c ls.c print.c util.c
 +BINDIR=	${PREFIX}/bin
 +MANDIR= ${PREFIX}/man/man
-+
-+beforeinstall:
-+	cp ls.1 colorls.1
  
  .include <bsd.prog.mk>
---- ./ls.1.org	Wed Mar  8 02:14:10 1995
-+++ ./ls.1	Wed Mar  8 02:17:10 1995
+--- ./colorls.1.org	Wed Mar  8 02:14:10 1995
++++ ./colorls.1	Wed Mar  8 02:17:10 1995
 @@ -36,16 +36,24 @@
  .\"	ls.1,v 1.3 1994/09/24 02:55:53 davidg Exp
  .\"