From 5b0593289a200ba6d52d262b403fd42a1fcfaf98 Mon Sep 17 00:00:00 2001
From: Begasus <kolymas@gmail.com>
Date: Wed, 9 Jul 2014 00:39:45 +0200
Subject: [PATCH 1/7] new recipe with working freetype

---
 games-engines/scummvm/scummvm-1.6.0.recipe | 47 +++++++++++++++++-----
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/games-engines/scummvm/scummvm-1.6.0.recipe b/games-engines/scummvm/scummvm-1.6.0.recipe
index 03f773944..d4e1c178d 100644
--- a/games-engines/scummvm/scummvm-1.6.0.recipe
+++ b/games-engines/scummvm/scummvm-1.6.0.recipe
@@ -8,54 +8,79 @@ designed!
 "
 HOMEPAGE="http://scummvm.org"
 SRC_URI="http://prdownloads.sourceforge.net/scummvm/scummvm-1.6.0.tar.bz2?download"
+
 CHECKSUM_SHA256="396060da6a8f391438055c292a280048d29dc408c5b615db43256a86f0e57ec4"
-SRC_FILENAME="scummvm-$portVersion.tar.bz2"
+
 REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2013 ScummVM Team"
 
-ARCHITECTURES="x86 ?x86_64"
-SECONDARY_ARCHITECTURES="x86 ?x86_64"
+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="
 	scummvm = $portVersion
 	app:scummvm = $portVersion
 "
+
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libfreetype$secondaryArchSuffix
+	lib:libfaad$secondaryArchSuffix
+	lib:libflac++$secondaryArchSuffix
+	lib:libmad$secondaryArchSuffix
 	lib:libSDL$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	lib:libvorbis$secondaryArchSuffix
+	lib:libtheora$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
 "
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	devel:libSDL$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
+	devel:libflac++$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
 	devel:libglu$secondaryArchSuffix
+	devel:libmad$secondaryArchSuffix
+	devel:libtheora$secondaryArchSuffix
+	devel:libfaad$secondaryArchSuffix
+	devel:libGL$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libbz2$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
 "
+
 BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:nasm$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:nasm
 	cmd:libtoolize
 "
 
-SOURCE_DIR="scummvm-1.6.0"
-
 BUILD()
 {
 	libtoolize --force --copy --install
-	./configure --prefix=$prefix --bindir=$appsDir --libdir=$libDir --datarootdir=$dataDir --mandir=$manDir --docdir=$docDir \
-		--enable-release
-	make
+	CPPFLAGS=`freetype-config --cflags` ./configure --prefix=$prefix --bindir=$appsDir --libdir=$libDir --datarootdir=$dataDir \
+		--mandir=$manDir --docdir=$docDir --enable-release
+
+	make $jobArgs
 }
+
 INSTALL()
 {
 	make install
 	
-	addAppDeskbarSymlink $appsDir/scummvm
+	addAppDeskbarSymlink $appsDir/scummvm ScummVM
 }

From aef944c49dcacf3e5260fa98173ad58c99b1ddcf Mon Sep 17 00:00:00 2001
From: Begasus <kolymas@gmail.com>
Date: Wed, 9 Jul 2014 16:35:24 +0200
Subject: [PATCH 2/7] a few fixes with the comments from waddlesplash

---
 games-engines/scummvm/scummvm-1.6.0.recipe | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-engines/scummvm/scummvm-1.6.0.recipe b/games-engines/scummvm/scummvm-1.6.0.recipe
index d4e1c178d..ce3a7425a 100644
--- a/games-engines/scummvm/scummvm-1.6.0.recipe
+++ b/games-engines/scummvm/scummvm-1.6.0.recipe
@@ -8,14 +8,13 @@ designed!
 "
 HOMEPAGE="http://scummvm.org"
 SRC_URI="http://prdownloads.sourceforge.net/scummvm/scummvm-1.6.0.tar.bz2?download"
-
 CHECKSUM_SHA256="396060da6a8f391438055c292a280048d29dc408c5b615db43256a86f0e57ec4"
 
-REVISION="1"
+REVISION="2"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2013 ScummVM Team"
 
