From 87c255e9d672aa54933a9e93ea0c6f7b473a8840 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sun, 28 Apr 2013 19:40:54 +0200
Subject: [PATCH] Convert and adjust recipe for BePDF

---
 haiku-apps/bepdf/bepdf-1.1.1b4.recipe         | 25 --------
 .../bepdf/bepdf-1.1.1~beta5_130428.recipe     | 58 +++++++++++++++++++
 .../bepdf/patches/bepdf-1.1.1b2-532.patch     | 21 -------
 3 files changed, 58 insertions(+), 46 deletions(-)
 delete mode 100644 haiku-apps/bepdf/bepdf-1.1.1b4.recipe
 create mode 100644 haiku-apps/bepdf/bepdf-1.1.1~beta5_130428.recipe
 delete mode 100644 haiku-apps/bepdf/patches/bepdf-1.1.1b2-532.patch

diff --git a/haiku-apps/bepdf/bepdf-1.1.1b4.recipe b/haiku-apps/bepdf/bepdf-1.1.1b4.recipe
deleted file mode 100644
index c2f2e10e8..000000000
--- a/haiku-apps/bepdf/bepdf-1.1.1b4.recipe
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION="BePDF is a PDF viewer for the BeOS, Haiku & Zeta" 
-HOMEPAGE="http://bepdf.sourceforge.net/" 
-SRC_URI="cvs://:pserver:anonymous@bepdf.cvs.sourceforge.net:/cvsroot/bepdf/BePDF"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="app-text/htmldoc == 1.8.27"	
-		
-BUILD()
-{
-	export BEPDF_BUILD_GCC=`setgcc | cut -d/ -f2`
-	cd bepdf-1.1.1b4
-	./build.sh package
-}
-
-INSTALL()
-{
-	cd bepdf-1.1.1b4
-	mkdir -p ${DESTDIR}/boot/apps
-	unzip generated/BePDF-1.1.1b4.x86.zip -d ${DESTDIR}/boot/apps
-}
-
-COPYRIGHT="1997 Benoit Triquet
-	1999-2000 Hubert Figuiere
-	2000-2010 Michael Pfeiffer"
-LICENSE="GNU GPL v2"
diff --git a/haiku-apps/bepdf/bepdf-1.1.1~beta5_130428.recipe b/haiku-apps/bepdf/bepdf-1.1.1~beta5_130428.recipe
new file mode 100644
index 000000000..126e0ee06
--- /dev/null
+++ b/haiku-apps/bepdf/bepdf-1.1.1~beta5_130428.recipe
@@ -0,0 +1,58 @@
+SUMMARY="A PDF viewer" 
+DESCRIPTION="
+	BePDF is a PDF viewer for the BeOS, Haiku & Zeta.
+	
+	Besides viewing, it supports annotating and user-defined bookmarking for 
+	unencrypted PDFs. It's fully localized for 20 languages at the moment 
+	with additional languages being easily added via text files.
+	"
+HOMEPAGE="http://bepdf.sourceforge.net/" 
+SRC_URI="cvs://:pserver:anonymous@bepdf.cvs.sourceforge.net:/cvsroot/bepdf/BePDF#04/28/13"
+COPYRIGHT="1997 Benoit Triquet
+	1999-2000 Hubert Figuiere
+	2000-2010 Michael Pfeiffer"
+LICENSE="GNU GPL v2"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	bepdf = $portVersion
+	cmd:BePDF = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	cmd:gcc
+	cmd:jam
+	cmd:htmldoc
+	cmd:ld
+	cmd:sed
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	if [ $architecture == 'x86_gcc2' ]; then
+		export BEPDF_BUILD_GCC=gcc2
+	else
+		export BEPDF_BUILD_GCC=gcc4
+	fi
+	
+	./build.sh
+}
+
+INSTALL()
+{
+	if [ $architecture == 'x86_gcc2' ]; then
+		architecture='x86'
+	fi
+	mkdir -p $prefix/apps
+	rm -f generated/$architecture/*Deskbar
+	cp -dR generated/$architecture $prefix/apps/BePDF
+}
diff --git a/haiku-apps/bepdf/patches/bepdf-1.1.1b2-532.patch b/haiku-apps/bepdf/patches/bepdf-1.1.1b2-532.patch
deleted file mode 100644
index 9d1c4df7b..000000000
--- a/haiku-apps/bepdf/patches/bepdf-1.1.1b2-532.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: bepdf-1.1.1b2-532/bepdf/Jamfile
-===================================================================
---- bepdf-1.1.1b2-532/bepdf/Jamfile	(revision 532)
-+++ bepdf-1.1.1b2-532/bepdf/Jamfile	(working copy)
-@@ -96,10 +96,14 @@
- #		naming scheme you need to specify the path to the library
- #		and it's name
- #		library: my_lib.a entry: my_lib.a or path/my_lib.a
--LIBS = 
-+LIBS = stdc++.r4 ;
-+if $(BEPDF_BUILD_GCC) = gcc4 {
-+	# Use the standard libstdc++ name when building with gcc 4.
-+	LIBS = stdc++ ;
-+}
-+LIBS +=
- # BeOS
- be
--stdc++.r4
- textencoding
- tracker
- translation