[packages] Use default templates instead of custom reimplementations where applicable

[packages.git] / libs / libmcrypt / Makefile

diff --git a/libs/libmcrypt/Makefile b/libs/libmcrypt/Makefile
index 46e16c4..78ee03a 100644 (file)
--- a/libs/libmcrypt/Makefile
+++ b/libs/libmcrypt/Makefile
@@ -1,26 +1,26 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmcrypt
-PKG_VERSION:=2.5.7
+PKG_VERSION:=2.5.8
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/mcrypt
-PKG_MD5SUM:=b1be163143f8e8ed0474beeb642b3bad
+PKG_MD5SUM:=c4f491dd411a09e9de3b8702ea6f73eb
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CFLAGS += $(FPIC)
+
 define Package/libmcrypt
   SECTION:=libs
   CATEGORY:=Libraries
@@ -29,7 +29,7 @@ define Package/libmcrypt
 endef
 
 define Package/libmcrypt/description
-       libmcrypt is a cryptographic library that conveniently brings 
+       libmcrypt is a cryptographic library that conveniently brings
        together a variety of ciphers for convenient use.
 endef
 
@@ -40,18 +40,12 @@ define Build/Configure
        )
 endef
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
 define Build/InstallDev
-       mkdir -p $(1)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/mcrypt.h $(1)/usr/include/
-       mkdir -p $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmcrypt.{a,so*} $(1)/usr/lib/
-       mkdir -p $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libmcrypt-config $(1)/usr/bin/
        $(SED) 's,-I$$$${prefix}/include,,g' $(1)/usr/bin/libmcrypt-config
        $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/libmcrypt-config