-ARCHITECTURES="x86 x86_64"
+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.
@@ -23,7 +22,7 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 else
 	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
 fi
-SECONDARY_ARCHITECTURES="x86"
+SECONDARY_ARCHITECTURES="x86 ?x86_64"
 
 PROVIDES="
 	scummvm = $portVersion
@@ -41,6 +40,7 @@ REQUIRES="
 	lib:libvorbis$secondaryArchSuffix
 	lib:libtheora$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 "
 
 BUILD_REQUIRES="

From e69ef60fcae4f46f5a5d02482356d91854a61b29 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 9 Jul 2014 15:47:30 +0200
Subject: [PATCH 3/7] Fix fluidsynth recipe.

---
 .../fluidsynth/fluidsynth-1.1.6.recipe        | 15 ++++++--
 .../fluidsynth/patches/fluidsynth-1.1.6.patch | 35 -------------------
 2 files changed, 12 insertions(+), 38 deletions(-)
 delete mode 100644 media-sound/fluidsynth/patches/fluidsynth-1.1.6.patch

diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
index 0cdc1a3c3..b568cb056 100644
--- a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
+++ b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
@@ -16,28 +16,37 @@ SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
 PROVIDES="
 	fluidsynth$secondaryArchSuffix = $portVersion
 	lib:libfluidsynth$secondaryArchSuffix
+	cmd:fluidsynth
 	"
 
 REQUIRES="
 	haiku$secondayArchSuffix >= $haikuVersion
 	lib:libsndfile$secondaryArchSuffix
 	lib:libreadline
-#	lib:glib
+	lib:libglib_2.0
+	lib:libgthread_2.0
+	lib:libintl
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libglib_2.0
+	devel:libreadline
 	"
 
 BUILD_PREREQUIRES="
 	cmd:cmake
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
 	"
 
+PATCHES="fluidsynth-$portVersion.patchset"
 BUILD()
 {
-	cmake .
+	cmake . -DCMAKE_INSTALL_PREFIX=$prefix \
+		-DINCLUDE_INSTALL_DIR=$relativeIncludeDir \
+		-DMAN_INSTALL_DIR=$relativeManDir
 	make $jobArgs
 }
 
diff --git a/media-sound/fluidsynth/patches/fluidsynth-1.1.6.patch b/media-sound/fluidsynth/patches/fluidsynth-1.1.6.patch
deleted file mode 100644
index d37506392..000000000
--- a/media-sound/fluidsynth/patches/fluidsynth-1.1.6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -urN fluidsynth-1.1.6/CMakeLists.txt fluidsynth-1.1.6-haiku/CMakeLists.txt
---- fluidsynth-1.1.6/CMakeLists.txt
-+++ fluidsynth-1.1.6/haiku/CMakeLists.txt
-@@ -168,9 +168,16 @@
-   endif  ( MINGW )
- else ( WIN32 )
- # Check PThreads, but not in Windows
--  find_package ( Pthreads REQUIRED )
--  set ( HAVE_LIBPTHREAD ${PTHREADS_FOUND} )
--  set ( LIBFLUID_LIBS "m" )
-+if (UNIX AND NOT HAIKU)
-+# Check PThreads, but not in Windows 
-+   find_package ( Pthreads REQUIRED )
-+   set ( HAVE_LIBPTHREAD ${PTHREADS_FOUND} )
-+   set ( LIBFLUID_LIBS "m" )
-+endif (UNIX AND NOT HAIKU)
-+
-+if (HAIKU)
-+set ( LIBFLUID_LIBS "network")
-+endif (HAIKU)
- endif ( WIN32 )
- 
- # IBM OS/2
-diff -Naur fluidsynth-1.1.6/src/utils/fluid_sys.h fluidsynth-1.1.3-haiku/src/utils/fluid_sys.h
---- fluidsynth-1.1.6/src/utils/fluid_sys.h
-+++ fluidsynth-1.1.6-haiku/src/utils/fluid_sys.h
-@@ -335,7 +335,7 @@
-     sample data.
-  */
- 
--#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__)
-+#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__) && !defined(__HAIKU__)
- #define fluid_mlock(_p,_n)      mlock(_p, _n)
- #define fluid_munlock(_p,_n)    munlock(_p,_n)
- #else

