Update prosody to 0.3.0, adjust dependencies, thanks to OrazioPirataDelloSpazio

SVN-Revision: 14521

diff --git a/net/prosody/Makefile b/net/prosody/Makefile
index e3b9f73f1b2c56af3ab900e249931f2a1dc21730..d634394df66b9b8c7081fcc89701ce394f012db7 100644 (file)
--- a/net/prosody/Makefile
+++ b/net/prosody/Makefile
@@ -9,19 +9,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=prosody
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=prosody

-PKG_VERSION:=0.2.0
+PKG_VERSION:=0.3.0

 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://prosody.im/downloads/source/
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://prosody.im/downloads/source/

-PKG_MD5SUM:=825b37b6917e5c21a8596c027e0972ec
+PKG_MD5SUM:=97b19d75b3d6770fb9b46b6452f945dd

 
 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
+  DEPENDS:=+liblua +libidn +luasocket +luaexpat +luasec

   TITLE:=XMPP server
   URL:=http://prosody.im
 endef
   TITLE:=XMPP server
   URL:=http://prosody.im
 endef

diff --git a/net/prosody/patches/001-cross_compile.patch b/net/prosody/patches/001-cross_compile.patch
deleted file mode 100644 (file)
index 71180a5..0000000
--- a/net/prosody/patches/001-cross_compile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN prosody-0.2.0/util-src/Makefile prosody-0.2.0.new/util-src/Makefile
---- prosody-0.2.0/util-src/Makefile    2008-12-27 22:54:07.000000000 +0100
-+++ prosody-0.2.0.new/util-src/Makefile        2009-01-28 12:25:44.000000000 +0100
-@@ -20,18 +20,18 @@
-       rm -f ../util/*.so
- 
- encodings.o: encodings.c
--      gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.c
-+      $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.c
- encodings.so: encodings.o
--      export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o encodings.so encodings.o -L/usr/local/lib -llua$(LUA_SUFFIX) -lcrypto -lidn
-+      export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(LFLAGS) -o encodings.so encodings.o -L$(STAGING_DIR)/usr/lib -llua$(LUA_SUFFIX) -lcrypto -lidn
-       
- 
- hashes.o: hashes.c
--      gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o hashes.o hashes.c
-+      $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o hashes.o hashes.c
- hashes.so: hashes.o
--      export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o hashes.so hashes.o -L/usr/local/lib -llua$(LUA_SUFFIX) -lcrypto -lssl
-+      export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(LFLAGS) -o hashes.so hashes.o -L$(STAGING_DIR)/usr/lib -llua$(LUA_SUFFIX) -lcrypto -lssl
- 
- pposix.o: pposix.c
--      gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o pposix.o pposix.c
-+      $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o pposix.o pposix.c
- pposix.so: pposix.o
--      export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o pposix.so pposix.o -L/usr/local/lib -llua$(LUA_SUFFIX)
-+      export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(LFLAGS) -o pposix.so pposix.o -L$(STAGING_DIR)/usr/lib -llua$(LUA_SUFFIX)
-       

diff --git a/net/prosody/patches/001-util_src_makefile.patch b/net/prosody/patches/001-util_src_makefile.patch
new file mode 100644 (file)
index 0000000..f675d6f
--- /dev/null
+++ b/net/prosody/patches/001-util_src_makefile.patch
@@ -0,0 +1,37 @@
+diff -urN prosody-0.3.0/util-src/Makefile prosody-0.3.0.new/util-src/Makefile
+--- prosody-0.3.0/util-src/Makefile    2009-02-02 19:05:21.000000000 +0100
++++ prosody-0.3.0.new/util-src/Makefile        2009-02-15 14:44:53.000000000 +0100
+@@ -6,7 +6,7 @@
+ LUA_LIB?=lua$(LUA_SUFFIX)
+ IDN_LIB?=idn
+ OPENSSL_LIB?=crypto
+-
++CC=gcc
+ 
+ 
+ all: encodings.so hashes.so pposix.so
+@@ -21,18 +21,18 @@
+       rm -f ../util/*.so
+ 
+ encodings.o: encodings.c
+-      gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.c
++      $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.c
+ encodings.so: encodings.o
+-      export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o encodings.so encodings.o -L/usr/local/lib -llua$(LUA_SUFFIX) -lidn
++      export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(LFLAGS) -o encodings.so encodings.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lidn
+       
+ 
+ hashes.o: hashes.c
+-      gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o hashes.o hashes.c
++      $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o hashes.o hashes.c
+ hashes.so: hashes.o
+-      export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o hashes.so hashes.o -L/usr/local/lib -llua$(LUA_SUFFIX) -lcrypto
++      export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(LFLAGS) -o hashes.so hashes.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lcrypto
+ 
+ pposix.o: pposix.c
+-      gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o pposix.o pposix.c
++      $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o pposix.o pposix.c
+ pposix.so: pposix.o
+-      export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o pposix.so pposix.o -L/usr/local/lib -llua$(LUA_SUFFIX)
++      export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(LFLAGS) -o pposix.so pposix.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX)
+