From fa3736107a746b349f93e0b4d84c25fe1dd964a7 Mon Sep 17 00:00:00 2001
From: "Arfonzo J. Coward" <art@poorcoding.com>
Date: Mon, 2 Dec 2013 19:12:11 +0000
Subject: [PATCH 1/6] Initial work on quassel-0.9.2 recipe.

---
 net-irc/quassel/quassel-0.9.2.recipe | 60 ++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 net-irc/quassel/quassel-0.9.2.recipe

diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe
new file mode 100644
index 000000000..fdd236a0e
--- /dev/null
+++ b/net-irc/quassel/quassel-0.9.2.recipe
@@ -0,0 +1,60 @@
+SUMMARY="Quassel IRC."
+DESCRIPTION="Quassel IRC core and client."
+HOMEPAGE="http://quassel-irc.org"
+SRC_URI="http://quassel-irc.org/pub/quassel-0.9.2.tar.bz2"
+CHECKSUM_MD5="4ed88d288f60290f4459d3e68d61b037"
+REVISION="1"
+LICENSE="
+	GNU GPL v2
+	GNU GPL v3
+	"
+COPYRIGHT="Copyright (C) 2005, 2006, 2007, 2008, 2009 by the Quassel IRC Team"
+
+ARCHITECTURES="x86 x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	quassel = $portVersion
+	"
+
+REQUIRES="
+        haiku >= $haikuVersion
+        qtcore${secondaryArchSuffix} >= 4.8
+        "
+        
+BUILD_REQUIRES="
+        haiku_devel >= $haikuVersion
+        pkgconfig
+        qtcore${secondaryArchSuffix}_devel >= 4.8
+        
+        cmd:cmake
+        cmd:gcc
+        cmd:g++
+        cmd:gcc${secondaryArchSuffix}
+        cmd:g++${secondaryArchSuffix}
+        cmd:make
+        "
+        
+#PATCHES="
+#	"
+
+BUILD()
+{	
+	echo "========================="
+	echo "TODO: Building quassel..."
+	
+	pushd .
+	mkdir -p build
+	cd build
+	cmake `popd`
+	make
+	
+	cd `popd`
+}
+
+INSTALL()
+{
+	echo "==========================="
+	echo "TODO: Installing quassel..."
+	#make install
+}

From d23305991c9f1108f019150cb6ea59acb320d031 Mon Sep 17 00:00:00 2001
From: "Arfonzo J. Coward" <art@poorcoding.com>
Date: Mon, 2 Dec 2013 23:47:56 +0000
Subject: [PATCH 2/6] Updated quassel recipe. Now builds on hrev46464 on gcc2h.
 Installs to $appDir/Quassel.

---
 net-irc/quassel/quassel-0.9.2.recipe | 60 ++++++++++++++++------------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe
index fdd236a0e..5ce0db1f8 100644
--- a/net-irc/quassel/quassel-0.9.2.recipe
+++ b/net-irc/quassel/quassel-0.9.2.recipe
@@ -14,47 +14,57 @@ ARCHITECTURES="x86 x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	quassel = $portVersion
+	quassel${secondaryArchSuffix} = $portVersion
+	cmd:quassel${secondaryArchSuffix}
+	cmd:quasselcore${secondaryArchSuffix}
+	cmd:quasselclient${secondaryArchSuffix}
 	"
 
 REQUIRES="
-        haiku >= $haikuVersion
+        haiku${secondaryArchSuffix} >= $haikuVersion
         qtcore${secondaryArchSuffix} >= 4.8
         "
+
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:gcc${secondaryArchSuffix}
+	cmd:g++${secondaryArchSuffix}
+	cmd:make
+	"	
         
 BUILD_REQUIRES="
-        haiku_devel >= $haikuVersion
-        pkgconfig
-        qtcore${secondaryArchSuffix}_devel >= 4.8
-        
-        cmd:cmake
-        cmd:gcc
-        cmd:g++
-        cmd:gcc${secondaryArchSuffix}
-        cmd:g++${secondaryArchSuffix}
-        cmd:make
+        haiku${secondaryArchSuffix}_devel >= $haikuVersion
+        qtcore${secondaryArchSuffix}_devel >= 4.8      
+        cmd:pkg_config
         "
