svn commit: r370212 - head/Mk/Scripts

[Antoine Brodin]

Author: antoine
Date: Mon Oct  6 19:17:22 2014
New Revision: 370212
URL: https://svnweb.freebsd.org/changeset/ports/370212
QAT: https://qat.redports.org/buildarchive/r370212/

Log:
  Replace @dirrm/@dirrmtry with @dir in makeplist and leftovers check
  
  Differential Revision:	https://reviews.freebsd.org/D901
  Reviewed by:	bapt
  With hat:	portmgr

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

Modified: head/Mk/Scripts/check-stagedir.sh
==============================================================================
--- head/Mk/Scripts/check-stagedir.sh	Mon Oct  6 19:16:42 2014	(r370211)
+++ head/Mk/Scripts/check-stagedir.sh	Mon Oct  6 19:17:22 2014	(r370212)
@@ -88,7 +88,7 @@ parse_plist() {
 			;;
 			esac
 		;;
-		# Handle [dirrmtry] Keywords
+		# Handle [dir] Keywords
 		@fc\ *|@fcfontsdir\ *|@fontsdir\ *)
 			set -- $line
 			shift
@@ -220,14 +220,14 @@ setup_plist_seds() {
 	# Used for generate_plist
 	sed_files_gen="s!${PREFIX}/!!g; ${sed_plist_sub} \
 	    ${sed_portdocsexamples} /^share\/licenses/d;"
-	sed_dirs_gen="s!${PREFIX}/!!g; ${sed_plist_sub} s,^, at dirrmtry ,; \
+	sed_dirs_gen="s!${PREFIX}/!!g; ${sed_plist_sub} s,^, at dir ,; \
 	    ${sed_portdocsexamples} \
-	    /^@dirrmtry share\/licenses/d;"
+	    /^@dir share\/licenses/d;"
 
 	# These prevent ignoring DOCS/EXAMPLES dirs with sed_portdocsexamples
 	sed_files="s!${PREFIX}/!!g; ${sed_plist_sub} /^share\/licenses/d;"
-	sed_dirs="s!${PREFIX}/!!g; ${sed_plist_sub} s,^, at dirrmtry ,; \
-	    /^@dirrmtry share\/licenses/d;"
+	sed_dirs="s!${PREFIX}/!!g; ${sed_plist_sub} s,^, at dir ,; \
+	    /^@dir share\/licenses/d;"
 
 }
 
@@ -264,16 +264,16 @@ check_orphans_from_plist() {
 	# Handle whitelisting
 	while read path; do
 		case "${path}" in
-		*'@dirrmtry '[^/]*) ;;
+		*'@dir '[^/]*) ;;
 		*.bak) ;;
 		*.orig) ;;
 		*/.DS_Store) ;;
 		*/.cvsignore) ;;
-		*/.git/*|'@dirrmtry '*/.git) ;;
+		*/.git/*|'@dir '*/.git) ;;
 		*/.gitattributes|*/.gitignore|*/.gitmodules) ;;
-		*/.svn/*|'@dirrmtry '*/.svn) ;;
+		*/.svn/*|'@dir '*/.svn) ;;
 		*/.svnignore) ;;
-		*/CVS/*|'@dirrmtry '*/CVS) ;;
+		*/CVS/*|'@dir '*/CVS) ;;
 		*/info/dir|info/dir) ;;
 		lib/X11/fonts/*/fonts.dir) ;;
 		lib/X11/fonts/*/fonts.scale) ;;

Modified: head/Mk/Scripts/check_leftovers.sh
==============================================================================
--- head/Mk/Scripts/check_leftovers.sh	Mon Oct  6 19:16:42 2014	(r370211)
+++ head/Mk/Scripts/check_leftovers.sh	Mon Oct  6 19:17:22 2014	(r370212)
@@ -66,11 +66,11 @@ while read modtype path extra; do
 	ignore_path=0
 	sub_path=$(echo "$path" | sed -e "s|^${PREFIX}/||" -e "${plistsub_sed}")
 	orig_sub_path="${sub_path}"
-	# If this is a directory, use @dirrm in output
+	# If this is a directory, use @dir in output
 	is_dir=0
 	if [ -d "${path}" ]; then
 		is_dir=1
-		sub_path="@dirrm ${sub_path}"
+		sub_path="@dir ${sub_path}"
 	fi
 
 	# Handle PORTDOCS/PORTEXAMPLES/etc
@@ -153,7 +153,7 @@ while read modtype path extra; do
 			/etc/pwd.db|\
 			/etc/shells|\
 			/etc/spwd.db) ;;
-			*) echo "M ${sub_path#@dirrm } ${extra}" ;;
+			*) echo "M ${sub_path#@dir } ${extra}" ;;
 		esac
 		;;
 	esac