From 419b5a487492b6c6d1b28135c96425097460935a Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Sat, 5 Mar 2016 21:54:42 -0500
Subject: ditaa-0.9-2.parabola2: Fix command line

---
 libre/ditaa/PKGBUILD                  | 10 ++++++----
 libre/ditaa/ditaa-usage_message.patch | 27 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 libre/ditaa/ditaa-usage_message.patch

(limited to 'libre/ditaa')

diff --git a/libre/ditaa/PKGBUILD b/libre/ditaa/PKGBUILD
index 275554437..f44854b11 100644
--- a/libre/ditaa/PKGBUILD
+++ b/libre/ditaa/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=ditaa
 pkgver=0.9
-pkgrel=2.parabola1
+pkgrel=2.parabola2
 pkgdesc='Java utility to convert diagrams drawn using ascii art to bitmap'
 arch=('any')
 url='http://ditaa.sf.net/'
@@ -10,15 +10,17 @@ license=('GPL')
 depends=('java-environment' 'java-commons-cli' 'gsfonts')
 makedepends=('apache-ant' 'java-commons-cli' 'java-batik')
 source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname${pkgver/./_}-src.zip"
-        'ditaa.sh' 'ditaa-fix_imports.patch')
+        'ditaa.sh' 'ditaa-fix_imports.patch' 'ditaa-usage_message.patch')
 sha256sums=('0c6b92ddbeb435a1b0180b4728284e7d98e1bd94ec4619e73911875026ef63de'
             '8640917f1241e26b3104e733b083eb099dc2b5be87e34348479130c3987e7883'
-            '4c24b233dca2ddd2c9a588f09b2aca421706daab68df3304f6ca4f4cd1a79372')
+            '4c24b233dca2ddd2c9a588f09b2aca421706daab68df3304f6ca4f4cd1a79372'
+            '0f8f5bb238ff203592e9f0c9b3194556a97fb9351e32beb14988ca7bedff874b')
 
 prepare() {
   rm -v lib/*.jar
-  patch -Np1 -i "${srcdir}/ditaa-fix_imports.patch"
   mkdir -p bin
+  patch -Np1 -i "${srcdir}/ditaa-fix_imports.patch"
+  patch -Np1 -i "${srcdir}/ditaa-usage_message.patch"
 }
 
 build() {
diff --git a/libre/ditaa/ditaa-usage_message.patch b/libre/ditaa/ditaa-usage_message.patch
new file mode 100644
index 000000000..2918fdfa5
--- /dev/null
+++ b/libre/ditaa/ditaa-usage_message.patch
@@ -0,0 +1,27 @@
+--- ditaa-0.9.orig/src/org/stathissideris/ascii2image/core/CommandLineConverter.java	2009-11-24 23:09:32.000000000 -0500
++++ ditaa-0.9/src/org/stathissideris/ascii2image/core/CommandLineConverter.java	2016-03-05 21:44:02.817542514 -0500
+@@ -120,13 +120,13 @@
+ 			
+ 		} catch (org.apache.commons.cli.ParseException e) {
+ 			System.err.println(e.getMessage());
+-			new HelpFormatter().printHelp("java -jar ditaa.jar <inpfile> [outfile]", cmdLnOptions, true);
++			new HelpFormatter().printHelp("ditaa <inpfile> [outfile]", cmdLnOptions, true);
+ 			System.exit(2);
+ 		}
+ 		
+ 		
+ 		if(cmdLine.hasOption("help") || args.length == 0 ){
+-			new HelpFormatter().printHelp("java -jar ditaa.jar <inpfile> [outfile]", cmdLnOptions, true);
++			new HelpFormatter().printHelp("ditaa <inpfile> [outfile]", cmdLnOptions, true);
+ 			System.exit(0);			
+ 		}
+ 						
+@@ -142,7 +142,7 @@
+ 		
+ 		if(args.length == 0) {
+ 			System.err.println("Error: Please provide the input file filename");
+-			new HelpFormatter().printHelp("java -jar ditaa.jar <inpfile> [outfile]", cmdLnOptions, true);
++			new HelpFormatter().printHelp("ditaa <inpfile> [outfile]", cmdLnOptions, true);
+ 			System.exit(2);
+ 		} 
+ 		
-- 
cgit v1.2.3-2-g168b