pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/prosody prosody: remove requirement for gmake to ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/13cc50610461
branches:  trunk
changeset: 412604:13cc50610461
user:      khorben <khorben%pkgsrc.org@localhost>
date:      Mon Mar 09 19:37:20 2020 +0000

description:
prosody: remove requirement for gmake to build

While there, install two modules which were missing in the patched
Makefile; bumps PKGREVISION.

No other changes intended.

diffstat:

 chat/prosody/Makefile                     |    8 +-
 chat/prosody/PLIST                        |    7 +-
 chat/prosody/distinfo                     |    5 +-
 chat/prosody/patches/patch-GNUmakefile    |   90 --------------------------
 chat/prosody/patches/patch-certs_makefile |   19 +++++
 chat/prosody/patches/patch-makefile       |  101 ++++++++++++++++++++++++++++++
 6 files changed, 133 insertions(+), 97 deletions(-)

diffs (truncated from 306 to 300 lines):

diff -r 9cd029821c6f -r 13cc50610461 chat/prosody/Makefile
--- a/chat/prosody/Makefile     Mon Mar 09 19:00:12 2020 +0000
+++ b/chat/prosody/Makefile     Mon Mar 09 19:37:20 2020 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2020/01/23 18:26:15 gdt Exp $
+# $NetBSD: Makefile,v 1.32 2020/03/09 19:37:20 khorben Exp $
 #
 
 DISTNAME=              prosody-0.11.4
+PKGREVISION=           1
 CATEGORIES=            chat
 MASTER_SITES=          https://prosody.im/downloads/source/
 
@@ -17,7 +18,6 @@
 
 HAS_CONFIGURE=         yes
 USE_LANGUAGES=         c99
-USE_TOOLS+=            gmake
 BUILD_DEFS+=           VARBASE
 
 LUA_VERSIONS_ACCEPTED= 52 51
@@ -53,7 +53,7 @@
 SUBST_CLASSES+=                path
 SUBST_MESSAGE.path=    Fixing default paths
 SUBST_STAGE.path=      pre-configure
-SUBST_FILES.path=      GNUmakefile man/prosodyctl.man prosody.cfg.lua.dist
+SUBST_FILES.path=      makefile man/prosodyctl.man prosody.cfg.lua.dist
 SUBST_SED.path=                -e 's,/etc/prosody,${PKG_SYSCONFDIR},g'
 SUBST_VARS.path=       EGDIR PROSODY_DATA PROSODY_LOG PROSODY_RUN
 
@@ -67,7 +67,7 @@
 
 CFLAGS+=               -fPIC -Wall -DLUA_COMPAT_MODULE
 MAKE_ENV.SunOS+=       SOCKET_LIB=-lsocket
-MAKE_FILE=             GNUmakefile
+MAKE_FILE=             makefile
 
 RCD_SCRIPTS=           prosody
 
diff -r 9cd029821c6f -r 13cc50610461 chat/prosody/PLIST
--- a/chat/prosody/PLIST        Mon Mar 09 19:00:12 2020 +0000
+++ b/chat/prosody/PLIST        Mon Mar 09 19:37:20 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2020/01/23 18:26:15 gdt Exp $
+@comment $NetBSD: PLIST,v 1.11 2020/03/09 19:37:20 khorben Exp $
 bin/prosody
 bin/prosodyctl
 lib/prosody/core/certmanager.lua
@@ -43,6 +43,9 @@
 lib/prosody/modules/mod_lastactivity.lua
 lib/prosody/modules/mod_legacyauth.lua
 lib/prosody/modules/mod_limits.lua
+lib/prosody/modules/mod_mam/mamprefs.lib.lua
+lib/prosody/modules/mod_mam/mamprefsxml.lib.lua
+lib/prosody/modules/mod_mam/mod_mam.lua
 lib/prosody/modules/mod_message.lua
 lib/prosody/modules/mod_motd.lua
 lib/prosody/modules/mod_muc_mam.lua
@@ -57,6 +60,8 @@
 lib/prosody/modules/mod_presence.lua
 lib/prosody/modules/mod_private.lua
 lib/prosody/modules/mod_proxy65.lua
