diff --git a/utils/sispmctl/Makefile b/utils/sispmctl/Makefile index 77a73fddf..76500c9f5 100644 --- a/utils/sispmctl/Makefile +++ b/utils/sispmctl/Makefile @@ -8,29 +8,34 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sispmctl -PKG_VERSION:=3.1+20120206 +PKG_VERSION:=4.0 PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=5ff4a05a5bcb6a64a9d6f77fed47014512f66b11 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_MIRROR_HASH:=d09782160dbcc1ba3bd6a38941f38e130049d8383843f6f292409909678aed82 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_URL:=https://git.code.sf.net/p/sispmctl/git +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/$(PKG_NAME) +PKG_HASH:=442d9bb9774da7214c222144035ac68ad5d25171040ce2731cfdf49b3365cfd5 PKG_MAINTAINER:=Richard Kunze PKG_LICENSE:=GPL-2.0+ +PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 -PKG_FIXUP:=autoreconf include $(INCLUDE_DIR)/package.mk +define Package/libsispmctl + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Silver Shield PM Control for Linux library + URL:=http://sispmctl.sourceforge.net + DEPENDS:=+libusb-compat +endef + define Package/sispmctl SECTION:=utils CATEGORY:=Utilities TITLE:=Silver Shield PM Control for Linux - URL:=http://sispmctl.sourceforge.net/ - DEPENDS:=+libusb-compat + URL:=http://sispmctl.sourceforge.net + DEPENDS:=+libsispmctl endef define Package/sispmctl/description @@ -49,9 +54,15 @@ CONFIGURE_ARGS += \ --enable-webless \ --disable-dependency-tracking +define Package/libsispmctl/install + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libsispmctl* $(1)/usr/lib/ +endef + define Package/sispmctl/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sispmctl $(1)/usr/bin/ endef +$(eval $(call BuildPackage,libsispmctl)) $(eval $(call BuildPackage,sispmctl)) diff --git a/utils/sispmctl/patches/001-fix-includes.patch b/utils/sispmctl/patches/001-fix-includes.patch deleted file mode 100644 index 218e22e1c..000000000 --- a/utils/sispmctl/patches/001-fix-includes.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/src/sispm_ctl.c -+++ b/src/sispm_ctl.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - #include - #include "sispm_ctl.h" ---- a/src/main.c -+++ b/src/main.c -@@ -34,11 +34,11 @@ - #define __USE_XOPEN - #include - #include --#include - #include - #include - #include - #include -+#include - - #include -