From 34b4ca0d3cf54079b815c5bd2d090ed92f8c20c3 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 18 Jun 2013 11:12:15 +0200
Subject: [PATCH] vision: update recipe

* Based on vision-942.recipe add new recipe vision-0.9.7.r944.recipe.
* Remove older recipes.
* Rename patch.
* Rename VisionSettings to InitialSettings as done in master.
* Add USER_SETTINGS_FILES declaration.
* Add Deskbar menu symlink.
---
 .../{VisionSettings => InitialSettings}       | Bin
 ...908-gcc4.patch => vision-0.9.7-gcc4.patch} |   0
 ...on-942.recipe => vision-0.9.7.r944.recipe} |  21 +++++---
 haiku-apps/vision/vision-908.recipe           |  48 ------------------
 haiku-apps/vision/vision-933.recipe           |  32 ------------
 5 files changed, 14 insertions(+), 87 deletions(-)
 rename haiku-apps/vision/{VisionSettings => InitialSettings} (100%)
 rename haiku-apps/vision/patches/{vision-908-gcc4.patch => vision-0.9.7-gcc4.patch} (100%)
 rename haiku-apps/vision/{vision-942.recipe => vision-0.9.7.r944.recipe} (65%)
 delete mode 100644 haiku-apps/vision/vision-908.recipe
 delete mode 100644 haiku-apps/vision/vision-933.recipe

diff --git a/haiku-apps/vision/VisionSettings b/haiku-apps/vision/InitialSettings
similarity index 100%
rename from haiku-apps/vision/VisionSettings
rename to haiku-apps/vision/InitialSettings
diff --git a/haiku-apps/vision/patches/vision-908-gcc4.patch b/haiku-apps/vision/patches/vision-0.9.7-gcc4.patch
similarity index 100%
rename from haiku-apps/vision/patches/vision-908-gcc4.patch
rename to haiku-apps/vision/patches/vision-0.9.7-gcc4.patch
diff --git a/haiku-apps/vision/vision-942.recipe b/haiku-apps/vision/vision-0.9.7.r944.recipe
similarity index 65%
rename from haiku-apps/vision/vision-942.recipe
rename to haiku-apps/vision/vision-0.9.7.r944.recipe
index a97718bad..5e4508b79 100644
--- a/haiku-apps/vision/vision-942.recipe
+++ b/haiku-apps/vision/vision-0.9.7.r944.recipe
@@ -1,14 +1,14 @@
 SUMMARY="IRC client for Haiku" 
 DESCRIPTION="Vision is an IRC client for Haiku." 
 HOMEPAGE="http://vision.sourceforge.net/" 
-SRC_URI="svn://svn.code.sf.net/p/vision/code/branches/0.9.7#942"
+SRC_URI="svn://svn.code.sf.net/p/vision/code/branches/0.9.7#944"
 LICENSE="MPL v1.1"
 COPYRIGHT="1999-2010 The Vision Team"
-REVISION="3"
+REVISION="1"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 if [ $targetArchitecture != x86_gcc2 ]; then
-	PATCHES="vision-908-gcc4.patch"
+	PATCHES="vision-0.9.7-gcc4.patch"
 fi
 
 PROVIDES="
@@ -26,11 +26,16 @@ BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	"
 
+USER_SETTINGS_FILES="
+	settings/Vision directory
+	"
+
 SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
-	make $jobArgs
+	make
+		# multi-job build not supported
 }
 
 INSTALL()
@@ -38,9 +43,11 @@ INSTALL()
 	visionDir=$appsDir/Vision
 	mkdir -p $visionDir
 
-	cp -a $portDir/VisionSettings $visionDir
-
 	cp Vision $visionDir
+	cp -a $portDir/InitialSettings $visionDir
+
 	cd data
-	copyattr -d -r -x .svn * $visionDir
+	cp -a * $visionDir
+
+	addAppDeskbarSymlink $visionDir/Vision
 }
diff --git a/haiku-apps/vision/vision-908.recipe b/haiku-apps/vision/vision-908.recipe
deleted file mode 100644
index 5959561a7..000000000
--- a/haiku-apps/vision/vision-908.recipe
+++ /dev/null
@@ -1,48 +0,0 @@
-SUMMARY="IRC client for Haiku" 
-DESCRIPTION="Vision is an IRC client for Haiku." 
-HOMEPAGE="http://vision.sourceforge.net/" 
-SRC_URI="svn+http://vision.svn.sourceforge.net/svnroot/vision/trunk#908"
-LICENSE="MPL v1.1"
-COPYRIGHT="1999-2010 The Vision Team"
-REVISION="3"
-ARCHITECTURES="x86_gcc2 ?x86"
-
-if [ $targetArchitecture != x86_gcc2 ]; then
-	PATCHES="vision-908-gcc4.patch"
-fi
-
-PROVIDES="
-	vision = $portVersion
-	"
-REQUIRES="
-	haiku >= $haikuVersion
-	"
-BUILD_REQUIRES="
-	cmd:gcc
-	cmd:ld
-	cmd:make
-	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
-
-SOURCE_DIR="$portVersionedName"
-
-BUILD()
-{
-	cd Vision
-	make $jobArgs
-}
-
-INSTALL()
-{
-	visionDir=$appsDir/Vision
-	mkdir -p $visionDir
-
-	cp -a $portDir/VisionSettings $visionDir
-
-	cd Vision
-	cp Vision $visionDir
-	cd data
-	copyattr -d -r -x .svn * $visionDir
-}
diff --git a/haiku-apps/vision/vision-933.recipe b/haiku-apps/vision/vision-933.recipe
deleted file mode 100644
index 41876b723..000000000
--- a/haiku-apps/vision/vision-933.recipe
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION="Vision is an irc client for Haiku" 
-HOMEPAGE="http://vision.sourceforge.net/" 
-SRC_URI="svn+http://vision.svn.sourceforge.net/svnroot/vision/trunk#933"
-REVISION="1"
-STATUS_HAIKU="unstable"
-DEPEND=""	
-		
-BUILD()
-{
-	cd vision-933
-	cd Vision
-	if [ -n "$(setgcc | grep '2')" ]; then
-		cp Makefile.gcc2 Makefile
-	else
-		rm Makefile
-		cp Makefile.gcc4 Makefile
-	fi
-	make	
-}
-
-INSTALL()
-{
-	cd vision-933
-	cd Vision
-	mkdir -p ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision
-	cp Vision ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision
-	cd data
-	cp -r * ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision
-}
-
-COPYRIGHT="1999-2010 The Vision Team"
-LICENSE="MPL v1.1"