[packages] massive: use $(INSTALL_DIR) instead of 'mkdir -p' in install and InstallDev

[openwrt/svn-archive/archive.git] / libs / gnutls / Makefile

diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile
index 4e6ab71dc10614eefa9f6741db73d5c5e13e55ae..e2c0af9eceea3ca76ae81c698754e8875eeedf53 100644 (file)
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnutls
-PKG_VERSION:=2.6.4
+PKG_VERSION:=2.8.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.gnu.org/pub/gnu/gnutls/ \
+PKG_SOURCE_URL:=@GNU/gnutls \
        ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/
-PKG_MD5SUM:=747111ab0d86e7b06a4bb120ba456ad8
+PKG_MD5SUM:=
 
 PKG_FIXUP = libtool
 
@@ -67,6 +67,7 @@ define Package/libgnutls
 $(call Package/gnutls/Default)
  TITLE+= (library)
  DEPENDS+= +zlib +libgcrypt +libgpg-error
+ SUBMENU:=SSL
 endef
 
 define Package/libgnutls/description
@@ -79,6 +80,7 @@ define Package/libgnutls-extra
 $(call Package/gnutls/Default)
  TITLE+= (extra library)
  DEPENDS+= +libgnutls
+ SUBMENU:=SSL
 endef
 
 define Package/libgnutls-extra/description
@@ -91,6 +93,7 @@ define Package/libgnutls-openssl
 $(call Package/gnutls/Default)
  TITLE+= (OpenSSL compat library)
  DEPENDS+= +libgnutls
+ SUBMENU:=SSL
 endef
 
 define Package/libgnutls-openssl/description
@@ -104,6 +107,7 @@ CONFIGURE_ARGS+= \
        --enable-shared \
        --enable-static \
        --disable-openpgp-authentication \
+       --disable-guile \
        --with-included-libcfg \
        --with-included-libtasn1 \
        --with-libgcrypt-prefix="$(STAGING_DIR)/usr" \
@@ -125,8 +129,7 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(1)/usr/bin $(2)/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libgnutls{,-extra}-config $(2)/bin/
+       $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/include/gnutls $(1)/usr/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc $(1)/usr/lib/pkgconfig/