summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chat/prosody/Makefile6
-rw-r--r--chat/prosody/PLIST4
-rw-r--r--chat/prosody/distinfo12
-rw-r--r--chat/prosody/patches/patch-aa8
4 files changed, 13 insertions, 17 deletions
diff --git a/chat/prosody/Makefile b/chat/prosody/Makefile
index ea083844eaf..f9ae1c11111 100644
--- a/chat/prosody/Makefile
+++ b/chat/prosody/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2015/04/15 14:05:46 nros Exp $
+# $NetBSD: Makefile,v 1.22 2016/01/25 13:01:39 fhajny Exp $
#
-DISTNAME= prosody-0.9.8
+DISTNAME= prosody-0.9.9
CATEGORIES= chat
MASTER_SITES= http://prosody.im/downloads/source/
@@ -46,10 +46,8 @@ PKG_SYSCONFSUBDIR= ${PKGBASE}
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
CONF_FILES+= ${EGDIR}/prosody.cfg.lua ${PKG_SYSCONFDIR}/prosody.cfg.lua
CONF_FILES+= ${EGDIR}/certs/example.com.cnf ${PKG_SYSCONFDIR}/certs/example.com.cnf
-CONF_FILES+= ${EGDIR}/certs/example.com.crt ${PKG_SYSCONFDIR}/certs/example.com.crt
CONF_FILES+= ${EGDIR}/certs/example.com.key ${PKG_SYSCONFDIR}/certs/example.com.key
CONF_FILES+= ${EGDIR}/certs/localhost.cnf ${PKG_SYSCONFDIR}/certs/localhost.cnf
-CONF_FILES+= ${EGDIR}/certs/localhost.crt ${PKG_SYSCONFDIR}/certs/localhost.crt
CONF_FILES+= ${EGDIR}/certs/localhost.key ${PKG_SYSCONFDIR}/certs/localhost.key
REPLACE_LUA+= prosody prosodyctl
diff --git a/chat/prosody/PLIST b/chat/prosody/PLIST
index 52a894bb633..bcb2a44bd04 100644
--- a/chat/prosody/PLIST
+++ b/chat/prosody/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2014/03/11 14:04:59 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/01/25 13:01:39 fhajny Exp $
bin/prosody
bin/prosodyctl
lib/prosody/core/certmanager.lua
@@ -134,10 +134,8 @@ lib/prosody/util/xmppstream.lua
man/man1/prosodyctl.1
share/examples/prosody/certs/Makefile
share/examples/prosody/certs/example.com.cnf
-share/examples/prosody/certs/example.com.crt
share/examples/prosody/certs/example.com.key
share/examples/prosody/certs/localhost.cnf
-share/examples/prosody/certs/localhost.crt
share/examples/prosody/certs/localhost.key
share/examples/prosody/certs/openssl.cnf
share/examples/prosody/prosody.cfg.lua
diff --git a/chat/prosody/distinfo b/chat/prosody/distinfo
index d2b7bb4fa68..bed3646f04b 100644
--- a/chat/prosody/distinfo
+++ b/chat/prosody/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2015/11/03 01:20:23 agc Exp $
+$NetBSD: distinfo,v 1.11 2016/01/25 13:01:39 fhajny Exp $
-SHA1 (prosody-0.9.8.tar.gz) = e338eb995f3c594ab6d1f03a7f36224e93c31c0b
-RMD160 (prosody-0.9.8.tar.gz) = d140de5c5bbfc176550e65db053c5adc87884811
-SHA512 (prosody-0.9.8.tar.gz) = 08ca8c8028a947a22d68ddc1d7eb93d3d205894102c900ece9e537ef9dd9332e8509e4b170069383e4f9717b52fd41aec2aa9d959e16ddebf0c3d54fe31aef3c
-Size (prosody-0.9.8.tar.gz) = 268716 bytes
-SHA1 (patch-aa) = db9f0e384e64069101a62e11284dd8b75032512b
+SHA1 (prosody-0.9.9.tar.gz) = 687cef7fe1c39c0309e35fd0718e1906c797bdff
+RMD160 (prosody-0.9.9.tar.gz) = 94a2aa93c4f820a1eb1b8bfadd4b12492e437320
+SHA512 (prosody-0.9.9.tar.gz) = f1b40d312819ba9f7eef0656e3e009319179a6c931fae6886ce8ad0e57c79365431ab3d115c3a9b2c8742e6027e5370af9c4732e01116038f64e0a5af5d396f3
+Size (prosody-0.9.9.tar.gz) = 269415 bytes
+SHA1 (patch-aa) = a51829983e9b4b28ee769a101df3dec00daf677d
SHA1 (patch-ab) = 755dd6d77689ef56ea4468f943f149933be72378
SHA1 (patch-ad) = abcae34982fee846c00252be1c0b033a44ad65d0
SHA1 (patch-prosodyctl) = e3e3a8f03c6d7c74b9026cf7ada765ee86c8397e
diff --git a/chat/prosody/patches/patch-aa b/chat/prosody/patches/patch-aa
index 6fc8dc3115d..4b3ae553e8c 100644
--- a/chat/prosody/patches/patch-aa
+++ b/chat/prosody/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 2015/04/15 14:05:46 nros Exp $
+$NetBSD: patch-aa,v 1.6 2016/01/25 13:01:39 fhajny Exp $
Fix installation directories and scripts
---- Makefile.orig 2015-03-24 19:18:04.000000000 +0000
+--- Makefile.orig 2016-01-08 13:07:07.000000000 +0000
+++ Makefile
@@ -3,10 +3,11 @@ include config.unix
@@ -27,7 +27,7 @@ Fix installation directories and scripts
- install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
- install -m755 ./prosody.install $(BIN)/prosody
- install -m755 ./prosodyctl.install $(BIN)/prosodyctl
-- install -m644 core/* $(SOURCE)/core
+- install -m644 core/*.lua $(SOURCE)/core
- install -m644 net/*.lua $(SOURCE)/net
- install -d $(SOURCE)/net/http
- install -m644 net/http/*.lua $(SOURCE)/net/http
@@ -51,7 +51,7 @@ Fix installation directories and scripts
+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/util
+ $(BSD_INSTALL_SCRIPT) ./prosody.install $(BIN)/prosody
+ $(BSD_INSTALL_SCRIPT) ./prosodyctl.install $(BIN)/prosodyctl
-+ $(BSD_INSTALL_DATA) core/* $(SOURCE)/core
++ $(BSD_INSTALL_DATA) core/*.lua $(SOURCE)/core
+ $(BSD_INSTALL_DATA) net/*.lua $(SOURCE)/net
+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/net/http
+ $(BSD_INSTALL_DATA) net/http/*.lua $(SOURCE)/net/http