From 9288dee5be5619b262da4c358e3c57e8bdf0f33a Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Sat, 17 May 2008 14:18:45 +0000
Subject: Some minor fixes  * Require working terminal library  * Honor
 PKG_SYSCONFDIR  * Fix sysconfdir mentioned in man pages.  * Add DESTDIR
 support

Bump PKGREVISION.
---
 misc/ja-less/Makefile         | 13 ++++++++++++-
 misc/ja-less/distinfo         |  4 ++--
 misc/ja-less/patches/patch-aa | 28 ++++++++++++++++++++++++++--
 3 files changed, 40 insertions(+), 5 deletions(-)

(limited to 'misc/ja-less')

diff --git a/misc/ja-less/Makefile b/misc/ja-less/Makefile
index f0d3768f475..717c99419d1 100644
--- a/misc/ja-less/Makefile
+++ b/misc/ja-less/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2008/02/04 14:34:09 obache Exp $
+# $NetBSD: Makefile,v 1.10 2008/05/17 14:18:45 obache Exp $
 
 DISTNAME=	less-382
 PKGNAME=	ja-${DISTNAME}.262
+PKGREVISION=	1
 CATEGORIES=	japanese misc
 MASTER_SITES=	${MASTER_SITE_GNU:=less/}
 
@@ -17,6 +18,16 @@ MAINTAINER=	komine@cc.meisei-u.ac.jp
 HOMEPAGE=	http://www25.big.jp/~jam/less/
 COMMENT=	Less + zcat + ISO-2022 - a pager similar to more and pg
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+
+SUBST_CLASSES+=		cfgdir
+SUBST_STAGE.cfgdir=	post-configure
+SUBST_FILES.cfgdir=	less.nro lesskey.nro
+SUBST_SED.cfgdir=	-e 's|/usr/local/etc|${PKG_SYSCONFDIR}|'
+
+.include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/ja-less/distinfo b/misc/ja-less/distinfo
index 93fa3996e7b..7b37e946886 100644
--- a/misc/ja-less/distinfo
+++ b/misc/ja-less/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2008/02/04 14:34:09 obache Exp $
+$NetBSD: distinfo,v 1.5 2008/05/17 14:18:45 obache Exp $
 
 SHA1 (less-382-iso258-259.patch.gz) = 7256998c59f9743e61e83e9e5ebc5183e8eeb269
 RMD160 (less-382-iso258-259.patch.gz) = 4b2214d0bea7db838d65feeb1ae011894001cdaa
@@ -18,7 +18,7 @@ Size (less-382-iso261-262.patch.gz) = 2215 bytes
 SHA1 (less-382.tar.gz) = 3c3f1ae0bf18039b047524ff0f573ef514bcc944
 RMD160 (less-382.tar.gz) = 2b851c7038d9a4dea4f369ff5705eafc9093de97
 Size (less-382.tar.gz) = 264414 bytes
-SHA1 (patch-aa) = 08761c6e5bf60fcb59fdf13e58d9c556acf41d84
+SHA1 (patch-aa) = 607c0b1c211d6d8b38218a7924e1526fab97666e
 SHA1 (patch-ad) = b000ff818556b824b3f293282e56b448c2af8cf6
 SHA1 (patch-ae) = 5f488d26762794293a6c94937f4588c99e96e2db
 SHA1 (patch-af) = c5dfe927c428beea5a53c7ef34bfd2efe41f04de
diff --git a/misc/ja-less/patches/patch-aa b/misc/ja-less/patches/patch-aa
index 0abeca287c0..175a2390620 100644
--- a/misc/ja-less/patches/patch-aa
+++ b/misc/ja-less/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2008/02/04 14:34:09 obache Exp $
+$NetBSD: patch-aa,v 1.3 2008/05/17 14:18:46 obache Exp $
 
---- Makefile.in.orig	2008-02-04 13:36:20.000000000 +0000
+--- Makefile.in.orig	2008-05-17 13:58:31.000000000 +0000
 +++ Makefile.in
 @@ -22,13 +22,13 @@ exec_prefix = @exec_prefix@
  
@@ -18,3 +18,27 @@ $NetBSD: patch-aa,v 1.2 2008/02/04 14:34:09 obache Exp $
  
  #### End of system configuration section. ####
  
+@@ -60,17 +60,17 @@ lessecho: lessecho.${O} version.${O}
+ ${OBJ}: ${srcdir}/less.h ${srcdir}/funcs.h ${srcdir}/multi.h defines.h 
+ 
+ install: all ${srcdir}/less.nro ${srcdir}/lesskey.nro installdirs
+-	${INSTALL_PROGRAM} less ${bindir}/${binprefix}less
+-	${INSTALL_PROGRAM} lesskey ${bindir}/${binprefix}lesskey
+-	${INSTALL_PROGRAM} lessecho ${bindir}/${binprefix}lessecho
+-	${INSTALL_DATA} ${srcdir}/less.nro ${mandir}/man${manext}/${manprefix}less.${manext}
+-	${INSTALL_DATA} ${srcdir}/lesskey.nro ${mandir}/man${manext}/${manprefix}lesskey.${manext}
++	${INSTALL_PROGRAM} less ${DESTDIR}${bindir}/${binprefix}less
++	${INSTALL_PROGRAM} lesskey ${DESTDIR}${bindir}/${binprefix}lesskey
++	${INSTALL_PROGRAM} lessecho ${DESTDIR}${bindir}/${binprefix}lessecho
++	${INSTALL_DATA} ${srcdir}/less.nro ${DESTDIR}${mandir}/man${manext}/${manprefix}less.${manext}
++	${INSTALL_DATA} ${srcdir}/lesskey.nro ${DESTDIR}${mandir}/man${manext}/${manprefix}lesskey.${manext}
+ 
+ install-strip:
+ 	${MAKE} INSTALL_PROGRAM='${INSTALL_PROGRAM} -s' install
+ 
+ installdirs: mkinstalldirs
+-	${srcdir}/mkinstalldirs ${bindir} ${mandir}/man${manext}
++	${srcdir}/mkinstalldirs ${DESTDIR}${bindir} ${DESTDIR}${mandir}/man${manext}
+ 
+ uninstall:
+ 	rm -f ${bindir}/${binprefix}less ${bindir}/${binprefix}lesskey ${bindir}/${binprefix}lessecho
-- 
cgit v1.2.3