diff options
-rw-r--r-- | testing/abook/APKBUILD | 2 | ||||
-rw-r--r-- | testing/asterisk-dongle/APKBUILD | 6 | ||||
-rw-r--r-- | testing/calcurse/APKBUILD | 2 | ||||
-rw-r--r-- | testing/cdw/APKBUILD | 2 | ||||
-rw-r--r-- | testing/clucene/APKBUILD | 4 | ||||
-rw-r--r-- | testing/cmus/APKBUILD | 5 | ||||
-rw-r--r-- | testing/csync/APKBUILD | 2 | ||||
-rw-r--r-- | testing/eina/APKBUILD | 4 | ||||
-rw-r--r-- | testing/ejabberd/APKBUILD | 3 | ||||
-rw-r--r-- | testing/lua5.2-xctrl/APKBUILD | 3 | ||||
-rw-r--r-- | testing/mkvtoolnix/APKBUILD | 4 | ||||
-rw-r--r-- | testing/networkmanager/APKBUILD | 6 | ||||
-rw-r--r-- | testing/strigi/APKBUILD | 4 | ||||
-rw-r--r-- | testing/xmlrpc-epi/APKBUILD | 4 |
14 files changed, 24 insertions, 27 deletions
diff --git a/testing/abook/APKBUILD b/testing/abook/APKBUILD index 0ac1891d45..7ddf2e183f 100644 --- a/testing/abook/APKBUILD +++ b/testing/abook/APKBUILD @@ -7,7 +7,7 @@ pkgdesc="Text-based addressbook designed for use with Mutt" url="http://abook.sourceforge.net" license="GPL2" arch="all" -makedepends="libiconv-dev ncurses-dev readline-dev" +makedepends="ncurses-dev readline-dev" subpackages="$pkgname-doc $pkgname-lang" source="http://$pkgname.sourceforge.net/devel/$pkgname-${_ver}.tar.gz vcard-compat.patch" diff --git a/testing/asterisk-dongle/APKBUILD b/testing/asterisk-dongle/APKBUILD index 75b23bf91a..b03d26116f 100644 --- a/testing/asterisk-dongle/APKBUILD +++ b/testing/asterisk-dongle/APKBUILD @@ -3,13 +3,13 @@ SVNREV=27 pkgname=asterisk-dongle pkgver=1.1.$SVNREV -pkgrel=2 +pkgrel=3 pkgdesc="GSM modem dongle channel driver" url="http://code.google.com/p/asterisk-chan-dongle/" arch="" license="GPL2" depends="asterisk" -depends_dev="libiconv-dev" +depends_dev="" makedepends="$depends_dev asterisk-dev subversion automake autoconf" install="" subpackages="" @@ -33,7 +33,7 @@ prepare() { build() { cd "$_builddir" aclocal && autoconf && automake -a - LDFLAGS="-liconv" ./configure || exit 1 + ./configure || return 1 make } diff --git a/testing/calcurse/APKBUILD b/testing/calcurse/APKBUILD index 781e3b1812..7f95372e02 100644 --- a/testing/calcurse/APKBUILD +++ b/testing/calcurse/APKBUILD @@ -8,7 +8,7 @@ pkgdesc="A text-based personal organizer" url="http://calcurse.org/" license="BSD" arch="all" -makedepends="libiconv-dev ncurses-dev" +makedepends="ncurses-dev" subpackages="$pkgname-doc" source="http://calcurse.org/files/${pkgname}-${pkgver}.tar.gz" diff --git a/testing/cdw/APKBUILD b/testing/cdw/APKBUILD index f26e0043bc..1b30a79548 100644 --- a/testing/cdw/APKBUILD +++ b/testing/cdw/APKBUILD @@ -30,7 +30,7 @@ prepare() { build() { cd "$_builddir" - export LIBS="-liconv -lintl" && ./configure --prefix=/usr + export LIBS="-lintl" && ./configure --prefix=/usr make } diff --git a/testing/clucene/APKBUILD b/testing/clucene/APKBUILD index ffc38eefa6..6e17577c49 100644 --- a/testing/clucene/APKBUILD +++ b/testing/clucene/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=clucene pkgver=2.3.3.4 -pkgrel=3 +pkgrel=4 pkgdesc="A C++ port of Lucene" url="http://www.sourceforge.net/projects/clucene" arch="all" license="LGPLv2+ or ASL 2.0" depends="" -depends_dev="zlib-dev boost-dev libiconv-dev" +depends_dev="zlib-dev boost-dev" makedepends="cmake $depends_dev" install="" subpackages="$pkgname-dev $pkgname-contribs" diff --git a/testing/cmus/APKBUILD b/testing/cmus/APKBUILD index 955733d563..533ba74f3a 100644 --- a/testing/cmus/APKBUILD +++ b/testing/cmus/APKBUILD @@ -7,15 +7,14 @@ pkgdesc="A very feature-rich ncurses-based music player" url="http://cmus.sourceforge.net/" license="GPL2+" arch="all" -makedepends="alsa-lib-dev faad2-dev flac-dev libiconv-dev libmad-dev - libogg-dev libvorbis-dev ncurses-dev wavpack-dev" +makedepends="alsa-lib-dev faad2-dev flac-dev libmad-dev + libogg-dev libvorbis-dev ncurses-dev wavpack-dev linux-headers" subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2" _builddir="$srcdir"/$pkgname-v$pkgver build() { cd "$_builddir" - LDFLAGS="$LDFLAGS -liconv" CC=gcc ./configure prefix=/usr || return 1 make || return 1 } diff --git a/testing/csync/APKBUILD b/testing/csync/APKBUILD index 2dd215b767..abae67048b 100644 --- a/testing/csync/APKBUILD +++ b/testing/csync/APKBUILD @@ -9,7 +9,7 @@ license="GPL" depends="" depends_dev="" makedepends="$depends_dev check-dev samba-dev libssh-dev cmake sqlite-dev - libiconv-dev iniparser-dev neon-dev" + iniparser-dev neon-dev" install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-sftp $pkgname-smb $pkgname-owncloud" source="https://open.cryptomilk.org/attachments/download/27/csync-$pkgver.tar.xz diff --git a/testing/eina/APKBUILD b/testing/eina/APKBUILD index 44512e8ac2..cd650fada9 100644 --- a/testing/eina/APKBUILD +++ b/testing/eina/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=eina pkgver=1.7.9 -pkgrel=0 +pkgrel=1 pkgdesc="Enlightenment's data types library (List, hash, etc) in C" url="http://trac.enlightenment.org/e/wiki/Eina" arch="all" license="LGPL2+" depends= -depends_dev="libiconv-dev" +depends_dev="" makedepends="$depends_dev" install="" subpackages="$pkgname-dev" diff --git a/testing/ejabberd/APKBUILD b/testing/ejabberd/APKBUILD index e67565ec5a..2e240d9e32 100644 --- a/testing/ejabberd/APKBUILD +++ b/testing/ejabberd/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: John Regan <john@jrjrtech.com> pkgname=ejabberd pkgver=15.02 -pkgrel=1 +pkgrel=2 pkgdesc="An erlang jabber server" url="http://www.ejabberd.im" arch="all" @@ -24,7 +24,6 @@ depends="erlang $_erl_deps" depends_dev="erlang-dev expat-dev - libiconv-dev openssl-dev zlib-dev heimdal-dev diff --git a/testing/lua5.2-xctrl/APKBUILD b/testing/lua5.2-xctrl/APKBUILD index 57308e58e5..68a1386783 100644 --- a/testing/lua5.2-xctrl/APKBUILD +++ b/testing/lua5.2-xctrl/APKBUILD @@ -13,7 +13,7 @@ url="http://code.google.com/p/xctrl/" arch="all" license="GPL-2" depends= -makedepends="lua$_luaver-dev libx11-dev libxmu-dev libiconv-dev" +makedepends="lua$_luaver-dev libx11-dev libxmu-dev" install= subpackages="$pkgname-doc" source="http://xctrl.googlecode.com/files/xctrl-$_ver.tar.gz" @@ -27,7 +27,6 @@ prepare() { build() { cd "$_builddir" export EXTRA_CFLAGS="-fPIC $( pkg-config lua$_luaver --cflags )" - [ "$ALPINE_LIBC" != "eglibc" ] && export EXTRA_LDFLAGS="-liconv" make -C src LUA=lua5.2 || return 1 } diff --git a/testing/mkvtoolnix/APKBUILD b/testing/mkvtoolnix/APKBUILD index 42af41cea2..be20537f97 100644 --- a/testing/mkvtoolnix/APKBUILD +++ b/testing/mkvtoolnix/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: pkgname=mkvtoolnix pkgver=7.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Set of tools to create, edit and inspect Matroska files" url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" arch="all" license="GPL" depends="" -depends_dev="libmatroska-dev flac-dev libvorbis-dev boost-dev libiconv-dev +depends_dev="libmatroska-dev flac-dev libvorbis-dev boost-dev zlib-dev file-dev libogg-dev" makedepends="$depends_dev autoconf automake ruby bash" install="" diff --git a/testing/networkmanager/APKBUILD b/testing/networkmanager/APKBUILD index 6e923f05f6..44b5891760 100644 --- a/testing/networkmanager/APKBUILD +++ b/testing/networkmanager/APKBUILD @@ -3,14 +3,14 @@ pkgname=networkmanager pkgver=0.9.8.10 _ver=0.9 -pkgrel=0 +pkgrel=1 pkgdesc="network management tool" url="http://projects.gnome.org/NetworkManager/" arch="all" license="GPL" depends="dhcpcd iptables dbus" -depends_dev="dbus-glib-dev udev-dev libnl3-dev util-linux-dev - polkit-dev ppp-dev zlib-dev libiconv-dev wireless-tools-dev +depends_dev="dbus-glib-dev udev-dev libnl3-dev util-linux-dev linux-headers + polkit-dev ppp-dev zlib-dev wireless-tools-dev nss-dev nspr-dev gobject-introspection-dev" makedepends="$depends_dev intltool" install="" diff --git a/testing/strigi/APKBUILD b/testing/strigi/APKBUILD index 6dec752599..137abde367 100644 --- a/testing/strigi/APKBUILD +++ b/testing/strigi/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: pkgname=strigi pkgver=0.7.8 -pkgrel=0 +pkgrel=1 pkgdesc="KDE desktop search software" url="http://www.vandenoever.info/software/strigi/" arch="all" license="LGPL" depends= -depends_dev="qt-dev exiv2-dev bzip2-dev zlib-dev libiconv-dev libxml2-dev attr-dev" +depends_dev="qt-dev exiv2-dev bzip2-dev zlib-dev libxml2-dev attr-dev" makedepends="$depends_dev cmake automoc4" install="" subpackages="$pkgname-dev" diff --git a/testing/xmlrpc-epi/APKBUILD b/testing/xmlrpc-epi/APKBUILD index c2b8ba658b..4a163e75b0 100644 --- a/testing/xmlrpc-epi/APKBUILD +++ b/testing/xmlrpc-epi/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: pkgname=xmlrpc-epi pkgver=0.54.2 -pkgrel=0 +pkgrel=1 pkgdesc="A versatile xmlrpc and soap implementation" url="http://xmlrpc-epi.sourceforge.net/" arch="all" license="MIT" depends= -depends_dev="expat-dev libiconv-dev" +depends_dev="expat-dev" makedepends="$depends_dev autoconf automake libtool" install="" subpackages="$pkgname-dev" |