From 0a4db91cd11655b2262827a526e34b5bdf94c07e Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Sun, 24 Nov 2013 20:54:41 -0700
Subject: [PATCH] Convert/update sharutils to working recipe

--HG--
rename : app-arch/sharutils/sharutils-4.10.recipe => app-arch/sharutils/sharutils-4.14.recipe
---
 .../sharutils/patches/sharutils-4.14.patchset | 19 +++++
 app-arch/sharutils/sharutils-4.10.recipe      | 27 -------
 app-arch/sharutils/sharutils-4.14.recipe      | 74 +++++++++++++++++++
 app-arch/sharutils/sharutils-4.6.3.recipe     | 19 -----
 4 files changed, 93 insertions(+), 46 deletions(-)
 create mode 100644 app-arch/sharutils/patches/sharutils-4.14.patchset
 delete mode 100644 app-arch/sharutils/sharutils-4.10.recipe
 create mode 100644 app-arch/sharutils/sharutils-4.14.recipe
 delete mode 100644 app-arch/sharutils/sharutils-4.6.3.recipe

diff --git a/app-arch/sharutils/patches/sharutils-4.14.patchset b/app-arch/sharutils/patches/sharutils-4.14.patchset
new file mode 100644
index 000000000..46e9f7500
--- /dev/null
+++ b/app-arch/sharutils/patches/sharutils-4.14.patchset
@@ -0,0 +1,19 @@
+From 72e4b6e9859ea8e7c3f4a55947a20141bdd4a254 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Sun, 24 Nov 2013 19:58:36 -0700
+Subject: Include config.h before other headers
+
+
+diff --git a/src/scribble.c b/src/scribble.c
+index 57fa9d0..26e820b 100644
+--- a/src/scribble.c
++++ b/src/scribble.c
+@@ -1,4 +1,5 @@
+ 
++#include "config.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include "scribble.h"
+-- 
+1.8.3.4
+
diff --git a/app-arch/sharutils/sharutils-4.10.recipe b/app-arch/sharutils/sharutils-4.10.recipe
deleted file mode 100644
index c81ae0831..000000000
--- a/app-arch/sharutils/sharutils-4.10.recipe
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION="sharutils"
-HOMEPAGE="http://www.gnu.org/software/sharutils/"
-SRC_URI="ftp://ftp.gnu.org/gnu/sharutils/sharutils-4.10.tar.gz"
-CHECKSUM_MD5="c8bbfa89810ce9f5399b38392549207c"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD()
-{
-	cd sharutils-4.10
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--infodir=$COMMON_DOCS/info \
-		--mandir=$COMMON_DOCS/man \
-		--disable-nls
-	make
-}
-
-INSTALL()
-{
-	cd sharutils-4.10
-	make install
-}
-
-LICENSE="GNU GPL v3"
-COPYRIGHT="1990-2010 Free Software Foundation, Inc."
diff --git a/app-arch/sharutils/sharutils-4.14.recipe b/app-arch/sharutils/sharutils-4.14.recipe
new file mode 100644
index 000000000..1db917579
--- /dev/null
+++ b/app-arch/sharutils/sharutils-4.14.recipe
@@ -0,0 +1,74 @@
+SUMMARY="sharutils"
+DESCRIPTION="
+GNU shar makes so-called shell archives out of many files, preparing
+them for transmission by electronic mail services. A shell archive is
+a collection of files that can be unpacked by /bin/sh. A wide range
+of features provide extensive flexibility in manufacturing shars and
+in specifying shar smartness. For example, shar may compress files,
+uuencode binary files, split long files and construct multi-part
+mailings, ensure correct unsharing order, and provide simplistic
+checksums.
+
+GNU unshar scans a set of mail messages looking for the start of shell
+archives. It will automatically strip off the mail headers and other
+introductory text. The archive bodies are then unpacked by a copy of
+the shell. unshar may also process files containing concatenated
+shell archives.
+"
+HOMEPAGE="http://www.gnu.org/software/sharutils/"
+LICENSE="GNU GPL v3"
+COPYRIGHT="1990-2013 Free Software Foundation, Inc."
+SRC_URI="http://ftp.gnu.org/gnu/sharutils/sharutils-4.14.tar.xz"
+CHECKSUM_MD5="77ede22951bdb67279c6e78e79a04784"
+REVISION="1"
+
+ARCHITECTURES="x86 ?x86_64"
+
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	sharutils$secondaryArchSuffix = $portVersion
+	cmd:shar$secondaryArchSuffix = $portVersion
+	cmd:unshar$secondaryArchSuffix = $portVersion
+	cmd:uudecode$secondaryArchSuffix = $portVersion
+	cmd:uuencode$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:which
+	cmd:bison
+	cmd:makeinfo
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	"
+
+PATCHES="sharutils-4.14.patchset"
+
+BUILD()
+{
+	runConfigure ./configure \
+	--disable-nls
+	make
+}
+
+INSTALL()
+{
+	make install
+	rm -rf $libDir
+}
diff --git a/app-arch/sharutils/sharutils-4.6.3.recipe b/app-arch/sharutils/sharutils-4.6.3.recipe
deleted file mode 100644
index 9adb9d2ee..000000000
--- a/app-arch/sharutils/sharutils-4.6.3.recipe
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION="sharutils" 
-HOMEPAGE="http://www.gnu.org/software/sharutils/" 
-SRC_URI="ftp://ftp.gnu.org/gnu/sharutils/REL-4.6.3/sharutils-4.6.3.tar.gz"
-CHECKSUM_MD5="74127a560e59be6dfa8b59993eb0ca91"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd sharutils-4.6.3
-	./configure --prefix=/boot/home/common
-	make
-}
-
-INSTALL()
-{
-	cd sharutils-4.6.3
-	make install
-}