[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_alternatives Updated pkg_alternatives to ...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d4f7ad383fe6
branches:  trunk
changeset: 523898:d4f7ad383fe6
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Jan 15 02:50:06 2007 +0000

description:
Updated pkg_alternatives to 1.4.

Changes since 1.3:
- Added support for non-standard PKGMANDIR.

diffstat:

 pkgtools/pkg_alternatives/Makefile                  |  6 +++---
 pkgtools/pkg_alternatives/files/pkg_alternatives.sh |  5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (50 lines):

diff -r 3850bf2b9216 -r d4f7ad383fe6 pkgtools/pkg_alternatives/Makefile
--- a/pkgtools/pkg_alternatives/Makefile        Mon Jan 15 02:35:28 2007 +0000
+++ b/pkgtools/pkg_alternatives/Makefile        Mon Jan 15 02:50:06 2007 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2006/09/20 13:00:02 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/15 02:50:06 rillig Exp $
 #
 
-DISTNAME=      pkg_alternatives-1.3
-PKGREVISION=   1
+DISTNAME=      pkg_alternatives-1.4
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -36,6 +35,7 @@
 SUBST_SED.vars=                -e 's|@CONFDIR@|${PKG_SYSCONFDIR}|g'
 SUBST_SED.vars+=       -e 's|@DATADIR@|${DATADIR}|g'
 SUBST_SED.vars+=       -e 's|@DBDIR@|${DBDIR}|g'
+SUBST_SED.vars+=       -e 's|@PKGMANDIR@|${PKGMANDIR}|g'
 SUBST_SED.vars+=       -e 's|@PKG_DBDIR@|${PKG_DBDIR}|g'
 SUBST_SED.vars+=       -e 's|@PREFIX@|${PREFIX}|g'
 SUBST_SED.vars+=       -e 's|@ROOT_USER@|${ROOT_USER}|g'
diff -r 3850bf2b9216 -r d4f7ad383fe6 pkgtools/pkg_alternatives/files/pkg_alternatives.sh
--- a/pkgtools/pkg_alternatives/files/pkg_alternatives.sh       Mon Jan 15 02:35:28 2007 +0000
+++ b/pkgtools/pkg_alternatives/files/pkg_alternatives.sh       Mon Jan 15 02:50:06 2007 +0000
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: pkg_alternatives.sh,v 1.5 2005/02/10 10:18:03 jmmv Exp $
+# $NetBSD: pkg_alternatives.sh,v 1.6 2007/01/15 02:50:06 rillig Exp $
 #
 # pkg_alternatives - Generic wrappers for programs with similar interfaces
 # Copyright (c) 2005 Julio M. Merino Vidal <jmmv%NetBSD.org@localhost>
@@ -41,6 +41,7 @@
 Verbose=yes
 
 : ${PKG_DBDIR:=@PKG_DBDIR@}
+: ${PKGMANDIR:=@PKGMANDIR@}
 
 # -------------------------------------------------------------------------
 
@@ -488,7 +489,7 @@
 #
 get_manpage() {
     sect=$(get_manpage_sect ${1})
-    echo ${Prefix}/man/man${sect}/${1##*/}.${sect}
+    echo ${Prefix}/${PKGMANDIR}/man${sect}/${1##*/}.${sect}
 }
 
 # -------------------------------------------------------------------------