mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
libassuan, bump version, cleanup (#2036)
This commit is contained in:
Schrijvers Luc
fbrosson
@@ -1,85 +0,0 @@
|
||||
SUMMARY="IPC library used by GnuPG and GPGME"
|
||||
DESCRIPTION="
|
||||
Libassuan is a small library implementing the so-called Assuan protocol. \
|
||||
This protocol is used for IPC between most newer GnuPG components. \
|
||||
Both, server and client side functions are provided.
|
||||
"
|
||||
LICENSE="
|
||||
GNU GPL v3
|
||||
GNU LGPL v2.1
|
||||
"
|
||||
COPYRIGHT="2003-2013 g10 Code GmbH"
|
||||
HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html"
|
||||
SOURCE_URI="ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="949285bb79345362cb72a40c798defefc007031c60f2f10251720bf60a9de2de"
|
||||
REVISION="1"
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
libassuan$secondaryArchSuffix = $portVersion compat >= 1
|
||||
lib:libassuan$secondaryArchSuffix = 0.5.1 compat >= 0
|
||||
"
|
||||
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libgpg_error${secondaryArchSuffix}
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libgpg_error${secondaryArchSuffix}
|
||||
"
|
||||
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:autoconf
|
||||
cmd:awk
|
||||
cmd:make
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:git
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PATCHES="libassuan-$portVersion.patchset"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoconf
|
||||
runConfigure ./configure
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
prepareInstalledDevelLibs libassuan
|
||||
|
||||
# The libtool files reference other libraries using the wrong paths, which
|
||||
# creates a lot of confusion. Fix them so correct paths are used.
|
||||
local develPackageName="${portName}_devel-$portFullVersion"
|
||||
local packageLinksDir=$(dirname $portPackageLinksDir)
|
||||
local linksDir="$packageLinksDir/${develPackageName}/devel~libgpg_error$secondaryArchSuffix/$relativeDevelopLibDir"
|
||||
sed -i -e "s,^\(dependency_libs.*\)-L.*$,\1 -L$linksDir $linksDir/libassuan.la\'," \
|
||||
$developLibDir/libassuan.la
|
||||
sed -i -e "s,\(gpg_error_libs.*\)-L.*\( -lgpg-error\),\1-L$linksDir\2," \
|
||||
$binDir/libassuan-config
|
||||
linksDir="$packageLinksDir/${develPackageName}/devel~libgpg_error$secondaryArchSuffix"
|
||||
sed -i -e "s,\(gpg_error_cflags.*\)-I.*/develop,\1-I$linksDir/develop," \
|
||||
$binDir/libassuan-config
|
||||
|
||||
packageEntries devel \
|
||||
$developDir $binDir/libassuan-config
|
||||
}
|
||||
|
||||
PROVIDES_devel="
|
||||
libassuan${secondaryArchSuffix}_devel = $portVersion compat >= 1
|
||||
cmd:libassuan_config$secondaryArchSuffix = $portVersion compat >= 1
|
||||
devel:libassuan$secondaryArchSuffix = 0.5.1 compat >= 0
|
||||
"
|
||||
|
||||
REQUIRES_devel="
|
||||
libassuan$secondaryArchSuffix == $portVersion
|
||||
devel:libgpg_error${secondaryArchSuffix}
|
||||
"
|
||||
@@ -1,26 +1,28 @@
|
||||
SUMMARY="IPC library used by GnuPG and GPGME"
|
||||
DESCRIPTION="
|
||||
Libassuan is a small library implementing the so-called Assuan protocol. \
|
||||
This protocol is used for IPC between most newer GnuPG components. \
|
||||
Both, server and client side functions are provided.
|
||||
"
|
||||
COPYRIGHT="2003-2013 g10 Code GmbH"
|
||||
DESCRIPTION="Libassuan is a small library implementing the so-called \
|
||||
Assuan protocol. This protocol is used for IPC between most newer GnuPG \
|
||||
components. Both, server and client side functions are provided."
|
||||
COPYRIGHT="2001-2013 Free Software Foundation, Inc.
|
||||
2001-2015 g10 Code GmbH"
|
||||
LICENSE="
|
||||
GNU GPL v3
|
||||
GNU LGPL v2.1
|
||||
"
|
||||
REVISION="1"
|
||||
HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html"
|
||||
HOMEPAGE="https://www.gnupg.org/related_software/libassuan/"
|
||||
SOURCE_URI="ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="9e69a102272324de0bb56025779f84fd44901afcc6eac51505f6a63ea5737ca1"
|
||||
CHECKSUM_SHA256="47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449"
|
||||
PATCHES="libassuan-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
libVersion=0.8.1
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
libassuan$secondaryArchSuffix = $portVersion compat >= 1
|
||||
lib:libassuan$secondaryArchSuffix = 0.7.4 compat >= 0
|
||||
libassuan$secondaryArchSuffix = $portVersion
|
||||
lib:libassuan$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
@@ -29,11 +31,10 @@ REQUIRES="
|
||||
|
||||
|
||||
PROVIDES_devel="
|
||||
libassuan${secondaryArchSuffix}_devel = $portVersion compat >= 1
|
||||
cmd:libassuan_config$secondaryArchSuffix = $portVersion compat >= 1
|
||||
devel:libassuan$secondaryArchSuffix = 0.7.4 compat >= 0
|
||||
libassuan${secondaryArchSuffix}_devel = $portVersion
|
||||
cmd:libassuan_config$secondaryArchSuffix = $portVersion
|
||||
devel:libassuan$secondaryArchSuffix = $libVersion
|
||||
"
|
||||
|
||||
REQUIRES_devel="
|
||||
libassuan$secondaryArchSuffix == $portVersion
|
||||
devel:libgpg_error${secondaryArchSuffix}
|
||||
@@ -44,27 +45,30 @@ BUILD_REQUIRES="
|
||||
devel:libgpg_error$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:awk
|
||||
cmd:make
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:git
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
defineDebugInfoPackage libassuan$secondaryArchSuffix \
|
||||
$libDir/libassuan.so.$libVersion
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoconf
|
||||
autoreconf -vfi
|
||||
runConfigure ./configure
|
||||
make
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
rm $libDir/libassuan.la
|
||||
rm $libDir/*.la
|
||||
|
||||
prepareInstalledDevelLibs libassuan
|
||||
|
||||
@@ -79,6 +83,17 @@ INSTALL()
|
||||
sed -i -e "s,\(gpg_error_cflags.*\)-I.*/develop,\1-I$linksDir/develop," \
|
||||
$binDir/libassuan-config
|
||||
|
||||
if [ -n "$secondaryArchSuffix" ]; then
|
||||
rm -rf $infoDir
|
||||
fi
|
||||
|
||||
packageEntries devel \
|
||||
$developDir $binDir/libassuan-config
|
||||
$developDir \
|
||||
$binDir \
|
||||
$dataDir
|
||||
}
|
||||
|
||||
TEST ()
|
||||
{
|
||||
make check
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
From c8ac5a2281347d8df7a423885f68ed8039f26b93 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
||||
Date: Sun, 16 Nov 2014 15:43:14 +0100
|
||||
Subject: [PATCH] Fix setsockopt test to search for libnetwork as well
|
||||
|
||||
Rewrite to use AC_SEARCH_LIBS.
|
||||
---
|
||||
configure.ac | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index cb21af1..ca82038 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -263,9 +263,11 @@ AC_DEFINE_UNQUOTED(BUILD_TIMESTAMP, "$BUILD_TIMESTAMP",
|
||||
#
|
||||
# Check for network libraries. They are needed for tests.
|
||||
#
|
||||
-AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt,
|
||||
- [NETLIBS="-lsocket $NETLIBS"]))
|
||||
+_save_libs="$LIBS"
|
||||
+AC_SEARCH_LIBS(setsockopt, network socket, [], [], [$NETLIBS])
|
||||
+NETLIBS="$LIBS $NETLIBS"
|
||||
AC_SUBST(NETLIBS)
|
||||
+LIBS="$_save_libs"
|
||||
|
||||
if test "$have_w32_system" = yes; then
|
||||
if test "$have_w32ce_system" = yes; then
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
Reference in New Issue
Block a user