remove a gnu-specific flag in find command lines

This commit is contained in:
sthen 2012-10-12 20:53:39 +00:00
parent 260ec750cf
commit f37584e19e
3 changed files with 38 additions and 10 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2012/10/12 19:59:32 sthen Exp $
# $OpenBSD: Makefile,v 1.17 2012/10/12 20:53:39 sthen Exp $
SHARED_ONLY = Yes
@ -7,6 +7,7 @@ COMMENT = program matching and transformation engine
# if updating, check for any additional use of diff/grep which
# may need to be switched to gdiff/ggrep
DISTNAME = coccinelle-1.0.0-rc15
REVISION = 0
PKGNAME = ${DISTNAME:S/-rc/rc/}
EXTRACT_SUFX = .tgz

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.6 2012/10/12 19:59:32 sthen Exp $
--- Makefile.orig Mon Jul 16 17:22:27 2012
+++ Makefile Sun Aug 5 10:53:42 2012
@@ -278,9 +278,9 @@ purebytecode:
$OpenBSD: patch-Makefile,v 1.7 2012/10/12 20:53:39 sthen Exp $
--- Makefile.orig Thu Aug 16 18:52:07 2012
+++ Makefile Fri Oct 12 21:23:42 2012
@@ -275,9 +275,9 @@ purebytecode:
# copies the stubs libraries (if any) to the root directory
copy-stubs:
@if test -f ./bundles/pycaml/dllpycaml_stubs.so; then \
@ -13,7 +13,7 @@ $OpenBSD: patch-Makefile,v 1.6 2012/10/12 19:59:32 sthen Exp $
##############################################################################
# Build version information
@@ -361,7 +361,7 @@ install-man:
@@ -358,7 +358,7 @@ install-man:
$(MKDIR_P) $(DESTDIR)$(MANDIR)/man1
$(MKDIR_P) $(DESTDIR)$(MANDIR)/man3
$(INSTALL_DATA) docs/spatch.1 $(DESTDIR)$(MANDIR)/man1/
@ -22,7 +22,7 @@ $OpenBSD: patch-Makefile,v 1.6 2012/10/12 19:59:32 sthen Exp $
install-bash:
@echo "Installing bash completion in: ${DESTDIR}${BASH_COMPLETION_DIR}"
@@ -392,9 +392,9 @@ install-python:
@@ -389,9 +389,9 @@ install-python:
install-stubs:
$(MKDIR_P) $(DESTDIR)$(SHAREDIR)
@if test -f ./bundles/pycaml/dllpycaml_stubs.so; then \

View File

@ -1,6 +1,33 @@
$OpenBSD: patch-commons_common_ml,v 1.3 2012/10/12 19:59:32 sthen Exp $
--- commons/common.ml.orig Mon Jul 16 16:29:26 2012
+++ commons/common.ml Sun Aug 5 09:31:54 2012
$OpenBSD: patch-commons_common_ml,v 1.4 2012/10/12 20:53:39 sthen Exp $
--- commons/common.ml.orig Thu Aug 16 18:35:22 2012
+++ commons/common.ml Fri Oct 12 22:09:20 2012
@@ -3407,7 +3407,7 @@ let glob pattern =
let files_of_dir_or_files ext xs =
xs +> List.map (fun x ->
if is_directory x
- then cmd_to_list ("find " ^ x ^" -noleaf -type f -name \"*." ^ext^"\"")
+ then cmd_to_list ("find " ^ x ^" -type f -name \"*." ^ext^"\"")
else [x]
) +> List.concat
@@ -3417,7 +3417,7 @@ let files_of_dir_or_files_no_vcs ext xs =
if is_directory x
then
cmd_to_list
- ("find " ^ x ^" -noleaf -type f -name \"*." ^ext^"\"" ^
+ ("find " ^ x ^" -type f -name \"*." ^ext^"\"" ^
"| grep -v /.hg/ |grep -v /CVS/ | grep -v /.git/ |grep -v /_darcs/"
)
else [x]
@@ -3430,7 +3430,7 @@ let files_of_dir_or_files_no_vcs_post_filter regex xs
then
cmd_to_list
("find " ^ x ^
- " -noleaf -type f | grep -v /.hg/ |grep -v /CVS/ | grep -v /.git/ |grep -v /_darcs/"
+ " -type f | grep -v /.hg/ |grep -v /CVS/ | grep -v /.git/ |grep -v /_darcs/"
)
+> List.filter (fun s -> s =~ regex)
else [x]
@@ -5357,7 +5357,7 @@ let (diff: (int -> int -> diff -> unit)-> (string list
write_file file1 (unwords xs);
write_file file2 (unwords ys);