-        
-#PATCHES="
-#	"
 
 BUILD()
-{	
-	echo "========================="
-	echo "TODO: Building quassel..."
-	
+{		
 	pushd .
 	mkdir -p build
 	cd build
-	cmake `popd`
-	make
-	
+	cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_C_COMPILER="gcc" -DCMAKE_CXX_COMPILER="g++" `popd`
+	make	
 	cd `popd`
 }
 
 INSTALL()
 {
-	echo "==========================="
-	echo "TODO: Installing quassel..."
-	#make install
+	pushd .
+	cd build	
+	# Optional: strip the binaries before installing.
+	echo "Stripping binaries ..."
+	strip quassel
+	strip quasselcore
+	strip quasselclient
+	
+	
+	echo "DEBUG: apps dir: ${appsDir}"
+	echo "Copying binaries to ${appsDir} ..."
+	mkdir -p ${appsDir}/Quassel
+	cp quassel ${appsDir}/Quassel
+	cp quasselcore ${appsDir}/Quassel
+	cp quasselclient ${appsDir}/Quassel
+		
+	cd `popd`
 }

From aba3601bd408e6707aceb5bef59301f5e7623855 Mon Sep 17 00:00:00 2001
From: "Arfonzo J. Coward" <art@poorcoding.com>
Date: Tue, 3 Dec 2013 08:25:41 +0000
Subject: [PATCH 3/6] Cleaned up quassel recipe based on feedback.

---
 net-irc/quassel/quassel-0.9.2.recipe | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe
index 5ce0db1f8..6908aea09 100644
--- a/net-irc/quassel/quassel-0.9.2.recipe
+++ b/net-irc/quassel/quassel-0.9.2.recipe
@@ -40,31 +40,26 @@ BUILD_REQUIRES="
 
 BUILD()
 {		
-	pushd .
 	mkdir -p build
-	cd build
+	pushd build
 	cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_C_COMPILER="gcc" -DCMAKE_CXX_COMPILER="g++" `popd`
 	make	
-	cd `popd`
+	popd
 }
 
 INSTALL()
 {
-	pushd .
-	cd build	
+	cd build
+	
 	# Optional: strip the binaries before installing.
 	echo "Stripping binaries ..."
 	strip quassel
 	strip quasselcore
 	strip quasselclient
 	
-	
-	echo "DEBUG: apps dir: ${appsDir}"
 	echo "Copying binaries to ${appsDir} ..."
 	mkdir -p ${appsDir}/Quassel
 	cp quassel ${appsDir}/Quassel
 	cp quasselcore ${appsDir}/Quassel
 	cp quasselclient ${appsDir}/Quassel
-		
-	cd `popd`
 }

From 6490a5f66a2e61731be707595eeacbff60f59d60 Mon Sep 17 00:00:00 2001
From: "Arfonzo J. Coward" <art@poorcoding.com>
Date: Tue, 3 Dec 2013 09:13:55 +0000
Subject: [PATCH 4/6] Quassel recipe updates based on feedback: - Modified
 description. - Modified copyright. - Only support gcc2 if we're building for
 a different architecture. - Removed unnecessary BUILD_PREREQUIRES entry for
 gcc. - Added note regarding stripped binaries for future reference.

---
 net-irc/quassel/quassel-0.9.2.recipe | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe
index 6908aea09..ce00b742b 100644
--- a/net-irc/quassel/quassel-0.9.2.recipe
+++ b/net-irc/quassel/quassel-0.9.2.recipe
@@ -1,5 +1,15 @@
 SUMMARY="Quassel IRC."
-DESCRIPTION="Quassel IRC core and client."
+DESCRIPTION="
+Quassel IRC is a modern, cross-platform, distributed IRC client, 
+meaning that one (or multiple) client(s) can attach to and detach
+from a central core -- much like the popular combination of screen
+and a text-based IRC client such as WeeChat, but graphical. In
+addition to this unique feature, we aim to bring a pleasurable,
+comfortable chatting experience to all major platforms (including
+Linux, Windows, and MacOS X as well as Android smartphones), making
+communication with your peers not only convenient, but also
+ubiquitous available.
+	"
 HOMEPAGE="http://quassel-irc.org"
 SRC_URI="http://quassel-irc.org/pub/quassel-0.9.2.tar.bz2"
 CHECKSUM_MD5="4ed88d288f60290f4459d3e68d61b037"
@@ -8,9 +18,15 @@ LICENSE="
 	GNU GPL v2
 	GNU GPL v3
 	"
-COPYRIGHT="Copyright (C) 2005, 2006, 2007, 2008, 2009 by the Quassel IRC Team"
+COPYRIGHT="2005-2009, the Quassel IRC Team"
+
+ARCHITECTURES="x86"
+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"
+fi
 
-ARCHITECTURES="x86 x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -27,7 +43,6 @@ REQUIRES="
 
 BUILD_PREREQUIRES="
 	cmd:cmake
-	cmd:gcc${secondaryArchSuffix}
 	cmd:g++${secondaryArchSuffix}
 	cmd:make
 	"	
@@ -52,6 +67,7 @@ INSTALL()
 	cd build
 	
 	# Optional: strip the binaries before installing.
+	# To be updated/removed whenever resources are added.
 	echo "Stripping binaries ..."
 	strip quassel
 	strip quasselcore

From 458b2f783ebb9ca00cb2f7b7ec40d9517858d216 Mon Sep 17 00:00:00 2001
From: "Arfonzo J. Coward" <art@poorcoding.com>
Date: Tue, 3 Dec 2013 09:33:06 +0000
Subject: [PATCH 5/6] Avoid using pushd/popd here for simplicity.

---
 net-irc/quassel/quassel-0.9.2.recipe | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe
index ce00b742b..b4e59beba 100644
--- a/net-irc/quassel/quassel-0.9.2.recipe
+++ b/net-irc/quassel/quassel-0.9.2.recipe
@@ -56,10 +56,9 @@ BUILD_REQUIRES="
 BUILD()
 {		
 	mkdir -p build
-	pushd build
-	cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_C_COMPILER="gcc" -DCMAKE_CXX_COMPILER="g++" `popd`
-	make	
-	popd
+	cd build
+	cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_C_COMPILER="gcc" -DCMAKE_CXX_COMPILER="g++" ..
+	make
 }
 
 INSTALL()

From 399941fb03098de439fb898066957d8fc1a2645b Mon Sep 17 00:00:00 2001
From: "Arfonzo J. Coward" <art@poorcoding.com>
Date: Tue, 3 Dec 2013 09:38:11 +0000
Subject: [PATCH 6/6] Move cmd:pkg_config requirement to BUILD_PREREQUIRES.

---
 net-irc/quassel/quassel-0.9.2.recipe | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe
index b4e59beba..d9e585e48 100644
--- a/net-irc/quassel/quassel-0.9.2.recipe
+++ b/net-irc/quassel/quassel-0.9.2.recipe
@@ -22,9 +22,9 @@ COPYRIGHT="2005-2009, the Quassel IRC Team"
 
 ARCHITECTURES="x86"
 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"
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
 fi
 
 SECONDARY_ARCHITECTURES="x86"
@@ -37,21 +37,21 @@ PROVIDES="
 	"
 
 REQUIRES="
-        haiku${secondaryArchSuffix} >= $haikuVersion
-        qtcore${secondaryArchSuffix} >= 4.8
-        "
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	qtcore${secondaryArchSuffix} >= 4.8
+	"
 
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:g++${secondaryArchSuffix}
 	cmd:make
+	cmd:pkg_config
 	"	
         
 BUILD_REQUIRES="
-        haiku${secondaryArchSuffix}_devel >= $haikuVersion
-        qtcore${secondaryArchSuffix}_devel >= 4.8      
-        cmd:pkg_config
-        "
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	qtcore${secondaryArchSuffix}_devel >= 4.8      
+	"
 
 BUILD()
 {