Catch up to new semantics of COMMENT variable (contains comment string

itself, instead of pointing to pkg-comment)

2 files changed, 2 insertions, 5 deletions

diff --git a/Tools/scripts/addport b/Tools/scripts/addport
index af911c13cb07..6ae6c51a6658 100755
--- a/Tools/scripts/addport
+++ b/Tools/scripts/addport
@@ -228,10 +228,7 @@ foreach my $thisdir (@dirs) {
 	} else {
 		## Set up the autofill file.
 		# Read COMMENT for part of the commit message.
-		open(COMMENT, "pkg-comment") or die("Can't open pkg-comment for reading: $!");
-		$pkgcomment = <COMMENT>;
-		close(COMMENT);
-		chomp $pkgcomment;
+		$pkgcomment = `$make $passenv -V COMMENT`;
 		# Change the first character to lowercase to make it fit with the
 		# rest of the commit message.
 		$pkgcomment =~ s/(^.)/\l$1/;
diff --git a/Tools/scripts/portsearch b/Tools/scripts/portsearch
index 46a09d314c5c..88cd4a6ba68e 100755
--- a/Tools/scripts/portsearch
+++ b/Tools/scripts/portsearch
@@ -77,7 +77,7 @@ Options:
 
   -n name	Search for \"name\" in name of ports
   -p path	Search for \"path\" in location of ports
-  -i info	Search for \"info\" in ports COMMENT files
+  -i info	Search for \"info\" in ports COMMENT
   -m maint	Search for \"maint\" in ports Maintainer
   -x index	Search for \"index\" in ports categories
   -b b_deps	Search for \"b_deps\" in build depends of ports