diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2005-09-01 21:07:24 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2005-09-01 21:07:24 +0000 |
| commit | 84bd65a5ffa2b48a66a1e343f8d47557febb4121 (patch) | |
| tree | f6e6707e14f43fcab0409f47c0aec04521911c19 /shells | |
| parent | Oops, a double slash sneaked into the linker spec, causing GCC to (diff) | |
Upgrade to 1.0.3.
Notes
Notes:
svn path=/head/; revision=141733
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/bush/Makefile | 5 | ||||
| -rw-r--r-- | shells/bush/distinfo | 4 | ||||
| -rw-r--r-- | shells/bush/files/patch-src__parser_dirops.adb | 67 |
3 files changed, 70 insertions, 6 deletions
diff --git a/shells/bush/Makefile b/shells/bush/Makefile index 4a922df164e2..2e5c3deebe55 100644 --- a/shells/bush/Makefile +++ b/shells/bush/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bush -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= shells MASTER_SITES= http://www.pegasoft.ca/downloads/ \ http://66.11.182.223/downloads/ @@ -42,9 +42,6 @@ PORTDOCS= * BASH2FIX= examples/benchmark.bash examples/export.sh src/testsuite/test.sh -post-extract: - @${RMDIR} ${WRKSRC}/examples/test - pre-build: .for FILE in ${BASH2FIX} @${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|" ${WRKSRC}/${FILE} diff --git a/shells/bush/distinfo b/shells/bush/distinfo index 7ffe17ac2ff2..7fe92140259a 100644 --- a/shells/bush/distinfo +++ b/shells/bush/distinfo @@ -1,2 +1,2 @@ -MD5 (bush-1.0.2-src.tgz) = 5d3cb890273fd1f58c0ec28c10a6babe -SIZE (bush-1.0.2-src.tgz) = 1448691 +MD5 (bush-1.0.3-src.tgz) = 7faae5efdd516441973acd8188be8375 +SIZE (bush-1.0.3-src.tgz) = 1432520 diff --git a/shells/bush/files/patch-src__parser_dirops.adb b/shells/bush/files/patch-src__parser_dirops.adb new file mode 100644 index 000000000000..27d300543e55 --- /dev/null +++ b/shells/bush/files/patch-src__parser_dirops.adb @@ -0,0 +1,67 @@ +--- src/parser_dirops.adb.orig Wed Aug 31 17:10:45 2005 ++++ src/parser_dirops.adb Thu Sep 1 20:42:27 2005 +@@ -127,6 +127,7 @@ + ParseExpression( expr_val, expr_type ); + if baseTypesOk( expr_type, dirops_dir_name_str_t ) then + if token = symbol_t and identifiers( token ).value = "," then ++ err( "second parameter not supported by the compiler that built this version of BUSH"); -- GNAT 3.15 + expect( symbol_t, "," ); + ParseExpression( expr_val2, expr_type2 ); + if baseTypesOk( expr_type2, boolean_t ) then +@@ -139,7 +140,8 @@ + recursive : boolean := expr_val2 = to_unbounded_string( "1" ); + begin + if isExecutingCommand then +- Remove_Dir( dir_name_str( to_string( expr_val ) ), recursive); ++ -- Remove_Dir( dir_name_str( to_string( expr_val ) ), recursive); ++ Remove_Dir( dir_name_str( to_string( expr_val ) ) ); + end if; + exception when directory_error => + err( "directory cannot be removed" ); +@@ -300,6 +302,7 @@ + ParseExpression( expr_val, expr_type ); + if baseTypesOk( expr_type, dirops_path_name_t ) then + if token = symbol_t and identifiers( token ).value = "," then ++ err( "second parameter not supported by the compiler that built this version of BUSH"); -- GNAT 3.15 + expect( symbol_t, "," ); + ParseExpression( expr_val2, expr_type2 ); + if baseTypesOk( expr_type2, dirops_env_style_t ) then +@@ -308,22 +311,23 @@ + end if; + end if; + expect( symbol_t, ")" ); +- declare +- style : environment_style := System_Default; ++ -- declare ++ -- style : environment_style := System_Default; + begin +- if isExecutingCommand then +- -- not very elegant +- if expr_val2 = to_unbounded_string( "0" ) then +- style := UNIX; +- elsif expr_val2 = to_unbounded_string( "1" ) then +- style := DOS; +- elsif expr_val2 = to_unbounded_string( "2" ) then +- style := Both; +- elsif expr_val2 = to_unbounded_string( "3" ) then +- style := System_Default; +- end if; +- result := to_unbounded_string( expand_path( path_name( to_string( expr_val ) ), style ) ); +- end if; ++ -- if isExecutingCommand then ++ -- -- not very elegant ++ -- if expr_val2 = to_unbounded_string( "0" ) then ++ -- style := UNIX; ++ -- elsif expr_val2 = to_unbounded_string( "1" ) then ++ -- style := DOS; ++ -- elsif expr_val2 = to_unbounded_string( "2" ) then ++ -- style := Both; ++ -- elsif expr_val2 = to_unbounded_string( "3" ) then ++ -- style := System_Default; ++ -- end if; ++ -- result := to_unbounded_string( expand_path( path_name( to_string( expr_val ) ), style ) ); ++ result := to_unbounded_string( expand_path( path_name( to_string( expr_val ) ) ) ); ++ --end if; + exception when directory_error => + err( "directory not accessible" ); + when others => |