diff options
| author | rillig <rillig@pkgsrc.org> | 2007-01-15 02:50:06 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-01-15 02:50:06 +0000 |
| commit | b6c7c8977f9175d712864287768357930fbb626f (patch) | |
| tree | 3b5e85fc80bdb055ed85da708ffa6080788e90cf | |
| parent | 0f0da8c9aad7521bbe7b825d7cfbd6d474ced534 (diff) | |
| download | pkgsrc-b6c7c8977f9175d712864287768357930fbb626f.tar.gz | |
Updated pkg_alternatives to 1.4.
Changes since 1.3:
- Added support for non-standard PKGMANDIR.
| -rw-r--r-- | pkgtools/pkg_alternatives/Makefile | 6 | ||||
| -rw-r--r-- | pkgtools/pkg_alternatives/files/pkg_alternatives.sh | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgtools/pkg_alternatives/Makefile b/pkgtools/pkg_alternatives/Makefile index dbed5fd823f..336d97c3d10 100644 --- a/pkgtools/pkg_alternatives/Makefile +++ b/pkgtools/pkg_alternatives/Makefile @@ -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_FILES.vars= * 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 --git a/pkgtools/pkg_alternatives/files/pkg_alternatives.sh b/pkgtools/pkg_alternatives/files/pkg_alternatives.sh index 5665d4754d0..6ef7126a6b6 100644 --- a/pkgtools/pkg_alternatives/files/pkg_alternatives.sh +++ b/pkgtools/pkg_alternatives/files/pkg_alternatives.sh @@ -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> @@ -41,6 +41,7 @@ Prog_Name=${0##*/} Verbose=yes : ${PKG_DBDIR:=@PKG_DBDIR@} +: ${PKGMANDIR:=@PKGMANDIR@} # ------------------------------------------------------------------------- @@ -488,7 +489,7 @@ get_my_config() { # get_manpage() { sect=$(get_manpage_sect ${1}) - echo ${Prefix}/man/man${sect}/${1##*/}.${sect} + echo ${Prefix}/${PKGMANDIR}/man${sect}/${1##*/}.${sect} } # ------------------------------------------------------------------------- |