diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-05-14 18:14:05 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-05-14 18:14:05 +0000 |
| commit | 72f39425b2ae9cac81085ce1e05bd1914aee5aab (patch) | |
| tree | 971794e06df31fd87a7237da6fada750e83ee01e /main | |
| parent | 6d0401bf35311300ee0c548c685fbae68c58dc77 (diff) | |
| download | aports-72f39425b2ae9cac81085ce1e05bd1914aee5aab.tar.bz2 aports-72f39425b2ae9cac81085ce1e05bd1914aee5aab.tar.xz | |
main/afpfs-ng: replace readline with libedit
Diffstat (limited to 'main')
| -rw-r--r-- | main/afpfs-ng/APKBUILD | 14 | ||||
| -rw-r--r-- | main/afpfs-ng/libedit.patch | 38 |
2 files changed, 47 insertions, 5 deletions
diff --git a/main/afpfs-ng/APKBUILD b/main/afpfs-ng/APKBUILD index b453c87432..b07daaa265 100644 --- a/main/afpfs-ng/APKBUILD +++ b/main/afpfs-ng/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: pkgname=afpfs-ng pkgver=0.8.1 -pkgrel=3 +pkgrel=4 pkgdesc="A client for the Apple Filing Protocol (AFP)" url="http://alexthepuffin.googlepages.com/" arch="all" license="GPL2" depends="" -depends_dev="libgcrypt-dev libiconv-dev readline-dev ncurses-dev" +depends_dev="libgcrypt-dev libiconv-dev libedit-dev ncurses-dev" makedepends="$depends_dev autoconf automake libtool" install="" subpackages="$pkgname-dev $pkgname-doc" @@ -24,6 +24,7 @@ source="http://downloads.sourceforge.net/sourceforge/afpfs-ng/afpfs-ng-$pkgver.t 08-afpfs-ng-0.8.1-fix-errno.patch 09-afpfs-ng-0.8.1-fix-stat.patch musl-fix-includes.patch + libedit.patch " _builddir="$srcdir"/afpfs-ng-$pkgver @@ -74,7 +75,8 @@ e7355dffc31cd9ce10bb968994eb15f6 06-afpfs-ng-0.8.1-boxee4.patch 34b6385ca2fd96caeac807581c4d169f 07-afpfs-ng-0.8.1-boxee5.patch eecc51996ab49a578f760b586106c16b 08-afpfs-ng-0.8.1-fix-errno.patch 2520ba3a39a97d2d29ee65767a1007ec 09-afpfs-ng-0.8.1-fix-stat.patch -1a9b68ff6b9b6b7bdd882fad7577a347 musl-fix-includes.patch" +1a9b68ff6b9b6b7bdd882fad7577a347 musl-fix-includes.patch +faa319df1d5046758bd5cf83beaa026d libedit.patch" sha256sums="688560de1cde57ab8d9e0ef7dc6436dbf0267fe8884f9014e50ff92b297b01a8 afpfs-ng-0.8.1.tar.bz2 627d94ab3c1cbc002b18839f514c6fa980b0a25dfc21e8761b389fcd39f32755 00-afpfs-ng-0.8.1-fix_afpfs-ng_includes.patch 18dc77b064fc02c229e0cfa071a7e31cde6d0243671ebde2f561ebdf09dc38bb 01-afpfs-ng-0.8.1-gcrypt.patch @@ -86,7 +88,8 @@ a5d892625e9c7d4825700eaaf35eed2e472441c7696c6df09f1393b5a1714f93 05-afpfs-ng-0. 56c547b9a9389665409bf64597443e9f123a5aacafdbce6bc375f99133a73d76 07-afpfs-ng-0.8.1-boxee5.patch 0e1c0c0e3a9ff6e55ccbbbc1b4de630c874ff058e2ea94360b7d90e650d04811 08-afpfs-ng-0.8.1-fix-errno.patch ab7c6be216c3b243c9474b2f9d87273b5a8af7fc675fafee037ec64bf962c2a0 09-afpfs-ng-0.8.1-fix-stat.patch -df256860152dc1b25b9a66d32ac6f0c14847a0a5927cec4111bbe96253b75146 musl-fix-includes.patch" +df256860152dc1b25b9a66d32ac6f0c14847a0a5927cec4111bbe96253b75146 musl-fix-includes.patch +54a17df771fcb9388d39149ce501f0d79b0ef8bf0bf5e6038188d3785404fb7f libedit.patch" sha512sums="cfb4ab145566cf75490ff6835482a2b3378f56cc223c5f4360cdd85acb221bf744ba2b00e0a851c8f155ad88a9deb778762547c4eda236cb80f671ef85f4525e afpfs-ng-0.8.1.tar.bz2 c4d9d0de4ed884cfa5cafcc2651acc5c50345ac42e2095663dfa49c02d65122e37acad2020d3e3e4f94a6c5a8b8238caced0d0593639dcd0bb9606351ceda1a2 00-afpfs-ng-0.8.1-fix_afpfs-ng_includes.patch fc469cc1ae988365f00bca61d84467edaaf8f44338847cc4926f1de3978889fa91aa7f8fc44bce032a28ca65caa2e05db0ddb8f287d3586a08cc6f4a8472a219 01-afpfs-ng-0.8.1-gcrypt.patch @@ -98,4 +101,5 @@ c8d8ba5c1d5d31ed64594283f0d9b5f983b8e59765605900519f1e65d19b5fda91cfe01a81ac7b8e 886998059e0768bf76b712327f1f94934ff4af0ec2c1108e9f5e9a235ba272627d25ac0d067ddaaa993915da741be50c8ceb630ebde646095653a06ff0d65222 07-afpfs-ng-0.8.1-boxee5.patch af5b7c7095d7f813cb90e3a19baf84c60e85dc4e021e0d9157379cbef0c3e7bfa445daf882a66f54548bbf4a6bbd3ab51942e83d4bf3c6710a8c070efe2170ea 08-afpfs-ng-0.8.1-fix-errno.patch 57f41e50f186330d1c0bd0d118afeb3a5f4b98a49bf7818fb04a57404543cdc2639ce832480644092e98a79cd62b2a81d10aa09ec1bb0b9c61612fdc0c7f3277 09-afpfs-ng-0.8.1-fix-stat.patch -d5b6471e859d7fa8a46503e6ddf41981f896aaa3a4bce58dff5f5937d7dd529dd1073ac80afcf6b455f679201160738595f0bee6048098638501e95402595749 musl-fix-includes.patch" +d5b6471e859d7fa8a46503e6ddf41981f896aaa3a4bce58dff5f5937d7dd529dd1073ac80afcf6b455f679201160738595f0bee6048098638501e95402595749 musl-fix-includes.patch +6fe34c913e500fa4801b69caafac56872ea31a60a9594b6582859700af272b382a6ba8250ae9eb6559bcbcd06fff2af6fed9209f96e24db1bc2c5731598f5943 libedit.patch" diff --git a/main/afpfs-ng/libedit.patch b/main/afpfs-ng/libedit.patch new file mode 100644 index 0000000000..dc07a790f9 --- /dev/null +++ b/main/afpfs-ng/libedit.patch @@ -0,0 +1,38 @@ +--- ./cmdline/Makefile.am.orig ++++ ./cmdline/Makefile.am +@@ -7,8 +7,8 @@ + + afpcmd_SOURCES = cmdline_afp.c cmdline_main.c cmdline_testafp.c + +-afpcmd_LDADD = -lreadline -lncurses $(top_builddir)/lib/libafpclient.la +-afpcmd_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64 @CFLAGS@ ++afpcmd_LDADD = $(libedit_LIBS) -lncurses $(top_builddir)/lib/libafpclient.la ++afpcmd_CFLAGS = $(libedit_CFLAGS) -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64 @CFLAGS@ + + install-data-hook: + mkdir -p $(DESTDIR)/$(mandir)/man1 +--- ./cmdline/cmdline_main.c.orig ++++ ./cmdline/cmdline_main.c +@@ -12,8 +12,8 @@ + #include <string.h> + #include <termios.h> + #include <unistd.h> +-#include <readline/readline.h> +-#include <readline/history.h> ++#include <readline.h> ++#include <histedit.h> + #include <getopt.h> + #include <ctype.h> + #include <signal.h> +--- ./configure.ac.orig ++++ ./configure.ac +@@ -16,8 +16,8 @@ + # Checks for libraries. + # FIXME: Replace `main' with a function in `-lncurses': + AC_CHECK_LIB([ncurses], [main]) +-AC_CHECK_LIB([readline],[readline]) + AC_CHECK_LIB([pthread], [pthread_create]) +++PKG_CHECK_MODULES([libedit], [libedit]) + + + |