summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorleot <leot@pkgsrc.org>2015-11-25 20:46:28 +0000
committerleot <leot@pkgsrc.org>2015-11-25 20:46:28 +0000
commitfd80dfba46f064e37bdf5beb4b085bbec88408d1 (patch)
treedab95e8efe2da46f03f521a7402d1f101fabb5b4 /pkgtools
parent14876564343e509cb66b64f12b02894b40799fa2 (diff)
downloadpkgsrc-fd80dfba46f064e37bdf5beb4b085bbec88408d1.tar.gz
Use Cwd::realpath() for the -[KMP] flags.
Fixes PR pkg/50444 reported by dholland@ and also fixes various possible problems when relative paths are used.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/lintpkgsrc/Makefile4
-rwxr-xr-xpkgtools/lintpkgsrc/files/lintpkgsrc.pl10
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgtools/lintpkgsrc/Makefile b/pkgtools/lintpkgsrc/Makefile
index 1f7e5fdb33c..62aeebcfda8 100644
--- a/pkgtools/lintpkgsrc/Makefile
+++ b/pkgtools/lintpkgsrc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2015/10/05 13:12:12 tnn Exp $
+# $NetBSD: Makefile,v 1.23 2015/11/25 20:46:28 leot Exp $
-PKGNAME= lintpkgsrc-4.90
+PKGNAME= lintpkgsrc-4.91
CATEGORIES= pkgtools
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl
index 69b600f8c08..dc0d710c1fe 100755
--- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl
+++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl
@@ -1,6 +1,6 @@
#! @PERL@
-# $NetBSD: lintpkgsrc.pl,v 1.8 2015/10/05 13:16:44 tnn Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.9 2015/11/25 20:46:28 leot Exp $
# Written by David Brownlee <abs@netbsd.org>.
#
@@ -627,7 +627,7 @@ sub get_default_makefile_vars() {
$default_vars->{LOWER_OPSYS} = lc( $default_vars->{OPSYS} );
if ( $opt{P} ) {
- $default_vars->{PKGSRCDIR} = $opt{P};
+ $default_vars->{PKGSRCDIR} = realpath($opt{P});
}
else {
$default_vars->{PKGSRCDIR} = $conf_pkgsrcdir;
@@ -646,18 +646,18 @@ sub get_default_makefile_vars() {
}
if ( $opt{P} ) {
- $default_vars->{PKGSRCDIR} = $opt{P};
+ $default_vars->{PKGSRCDIR} = realpath($opt{P});
}
if ( $opt{M} ) {
- $default_vars->{DISTDIR} = $opt{M};
+ $default_vars->{DISTDIR} = realpath($opt{M});
}
else {
$default_vars->{DISTDIR} ||= $default_vars->{PKGSRCDIR} . '/distfiles';
}
if ( $opt{K} ) {
- $default_vars->{PACKAGES} = $opt{K};
+ $default_vars->{PACKAGES} = realpath($opt{K});
}
# Extract some variables from bsd.pkg.mk