packages: prune empty dirs, closes #3078

[openwrt/svn-archive/archive.git] / net / socat / Makefile

diff --git a/net/socat/Makefile b/net/socat/Makefile
index 1cf8f93ccbfb0a4bc0b9881175df21f79bf04210..227464831de5a5cfeace086fd826bee767457046 100644 (file)
--- a/net/socat/Makefile
+++ b/net/socat/Makefile
@@ -10,12 +10,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=socat
 PKG_VERSION:=1.4.3.0
-PKG_RELEASE:=1
-PKG_MD5SUM:=ce574e75c2fda4456e8efd4efb86ec5e
+PKG_RELEASE:=2
 
-PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_CAT:=bzcat
+PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download/
+PKG_MD5SUM:=ce574e75c2fda4456e8efd4efb86ec5e
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-1.4
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -25,29 +24,40 @@ include $(INCLUDE_DIR)/package.mk
 define Package/socat
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libopenssl +libpthread
+  DEPENDS:=+libpthread
   TITLE:=A multipurpose relay (SOcket CAT)
-  DESCRIPTION:=SoCat (for SOcket CAT) establishes two bidirectional byte streams and\\\
-       transfers data between them.\\\
-       Data channels may be files, pipes, devices (terminal or modem, etc.), or\\\
-       sockets (Unix, IPv4, IPv6, raw, UDP, TCP, SSL). It provides forking,\\\
-       logging and tracing, different modes for interprocess communication and\\\
-       many more options.\\\
   URL:=http://www.dest-unreach.org/socat/
 endef
 
+define Package/socat/description
+       SoCat (for SOcket CAT) establishes two bidirectional byte streams and 
+       transfers data between them.
+       Data channels may be files, pipes, devices (terminal or modem, etc.), or 
+       sockets (Unix, IPv4, IPv6, raw, UDP, TCP, SSL). It provides forking, 
+       logging and tracing, different modes for interprocess communication and 
+       many more options.
+endef
+
 define Build/Configure
-$(call Build/Configure/Default,--disable-libwrap \
-                        --disable-readline, sc_cv_termios_ispeed="no")
+       $(call Build/Configure/Default, \
+               --disable-libwrap \
+               --disable-readline \
+               --disable-termios \
+               --disable-openssl \
+               , \
+               sc_cv_termios_ispeed="no" \
+       )
 endef
 
 define Build/Compile   
-$(call Build/Compile/Default, DESTDIR="$(PKG_INSTALL_DIR)" all install)
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               all install
 endef
 
 define Package/socat/install   
-       install -d -m0755 $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/socat $(1)/usr/bin/
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/socat $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,socat))