X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=utils%2Fpsmisc%2FMakefile;h=cd06b0870dc71b198efd3d8aed280d8d6d8eb09a;hb=HEAD;hp=267ee127838efb49c709622e59af661e284e6c36;hpb=3e49640186b5d43d0a16054c57b89e5a5bd34f36;p=packages.git

diff --git a/utils/psmisc/Makefile b/utils/psmisc/Makefile
index 267ee1278..cd06b0870 100644
--- a/utils/psmisc/Makefile
+++ b/utils/psmisc/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=psmisc
-PKG_VERSION:=22.11
+PKG_VERSION:=22.16
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://psmisc.sourceforge.net
-PKG_MD5SUM:=b5d32aa285b75c59dee96d3ea26a4881
+PKG_SOURCE_URL:=@SF/psmisc
+PKG_MD5SUM:=d52caf26159c905574c2ce4bd792b9ee
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -22,7 +25,7 @@ define Package/psmisc
   CATEGORY:=Utilities
   DEPENDS:=+libncurses
   TITLE:=proc utilities
-  URL:=http://sourceforge.net/projects/psmisc/
+  URL:=http://psmisc.sourceforge.net/
 endef
 
 define Package/psmisc/description
@@ -30,18 +33,33 @@ define Package/psmisc/description
  the proc filesystem: fuser, killall, pstree, and prtstat
 endef
 
+CONFIGURE_ARGS += \
+	--disable-harden-flags
+
 MAKE_FLAGS += \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	CPPFLAGS="$(TARGET_CPPFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)"
+
+define Package/psmisc/preinst
+#!/bin/sh
+if [ -e $${IPKG_INSTROOT}/usr/bin/killall ]; then
+  rm $${IPKG_INSTROOT}/usr/bin/killall;
+fi
+endef
 
 define Package/psmisc/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/fuser $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/killall $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/pstree $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/prtstat $(1)/usr/bin
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/bin/{fuser,killall,prtstat,pstree} \
+		$(1)/usr/bin/
+endef
+
+define Package/psmisc/postrm
+#!/bin/sh
+ln -sf ../../bin/busybox $${IPKG_INSTROOT}/usr/bin/killall
+$${IPKG_INSTROOT}/usr/bin/killall 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/usr/bin/killall
+exit 0
 endef
 
 $(eval $(call BuildPackage,psmisc))