From bbb212cccb542d914a1bf1b3ddbecc1f72c1c893 Mon Sep 17 00:00:00 2001
From: Begasus <kolymas@gmail.com>
Date: Wed, 9 Jul 2014 16:44:12 +0200
Subject: [PATCH 4/7] removed a linebreak

---
 games-engines/scummvm/scummvm-1.6.0.recipe | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-engines/scummvm/scummvm-1.6.0.recipe b/games-engines/scummvm/scummvm-1.6.0.recipe
index ce3a7425a..bd5c7d854 100644
--- a/games-engines/scummvm/scummvm-1.6.0.recipe
+++ b/games-engines/scummvm/scummvm-1.6.0.recipe
@@ -9,7 +9,6 @@ designed!
 HOMEPAGE="http://scummvm.org"
 SRC_URI="http://prdownloads.sourceforge.net/scummvm/scummvm-1.6.0.tar.bz2?download"
 CHECKSUM_SHA256="396060da6a8f391438055c292a280048d29dc408c5b615db43256a86f0e57ec4"
-
 REVISION="2"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2013 ScummVM Team"

From 953cabe9ba910dd26fdf74838510676db795d3d2 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 9 Jul 2014 16:51:24 +0200
Subject: [PATCH 5/7] Forgot to add patch for fluidsynth.

---
 .../patches/fluidsynth-1.1.6.patchset         | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 media-sound/fluidsynth/patches/fluidsynth-1.1.6.patchset

diff --git a/media-sound/fluidsynth/patches/fluidsynth-1.1.6.patchset b/media-sound/fluidsynth/patches/fluidsynth-1.1.6.patchset
new file mode 100644
index 000000000..c908a467a
--- /dev/null
+++ b/media-sound/fluidsynth/patches/fluidsynth-1.1.6.patchset
@@ -0,0 +1,57 @@
+From 24f44d67be0ad012ec04ffc8fd620d19ae1aaa75 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Wed, 9 Jul 2014 15:19:11 +0200
+Subject: Get things to build on Haiku.
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 004b022..e210f6b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -140,7 +140,7 @@ if ( CMAKE_COMPILER_IS_GNUCC )
+     set ( CMAKE_SHARED_LINKER_FLAGS
+           "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+   endif ( NOT APPLE AND NOT OS2 )
+-  set ( GNUCC_WARNING_FLAGS "-Wall -W -Wpointer-arith -Wbad-function-cast -Wno-cast-qual -Wcast-align -Wstrict-prototypes -Wno-unused-parameter -Wdeclaration-after-statement" )
++  set ( GNUCC_WARNING_FLAGS "-Wall -W -Wpointer-arith -Wbad-function-cast -Wno-cast-qual -Wcast-align -Wstrict-prototypes" )
+   set ( CMAKE_C_FLAGS_DEBUG "-g -DDEBUG ${GNUCC_WARNING_FLAGS}" )
+   set ( CMAKE_C_FLAGS_RELEASE "-O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -DNDEBUG ${GNUCC_WARNING_FLAGS}" )
+   set ( CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -fomit-frame-pointer -funroll-all-loops -finline-functions -DNDEBUG ${GNUCC_WARNING_FLAGS}" )
+@@ -168,9 +168,9 @@ if ( WIN32 )
+   endif  ( MINGW )
+ else ( WIN32 )
+ # Check PThreads, but not in Windows
+-  find_package ( Pthreads REQUIRED )
+-  set ( HAVE_LIBPTHREAD ${PTHREADS_FOUND} )
+-  set ( LIBFLUID_LIBS "m" )
++  find_package ( Threads REQUIRED )
++  set ( HAVE_LIBPTHREAD ${THREADS_FOUND} )
++  set ( LIBFLUID_LIBS "network;bsd" )
+ endif ( WIN32 )
+ 
+ # IBM OS/2
+@@ -412,7 +412,7 @@ set ( includedir "\${prefix}/${INCLUDE_INSTALL_DIR}" )
+ configure_file ( fluidsynth.pc.in
+ 	${CMAKE_BINARY_DIR}/fluidsynth.pc IMMEDIATE @ONLY )
+ install ( FILES ${CMAKE_BINARY_DIR}/fluidsynth.pc
+-	DESTINATION ${LIB_INSTALL_DIR}${LIB_SUFFIX}/pkgconfig )
++	DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}${LIB_SUFFIX}/pkgconfig )
+ 
+ # Extra targets for Unix build environments
+ if ( UNIX )
+diff --git a/src/utils/fluid_sys.h b/src/utils/fluid_sys.h
+index 7cfb7a9..6ac460e 100644
+--- a/src/utils/fluid_sys.h
++++ b/src/utils/fluid_sys.h
+@@ -335,7 +335,7 @@ extern fluid_profile_data_t fluid_profile_data[];
+     sample data.
+  */
+ 
+-#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__)
++#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__) && !defined(__HAIKU__)
+ #define fluid_mlock(_p,_n)      mlock(_p, _n)
+ #define fluid_munlock(_p,_n)    munlock(_p,_n)
+ #else
+-- 
+1.8.3.4
+

