From 7ba45330afdb91a818c0b4cb3360d080f144e788 Mon Sep 17 00:00:00 2001
From: Mrowqa <artur.jamro@gmail.com>
Date: Sun, 1 Dec 2013 00:37:04 +0100
Subject: [PATCH 01/12] Added RDesktop and BeRDP, work by GCI2013 student Artur
 Jamro (Mrowqa)

---
 net-misc/berdp/berdp-1.recipe           | 47 ++++++++++++++++++++
 net-misc/rdesktop/rdesktop-1.8.0.recipe | 58 +++++++++++++++++++++++++
 2 files changed, 105 insertions(+)
 create mode 100644 net-misc/berdp/berdp-1.recipe
 create mode 100644 net-misc/rdesktop/rdesktop-1.8.0.recipe

diff --git a/net-misc/berdp/berdp-1.recipe b/net-misc/berdp/berdp-1.recipe
new file mode 100644
index 000000000..f3bf87da4
--- /dev/null
+++ b/net-misc/berdp/berdp-1.recipe
@@ -0,0 +1,47 @@
+DESCRIPTION="BeRDP is a project dedicated to bringing the RDP protocol to the BeOS platform utilizing the rdesktop project. RDP is a protocol designed by Microsoft to remotely administer / run a session on Windows 2000/2003 Servers / Windows XP Professional workstations."
+SUMMARY="BeRDP is a project dedicated to bringing the RDP protocol to the BeOS."
+HOMEPAGE="https://github.com/HaikuArchives/BeRDP/"
+SRC_URI="git+https://github.com/HaikuArchives/BeRDP.git#3db6f86f8409984d1a9b18b3c877042a42ebe849"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	berdp = $portVersion
+	app:BeRDP = $portVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	makefile_engine
+	cmd:gcc
+	cmd:make
+	cmd:mkdepend
+	"
+
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion 
+	"
+	
+REQUIRES="
+	bin:rdesktop
+	"
+
+
+COPYRIGHT="2003-2004 Giovani Zamboni, Eduardo Luis Voltolini Tafner, Phil Greenway"
+LICENSE="GNU GPL v2"
+
+BUILD()
+{
+	cd Source
+	make
+	cd ..
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/BeRDP
+	objDir=Source/objects.$(echo $buildArchitecture|sed -r s/_/-/g)-release
+	cp $objDir/BeRDP $appsDir/BeRDP
+	addAppDeskbarSymlink $appsDir/BeRDP/BeRDP
+}
diff --git a/net-misc/rdesktop/rdesktop-1.8.0.recipe b/net-misc/rdesktop/rdesktop-1.8.0.recipe
new file mode 100644
index 000000000..8e705a5ed
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.8.0.recipe
@@ -0,0 +1,58 @@
+DESCRIPTION="
+	rdesktop is an open source client for Windows Remote Desktop Services, capable of natively speaking
+	Remote Desktop Protocol (RDP) in order to present the user's Windows desktop. rdesktop is known to
+	work with Windows versions such as NT 4 Terminal Server, 2000, XP, 2003, 2003 R2, Vista, 2008, 7, and 2008 R2.
+	"	
+SUMMARY="An open source client for Windows Remote Desktop Services."
+HOMEPAGE="http://rdesktop.org/" 
+SRC_URI="git+https://github.com/threedeyes/rdesktop.git#dc04b43ccb443f8245e5cda69ab063624e0d6f8c"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	rdesktop = $portVersion
+	bin:rdesktop = $portVersion
+	cmd:rdesktop = $portVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	makefile_engine
+	openssl
+	openssl_devel
+	cmd:gcc
+	cmd:make
+	cmd:mkdepend
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libssl
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libcrypto
+	lib:libssl
+	"
+	
+
+COPYRIGHT="1999-2013 Matthew Chapman"
+LICENSE="GNU GPL v3"
+
+BUILD()
+{
+	cd haiku
+	makefile=makefile_gcc4
+	if [[ "$buildArchitecture" == *gcc2* ]]; then
+		makefile=makefile_gcc2
+	fi
+	make -f $makefile
+	cd ..
+}
+
+INSTALL()
+{
+	mkdir -p $binDir
+	cp haiku/rdesktop $binDir
+}

From 8ae8ec61b43cd5788eee2b739176c1f68509facc Mon Sep 17 00:00:00 2001
From: Mrowqa <artur.jamro@gmail.com>
Date: Mon, 2 Dec 2013 17:31:29 +0100
Subject: [PATCH 02/12] Some BeRDP and RDesktop recipes fixes.

