From e51c134552cc067baf93d2fe218d95ac4195669e Mon Sep 17 00:00:00 2001 From: Stephen Walker Date: Thu, 22 Jul 2010 15:42:27 +0000 Subject: [PATCH] [packages] diffutils: update to 3.0, use PKG_INSTALL, handle the busybox diff applet on preinst and postrm, cleanup SVN-Revision: 22354 --- devel/diffutils/Makefile | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/devel/diffutils/Makefile b/devel/diffutils/Makefile index ce6b369ad6..202cc099c0 100644 --- a/devel/diffutils/Makefile +++ b/devel/diffutils/Makefile @@ -8,11 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=diffutils -PKG_VERSION:=2.8.1 +PKG_VERSION:=3.0 PKG_RELEASE:=1 -PKG_MD5SUM:=71f9c5ae19b60608f6c7f162da86a428 -PKG_SOURCE_URL:=@GNU/diffutils + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@GNU/diffutils +PKG_MD5SUM:=684aaba1baab743a2a90e52162ff07da + +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk @@ -24,21 +27,30 @@ define Package/diffutils endef define Package/diffutils/description - The Diffutils package contains programs that show the differences between files or directories. + The Diffutils package contains programs that show the differences between + files or directories. endef -define Build/Configure - $(CP) $(SCRIPT_DIR)/config.* $(PKG_BUILD_DIR)/config/ - $(call Build/Configure/Default,ac_cv_func_mempcpy=n) +CONFIGURE_VARS += \ + ac_cv_func_mempcpy=n \ + +define Package/diffutils/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{sdiff,diff3,diff,cmp} $(1)/usr/bin/ endef -define Build/Compile - $(MAKE_VARS) $(MAKE) $(MAKE_ARGS) -C $(PKG_BUILD_DIR) all +define Package/diffutils/preinst +#!/bin/sh +if [ -e $${IPKG_INSTROOT}/usr/bin/diff ]; then + rm $${IPKG_INSTROOT}/usr/bin/diff; +fi endef -define Package/diffutils/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/{sdiff,diff3,diff,cmp} $(1)/usr/bin/ +define Package/diffutils/postrm +#!/bin/sh +ln -sf ../../bin/busybox $${IPKG_INSTROOT}/usr/bin/diff +$${IPKG_INSTROOT}/usr/bin/diff 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/usr/bin/diff +exit 0 endef $(eval $(call BuildPackage,diffutils)) -- 2.30.2