+lib/prosody/modules/mod_pubsub/mod_pubsub.lua
+lib/prosody/modules/mod_pubsub/pubsub.lib.lua
 lib/prosody/modules/mod_register.lua
 lib/prosody/modules/mod_register_ibr.lua
 lib/prosody/modules/mod_register_limits.lua
diff -r 9cd029821c6f -r 13cc50610461 chat/prosody/distinfo
--- a/chat/prosody/distinfo     Mon Mar 09 19:00:12 2020 +0000
+++ b/chat/prosody/distinfo     Mon Mar 09 19:37:20 2020 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.17 2020/03/09 19:00:12 khorben Exp $
+$NetBSD: distinfo,v 1.18 2020/03/09 19:37:20 khorben Exp $
 
 SHA1 (prosody-0.11.4.tar.gz) = 59e9e684230c26daf53526e18b0e6e2efb0d63c5
 RMD160 (prosody-0.11.4.tar.gz) = c177c6f58054bd595e11b9d83b2889c8d67ba611
 SHA512 (prosody-0.11.4.tar.gz) = 0c3aa3373c53f803b88a87dad4ca18b215de7a485d29b0bc4b186d97f7c48262840199a74f62aba6b7b4f1766fdfb37327ed4ff24e877c3a6dfca58764a035c3
 Size (prosody-0.11.4.tar.gz) = 423518 bytes
-SHA1 (patch-GNUmakefile) = 6f2bf449923db2ebd970535b4b0975d3dd277f28
+SHA1 (patch-certs_makefile) = 8a3c9640cf01d034a1e8edbfc86fb319f27c875b
+SHA1 (patch-makefile) = d7931c59b043a73d79a3acaf3bbf66c0e78beb88
 SHA1 (patch-prosody.cfg.lua.dist) = e8cc3a467b21bfe606a87beb412cebac71a627a9
 SHA1 (patch-util-src_GNUmakefile) = d64699fb842be5fb963085dcb1edff67cd130161
 SHA1 (patch-util-src_hashes.c) = e955d3ab2d170dce179bee8eed559ba57f825497