---
 net-misc/berdp/berdp-1.recipe           | 9 ++++-----
 net-misc/rdesktop/rdesktop-1.8.0.recipe | 5 -----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/net-misc/berdp/berdp-1.recipe b/net-misc/berdp/berdp-1.recipe
index f3bf87da4..8cd0d9609 100644
--- a/net-misc/berdp/berdp-1.recipe
+++ b/net-misc/berdp/berdp-1.recipe
@@ -1,7 +1,7 @@
 DESCRIPTION="BeRDP is a project dedicated to bringing the RDP protocol to the BeOS platform utilizing the rdesktop project. RDP is a protocol designed by Microsoft to remotely administer / run a session on Windows 2000/2003 Servers / Windows XP Professional workstations."
 SUMMARY="BeRDP is a project dedicated to bringing the RDP protocol to the BeOS."
 HOMEPAGE="https://github.com/HaikuArchives/BeRDP/"
-SRC_URI="git+https://github.com/HaikuArchives/BeRDP.git#3db6f86f8409984d1a9b18b3c877042a42ebe849"
+SRC_URI="git+https://github.com/HaikuArchives/BeRDP.git#8d73363b567361a5f14bf36173bf68f01260013a"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
@@ -11,7 +11,6 @@ PROVIDES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	makefile_engine
 	cmd:gcc
 	cmd:make
@@ -24,18 +23,18 @@ BUILD_REQUIRES="
 	"
 	
 REQUIRES="
+	haiku >= $haikuVersion
 	bin:rdesktop
 	"
 
 
-COPYRIGHT="2003-2004 Giovani Zamboni, Eduardo Luis Voltolini Tafner, Phil Greenway"
-LICENSE="GNU GPL v2"
+COPYRIGHT="2003-2004 Sikos"
+LICENSE="BSDv1"
 
 BUILD()
 {
 	cd Source
 	make
-	cd ..
 }
 
 INSTALL()
diff --git a/net-misc/rdesktop/rdesktop-1.8.0.recipe b/net-misc/rdesktop/rdesktop-1.8.0.recipe
index 8e705a5ed..022a4a146 100644
--- a/net-misc/rdesktop/rdesktop-1.8.0.recipe
+++ b/net-misc/rdesktop/rdesktop-1.8.0.recipe
@@ -11,15 +11,11 @@ ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
 PROVIDES="
 	rdesktop = $portVersion
-	bin:rdesktop = $portVersion
 	cmd:rdesktop = $portVersion
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	makefile_engine
-	openssl
-	openssl_devel
 	cmd:gcc
 	cmd:make
 	cmd:mkdepend
@@ -48,7 +44,6 @@ BUILD()
 		makefile=makefile_gcc2
 	fi
 	make -f $makefile
-	cd ..
 }
 
 INSTALL()

From 5dea7c1783d041d8d8adffee74003b6cfed4205e Mon Sep 17 00:00:00 2001
From: Mrowqa <artur.jamro@gmail.com>
Date: Tue, 3 Dec 2013 00:43:08 +0100
Subject: [PATCH 03/12] Corrected license string for BeRDP.

---
 net-misc/berdp/berdp-1.recipe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/berdp/berdp-1.recipe b/net-misc/berdp/berdp-1.recipe
index 8cd0d9609..6aa7572f7 100644
--- a/net-misc/berdp/berdp-1.recipe
+++ b/net-misc/berdp/berdp-1.recipe
@@ -29,7 +29,7 @@ REQUIRES="
 
 
 COPYRIGHT="2003-2004 Sikos"
