diff options
| author | abs <abs@pkgsrc.org> | 2006-06-09 16:43:33 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2006-06-09 16:43:33 +0000 |
| commit | d4dac6f718dfc5dcb557543c3a6770697b569179 (patch) | |
| tree | 1b251ea7260332f1bad485fa4b344ee8217f556e | |
| parent | fa494e1722ae153938a056e8e15cc39f5ceb7d6a (diff) | |
| download | pkgsrc-d4dac6f718dfc5dcb557543c3a6770697b569179.tar.gz | |
update pkg_chk to 1.75
- match bsd.own.mk logic for determining MAKECONF, as requested by Joerg
| -rw-r--r-- | doc/CHANGES-2006 | 3 | ||||
| -rw-r--r-- | pkgtools/pkg_chk/Makefile | 5 | ||||
| -rwxr-xr-x | pkgtools/pkg_chk/files/pkg_chk.sh | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/doc/CHANGES-2006 b/doc/CHANGES-2006 index 3f90376caf9..02138c3d949 100644 --- a/doc/CHANGES-2006 +++ b/doc/CHANGES-2006 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2006,v 1.457 2006/06/09 15:24:32 minskim Exp $ +$NetBSD: CHANGES-2006,v 1.458 2006/06/09 16:45:40 abs Exp $ Changes to the packages collection and infrastructure in 2006: @@ -2968,3 +2968,4 @@ Changes to the packages collection and infrastructure in 2006: Added sysutils/munin-server version 1.3.1 [he 2006-06-08] Updated devel/glib to 1.2.10nb10 [tron 2006-06-08] Updated audio/libsidplay2 to 2.1.1nb1 [minskim 2006-06-09] + Updated pkgtools/pkg_chk to 1.75 [abs 2006-06-08] diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile index b59e25f9fa1..610feca28e5 100644 --- a/pkgtools/pkg_chk/Makefile +++ b/pkgtools/pkg_chk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.34 2006/06/07 16:27:14 abs Exp $ +# $NetBSD: Makefile,v 1.35 2006/06/09 16:43:33 abs Exp $ -DISTNAME= pkg_chk-1.74 +DISTNAME= pkg_chk-1.75 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty @@ -38,6 +38,7 @@ do-build: -e 's#@SH@#${SH}#g' \ -e 's#@SORT@#${SORT}#g' \ -e 's#@TSORT@#${TSORT}#g' \ + -e 's#@PREFIX@#${PREFIX}#g' \ ${FILESDIR}/pkg_chk.sh >${WRKSRC}/pkg_chk.sh do-install: diff --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh index b80606a34ca..20f40db6f9f 100755 --- a/pkgtools/pkg_chk/files/pkg_chk.sh +++ b/pkgtools/pkg_chk/files/pkg_chk.sh @@ -1,6 +1,6 @@ #!@SH@ -e # -# $Id: pkg_chk.sh,v 1.35 2006/06/07 16:27:14 abs Exp $ +# $Id: pkg_chk.sh,v 1.36 2006/06/09 16:43:33 abs Exp $ # # TODO: Make -g check dependencies and tsort # TODO: Variation of -g which only lists top level packages @@ -646,7 +646,9 @@ test -n "$SORT" || SORT="@SORT@" test -n "$TSORT" || TSORT="@TSORT@" if [ ! -f $MAKECONF ] ; then - if [ -f /etc/mk.conf ] ; then + if [ -f @PREFIX@/etc/mk.conf ] ; then + MAKECONF=@PREFIX@/etc/mk.conf + elif [ -f /etc/mk.conf ] ; then MAKECONF=/etc/mk.conf else MAKECONF=/dev/null |