[openssl-commits] [web] master update

[Rich Salz]

The branch master has been updated
       via  64db0cd34882209d6a5dca1db75d6a56ff3d4bee (commit)
      from  f44641eeb0aad6a3313a2240723537bb20b13244 (commit)


- Log -----------------------------------------------------------------
commit 64db0cd34882209d6a5dca1db75d6a56ff3d4bee
Author: Rich Salz <rsalz at akamai.com>
Date:   Thu Aug 20 15:17:20 2015 -0400

    add alpha-sort for manpages

-----------------------------------------------------------------------

Summary of changes:
 Makefile        |  6 +++---
 bin/mk-filelist | 10 +++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 276efc3..40921b5 100644
--- a/Makefile
+++ b/Makefile
@@ -41,9 +41,9 @@ relupd: all
 
 define makemanpages
 	./bin/mk-manpages $(1) $(2) docs
-	./bin/mk-filelist docs/man$(2)/apps '' '*.html' >docs/man$(2)/apps/index.inc
-	./bin/mk-filelist docs/man$(2)/crypto '' '*.html' >docs/man$(2)/crypto/index.inc
-	./bin/mk-filelist docs/man$(2)/ssl '' '*.html' >docs/man$(2)/ssl/index.inc
+	./bin/mk-filelist -a docs/man$(2)/apps '' '*.html' >docs/man$(2)/apps/index.inc
+	./bin/mk-filelist -a docs/man$(2)/crypto '' '*.html' >docs/man$(2)/crypto/index.inc
+	./bin/mk-filelist -a docs/man$(2)/ssl '' '*.html' >docs/man$(2)/ssl/index.inc
 endef
 manpages: manmaster
 	$(call makemanpages,$(CHECKOUTS)/openssl-1.0.2-stable,1.0.2)
diff --git a/bin/mk-filelist b/bin/mk-filelist
index e6b6088..b39e5da 100755
--- a/bin/mk-filelist
+++ b/bin/mk-filelist
@@ -2,6 +2,12 @@
 use strict;
 
 die "Missing args\n" if $#ARGV < 2;
+my $timebased = 1;
+if ($ARGV[0] eq '-a') {
+    $timebased = 0;
+    shift;
+}
+
 my $SRCDIR = $ARGV[0]; shift;
 my $URLBASE = $ARGV[0]; shift;
 my $GLOB = join(' ', @ARGV);
@@ -11,7 +17,9 @@ my @months = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
 
 sub ls {
     my ($pat) = @_;
-    my @F = sort { (stat($b))[9] <=> (stat($a))[9]; } (glob($pat));
+    my @F = $timebased
+                ? sort { (stat($b))[9] <=> (stat($a))[9]; } (glob($pat))
+                : sort (glob($pat));
     my @R = ();
     foreach my $f (@F) {
         next if ($f =~ m|^index.*|);