From 94eee370f46007cf8a53fd7f73b71d14191182fb Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Thu, 13 Dec 2012 20:26:01 +0000
Subject: [PATCH] Updated bep and added patch for libs3, from GCI2012 student
 Piotr

---
 net-libs/libs3/libs3-2.0.bep           | 19 +++++++-------
 net-libs/libs3/patches/libs3-2.0.patch | 36 ++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 9 deletions(-)
 create mode 100644 net-libs/libs3/patches/libs3-2.0.patch

diff --git a/net-libs/libs3/libs3-2.0.bep b/net-libs/libs3/libs3-2.0.bep
index 590bbc5a6..7d2683e9c 100644
--- a/net-libs/libs3/libs3-2.0.bep
+++ b/net-libs/libs3/libs3-2.0.bep
@@ -1,19 +1,20 @@
-DESCRIPTION="A C Library API for Amazon S3" 
-HOMEPAGE="http://libs3.ischo.com" 
-SRC_URI="http://libs3.ischo.com/libs3-2.0.tar.gz"
+DESCRIPTION="C Library API for Amazon S3" 
+HOMEPAGE="http://libs3.ischo.com.s3.amazonaws.com/index.html" 
+SRC_URI="http://libs3.ischo.com.s3.amazonaws.com/libs3-2.0.tar.gz"
 CHECKSUM_MD5="e52da69ddc11019e98cf8246fc55b4e1"
 REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND="net-misc/curl >= 7.24"
+STATUS_HAIKU="stable"
+DEPEND="dev-libs/libxml2>=2.7.3
+	net-misc/curl>=7.18.2"
+
 BUILD {
 	cd libs3-2.0
-	make
+	make DESTDIR=${DESTDIR}/`finddir B_COMMON_DIRECTORY`
 }
 
 INSTALL {
 	cd libs3-2.0
-	make install
+	make install DESTDIR=${DESTDIR}/`finddir B_COMMON_DIRECTORY`
 }
-
 LICENSE="GNU GPL v3"
-COPYRIGHT="2012 Bryan Ischo"
+COPYRIGHT="2008 Bryan Ischo"
diff --git a/net-libs/libs3/patches/libs3-2.0.patch b/net-libs/libs3/patches/libs3-2.0.patch
new file mode 100644
index 000000000..33e5aacad
--- /dev/null
+++ b/net-libs/libs3/patches/libs3-2.0.patch
@@ -0,0 +1,36 @@
+diff -Naur libs3-2.0/GNUmakefile libs3-2.0-haiku/GNUmakefile
+--- libs3-2.0/GNUmakefile	2011-09-28 08:16:09.000000000 +0000
++++ libs3-2.0-haiku/GNUmakefile	2012-12-12 16:19:46.457965568 +0000
+@@ -134,7 +134,7 @@
+           -D_ISOC99_SOURCE \
+           -D_POSIX_C_SOURCE=200112L
+ 
+-LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) -lpthread
++LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS)
+ 
+ 
+ # --------------------------------------------------------------------------
+diff -Naur libs3-2.0/src/request_context.c libs3-2.0-haiku/src/request_context.c
+--- libs3-2.0/src/request_context.c	2011-09-28 08:16:09.000000000 +0000
++++ libs3-2.0-haiku/src/request_context.c	2012-12-12 14:04:42.375652352 +0000
+@@ -29,6 +29,8 @@
+ #include <sys/select.h>
+ #include "request.h"
+ #include "request_context.h"
++#include <string.h> /* memset */
++#include <unistd.h> /* close */
+ 
+ 
+ S3Status S3_create_request_context(S3RequestContext **requestContextReturn)
+diff -Naur libs3-2.0/src/s3.c libs3-2.0-haiku/src/s3.c
+--- libs3-2.0/src/s3.c	2011-09-28 08:16:09.000000000 +0000
++++ libs3-2.0-haiku/src/s3.c	2012-12-12 14:31:37.335020032 +0000
+@@ -52,7 +52,7 @@
+ #endif
+ 
+ // Also needed for Windows, because somehow MinGW doesn't define this
+-extern int putenv(char *);
++//extern int putenv(char *);
+ 
+ 
+ // Command-line options, saved as globals ------------------------------------