From 7cdda653abad90c55026459f9e03cbd6952de75c Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 9 Jul 2014 11:49:59 -0400
Subject: [PATCH 6/7] libsanta: Fix recipe.

---
 haiku-libs/libsanta/libsanta-3.0.0.recipe | 66 +++++++++--------------
 1 file changed, 25 insertions(+), 41 deletions(-)

diff --git a/haiku-libs/libsanta/libsanta-3.0.0.recipe b/haiku-libs/libsanta/libsanta-3.0.0.recipe
index dd8da8c57..5bbede2a1 100644
--- a/haiku-libs/libsanta/libsanta-3.0.0.recipe
+++ b/haiku-libs/libsanta/libsanta-3.0.0.recipe
@@ -1,15 +1,16 @@
-SUMMARY="Custom widget library"
-DESCRIPTION="
-libsanta has some useful custom widgets (color picker, column \
-list view, scroll view etc.)
-NOT recommended for new apps! Use Haiku's Layout Manager instead. \
-The recipe exists only for legacy BeOS apps.
+SUMMARY="Deprecated custom widget library."
+DESCRIPTION="Santa's Gift Bag has some useful custom widgets \
+(color picker, column list view, scroll view etc.) NOT recommended \
+for new apps! Use libwalter or Haiku's built-in widgets. \
+This package only exists for applications that have not yet been migrated.
 "
 HOMEPAGE="https://github.com/HaikuArchives/SantasGiftBag"
-COPYRIGHT="briant@timelinevista.com"
+COPYRIGHT="1997-2000 Brian Tietz"
 LICENSE="libsanta"
-SRC_URI="git+https://github.com/HaikuArchives/SantasGiftBag#4b62541"
-REVISION="2"
+SRC_URI="https://github.com/HaikuArchives/SantasGiftBag/archive/57a3163e7430c0caa4b7cc50947f3e547d3de0c1.zip"
+CHECKSUM_SHA256="239559169556df90f30dcd88b83c2acc5efdbff9b01cc8bb375129ec5f02f86f"
+SOURCE_DIR="SantasGiftBag-57a3163e7430c0caa4b7cc50947f3e547d3de0c1"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -25,6 +26,7 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	"
+
 BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:gcc$secondaryArchSuffix
@@ -33,36 +35,30 @@ BUILD_PREREQUIRES="
 	cmd:mkdepend
 	"
 
