diff options
| -rw-r--r-- | package/neon/Makefile | 18 | ||||
| -rw-r--r-- | package/neon/patches/patch-configure | 31 | ||||
| -rw-r--r-- | package/neon/patches/patch-ltmain_sh | 11 | ||||
| -rw-r--r-- | package/neon/patches/patch-neon-config_in | 11 | ||||
| -rw-r--r-- | package/neon/patches/patch-neon_pc_in | 10 |
5 files changed, 13 insertions, 68 deletions
diff --git a/package/neon/Makefile b/package/neon/Makefile index 22ff33a03..3da8b26f4 100644 --- a/package/neon/Makefile +++ b/package/neon/Makefile @@ -4,19 +4,27 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= neon -PKG_VERSION:= 0.29.5 -PKG_RELEASE:= 2 -PKG_HASH:= dea3c52b9f3f915651c6279c76758acf7c427727e8b9b0130f8b138f24012290 +PKG_VERSION:= 0.30.1 +PKG_RELEASE:= 1 +PKG_HASH:= 00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd PKG_DESCR:= http and webdav library PKG_SECTION:= libs/misc -PKG_DEPENDS:= libpthread libxml2 libopenssl zlib -PKG_BUILDDEP:= libpthread libxml2 openssl zlib +PKG_DEPENDS:= libpthread libxml2 zlib +PKG_BUILDDEP:= libpthread libxml2 zlib PKG_URL:= http://webdav.org/neon/ PKG_SITES:= http://webdav.org/neon/ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_CHOICES_NEON:= WITH_LIBRESSL WITH_OPENSSL +PKGCD_WITH_LIBRESSL:= use libressl for crypto +PKGCB_WITH_LIBRESSL:= libressl +PKGCS_WITH_LIBRESSL:= libressl +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCB_WITH_OPENSSL:= openssl +PKGCS_WITH_OPENSSL:= libopenssl + include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,NEON,neon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/neon/patches/patch-configure b/package/neon/patches/patch-configure deleted file mode 100644 index 4ced7dd7f..000000000 --- a/package/neon/patches/patch-configure +++ /dev/null @@ -1,31 +0,0 @@ ---- neon-0.29.4.orig/configure 2010-10-01 14:35:24.000000000 +0200 -+++ neon-0.29.4/configure 2010-10-03 01:29:52.000000000 +0200 -@@ -4249,28 +4249,6 @@ _ACEOF - fi - - --# Check for Darwin, which needs extra cpp and linker flags. --{ $as_echo "$as_me:$LINENO: checking for uname" >&5 --$as_echo_n "checking for uname... " >&6; } --if test "${ne_cv_os_uname+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- -- ne_cv_os_uname=`uname -s 2>/dev/null` -- --fi --{ $as_echo "$as_me:$LINENO: result: $ne_cv_os_uname" >&5 --$as_echo "$ne_cv_os_uname" >&6; } -- --if test "$ne_cv_os_uname" = "Darwin"; then -- CPPFLAGS="$CPPFLAGS -no-cpp-precomp" -- LDFLAGS="$LDFLAGS -flat_namespace" -- # poll has various issues in various Darwin releases -- if test x${ac_cv_func_poll+set} != xset; then -- ac_cv_func_poll=no -- fi --fi -- - { $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 - $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } - set x ${MAKE-make} diff --git a/package/neon/patches/patch-ltmain_sh b/package/neon/patches/patch-ltmain_sh deleted file mode 100644 index 2655e933d..000000000 --- a/package/neon/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- neon-0.29.4.orig/ltmain.sh 2010-10-01 14:35:13.000000000 +0200 -+++ neon-0.29.4/ltmain.sh 2011-01-14 21:29:01.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/neon/patches/patch-neon-config_in b/package/neon/patches/patch-neon-config_in deleted file mode 100644 index 6fc13138d..000000000 --- a/package/neon/patches/patch-neon-config_in +++ /dev/null @@ -1,11 +0,0 @@ ---- neon-0.29.5.orig/neon-config.in 2008-02-06 12:12:09.000000000 +0100 -+++ neon-0.29.5/neon-config.in 2011-03-08 18:52:01.000000000 +0100 -@@ -78,7 +78,7 @@ while test $# -gt 0; do - if test "$prefix" != "/usr"; then - LIBS="-L${libdir} ${LIBS}" - fi -- echo @user_LDFLAGS@ ${LIBS} -+ echo ${LIBS} - ;; - - --la-file) diff --git a/package/neon/patches/patch-neon_pc_in b/package/neon/patches/patch-neon_pc_in deleted file mode 100644 index 7ae4faf9a..000000000 --- a/package/neon/patches/patch-neon_pc_in +++ /dev/null @@ -1,10 +0,0 @@ ---- neon-0.29.5.orig/neon.pc.in 2006-06-26 12:01:29.000000000 +0200 -+++ neon-0.29.5/neon.pc.in 2011-04-25 18:11:35.518922624 +0200 -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: neon - Description: HTTP/WebDAV client library - Version: @NEON_VERSION@ --Libs.private: @NEON_LIBS@ -+Libs.private: -lz -lssl -lcrypto -ldl -lxml2 -lm - Libs: -L${libdir} -lneon @NEON_PC_LIBS@ - Cflags: -I${includedir}/neon @NEON_CFLAGS@ |