diff options
-rw-r--r-- | package/wget/Makefile | 8 | ||||
-rw-r--r-- | package/wget/patches/patch-Makefile_am | 11 | ||||
-rw-r--r-- | package/wget/patches/patch-configure_ac | 15 | ||||
-rw-r--r-- | package/wget/patches/patch-m4_spawn_h_m4 | 19 |
4 files changed, 3 insertions, 50 deletions
diff --git a/package/wget/Makefile b/package/wget/Makefile index d1f69f7db..516f468b6 100644 --- a/package/wget/Makefile +++ b/package/wget/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= wget -PKG_VERSION:= 1.15 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 506df41295afc6486662cc47470b4618 +PKG_VERSION:= 1.16 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 293a37977c41b5522f781d3a3a078426 PKG_DESCR:= retrieving files using http(s) and ftp PKG_SECTION:= net/http PKG_URL:= http://www.gnu.org/software/wget/ @@ -39,8 +39,6 @@ CONFIGURE_ARGS+= --with-ssl=gnutls \ --with-libgnutls-prefix="$(STAGING_TARGET_DIR)/usr" endif -AUTOTOOL_STYLE:= autoreconf - wget-install: ${INSTALL_DIR} ${IDIR_WGET}/etc ${IDIR_WGET}/usr/bin ${INSTALL_DATA} ${WRKBUILD}/doc/sample.wgetrc \ diff --git a/package/wget/patches/patch-Makefile_am b/package/wget/patches/patch-Makefile_am deleted file mode 100644 index c9c937c60..000000000 --- a/package/wget/patches/patch-Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ ---- wget-1.15.orig/Makefile.am 2014-01-04 13:49:47.000000000 +0100 -+++ wget-1.15/Makefile.am 2014-04-23 19:48:58.359897378 +0200 -@@ -41,7 +41,7 @@ distuninstallcheck_listfiles = find . -t - ACLOCAL_AMFLAGS = -I m4 - - # subdirectories in the distribution --SUBDIRS = lib src doc po tests util -+SUBDIRS = lib src util - - EXTRA_DIST = ChangeLog.README MAILING-LIST \ - msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \ diff --git a/package/wget/patches/patch-configure_ac b/package/wget/patches/patch-configure_ac deleted file mode 100644 index cfb3a165b..000000000 --- a/package/wget/patches/patch-configure_ac +++ /dev/null @@ -1,15 +0,0 @@ ---- wget-1.15.orig/configure.ac 2014-01-04 13:49:47.000000000 +0100 -+++ wget-1.15/configure.ac 2014-04-23 19:48:44.679755324 +0200 -@@ -104,12 +104,6 @@ AC_AIX - - gl_EARLY - --dnl --dnl Gettext --dnl --AM_GNU_GETTEXT([external],[need-ngettext]) --AM_GNU_GETTEXT_VERSION([0.17]) -- - AC_PROG_RANLIB - - AC_PROG_LEX diff --git a/package/wget/patches/patch-m4_spawn_h_m4 b/package/wget/patches/patch-m4_spawn_h_m4 deleted file mode 100644 index f49598f3b..000000000 --- a/package/wget/patches/patch-m4_spawn_h_m4 +++ /dev/null @@ -1,19 +0,0 @@ ---- wget-1.15.orig/m4/spawn_h.m4 2014-01-19 11:00:21.000000000 +0100 -+++ wget-1.15/m4/spawn_h.m4 2014-02-21 17:25:19.000000000 +0100 -@@ -64,7 +64,15 @@ AC_DEFUN([gl_HAVE_POSIX_SPAWN], - dnl once only, before all statements that occur in other macros. - AC_REQUIRE([gl_SPAWN_H_DEFAULTS]) - -- AC_CHECK_FUNCS_ONCE([posix_spawn]) -+ LIB_POSIX_SPAWN= -+ AC_SUBST([LIB_POSIX_SPAWN]) -+ gl_saved_libs=$LIBS -+ AC_SEARCH_LIBS([posix_spawn], [rt], -+ [test "$ac_cv_search_posix_spawn" = "none required" || -+ LIB_POSIX_SPAWN=$ac_cv_search_posix_spawn]) -+ AC_CHECK_FUNCS([posix_spawn]) -+ LIBS=$gl_saved_libs -+ - if test $ac_cv_func_posix_spawn != yes; then - HAVE_POSIX_SPAWN=0 - fi |