+PROVIDES_devel="
+	libsanta${secondaryArchSuffix}_devel = $portVersion
+	devel:libsanta$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_devel="
+	libsanta$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD()
 {
-	make TYPE=STATIC \
-		OBJ_DIR=obj-static \
-		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
-	
-	make TYPE=SHARED \
-		OBJ_DIR=obj-shared \
-		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	make OBJ_DIR=objects $jobArgs
 }
 
 INSTALL()
 {
 	mkdir -p $developLibDir $developDocDir $includeDir/santa $libDir
-	
-	cp -R Documentation/* $developDocDir
-	
-	cd obj-static
-	cp libsanta.a $developLibDir
-	
-	cd ../obj-shared
-	cp libsanta $libDir/libsanta.so.3.0.0
 
+	cp -R Documentation/* $developDocDir
+
+	cp objects/libsanta.so $libDir/libsanta.so.3.0.0
 	ln -s $libDir/libsanta.so.3.0.0 $libDir/libsanta.so.3
 	ln -s $libDir/libsanta.so.3.0.0 $libDir/libsanta.so
-	
-	cd ..
-	
-	# Copy header files to $includeDir
-	
+
 	cp ./BetterScrollView/BetterScrollView.h \
 	   ./Colors.h \
 	   ./ColumnListView/CLVColumn.h \
@@ -75,20 +71,8 @@ INSTALL()
 	   ./PrefilledBitmap/PrefilledBitmap.h \
 	   ./ScrollViewCorner/ScrollViewCorner.h  $includeDir/santa
 	
-	symlinkRelative -s $libDir/libsanta.so.3.0.0 $developLibDir
-	
 	packageEntries devel \
 		$developLibDir \
 		$developDocDir \
 		$includeDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libsanta${secondaryArchSuffix}_devel = $portVersion
-	devel:libsanta$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	libsanta$secondaryArchSuffix == $portVersion base
-	"

From 55c4015e50de14bf22f68df4d33a5cd37d787dbb Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 9 Jul 2014 15:12:55 -0400
Subject: [PATCH 7/7] BePDF: version 1.2.0

---
 .../bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe |  73 -------------
 haiku-apps/bepdf/bepdf-1.2.0.recipe           |  76 +++++++++++++
 .../bepdf-1.1.1~beta5_2013_04_28.patchset     | 103 ------------------
 3 files changed, 76 insertions(+), 176 deletions(-)
 delete mode 100644 haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe
 create mode 100644 haiku-apps/bepdf/bepdf-1.2.0.recipe
 delete mode 100644 haiku-apps/bepdf/patches/bepdf-1.1.1~beta5_2013_04_28.patchset

diff --git a/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe b/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe
deleted file mode 100644
index 9b9a6f314..000000000
--- a/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe
+++ /dev/null
@@ -1,73 +0,0 @@
-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="2"
-ARCHITECTURES="x86_gcc2 x86"
-
-PROVIDES="
-	bepdf = $portVersion
-	app:BePDF = $portVersion
-	"
-
-REQUIRES="
-	haiku >= $haikuVersion
-	lib:liblayout
-	"
-
-BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
-	devel:liblayout
-	"
-
-BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:jam
-	cmd:htmldoc
-	cmd:ld
-	cmd:sed
-	"
-
-PATCHES="bepdf-1.1.1~beta5_2013_04_28.patchset"
-
-PATCH()
-{
-	if [ "$targetArchitecture" = x86 ];then
-		sed -i 's/stdc++.r4/stdc++/' bepdf/Jamfile
-	fi
-}
-
-BUILD()
-{
-	if [ $targetArchitecture == 'x86_gcc2' ]; then
-		export BEPDF_BUILD_GCC=gcc2
-	else
-		export BEPDF_BUILD_GCC=gcc4
-	fi
-	
-	./build.sh
-}
-
-INSTALL()
-{
-	bepdfArch=$targetArchitecture
-	if [ $bepdfArch == 'x86_gcc2' ]; then
-		bepdfArch='x86'
-	fi
-	mkdir -p $appsDir
-	rm -f generated/$bepdfArch/*Deskbar
-	rm -rf generated/$bepdfArch/lib
-	cp -dR generated/$bepdfArch $appsDir/BePDF
-
-	addAppDeskbarSymlink $appsDir/BePDF/BePDF
-}
diff --git a/haiku-apps/bepdf/bepdf-1.2.0.recipe b/haiku-apps/bepdf/bepdf-1.2.0.recipe
new file mode 100644
index 000000000..4a62b1e61
--- /dev/null
+++ b/haiku-apps/bepdf/bepdf-1.2.0.recipe
@@ -0,0 +1,76 @@
+SUMMARY="The PDF viewer for Haiku." 
+DESCRIPTION="BePDF is a PDF viewer for Haiku. \
+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://haikuarchives.github.io/BePDF/" 
+SRC_URI="https://github.com/HaikuArchives/BePDF/archive/v1.2.0.tar.gz"
+CHECKSUM_SHA256="663c8819db01b49227165cfd3f68ba1f659ae004b96f0bac5a7e52f773aed405"
+SOURCE_DIR="BePDF-1.2.0"
+COPYRIGHT="
+	1997 Benoit Triquet
+	1999-2000 Hubert Figuiere
+	2000-2011 Michael Pfeiffer
+	2013-2014 Augustin Cavalier"
+LICENSE="GNU GPL v2"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86"
+
+SRC_URI_2="http://haikuarchives.github.io/BePDF/English.pdf#noarchive"
+CHECKSUM_SHA256_2="963fd77bad6f2018e68724d2904f5a5bed922491e281af57a6fdd7854eecb3ab"
+SRC_URI_3="http://haikuarchives.github.io/BePDF/Deutsch.pdf#noarchive"
+CHECKSUM_SHA256_3="54c30bf2907bdd340fe0989a844f949102eeefe8acd53c62cf44e276ac4d08f0"
+SRC_URI_4="http://haikuarchives.github.io/BePDF/Espa%C3%B1ol.pdf#noarchive"
+CHECKSUM_SHA256_4="d753d20d842ee378e7fd17143d0eb9d4996d0ff9026d3cd86667df6765aa4e2a"
+SRC_URI_5="http://haikuarchives.github.io/BePDF/Italiano.pdf#noarchive"
+CHECKSUM_SHA256_5="994998838d6a2121e83f99b9d3f1802500f29b6061c58a88fc44470d50087e93"
+
+PROVIDES="
+	bepdf = $portVersion
+	app:BePDF = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:liblayout
+	lib:libsanta
+	lib:libfreetype
+	lib:libz
+	lib:libbz2
+	lib:libpng
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:liblayout
+	devel:libsanta
+	devel:libfreetype
+	devel:libz
+	devel:libbz2
+	devel:libpng
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc
+	cmd:make
+	cmd:mkdepend
+	cmd:freetype_config
+	"
+
+BUILD()
+{
+	./build.sh
+	cp ../../sources-2/*.pdf generated/BePDF/docs/
+	cp ../../sources-3/*.pdf generated/BePDF/docs/
+	cp ../../sources-4/*.pdf generated/BePDF/docs/
+	cp ../../sources-5/*.pdf generated/BePDF/docs/
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cp -dR generated/BePDF $appsDir/BePDF
+
+	addAppDeskbarSymlink $appsDir/BePDF/BePDF
+}
diff --git a/haiku-apps/bepdf/patches/bepdf-1.1.1~beta5_2013_04_28.patchset b/haiku-apps/bepdf/patches/bepdf-1.1.1~beta5_2013_04_28.patchset
deleted file mode 100644
index 7844e77fc..000000000
--- a/haiku-apps/bepdf/patches/bepdf-1.1.1~beta5_2013_04_28.patchset
+++ /dev/null
@@ -1,103 +0,0 @@
-From a586ff65e3d422ed194b89fc2a9e1be205d613cc Mon Sep 17 00:00:00 2001
-From: Chris Roberts <cpr420@gmail.com>
-Date: Tue, 12 Nov 2013 15:17:24 -0700
-Subject: Change COMMON font dirs to USER and add non-packaged entries
-
-
-diff --git a/bepdf/beos/PreferencesWindow.cpp b/bepdf/beos/PreferencesWindow.cpp
-index 7f8aa37..309e5ef 100644
---- a/bepdf/beos/PreferencesWindow.cpp
-+++ b/bepdf/beos/PreferencesWindow.cpp
-@@ -263,8 +263,10 @@ DisplayCIDFonts::Type PreferencesWindow::GetType(const char* file) {
- }
- 
- void PreferencesWindow::FillFontFileMenu(BMenuField* menuField, const char* name, const char* file) {
--	FillFontFileMenu(menuField, B_BEOS_FONTS_DIRECTORY, TRANSLATE("System Fonts"), name, file);
--	FillFontFileMenu(menuField, B_COMMON_FONTS_DIRECTORY, TRANSLATE("Common Fonts"), name, file);
-+	FillFontFileMenu(menuField, B_SYSTEM_FONTS_DIRECTORY, TRANSLATE("System Fonts"), name, file);
-+	FillFontFileMenu(menuField, B_USER_FONTS_DIRECTORY, TRANSLATE("User Fonts"), name, file);
-+	FillFontFileMenu(menuField, B_SYSTEM_NONPACKAGED_FONTS_DIRECTORY, TRANSLATE("System Fonts"), name, file);
-+	FillFontFileMenu(menuField, B_USER_NONPACKAGED_FONTS_DIRECTORY, TRANSLATE("User Fonts"), name, file);
- 	// B_USER_FONTS_DIRECTORY is same as B_COMMON_FONTS_DIRECTORY in 
- 	// BeOS R5
- 	// FillFontFileMenu(menu, B_USER_FONTS_DIRECTORY, TRANSLATE("User Fonts"), name, file);
--- 
-1.8.3.4
-
-
-From cd1c88d6110d6721107c374d176220f7a9a77277 Mon Sep 17 00:00:00 2001
-From: Chris Roberts <cpr420@gmail.com>
-Date: Tue, 12 Nov 2013 15:50:24 -0700
-Subject: Add -fpermissive to the compile flags
-
-
-diff --git a/bepdf/Jamfile b/bepdf/Jamfile
-index a672bdb..6b24096 100644
---- a/bepdf/Jamfile
-+++ b/bepdf/Jamfile
-@@ -193,7 +193,7 @@ SYMBOLS =  ;
- # DEBUGGER = ;
- 
- # Specify additional compiler flags for all files
--COMPILER_FLAGS = -Wno-write-strings ;
-+COMPILER_FLAGS = -Wno-write-strings -fpermissive ;
- 
- # Specify additional linker flags
- LINKER_FLAGS =  ;
--- 
-1.8.3.4
-
-
-From 896408ce30fad08237400ba8a07fba9d59c35c2b Mon Sep 17 00:00:00 2001
-From: Chris Roberts <cpr420@gmail.com>
-Date: Tue, 12 Nov 2013 15:57:40 -0700
-Subject: Adjust liblayout directories/flags
-
-
-diff --git a/bepdf/Jamfile b/bepdf/Jamfile
-index 6b24096..a1412bf 100644
---- a/bepdf/Jamfile
-+++ b/bepdf/Jamfile
-@@ -113,7 +113,7 @@ translation
- # additional libraries
- ../xpdf/obj.X86/libxpdf.a 
- ../freetype2/objs/libfreetype.a 
--../layout/lib/liblayout.so 
-+layout
- ../santa/obj.X86/libsanta.a 
- ;
- 
-@@ -131,8 +131,6 @@ LIBPATHS =
- #	source file directories are NOT auto-included here
- SYSTEM_INCLUDE_PATHS =  
- 
--../layout/headers
--
- ../santa
- ../santa/BetterScrollView
- ../santa/ColumnListView
--- 
-1.8.3.4
-
-
-From 6b76eae819fbb2bd68612c8596245ef3b5b68b40 Mon Sep 17 00:00:00 2001
-From: Chris Roberts <cpr420@gmail.com>
-Date: Tue, 12 Nov 2013 16:16:02 -0700
-Subject: Add liblayout to the include search path
-
-
-diff --git a/bepdf/Jamfile b/bepdf/Jamfile
-index a1412bf..530be70 100644
---- a/bepdf/Jamfile
-+++ b/bepdf/Jamfile
-@@ -130,6 +130,7 @@ LIBPATHS =
- #	These use the form: #include <header>
- #	source file directories are NOT auto-included here
- SYSTEM_INCLUDE_PATHS =  
-+/boot/system/develop/headers/liblayout
- 
- ../santa
- ../santa/BetterScrollView
--- 
-1.8.3.4
-