From 45eda090bed704c01d3ab9e2205bbf0c21e5de1f Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Fri, 23 Aug 2013 16:44:45 +0000
Subject: [PATCH] Delete armyknife-63, add recipe for armyknife-66 WIP on
 taglib recipes, Note that taglib-1.8 won't build with gcc2, Thus for a gcc2
 built armyknife we may need a taglib-1.7.2 library. Fix filename for ed-1.7,
 still may need more work, not fully tested yes but it is getting further than
 previous version.

---
 haiku-apps/armyknife/armyknife-63.recipe      | 20 ----------
 haiku-apps/armyknife/armyknife-66.recipe      | 38 +++++++++++++++++++
 media-libs/taglib/taglib-1.7.2.recipe         | 33 ++++++++++------
 media-libs/taglib/taglib-1.8.recipe           | 33 ++++++++++------
 .../ed/{ed-1.7-0.recipe => ed-1.7.recipe}     |  3 +-
 5 files changed, 83 insertions(+), 44 deletions(-)
 delete mode 100644 haiku-apps/armyknife/armyknife-63.recipe
 create mode 100644 haiku-apps/armyknife/armyknife-66.recipe
 rename sys-apps/ed/{ed-1.7-0.recipe => ed-1.7.recipe} (93%)

diff --git a/haiku-apps/armyknife/armyknife-63.recipe b/haiku-apps/armyknife/armyknife-63.recipe
deleted file mode 100644
index ba577daaa..000000000
--- a/haiku-apps/armyknife/armyknife-63.recipe
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of audio files." 
-HOMEPAGE="http://dev.osdrawer.net/projects/armyknife" 
-SRC_URI="svn+http://svn.osdrawer.net/armyknife#63"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/taglib >= 1.6.3"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd armyknife-63
-	make
-}
-
-INSTALL()
-{
-	cd armyknife-63
-	make zipfile
-	mkdir -p ${DESTDIR}/boot/apps
-	unzip release/ArmyKnife-*.zip -d ${DESTDIR}/boot/apps
-}
diff --git a/haiku-apps/armyknife/armyknife-66.recipe b/haiku-apps/armyknife/armyknife-66.recipe
new file mode 100644
index 000000000..471b2c863
--- /dev/null
+++ b/haiku-apps/armyknife/armyknife-66.recipe
@@ -0,0 +1,38 @@
+SUMMARY="The all-in-one metadata editor for audio files."
+DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of audio files." 
+HOMEPAGE="http://dev.osdrawer.net/projects/armyknife" 
+SRC_URI="git://github.com:HaikuArchives/ArmyKnife.git"
+COPYRIGHT="2000-2001 Jason Burgess"
+LICENSE="MIT"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	armyknife = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	taglib >= 1.6
+	"
+BUILD_PREREQUIRED="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:cmake
+	cmd:make
+	"
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	make
+}
+
+INSTALL()
+{
+	make zipfile
+	mkdir -p ${DESTDIR}/boot/apps
+	unzip release/ArmyKnife-*.zip -d ${DESTDIR}/boot/apps
+}
+
diff --git a/media-libs/taglib/taglib-1.7.2.recipe b/media-libs/taglib/taglib-1.7.2.recipe
index a71332c80..16898ab15 100644
--- a/media-libs/taglib/taglib-1.7.2.recipe
+++ b/media-libs/taglib/taglib-1.7.2.recipe
@@ -1,23 +1,34 @@
+SUMMARY="TabLib Audio Meta-Data Library" 
 DESCRIPTION="TagLib Audio Meta-Data Library" 
 HOMEPAGE="http://github.com/taglib" 
-SRC_URI="http://github.com/downloads/taglib/taglib/taglib-1.7.2.tar.gz"
+SRC_URI="http://taglib.github.io/releases/taglib-1.8.tar.gz" 
+CHECKSUM_MD5="dcb8bd1b756f2843e18b1fdf3aaeee15"
+COPYRIGHT="2002-2012 Scott Wheeler"
+LICENSE="GNU LGPL v2
+	MPL v1.1
+	" 
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="cmake"
-CHECKSUM_MD5="b0a9e797d3833fb933c7c3176de3d720"
-BUILD()
+ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	taglib = $portVersion
+	"
+REQUIRES=""
+BUILD_REQUIRES=""
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:cmake
+	cmd:make
+	"
+SOURCE_DIR="$portVersionedName"
+
+BUILD() 
 {
-	cd taglib-1.7.2
 	cmake .
 	make
 }
 
 INSTALL()
 {
-	cd taglib-1.7.2
 	make install
 }
-
-LICENSE="GNU LGPL v2
-	MPL v1.1"
-COPYRIGHT="2002-2012 Scott Wheeler"
diff --git a/media-libs/taglib/taglib-1.8.recipe b/media-libs/taglib/taglib-1.8.recipe
index 7c6b5e78a..6bec8fd82 100644
--- a/media-libs/taglib/taglib-1.8.recipe
+++ b/media-libs/taglib/taglib-1.8.recipe
@@ -1,23 +1,34 @@
+SUMMARY="TabLib Audio Meta-Data Library" 
 DESCRIPTION="TagLib Audio Meta-Data Library" 
 HOMEPAGE="http://github.com/taglib" 
-SRC_URI="http://github.com/downloads/taglib/taglib/taglib-1.8.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+SRC_URI="http://taglib.github.io/releases/taglib-1.8.tar.gz" 
 CHECKSUM_MD5="dcb8bd1b756f2843e18b1fdf3aaeee15"
-BUILD()
+COPYRIGHT="2002-2012 Scott Wheeler"
+LICENSE="GNU LGPL v2
+	MPL v1.1
+	" 
+REVISION="1"
+ARCHITECTURES="x86"
+
+PROVIDES="
+	taglib = $portVersion
+	"
+REQUIRES=""
+BUILD_REQUIRES=""
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:cmake
+	cmd:make
+	"
+SOURCE_DIR="$portVersionedName"
+
+BUILD() 
 {
-	cd taglib-1.8
 	cmake .
 	make
 }
 
 INSTALL()
 {
-	cd taglib-1.8
 	make install
 }
-
-LICENSE="GNU LGPL v2
-	MPL v1.1"
-COPYRIGHT="2002-2012 Scott Wheeler"
diff --git a/sys-apps/ed/ed-1.7-0.recipe b/sys-apps/ed/ed-1.7.recipe
similarity index 93%
rename from sys-apps/ed/ed-1.7-0.recipe
rename to sys-apps/ed/ed-1.7.recipe
index cad118eb9..1f6e528df 100644
--- a/sys-apps/ed/ed-1.7-0.recipe
+++ b/sys-apps/ed/ed-1.7.recipe
@@ -6,7 +6,7 @@ LICENSE="GNU GPL v3"
 SRC_URI="http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ed/ed-1.7.tar.gz"
 CHECKSUM_MD5="0aa4e2428e325203d0d7c3e86c961b1c"
 REVISION="1"
-ARCHITECTURES="?x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	ed = $portVersion compat >= 1
@@ -22,7 +22,6 @@ BUILD_REQUIRES="
 	cmd:make
 	cmd:perl
 	cmd:sed
-	cmd:texinfo
 	"
 
 SOURCE_DIR="$portVersionedName"