From 669da68afaa8173a6418e4bb7ba69cbd2be2aeab Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 16 Sep 2017 12:28:00 +0200
Subject: [PATCH] colordiff: bump version.

---
 ...-1.0.13.recipe => colordiff-1.0.18.recipe} | 20 +++++++++----------
 .../colordiff/patches/colordiff-1.0.13.patch  | 18 -----------------
 .../patches/colordiff-1.0.18.patchset         | 19 ++++++++++++++++++
 3 files changed, 28 insertions(+), 29 deletions(-)
 rename app-misc/colordiff/{colordiff-1.0.13.recipe => colordiff-1.0.18.recipe} (69%)
 delete mode 100644 app-misc/colordiff/patches/colordiff-1.0.13.patch
 create mode 100644 app-misc/colordiff/patches/colordiff-1.0.18.patchset

diff --git a/app-misc/colordiff/colordiff-1.0.13.recipe b/app-misc/colordiff/colordiff-1.0.18.recipe
similarity index 69%
rename from app-misc/colordiff/colordiff-1.0.13.recipe
rename to app-misc/colordiff/colordiff-1.0.18.recipe
index a8e48ba92..f51b2d3ba 100644
--- a/app-misc/colordiff/colordiff-1.0.13.recipe
+++ b/app-misc/colordiff/colordiff-1.0.18.recipe
@@ -3,15 +3,15 @@ DESCRIPTION="
 The Perl script colordiff is a wrapper for 'diff' and produces the same output \
 but with pretty 'syntax' highlighting. Colour schemes can be customized.
 "
-
 HOMEPAGE="http://colordiff.sourceforge.net/"
-SOURCE_URI="http://www.colordiff.org/colordiff-1.0.13.tar.gz"
-CHECKSUM_SHA256="ce2805a130c81545711df94bc00a93545da3f323d835cc38b452d3396ef86c2a"
-REVISION="1"
-ARCHITECTURES="any"
-LICENSE="GNU GPL v2"
 COPYRIGHT="2002-2012  Dave Ewart"
-PATCHES="colordiff-1.0.13.patch"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="http://www.colordiff.org/colordiff-$portVersion.tar.gz"
+CHECKSUM_SHA256="29cfecd8854d6e19c96182ee13706b84622d7b256077df19fbd6a5452c30d6e0"
+PATCHES="colordiff-$portVersion.patchset"
+
+ARCHITECTURES="any"
 
 PROVIDES="
 	colordiff = $portVersion
@@ -20,24 +20,22 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku
 	cmd:diff
 	cmd:perl
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:make
 	"
 
 GLOBAL_WRITABLE_FILES="
-	settings/colordiffrc keep-old
+	settings/colordiff/colordiffrc keep-old
 	"
 
 INSTALL()
 {
 	make INSTALL_DIR="$prefix/bin" \
 	MAN_DIR="${manDir}/man1" \
-	ETC_DIR="${sysconfDir}" \
+	ETC_DIR="${sysconfDir}/colordiff" \
 	install
 }
diff --git a/app-misc/colordiff/patches/colordiff-1.0.13.patch b/app-misc/colordiff/patches/colordiff-1.0.13.patch
deleted file mode 100644
index 3f5ab8b26..000000000
--- a/app-misc/colordiff/patches/colordiff-1.0.13.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up colordiff-1.0.13/colordiff.pl.orig colordiff-1.0.13/colordiff.pl
---- colordiff-1.0.13/colordiff.pl.orig	2013-10-15 17:51:27.583270400 -0600
-+++ colordiff-1.0.13/colordiff.pl	2013-10-15 17:58:48.368836608 -0600
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!perl -w
- 
- ########################################################################
- #                                                                      #
-@@ -67,7 +67,7 @@ my $HOME   = $ENV{HOME};
- my $etcdir = '/etc';
- my ($setting, $value);
- my @config_files = ("$etcdir/colordiffrc");
--push (@config_files, "$ENV{HOME}/.colordiffrc") if (defined $ENV{HOME});
-+push (@config_files, "$ENV{HOME}/config/settings/colordiffrc") if (defined $ENV{HOME});
- my $config_file;
- my $diff_type = 'unknown';
- 
diff --git a/app-misc/colordiff/patches/colordiff-1.0.18.patchset b/app-misc/colordiff/patches/colordiff-1.0.18.patchset
new file mode 100644
index 000000000..92951a241
--- /dev/null
+++ b/app-misc/colordiff/patches/colordiff-1.0.18.patchset
@@ -0,0 +1,19 @@
+From ac1aa2968cfbe65ea6c2e2246c39c29f7c7c8abf Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 16 Sep 2017 12:17:18 +0200
+Subject: Haiku patch
+
+
+diff --git a/colordiff.pl b/colordiff.pl
+index 2275ee7..9f2cb8a 100755
+--- a/colordiff.pl
++++ b/colordiff.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!perl -w
+ 
+ ########################################################################
+ #                                                                      #
+-- 
+2.13.1
+