Merge branch 'master' of git+ssh://openadk.org/git/openadk

package/wget/Makefile

@@ -4,18 +4,37 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		wget
-PKG_VERSION:=		1.12
+PKG_VERSION:=		1.13.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		141461b9c04e454dc8933c9d1f2abf83
+PKG_MD5SUM:=		1df489976a118b9cbe1b03502adbfc27
 PKG_DESCR:=		retrieving files using HTTP(S) and FTP
 PKG_SECTION:=		www
 PKG_URL:=		http://www.gnu.org/software/wget/
 PKG_SITES:=		${MASTER_SITE_GNU:=wget/}
 
+PKG_CHOICES_WGET:=	WITHOUT_SSL WITH_OPENSSL WITH_GNUTLS
+PKGCD_WITHOUT_SSL:=	use no SSL
+PKGCD_WITH_OPENSSL:=	use OpenSSL for crypto
+PKGCS_WITH_OPENSSL:=	libopenssl
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCD_WITH_GNUTLS:=	use GnuTLS for crypto
+PKGCS_WITH_GNUTLS:=	libgnutls
+PKGCB_WITH_GNUTLS:=	gnutls
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,WGET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+ifeq (${ADK_PACKAGE_WGET_WITHOUT_SSL},y)
+CONFIGURE_ARGS+=	--with-ssl=no
+endif
+ifeq (${ADK_PACKAGE_WGET_WITH_OPENSSL},y)
+CONFIGURE_ARGS+=	--with-ssl=openssl
+endif
+ifeq (${ADK_PACKAGE_WGET_WITH_GNUTLS},y)
+CONFIGURE_ARGS+=	--with-ssl=gnutls
+endif
+
 post-install:
 	${INSTALL_DIR} ${IDIR_WGET}/etc ${IDIR_WGET}/usr/bin
 	${INSTALL_DATA} ${WRKINST}/etc/wgetrc ${IDIR_WGET}/etc/