From 3c01b652a1a1c67bcf70ce75418496d43c3ee789 Mon Sep 17 00:00:00 2001
From: jperkin <jperkin@pkgsrc.org>
Date: Thu, 8 Sep 2016 14:41:36 +0000
Subject: Support PKGMANDIR.  Use RESTRICTED correctly.

---
 misc/colorls/Makefile         | 5 +++--
 misc/colorls/distinfo         | 4 ++--
 misc/colorls/patches/patch-aa | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'misc')

diff --git a/misc/colorls/Makefile b/misc/colorls/Makefile
index 92dc017a5da..972fd4b1ff8 100644
--- a/misc/colorls/Makefile
+++ b/misc/colorls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2015/07/09 11:44:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.31 2016/09/08 14:41:36 jperkin Exp $
 
 DISTNAME=	ls
 PKGNAME=	colorls-2.2
@@ -12,7 +12,8 @@ COMMENT=	Uses color with ls(1) to display file attributes
 USE_FEATURES+=		fts_open
 USE_TOOLS=		nroff
 
-NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
+RESTRICTED=		Already in MASTER_SITE_LOCAL
+NO_SRC_ON_FTP=		${RESTRICTED}
 
 MANCOMPRESSED_IF_MANZ=	yes
 MAKE_ENV+=		BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} \
diff --git a/misc/colorls/distinfo b/misc/colorls/distinfo
index 0d01c195bce..ea7c5f2c9ca 100644
--- a/misc/colorls/distinfo
+++ b/misc/colorls/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2015/07/09 11:44:09 jperkin Exp $
+$NetBSD: distinfo,v 1.11 2016/09/08 14:41:36 jperkin Exp $
 
 SHA1 (ls.tar.gz) = f0d069e71faade167feaf14c4e6327bcc14d6616
 RMD160 (ls.tar.gz) = 7b607b7ab953ad0dc603c269fa03648cd54ac04f
 Size (ls.tar.gz) = 11768 bytes
-SHA1 (patch-aa) = d7d2381f1af5f8a452b6c875f7d0c84c80460ec0
+SHA1 (patch-aa) = 5c43a6d6fcbf44606a68f81be14f81a92c7dd3e7
 SHA1 (patch-ab) = 9e54a34c85ec0e4011aa6e5a4776b29e8cb0be54
 SHA1 (patch-ac) = ca39144a044969fe5aa17960c898c7e1b8bba86f
 SHA1 (patch-ad) = fb1d96b03fa028d45ddd4fe46ca520036f26be25
diff --git a/misc/colorls/patches/patch-aa b/misc/colorls/patches/patch-aa
index 4daed88c40f..c071f768f73 100644
--- a/misc/colorls/patches/patch-aa
+++ b/misc/colorls/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2015/07/09 11:44:09 jperkin Exp $
+$NetBSD: patch-aa,v 1.9 2016/09/08 14:41:36 jperkin Exp $
 
 Use pkgsrc layout.
 
@@ -10,6 +10,6 @@ Use pkgsrc layout.
 +PROG=	colorls
  SRCS=	cmp.c stat_flags.c ls.c print.c util.c
 +BINDIR=	${PREFIX}/bin
-+MANDIR= ${PREFIX}/man
++MANDIR= ${PREFIX}/${PKGMANDIR}
 +MANINSTALL= catinstall maninstall
  
-- 
cgit v1.2.3