-LICENSE="BSDv1"
+LICENSE="BSD (4-clause)"
 
 BUILD()
 {

From ccdd4279397e7d1cd193dd9934477fa47dc20d37 Mon Sep 17 00:00:00 2001
From: Mrowqa <artur.jamro@gmail.com>
Date: Tue, 3 Dec 2013 21:43:22 +0100
Subject: [PATCH 04/12] Tested and fixed errors in BeRDP and RDesktop.

---
 net-misc/berdp/berdp-1.recipe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/berdp/berdp-1.recipe b/net-misc/berdp/berdp-1.recipe
index 6aa7572f7..4a6741dc2 100644
--- a/net-misc/berdp/berdp-1.recipe
+++ b/net-misc/berdp/berdp-1.recipe
@@ -24,7 +24,7 @@ BUILD_REQUIRES="
 	
 REQUIRES="
 	haiku >= $haikuVersion
-	bin:rdesktop
+	cmd:rdesktop
 	"
 
 

From 6adc6aaba3a1e46ba98456881a7e92c75f0ff9c3 Mon Sep 17 00:00:00 2001
From: Thomas Schmidt <thomas.compix@googlemail.com>
Date: Wed, 4 Dec 2013 20:44:48 +0000
Subject: [PATCH 05/12] Added BDH Calc .recipe file for version 1.1

---
 haiku-apps/bdhcalc/bdhcalc-1.1.recipe | 40 +++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 haiku-apps/bdhcalc/bdhcalc-1.1.recipe

diff --git a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
new file mode 100644
index 000000000..d8ebaac3c
--- /dev/null
+++ b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
@@ -0,0 +1,40 @@
+SUMMARY="BDH Calc"
+DESCRIPTION="Fully functunal 64bit calculator"
+HOMEPAGE="http://haikuware.com/directory/view-details/science-math/calculators/bdh-calc-for-haiku"
+SRC_URI="git://github.com/ThomasCompix/BDH-Calc.git#4a6865932ae0e95244ed0149b6e8c4f437ea742a"
+REVISION="1"
+LICENSE="MIT"
+COPYRIGHT="Scott Hammond"
+
+ARCHITECTURES="x86 x86_gcc2 !ppc"
+
+PROVIDES="
+	bdhcalc = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:make
+	"
+
+BUILD()
+{
+	gcc -c src/bdh_main.cpp -o bdh_main.o
+	gcc -c src/bdh_view.cpp -o bdh_view.o
+	gcc -lbe bdh_main.o bdh_view.o -o bdhcalc
+	xres bdhcalc Ressources/bdh.rsrc
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/bdhcalc
+	mv bdhcalc $appsDir/bdhcalc/bdhcalc
+	addAppDeskbarSymlink $appsDir/bdhcalc/bdhcalc "BDH Calc"
+}

From a59d836c266ec3abf66f7a5dfd166f37ac3fe28b Mon Sep 17 00:00:00 2001
From: Mrowqa <artur.jamro@gmail.com>
Date: Wed, 4 Dec 2013 21:54:00 +0100
Subject: [PATCH 06/12] Moved COPYRIGHT and LICENSE entries up to other general
 informations strings

---
 net-misc/berdp/berdp-1.recipe           | 7 +++----
 net-misc/rdesktop/rdesktop-1.8.0.recipe | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/net-misc/berdp/berdp-1.recipe b/net-misc/berdp/berdp-1.recipe
index 4a6741dc2..cbceeaa2c 100644
--- a/net-misc/berdp/berdp-1.recipe
+++ b/net-misc/berdp/berdp-1.recipe
@@ -1,7 +1,9 @@
 DESCRIPTION="BeRDP is a project dedicated to bringing the RDP protocol to the BeOS platform utilizing the rdesktop project. RDP is a protocol designed by Microsoft to remotely administer / run a session on Windows 2000/2003 Servers / Windows XP Professional workstations."
-SUMMARY="BeRDP is a project dedicated to bringing the RDP protocol to the BeOS."
+SUMMARY="BeRDP is a project dedicated to bringing the RDP protocol to the BeOS"
 HOMEPAGE="https://github.com/HaikuArchives/BeRDP/"
 SRC_URI="git+https://github.com/HaikuArchives/BeRDP.git#8d73363b567361a5f14bf36173bf68f01260013a"
+COPYRIGHT="2003-2004 Sikos"
+LICENSE="BSD (4-clause)"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
@@ -28,9 +30,6 @@ REQUIRES="
 	"
 
 
-COPYRIGHT="2003-2004 Sikos"
-LICENSE="BSD (4-clause)"
-
 BUILD()
 {
 	cd Source
diff --git a/net-misc/rdesktop/rdesktop-1.8.0.recipe b/net-misc/rdesktop/rdesktop-1.8.0.recipe
index 022a4a146..f770cfe9f 100644
--- a/net-misc/rdesktop/rdesktop-1.8.0.recipe
+++ b/net-misc/rdesktop/rdesktop-1.8.0.recipe
@@ -6,6 +6,8 @@ DESCRIPTION="
 SUMMARY="An open source client for Windows Remote Desktop Services."
 HOMEPAGE="http://rdesktop.org/" 
 SRC_URI="git+https://github.com/threedeyes/rdesktop.git#dc04b43ccb443f8245e5cda69ab063624e0d6f8c"
+COPYRIGHT="1999-2013 Matthew Chapman"
+LICENSE="GNU GPL v3"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
@@ -31,10 +33,7 @@ REQUIRES="
 	lib:libcrypto
 	lib:libssl
 	"
-	
 
-COPYRIGHT="1999-2013 Matthew Chapman"
-LICENSE="GNU GPL v3"
 
 BUILD()
 {

From 62d30ce32448ce89d13782912dc94a77565f9e3a Mon Sep 17 00:00:00 2001
From: Thomas Schmidt <thomas.compix@googlemail.com>
Date: Wed, 4 Dec 2013 21:59:27 +0000
Subject: [PATCH 07/12] Modified the recipe

---
 haiku-apps/bdhcalc/bdhcalc-1.1.recipe | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
index d8ebaac3c..1bb21942b 100644
--- a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
+++ b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
@@ -1,5 +1,8 @@
-SUMMARY="BDH Calc"
-DESCRIPTION="Fully functunal 64bit calculator"
+SUMMARY="Fully functunal 64bit calculator"
+DESCRIPTION="A programmer's calculator supporting standard arithmetic and binary operators.
+	Moreover you are able to choose the word size from 8bit to 64bit. Moreover you are free
+	to choose whether it is a signed or unsigned behavior. Classical conversations are
+	possible, too."
 HOMEPAGE="http://haikuware.com/directory/view-details/science-math/calculators/bdh-calc-for-haiku"
 SRC_URI="git://github.com/ThomasCompix/BDH-Calc.git#4a6865932ae0e95244ed0149b6e8c4f437ea742a"
 REVISION="1"
@@ -10,31 +13,33 @@ ARCHITECTURES="x86 x86_gcc2 !ppc"
 
 PROVIDES="
 	bdhcalc = $portVersion
+	app:bdhcalc = $portVersion
 	"
 REQUIRES="
 	haiku >= $haikuVersion
 	"
 
 BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:make
 	"
 
 BUILD()
 {
-	gcc -c src/bdh_main.cpp -o bdh_main.o
-	gcc -c src/bdh_view.cpp -o bdh_view.o
-	gcc -lbe bdh_main.o bdh_view.o -o bdhcalc
+	g++ -c src/bdh_main.cpp -o bdh_main.o
+	g++ -c src/bdh_view.cpp -o bdh_view.o
+	g++ -lbe bdh_main.o bdh_view.o -o bdhcalc
 	xres bdhcalc Ressources/bdh.rsrc
+	mimeset -f bdhcalc
 }
 
 INSTALL()
 {
-	mkdir -p $appsDir/bdhcalc
-	mv bdhcalc $appsDir/bdhcalc/bdhcalc
-	addAppDeskbarSymlink $appsDir/bdhcalc/bdhcalc "BDH Calc"
+	mkdir -p $appsDir
+	mv bdhcalc $appsDir/bdhcalc
+	addAppDeskbarSymlink $appsDir/bdhcalc "BDH Calc"
 }

From d58da7e81dada16f4fd15769b8e2e54f175dab6b Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puckipedia.nl>
Date: Thu, 5 Dec 2013 00:00:01 +0100
Subject: [PATCH 08/12] Add FilWip recipe

---
 haiku-apps/filwip/filwip-1.0.0.recipe |  54 +++++++
 haiku-apps/filwip/licenses/SPL        | 202 ++++++++++++++++++++++++++
 2 files changed, 256 insertions(+)
 create mode 100644 haiku-apps/filwip/filwip-1.0.0.recipe
 create mode 100644 haiku-apps/filwip/licenses/SPL

diff --git a/haiku-apps/filwip/filwip-1.0.0.recipe b/haiku-apps/filwip/filwip-1.0.0.recipe
new file mode 100644
index 000000000..d86d79887
--- /dev/null
+++ b/haiku-apps/filwip/filwip-1.0.0.recipe
@@ -0,0 +1,54 @@
+SUMMARY="An app to clean all temporary and unwanted files"
+
+DESCRIPTION="
+	It cleans your hard disk of all unwanted files such as left-over temporary files,
+	cache files of internet sessions, logs, history files and the like.
+	FilWip is the successor of the BeOS Clean-Up Manager. The reason why the Clean-Up Manager 
+	was dropped was because it had certain problems that needed almost a complete rewrite to be fixed.
+	It was not worth doing because I wanted to add more features and change the overall approach.
+	" 
+
+HOMEPAGE="https://sites.google.com/site/appfilwip/home"
+SRC_URI="git://github.com/HaikuArchives/FilWip.git#35fa6d11f1174735d0a1dcbcb47d0d6bafa9dc19"
+REVISION="1"
+
+LICENSE="SPL"
+COPYRIGHT="2002 Ramshankar"
+
+ARCHITECTURES="x86 x86_gcc2"
+
+
+PROVIDES="
+	filwip = $portVersion
+	app:filwip = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:g++
+	cmd:xres
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD()
+{
+	cd Source
+	g++ -o ../FilWip -lbe -ltranslation -ltracker *.cpp */*.cpp
+	rc -o ../FilWip.rsrc FilWip.rdef
+	xres -o ../FilWip ../FilWip.rsrc
+	mimeset -f ../FilWip
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/FilWip
+	cp -rf Plugins $appsDir/FilWip/Plugins
+	cp FilWip $appsDir/FilWip/FilWip
+	addAppDeskbarSymlink $appsDir/FilWip/FilWip
+}
diff --git a/haiku-apps/filwip/licenses/SPL b/haiku-apps/filwip/licenses/SPL
new file mode 100644
index 000000000..c21379288
--- /dev/null
+++ b/haiku-apps/filwip/licenses/SPL
@@ -0,0 +1,202 @@
+===================
+Somebody Public License (SPL)
+===================
+
+Copyright 2002-2003 Ramshankar
+All rights reserved.
+
+1. Definitions
+
+	1. The term "Software" refers to BeConverter program that
+	   accompanies this license, all associated data files including
+	   but not limited to documentation, pictures and source code
+	   and all files associated with the source code. Any exclusions
+	   that does not belong to the term "Software" will be explicitly
+	   stated in the appropriate section of this License, eg: source
+	   files that are written by third party users etc.
+
+	2. The term "Author" refers to the individual V.Ramshankar,
+   	   who wrote the Software and holds the copyright. Section 5
+	   of this License defines the owner(s) of this Software.
+
+	3. The term "Commercial Use" or "Commercial distribution"
+	   means distribution of the Software, or parts thereof, for
+	   monetary benefits to any entity including but not limited
+	   to companies.
+
+	4. The term "License" means this document.
+
+	5. The term "Original Code" refers to the source code for the
+	   Software written fully by the Author. If the source code
+	   contains third-party source code, they do not fall under this
+	   license. When the Author makes changes to the Original
+	   code, the changed code thereof is referred as Original Code.
+	   Thus any code written by the Author is referred to as
+	   Original Code.
+
+	6. The term "Modifications" means any addition or deletion
+	   from the substance or structure of the Original Code by any
+	   entity other than the Author. The modified source code will
+	   thereof not be called Original Code as it was not modified by
+	   the Author.
+	
+	7. The term "Source Code" means those files that are either
+	   compiled and/or linked by a compiler/linker to produce the
+	   final binary file which can be executed by the Operating
+	   System. The Source Code can either be in compressed or
+	   archival form, provided the appropriate decompression or
+	   de-archiving program is widely available for no charge.
+		   
+	8. The term "You" or "Your" means an individual or a legal
+	   entity exercising rights under, and complying with all of
+	   the terms of, this License or a future version of this
+	   License. For legal entities, "You" includes any entity which
+	   controls, is controlled by, or is under common control with
+	   You. For purposes of this definition, "control" means (a)
+	   the power, direct or indirect, to cause the direction or
+	   management of such entity, whether by contract or
+	   otherwise, or (b) ownership of more than fifty percent
+	   (50%) of the outstanding shares or beneficial ownership
+	   of such entity.
+
+2. Source Code License
+
+	This section is only applicable if the source code is distributed by
+	the Author. Otherwise just ignore section 2 of this agreement.
+
+	This section of the license does not apply to source code written
+	by third parties included with and/or used by the Software. These
+	include libraries, components and/or other third party modules'
+	source code. All third party code fall under their respective licenses
+	defined in "License.txt" of that particular code component. The
+	term "Code" or "Source Code" refers to the source code and/or
+	parts thereof, of the Software.
+
+	2.1.1 Using the Source Code in freeware programs
+	You are allowed to use parts of the Code in your program/s
+	provided the program is distributed totally free of cost. In this case
+	you must give credit to the Author in your program's interactive
+	mode (i.e. viewable by the end-user). Notification about the use
+	of the Code to the Author would be appreciated but not needed.
+
+	2.1.2. Using the Source Code in Commercial/Paid softwares
+	You are allowed to use the Code and parts thereof in commercial
+	or shareware programs provided you adhere to the following 
+	condition:
+		The Author receives a free copy of ever major
+		version of the commercial/paid software through download
+		from a website,	in the latter case the Author must be given
+		the details of where to download.
+
+	2.2.1 Modifying the Source Code
+	You are allowed to modify the Source Code in any manner and
+	distribute it, provided you disclaim the Author from any and all
+	responsibilities and/or liabilities and you explicitly state that the
+	modified distribution is not an original distribution made by the
+	Author and that it is in fact a modified version of the Source
+	Code. This modified code can be used as the Source Code/Code
+	in Sections 2.1.1 and 2.1.2 of this License.
+	
+	2.2.2 Public distribution in websites etc.
+	Publishing the Source Code, or parts thereof and/or modified
+	versions of the Source Code, or parts thereof, in public mediums
+	such as CD-ROMs, floppy disks, DVDs and/or the Internet or in
+	other mediums such as books, journals etc. are allowed. If the
+	medium and/or viewing of the medium is commercial (providing
+	monetary gains to one or more entities) the Author must
+	be contacted to negotiate a premium. If the medium and/or
+	viewing of the medium is completely free of cost to the public,
+	informing the Author about such a medium would be appreciated.
+
+3. Program License
+	You are permitted to copy and distribute the Software any
+	number of times, provided you include this License and all
+	other License agreements (if any) that you received along with
+	this Software. You also must keep any and all documentation
+	intact. You may or may not distribute the Source Code
+	but if you are distributing the Source Code, it must be in
+	accord with Section 2 of thise License. For any enquiries with
+	this clause please contact the Author for clarification. Any and
+	all distributions here forth will be in accord to Section 3 of the License.
+
+	3.1.1 Bundling in Commercial distributions.
+	You are allowed to "bundle" this Software or parts thereof,
+	in a commercial or shareware distribution provided You give
+	credit to the Author as viewable by the end-user/customer.
+	And You must contact the Author for negotiating a premium
+	for such a distribution. The premium amount if any at all will
+	be determined by the Author. The amount will be in accord to
+	the cost of purchase of the distribution.
+
+	3.1.2. Bundling in Freeware distributions.
+	You are allowed to "bundle" this Software in any non-
+	commercial (freeware) distribution, meaning the distributor/s
+	do not gain any monetary benefits of any kind. Prior
+	permission must be obtained from the Author, and credit for
+	the Software must be explicitly mentioned as viewable by the
+	end-users of the package.
+
+4. Term and Termination
+	This License is effective until terminated. If you install the
+	Software and/or parts thereof, it implies you have read this
+	License and agreed to and will comply with all the terms and
+	conditions of this License.
+
+	If you do not agree to any of the terms and conditions of this
+	License, you are not permitted to install the Software or
+	parts thereof, and this License will be terminated and be
+	void. In which case, You must remove all copies of the
+	Software and its install program from your all	Your computer
+	system/s. Additionally, you may terminate this License at
+	any time by destroying the Software and all copies and parts
+	thereof in computer system/s owned by You. This License
+	automatically terminates if you fail to comply with all its
+	terms and conditions. You agree that, upon such termination,
+	you will destroy (permanently erase) all copies of the
+	Software and parts thereof, including but not limited to
+	documentation and data files.
+
+5. Ownership
+	You agree that you neither own nor hereby acquire any
+	claim or right of ownership of the Software or to any related
+	patents, copyrights, trademarks or other intellectual property.
+	You only own the magnetic or other physical media on which
+	the Software is recorded or fixed. The Author retains all right,
+	title and interest in and to all copies of the Software as recorded
+	on the original media and all subsequent copies of the Software
+	at all times, regardless of the form or media or media in or on
+	which the original or other copies my subsequently exist. The
+	License is not a sale of the original or any subsequent copy.
+
+6. Disclaimer
+	THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND
+	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
+	NOT LIMITED TO, THE IMPLIED WARRANTIES OF TITLE,
+	NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR
+	A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
+	SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+	INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+	DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+	OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+	PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+	OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+	DAMAGE.    
+
+7. Additional Information
+	If you have questions about this License, or if you wish to
+	contact the author for any reason, you may write to following
+	e-mail address:
+		
+		ramshankar@bemail.org
+		ramshankar@themail.com
+	
+	Or visit the following website for the latest info on how
+	to contact the author:
+
+		http://www.geocities.com/ram_beos/
+
+All cited trademarks and registered trademarks are the property
+of their respective owners.

From 90d34b2cc2ac42f641135c1d833f5e08c86aa9f5 Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puckipedia.nl>
Date: Thu, 5 Dec 2013 08:00:21 +0100
Subject: [PATCH 09/12] Fix recipe: update git, define cmd:filwip

---
 haiku-apps/filwip/filwip-1.0.0.recipe | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/haiku-apps/filwip/filwip-1.0.0.recipe b/haiku-apps/filwip/filwip-1.0.0.recipe
index d86d79887..948658a13 100644
--- a/haiku-apps/filwip/filwip-1.0.0.recipe
+++ b/haiku-apps/filwip/filwip-1.0.0.recipe
@@ -2,15 +2,13 @@ SUMMARY="An app to clean all temporary and unwanted files"
 
 DESCRIPTION="
 	It cleans your hard disk of all unwanted files such as left-over temporary files,
-	cache files of internet sessions, logs, history files and the like.
-	FilWip is the successor of the BeOS Clean-Up Manager. The reason why the Clean-Up Manager 
-	was dropped was because it had certain problems that needed almost a complete rewrite to be fixed.
-	It was not worth doing because I wanted to add more features and change the overall approach.
+	cache files of internet sessions, logs, history files and the like. It works with
+	easy to write text files that include information about where the files to delete are.
 	" 
 
 HOMEPAGE="https://sites.google.com/site/appfilwip/home"
-SRC_URI="git://github.com/HaikuArchives/FilWip.git#35fa6d11f1174735d0a1dcbcb47d0d6bafa9dc19"
-REVISION="1"
+SRC_URI="git://github.com/HaikuArchives/FilWip.git#8ec265e771019d31ed63be69cb8cc0d8a271f19b"
+REVISION="2"
 
 LICENSE="SPL"
 COPYRIGHT="2002 Ramshankar"
@@ -21,6 +19,7 @@ ARCHITECTURES="x86 x86_gcc2"
 PROVIDES="
 	filwip = $portVersion
 	app:filwip = $portVersion
+	cmd:filwip = $portVersion
 	"
 
 REQUIRES="
@@ -31,11 +30,14 @@ BUILD_PREREQUIRES="
 	cmd:g++
 	cmd:xres
 	"
-
 BUILD_REQUIRES="
 	haiku_devel >= $haikuVersion
 	"
 
+USER_SETTINGS_FILES="
+	settings/FilWip_settings
+	"
+
 BUILD()
 {
 	cd Source
@@ -48,7 +50,11 @@ BUILD()
 INSTALL()
 {
 	mkdir -p $appsDir/FilWip
+	mkdir -p $binDir
+
 	cp -rf Plugins $appsDir/FilWip/Plugins
 	cp FilWip $appsDir/FilWip/FilWip
+
 	addAppDeskbarSymlink $appsDir/FilWip/FilWip
+	ln -s $appsDir/FilWip/FilWip $binDir/FilWip
 }

From 039942fc66c97d0c05649d7693e013ce6cbf9a73 Mon Sep 17 00:00:00 2001
From: Mrowqa <artur.jamro@gmail.com>
Date: Thu, 5 Dec 2013 13:21:43 +0100
Subject: [PATCH 10/12] Wrapped DESCRIPTION strings to no more than 70
 characters per line.

---
 net-misc/berdp/berdp-1.recipe           | 7 ++++++-
 net-misc/rdesktop/rdesktop-1.8.0.recipe | 8 +++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/net-misc/berdp/berdp-1.recipe b/net-misc/berdp/berdp-1.recipe
index cbceeaa2c..69afb62fc 100644
--- a/net-misc/berdp/berdp-1.recipe
+++ b/net-misc/berdp/berdp-1.recipe
@@ -1,4 +1,9 @@
-DESCRIPTION="BeRDP is a project dedicated to bringing the RDP protocol to the BeOS platform utilizing the rdesktop project. RDP is a protocol designed by Microsoft to remotely administer / run a session on Windows 2000/2003 Servers / Windows XP Professional workstations."
+DESCRIPTION="
+	BeRDP is a project dedicated to bringing the RDP protocol to the BeOS
+	platform utilizing the rdesktop project. RDP is a protocol designed by
+	Microsoft to remotely administer / run a session on Windows 2000/2003
+	Servers / Windows XP Professional workstations.
+	"
 SUMMARY="BeRDP is a project dedicated to bringing the RDP protocol to the BeOS"
 HOMEPAGE="https://github.com/HaikuArchives/BeRDP/"
 SRC_URI="git+https://github.com/HaikuArchives/BeRDP.git#8d73363b567361a5f14bf36173bf68f01260013a"
diff --git a/net-misc/rdesktop/rdesktop-1.8.0.recipe b/net-misc/rdesktop/rdesktop-1.8.0.recipe
index f770cfe9f..c45c74b94 100644
--- a/net-misc/rdesktop/rdesktop-1.8.0.recipe
+++ b/net-misc/rdesktop/rdesktop-1.8.0.recipe
@@ -1,7 +1,9 @@
 DESCRIPTION="
-	rdesktop is an open source client for Windows Remote Desktop Services, capable of natively speaking
-	Remote Desktop Protocol (RDP) in order to present the user's Windows desktop. rdesktop is known to
-	work with Windows versions such as NT 4 Terminal Server, 2000, XP, 2003, 2003 R2, Vista, 2008, 7, and 2008 R2.
+	rdesktop is an open source client for Windows Remote Desktop Services,
+	capable of natively speaking Remote Desktop Protocol (RDP) in order to
+	present the user's Windows desktop. rdesktop is known to work with
+	Windows versions such as NT 4 Terminal Server, 2000, XP, 2003,
+	2003 R2, Vista, 2008, 7, and 2008 R2.
 	"	
 SUMMARY="An open source client for Windows Remote Desktop Services."
 HOMEPAGE="http://rdesktop.org/" 

From 44a274f0d8475e9ca3c3d8e5a5066a251740ea1f Mon Sep 17 00:00:00 2001
From: Thomas Schmidt <thomas.compix@googlemail.com>
Date: Thu, 5 Dec 2013 13:53:26 +0000
Subject: [PATCH 11/12] Improved description and added year to the copyright
 note.

---
 haiku-apps/bdhcalc/bdhcalc-1.1.recipe | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
index 1bb21942b..bdd5cd94d 100644
--- a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
+++ b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
@@ -1,13 +1,16 @@
 SUMMARY="Fully functunal 64bit calculator"
-DESCRIPTION="A programmer's calculator supporting standard arithmetic and binary operators.
-	Moreover you are able to choose the word size from 8bit to 64bit. Moreover you are free
-	to choose whether it is a signed or unsigned behavior. Classical conversations are
-	possible, too."
+DESCRIPTION="BDH Calc is a fully functunal 64bit calculator, supporting
+	common arithmetic operations like adding, subtracting, dividing and
+	multiplying as well as bitwise operators. You can choose the word
+	size and whether the sign is considered to simulate any integeral
+	data type. Moreover the calculator supports binary, decimal and
+	hexadecimal conversion.
+	"
 HOMEPAGE="http://haikuware.com/directory/view-details/science-math/calculators/bdh-calc-for-haiku"
 SRC_URI="git://github.com/ThomasCompix/BDH-Calc.git#4a6865932ae0e95244ed0149b6e8c4f437ea742a"
 REVISION="1"
 LICENSE="MIT"
-COPYRIGHT="Scott Hammond"
+COPYRIGHT="1999 Scott Hammond"
 
 ARCHITECTURES="x86 x86_gcc2 !ppc"
 

From 37c6fcd029d7b62b3919c3d5dee7e265db8c0967 Mon Sep 17 00:00:00 2001
From: Thomas Schmidt <thomas.compix@googlemail.com>
Date: Thu, 5 Dec 2013 16:39:38 +0000
Subject: [PATCH 12/12] Fixed typos in bdhcalc-1.1 recipe

---
 haiku-apps/bdhcalc/bdhcalc-1.1.recipe | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
index bdd5cd94d..85e34b1f8 100644
--- a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
+++ b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
@@ -1,8 +1,8 @@
 SUMMARY="Fully functunal 64bit calculator"
-DESCRIPTION="BDH Calc is a fully functunal 64bit calculator, supporting
+DESCRIPTION="BDH Calc is a fully functional 64bit calculator, supporting
 	common arithmetic operations like adding, subtracting, dividing and
 	multiplying as well as bitwise operators. You can choose the word
-	size and whether the sign is considered to simulate any integeral
+	size and whether the sign is considered to simulate any integral
 	data type. Moreover the calculator supports binary, decimal and
 	hexadecimal conversion.
 	"