diff --git a/net-libs/gloox/gloox-1.0.12.recipe b/net-libs/gloox/gloox-1.0.13.recipe similarity index 79% rename from net-libs/gloox/gloox-1.0.12.recipe rename to net-libs/gloox/gloox-1.0.13.recipe index 206fbad56..628324d9c 100644 --- a/net-libs/gloox/gloox-1.0.12.recipe +++ b/net-libs/gloox/gloox-1.0.13.recipe @@ -6,7 +6,7 @@ HOMEPAGE="http://camaya.net/gloox/" LICENSE="GNU GPL v2" COPYRIGHT="2002-2012 Jakob Schröter" SRC_URI="http://camaya.net/download/gloox-$portVersion.tar.bz2" -CHECKSUM_SHA256="67125a2e98a9803179af75f1c9c3c0a14f0bc238d48f23c4a3cf7c8fdebc43a9" +CHECKSUM_SHA256="4d9f1eeac97c6563dde11d4bdba346a025ef27908b088b47b5c8d3d03df6ea8a" REVISION="1" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then @@ -21,18 +21,22 @@ PATCHES="gloox-1.0.9.patch" PROVIDES=" gloox$secondaryArchSuffix = $portVersion - lib:libgloox$secondaryArchSuffix = 12.0.0 compat >= 12 + lib:libgloox$secondaryArchSuffix = 13.0.0 compat >= 13 " REQUIRES=" haiku$secondaryArchSuffix - lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libssl$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix @@ -58,7 +62,7 @@ INSTALL() prepareInstalledDevelLib libgloox # devel package - packageEntries devel $developDir + packageEntries devel $developDir $binDir } TEST() @@ -71,7 +75,8 @@ TEST() PROVIDES_devel=" gloox${secondaryArchSuffix}_devel = $portVersion - devel:libgloox$secondaryArchSuffix = 12.0.0 compat >= 12 + cmd:gloox_config${secondaryArchSuffix} + devel:libgloox$secondaryArchSuffix = 13.0.0 compat >= 13 " REQUIRES_devel=" gloox$secondaryArchSuffix == $portVersion base diff --git a/net-libs/gloox/gloox-1.0.9.recipe b/net-libs/gloox/gloox-1.0.9.recipe deleted file mode 100644 index cf866aa40..000000000 --- a/net-libs/gloox/gloox-1.0.9.recipe +++ /dev/null @@ -1,80 +0,0 @@ -SUMMARY="Full-featured Jabber/XMPP client library" -DESCRIPTION=" -Rock-solid, full-featured Jabber/XMPP client library, written in clean ANSI C++. -" -HOMEPAGE="http://camaya.net/gloox/" -LICENSE="GNU GPL v2" -COPYRIGHT="2002-2012 Jakob Schröter" -SRC_URI="http://camaya.net/download/gloox-1.0.9.tar.bz2" -CHECKSUM_SHA256="143dd50e1edc4eb1d304fa28bdd6ab9e53b60c37c1726dd0e34c06c51f9a453e" -REVISION="1" -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_gcc2 x86" -PATCHES="gloox-1.0.9.patch" - -PROVIDES=" - gloox$secondaryArchSuffix = $portVersion - lib:libgloox$secondaryArchSuffix = $portVersion - " - -REQUIRES=" - haiku$secondaryArchSuffix - lib:libssl$secondaryArchSuffix - lib:libcrypto$secondaryArchSuffix - " -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libssl$secondaryArchSuffix - devel:libcrypto$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:make - cmd:libtoolize - cmd:aclocal - cmd:autoconf - cmd:automake - " -BUILD() -{ - libtoolize --force --copy --install - aclocal - autoconf - automake - runConfigure ./configure - make -} - -INSTALL() -{ - make install - - # prepare development lib links - prepareInstalledDevelLib libgloox - - # devel package - packageEntries devel $developDir -} - -TEST() -{ - make check -} - - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - gloox${secondaryArchSuffix}_devel = $portVersion - devel:libgloox$secondaryArchSuffix = $portVersion - " -REQUIRES_devel=" - gloox$secondaryArchSuffix == $portVersion base - "