From 68aea8f3d7cbfb479f4f6b92871de61e04c28a90 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Wed, 16 Oct 2013 16:18:34 -0600
Subject: [PATCH] Convert/update colordiff to working recipe

---
 app-misc/colordiff/colordiff-1.0.10.recipe    | 25 -----------
 app-misc/colordiff/colordiff-1.0.13.recipe    | 44 +++++++++++++++++++
 .../colordiff/patches/colordiff-1.0.10.patch  |  9 ----
 .../colordiff/patches/colordiff-1.0.13.patch  | 18 ++++++++
 4 files changed, 62 insertions(+), 34 deletions(-)
 delete mode 100644 app-misc/colordiff/colordiff-1.0.10.recipe
 create mode 100644 app-misc/colordiff/colordiff-1.0.13.recipe
 delete mode 100644 app-misc/colordiff/patches/colordiff-1.0.10.patch
 create mode 100644 app-misc/colordiff/patches/colordiff-1.0.13.patch

diff --git a/app-misc/colordiff/colordiff-1.0.10.recipe b/app-misc/colordiff/colordiff-1.0.10.recipe
deleted file mode 100644
index 8f8393bc7..000000000
--- a/app-misc/colordiff/colordiff-1.0.10.recipe
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION="Colorizes output of diff"
-HOMEPAGE="http://colordiff.sourceforge.net/"
-SRC_URI="http://colordiff.sourceforge.net/colordiff-1.0.10.tar.gz"
-CHECKSUM_MD5="e3e86e2837deb884e43eacdc96a67baa"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-lang/perl >= 5.10.1
-		sys-apps/diffutils >= 2.8.1"
-BUILD()
-{
-	# Nothing to see here
-	cd colordiff-1.0.10
-}
-
-INSTALL()
-{
-	cd colordiff-1.0.10
-	make INSTALL_DIR="$(finddir B_COMMON_BIN_DIRECTORY)" \
-	MAN_DIR="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1" \
-	ETC_DIR="$(finddir B_USER_SETTINGS_DIRECTORY)" \
-	install
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2002-2012  Dave Ewart"
diff --git a/app-misc/colordiff/colordiff-1.0.13.recipe b/app-misc/colordiff/colordiff-1.0.13.recipe
new file mode 100644
index 000000000..e28644734
--- /dev/null
+++ b/app-misc/colordiff/colordiff-1.0.13.recipe
@@ -0,0 +1,44 @@
+SUMMARY="Colorizes output of diff"
+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/"
+SRC_URI="http://www.colordiff.org/colordiff-1.0.13.tar.gz"
+CHECKSUM_MD5="77093f7b31b84622bb59e75a12259ca5"
+REVISION="1"
+ARCHITECTURES="any"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2002-2012  Dave Ewart"
+SOURCE_DIR="$portVersionedName"
+PATCHES="colordiff-1.0.13.patch"
+
+PROVIDES="
+	colordiff = $portVersion
+	cmd:colordiff = $portVersion
+	cmd:cdiff = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:diff
+	cmd:perl
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:make
+	"
+
+GLOBAL_WRITABLE_FILES="
+	settings/colordiffrc keep-old
+	"
+
+INSTALL()
+{
+	make INSTALL_DIR="$prefix/bin" \
+	MAN_DIR="${manDir}/man1" \
+	ETC_DIR="${sysconfDir}" \
+	install
+}
diff --git a/app-misc/colordiff/patches/colordiff-1.0.10.patch b/app-misc/colordiff/patches/colordiff-1.0.10.patch
deleted file mode 100644
index b99900f2b..000000000
--- a/app-misc/colordiff/patches/colordiff-1.0.10.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up colordiff-1.0.10/colordiff.pl.orig colordiff-1.0.10/colordiff.pl
---- colordiff-1.0.10/colordiff.pl.orig	2012-08-05 14:43:30.500432896 -0600
-+++ colordiff-1.0.10/colordiff.pl	2012-08-05 14:43:41.898367488 -0600
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/boot/common/bin/perl -w
- 
- ########################################################################
- #                                                                      #
diff --git a/app-misc/colordiff/patches/colordiff-1.0.13.patch b/app-misc/colordiff/patches/colordiff-1.0.13.patch
new file mode 100644
index 000000000..3f5ab8b26
--- /dev/null
+++ b/app-misc/colordiff/patches/colordiff-1.0.13.patch
@@ -0,0 +1,18 @@
+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';
+