diff -r 9cd029821c6f -r 13cc50610461 chat/prosody/patches/patch-GNUmakefile
--- a/chat/prosody/patches/patch-GNUmakefile    Mon Mar 09 19:00:12 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-$NetBSD: patch-GNUmakefile,v 1.2 2020/03/09 19:00:12 khorben Exp $
-
-Fix installation directories and scripts
-
---- GNUmakefile.orig   2019-08-31 14:08:45.000000000 +0000
-+++ GNUmakefile
-@@ -3,10 +3,11 @@ include config.unix
- 
- BIN = $(DESTDIR)$(PREFIX)/bin
- CONFIG = $(DESTDIR)$(SYSCONFDIR)
-+EGDIR = $(DESTDIR)@EGDIR@
- MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules
- SOURCE = $(DESTDIR)$(LIBDIR)/prosody
- DATA = $(DESTDIR)$(DATADIR)
--MAN = $(DESTDIR)$(PREFIX)/share/man
-+MAN = $(DESTDIR)$(PREFIX)/$(PKGMANDIR)
- 
- INSTALLEDSOURCE = $(LIBDIR)/prosody
- INSTALLEDCONFIG = $(SYSCONFDIR)
-@@ -31,34 +32,42 @@ ifeq ($(EXCERTS),yes)
- endif
- 
- install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so
--      $(MKDIR) $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
--      $(MKDIR_PRIVATE) $(DATA)
--      $(MKDIR) $(MAN)/man1
--      $(MKDIR) $(CONFIG)/certs
--      $(MKDIR) $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
--      $(INSTALL_EXEC) ./prosody.install $(BIN)/prosody
--      $(INSTALL_EXEC) ./prosodyctl.install $(BIN)/prosodyctl
--      $(INSTALL_DATA) core/*.lua $(SOURCE)/core
--      $(INSTALL_DATA) net/*.lua $(SOURCE)/net
--      $(MKDIR) $(SOURCE)/net/http $(SOURCE)/net/resolvers $(SOURCE)/net/websocket
--      $(INSTALL_DATA) net/http/*.lua $(SOURCE)/net/http
--      $(INSTALL_DATA) net/resolvers/*.lua $(SOURCE)/net/resolvers
--      $(INSTALL_DATA) net/websocket/*.lua $(SOURCE)/net/websocket
--      $(INSTALL_DATA) util/*.lua $(SOURCE)/util
--      $(INSTALL_DATA) util/*.so $(SOURCE)/util
--      $(MKDIR) $(SOURCE)/util/sasl
--      $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl
--      $(MKDIR) $(MODULES)/mod_s2s $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam
--      $(INSTALL_DATA) plugins/*.lua $(MODULES)
--      $(INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES)/mod_s2s
--      $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub
--      $(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
--      $(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc
--      $(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam
--      $(INSTALL_DATA) certs/* $(CONFIG)/certs
--      $(INSTALL_DATA) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
--      test -f $(CONFIG)/prosody.cfg.lua || $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
--      -test -f prosody.version && $(INSTALL_DATA) prosody.version $(SOURCE)/prosody.version
-+      $(BSD_INSTALL_SCRIPT_DIR) $(BIN)
-+      $(BSD_INSTALL_DATA_DIR) $(EGDIR)
-+      $(BSD_INSTALL_DATA_DIR) $(MODULES)
-+      $(BSD_INSTALL_DATA_DIR) $(SOURCE)
-+      $(BSD_INSTALL_DATA_DIR) -m 750 $(DATA)
-+      $(BSD_INSTALL_MAN_DIR) $(MAN)/man1
-+      $(BSD_INSTALL_LIB_DIR) $(SOURCE)/core
-+      $(BSD_INSTALL_LIB_DIR) $(SOURCE)/net
-+      $(BSD_INSTALL_LIB_DIR) $(SOURCE)/util
-+      $(BSD_INSTALL_SCRIPT) ./prosody.install $(BIN)/prosody
-+      $(BSD_INSTALL_SCRIPT) ./prosodyctl.install $(BIN)/prosodyctl
-+      $(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
-+      $(BSD_INSTALL_LIB_DIR) $(SOURCE)/net/resolvers
-+      $(BSD_INSTALL_DATA) net/resolvers/*.lua $(SOURCE)/net/resolvers
-+      $(BSD_INSTALL_LIB_DIR) $(SOURCE)/net/websocket
-+      $(BSD_INSTALL_DATA) net/websocket/*.lua $(SOURCE)/net/websocket
-+      $(BSD_INSTALL_DATA) util/*.lua $(SOURCE)/util
-+      $(BSD_INSTALL_LIB) util/*.so $(SOURCE)/util
-+      $(BSD_INSTALL_LIB_DIR) $(SOURCE)/util/sasl
-+      $(BSD_INSTALL_DATA) util/sasl/* $(SOURCE)/util/sasl
-+      $(BSD_INSTALL_DATA) plugins/*.lua $(MODULES)
-+      $(BSD_INSTALL_DATA_DIR) $(EGDIR)/certs
-+      $(BSD_INSTALL_DATA) certs/* $(EGDIR)/certs
-+      $(BSD_INSTALL_LIB_DIR) $(MODULES)/adhoc
-+      $(BSD_INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
-+      $(BSD_INSTALL_LIB_DIR) $(MODULES)/mod_s2s
-+      $(BSD_INSTALL_DATA) plugins/mod_s2s/* $(MODULES)/mod_s2s
-+      $(BSD_INSTALL_LIB_DIR) $(MODULES)/muc
-+      $(BSD_INSTALL_DATA) plugins/muc/* $(MODULES)/muc
-+      $(BSD_INSTALL_LIB_DIR) $(MODULES)/storage
-+      $(BSD_INSTALL_MAN) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
-+      $(BSD_INSTALL_DATA) prosody.cfg.lua.install $(EGDIR)/prosody.cfg.lua
-+      $(BSD_INSTALL_DATA) prosody.version $(SOURCE)/prosody.version
-       $(MAKE) install -C util-src
- 
- clean:
diff -r 9cd029821c6f -r 13cc50610461 chat/prosody/patches/patch-certs_makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/prosody/patches/patch-certs_makefile Mon Mar 09 19:37:20 2020 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-certs_makefile,v 1.1 2020/03/09 19:37:20 khorben Exp $
+
+Also generate localhost.cnf
+
+--- certs/makefile.orig        2020-01-02 09:49:37.000000000 +0000
++++ certs/makefile
+@@ -12,7 +12,12 @@ keysize=2048
+ # to generate a self signed certificate.
+ 
+ ${.TARGETS:M*.crt}: 
++      $(MAKE) ${.TARGET:R}.cnf
+       openssl req -new -x509 -newkey rsa:$(keysize) -nodes -keyout ${.TARGET:R}.key \
+               -days 365 -sha256 -out $@ -utf8 -subj /CN=${.TARGET:R}
+ 
++# Generate a config from the example
++${.TARGETS:M*.cnf}:
++      sed 's,example\.com,$*,g' openssl.cnf > $@
++
+ .SUFFIXES: .key .crt
diff -r 9cd029821c6f -r 13cc50610461 chat/prosody/patches/patch-makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/prosody/patches/patch-makefile       Mon Mar 09 19:37:20 2020 +0000
@@ -0,0 +1,101 @@
+$NetBSD: patch-makefile,v 1.1 2020/03/09 19:37:20 khorben Exp $
+
+Fix installation directories and scripts
+
+--- makefile.orig      2020-01-02 09:49:37.000000000 +0000
++++ makefile
+@@ -3,10 +3,11 @@ include config.unix
+ 
+ BIN = $(DESTDIR)$(PREFIX)/bin
+ CONFIG = $(DESTDIR)$(SYSCONFDIR)
++EGDIR = $(DESTDIR)@EGDIR@
+ MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules
+ SOURCE = $(DESTDIR)$(LIBDIR)/prosody
+ DATA = $(DESTDIR)$(DATADIR)
+-MAN = $(DESTDIR)$(PREFIX)/share/man
++MAN = $(DESTDIR)$(PREFIX)/$(PKGMANDIR)
+ 
+ INSTALLEDSOURCE = $(LIBDIR)/prosody
+ INSTALLEDCONFIG = $(SYSCONFDIR)
+@@ -28,37 +29,52 @@ all: prosody.install prosodyctl.install 
+ .endif
+ 
+ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so
+-      $(MKDIR) $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
+-      $(MKDIR_PRIVATE) $(DATA)
+-      $(MKDIR) $(MAN)/man1
+-      $(MKDIR) $(CONFIG)/certs
+-      $(MKDIR) $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
+-      $(INSTALL_EXEC) ./prosody.install $(BIN)/prosody
+-      $(INSTALL_EXEC) ./prosodyctl.install $(BIN)/prosodyctl
+-      $(INSTALL_DATA) core/*.lua $(SOURCE)/core
+-      $(INSTALL_DATA) net/*.lua $(SOURCE)/net
+-      $(MKDIR) $(SOURCE)/net/http $(SOURCE)/net/resolvers $(SOURCE)/net/websocket
+-      $(INSTALL_DATA) net/http/*.lua $(SOURCE)/net/http
+-      $(INSTALL_DATA) net/resolvers/*.lua $(SOURCE)/net/resolvers
+-      $(INSTALL_DATA) net/websocket/*.lua $(SOURCE)/net/websocket
+-      $(INSTALL_DATA) util/*.lua $(SOURCE)/util
+-      $(INSTALL_DATA) util/*.so $(SOURCE)/util
+-      $(MKDIR) $(SOURCE)/util/sasl
+-      $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl
+-      $(MKDIR) $(MODULES)/mod_s2s $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam
+-      $(INSTALL_DATA) plugins/*.lua $(MODULES)
+-      $(INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES)/mod_s2s
+-      $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub
+-      $(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
+-      $(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc
+-      $(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam
++      $(BSD_INSTALL_SCRIPT_DIR) $(BIN)
++      $(BSD_INSTALL_DATA_DIR) $(EGDIR)
++      $(BSD_INSTALL_DATA_DIR) $(MODULES)
++      $(BSD_INSTALL_DATA_DIR) $(SOURCE)
++      $(BSD_INSTALL_DATA_DIR) -m 750 $(DATA)
++      $(BSD_INSTALL_MAN_DIR) $(MAN)/man1
++      $(BSD_INSTALL_SCRIPT) ./prosody.install $(BIN)/prosody
++      $(BSD_INSTALL_SCRIPT) ./prosodyctl.install $(BIN)/prosodyctl
++      $(BSD_INSTALL_LIB_DIR) $(SOURCE)/core
++      $(BSD_INSTALL_DATA) core/*.lua $(SOURCE)/core
++      $(BSD_INSTALL_LIB_DIR) $(SOURCE)/net
++      $(BSD_INSTALL_DATA) net/*.lua $(SOURCE)/net
++      $(BSD_INSTALL_LIB_DIR) $(SOURCE)/net/http
++      $(BSD_INSTALL_DATA) net/http/*.lua $(SOURCE)/net/http
++      $(BSD_INSTALL_LIB_DIR) $(SOURCE)/net/resolvers
++      $(BSD_INSTALL_DATA) net/resolvers/*.lua $(SOURCE)/net/resolvers
++      $(BSD_INSTALL_LIB_DIR) $(SOURCE)/net/websocket
++      $(BSD_INSTALL_DATA) net/websocket/*.lua $(SOURCE)/net/websocket
++      $(BSD_INSTALL_LIB_DIR) $(SOURCE)/util
++      $(BSD_INSTALL_DATA) util/*.lua $(SOURCE)/util
++      $(BSD_INSTALL_LIB) util/*.so $(SOURCE)/util
++      $(BSD_INSTALL_LIB_DIR) $(SOURCE)/util/sasl
++      $(BSD_INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl
++      $(BSD_INSTALL_LIB_DIR) $(MODULES)
++      $(BSD_INSTALL_DATA) plugins/*.lua $(MODULES)
++      $(BSD_INSTALL_LIB_DIR) $(MODULES)/mod_s2s
++      $(BSD_INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES)/mod_s2s
++      $(BSD_INSTALL_LIB_DIR) $(MODULES)/mod_pubsub
++      $(BSD_INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub
++      $(BSD_INSTALL_DATA_DIR) $(EGDIR)/certs
++      $(BSD_INSTALL_DATA) certs/*.cnf $(EGDIR)/certs
++      $(BSD_INSTALL_DATA) certs/*makefile $(EGDIR)/certs
++      $(BSD_INSTALL_LIB_DIR) $(MODULES)/adhoc
++      $(BSD_INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
++      $(BSD_INSTALL_LIB_DIR) $(MODULES)/muc
++      $(BSD_INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc
++      $(BSD_INSTALL_LIB_DIR) $(MODULES)/mod_mam
++      $(BSD_INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam
+ .if $(EXCERTS) == "yes"
+-      $(INSTALL_DATA) certs/localhost.crt certs/localhost.key $(CONFIG)/certs
+-      $(INSTALL_DATA) certs/example.com.crt certs/example.com.key $(CONFIG)/certs
++      $(BSD_INSTALL_DATA_DIR) $(EGDIR)/certs
++      $(BSD_INSTALL_DATA) certs/localhost.crt certs/localhost.key $(EGDIR)/certs
++      $(BSD_INSTALL_DATA) certs/example.com.crt certs/example.com.key $(EGDIR)/certs
+ .endif
+-      $(INSTALL_DATA) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
+-      test -f $(CONFIG)/prosody.cfg.lua || $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
+-      -test -f prosody.version && $(INSTALL_DATA) prosody.version $(SOURCE)/prosody.version



Home | Main Index | Thread Index | Old Index