Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 May 2014 17:21:44 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r354246 - head/Mk/Scripts
Message-ID:  <201405161721.s4GHLisk073145@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Fri May 16 17:21:44 2014
New Revision: 354246
URL: http://svnweb.freebsd.org/changeset/ports/354246
QAT: https://qat.redports.org/buildarchive/r354246/

Log:
  - Fix check-plist showing @sample dest files as orphans and also showing in
    makeplist.
  
  Reported by:	droso
  With hat:	portmgr

Modified:
  head/Mk/Scripts/check-stagedir.sh

Modified: head/Mk/Scripts/check-stagedir.sh
==============================================================================
--- head/Mk/Scripts/check-stagedir.sh	Fri May 16 17:13:02 2014	(r354245)
+++ head/Mk/Scripts/check-stagedir.sh	Fri May 16 17:21:44 2014	(r354246)
@@ -64,11 +64,18 @@ parse_plist() {
 			esac
 		;;
 		# Handle [file] Keywords
-		@info\ *|@sample\ *)
+		@info\ *)
 			set -- $line
 			shift
 			echo "${comment}${cwd}/$@"
 		;;
+		@sample\ *)
+			set -- $line
+			shift
+			# Ignore the actual file if it is in stagedir
+			echo "@comment ${cwd}/${@%.sample}"
+			echo "${comment}${cwd}/$@"
+		;;
 		# Handle [dirrmty] Keywords
 		@fc\ *|@fcfontsdir\ *|@fontsdir\ *)
 			set -- $line



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405161721.s4GHLisk073145>