From c5fdea2b14e3f3c76b4d140e697cebbe09ee78e4 Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Thu, 1 Dec 2005 16:11:27 +0000
Subject: - In resolve_relative_path(), PKGSRCDIR is replaced with $pkgsrcdir.
 - In checkline_relative_path(), an info message is generated if a filename  
 could not be resolved completely.

---
 pkgtools/pkglint/files/pkglint.pl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'pkgtools/pkglint/files')

diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index daf2630b4eb..045e08c2ef8 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -11,7 +11,7 @@
 # Freely redistributable.  Absolutely no warranty.
 #
 # From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp
-# $NetBSD: pkglint.pl,v 1.405 2005/12/01 15:21:56 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.406 2005/12/01 16:11:27 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -1082,6 +1082,7 @@ sub checkperms($) {
 sub resolve_relative_path($) {
 	my ($relpath) = @_;
 
+	$relpath =~ s,\$\{PKGSRCDIR\},$pkgsrcdir,;
 	$relpath =~ s,\$\{\.CURDIR\},.,;
 	$relpath =~ s,\$\{PHPPKGSRCDIR\},../../lang/php5,;
 	$relpath =~ s,\$\{SUSE_DIR_PREFIX\},suse91,;
@@ -1168,7 +1169,9 @@ sub checkline_relative_path($$) {
 		$line->log_error("A pkgsrc package must not depend on any outside package.");
 	}
 	$path = resolve_relative_path($path);
-	if ($path !~ regex_unresolved && !-e "${current_dir}/${path}") {
+	if ($path =~ regex_unresolved) {
+		$line->log_info("Unresolved path: \"${path}\".");
+	} elsif (!-e "${current_dir}/${path}") {
 		$line->log_error("\"${path}\" does not exist.");
 	}
 }
-- 
cgit v1.2.3