[packages] prosody: add missing dependency on libopenssl, bump release number
[openwrt/svn-archive/archive.git] / net / prosody / Makefile
index d634394..a6ed1eb 100644 (file)
@@ -4,24 +4,23 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=prosody
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=prosody
-PKG_VERSION:=0.3.0
-PKG_RELEASE:=1
+PKG_VERSION:=0.4.0
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://prosody.im/downloads/source/
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://prosody.im/downloads/source/
-PKG_MD5SUM:=97b19d75b3d6770fb9b46b6452f945dd
+PKG_MD5SUM:=c143532a289a72d5d48b81b5bdac7c25
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/prosody
   SECTION:=net
   CATEGORY:=Network
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/prosody
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+liblua +libidn +luasocket +luaexpat +luasec
+  DEPENDS:=+liblua +libidn +libopenssl +luasocket +luaexpat +luasec
   TITLE:=XMPP server
   URL:=http://prosody.im
 endef
   TITLE:=XMPP server
   URL:=http://prosody.im
 endef
@@ -37,10 +36,11 @@ define Package/prosody/conffiles
 endef
 
 define Build/Configure
 endef
 
 define Build/Configure
+       # this is *NOT* GNU autoconf stuff
        (cd $(PKG_BUILD_DIR); ./configure \
                --prefix=/usr \
                --with-lua="$(STAGING_DIR)/host/bin" \
        (cd $(PKG_BUILD_DIR); ./configure \
                --prefix=/usr \
                --with-lua="$(STAGING_DIR)/host/bin" \
-               --with-lua-include="$(STAGING_DIR)/usr/include/" \
+               --with-lua-include="$(STAGING_DIR)/usr/include" \
                --with-lua-lib="$(STAGING_DIR)/usr/lib" \
                --cflags="$(TARGET_CFLAGS)" \
        )
                --with-lua-lib="$(STAGING_DIR)/usr/lib" \
                --cflags="$(TARGET_CFLAGS)" \
        )
@@ -48,8 +48,8 @@ endef
 
 define Build/Compile
        $(call Build/Compile/Default,\
 
 define Build/Compile
        $(call Build/Compile/Default,\
-               CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+               CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                PREFIX="/usr" \
                all install \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                PREFIX="/usr" \
                all install \
@@ -57,7 +57,7 @@ define Build/Compile
 endef
 
 define Package/prosody/install
 endef
 
 define Package/prosody/install
-       $(INSTALL_DIR) $(1)/
+       $(INSTALL_DIR) $(1)
        $(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
        $(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef