head 1.3; access; symbols; locks; strict; comment @# @; 1.3 date 2020.03.09.19.37.20; author khorben; state dead; branches; next 1.2; commitid GOaBBkYI3xHajLZB; 1.2 date 2020.03.09.19.00.12; author khorben; state Exp; branches; next 1.1; commitid Ca5MhN30R0yR6LZB; 1.1 date 2020.01.23.18.26.15; author gdt; state Exp; branches; next ; commitid Exbe7mDOuPRkpQTB; desc @@ 1.3 log @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. @ text @$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: @ 1.2 log @prosody: fix the build with an alternative LOCALBASE @ text @d1 1 a1 1 $NetBSD: patch-GNUmakefile,v 1.1 2020/01/23 18:26:15 gdt Exp $ @ 1.1 log @chat/prosody: Update to 0.11.4 Update prepared in wip by Tiago Seco. Changes in 0.11.4 ================= Fixes and improvements core.rostermanager: Improve performance by caching rosters of offline #1233 mod_pep: Handling subscriptions more efficiently #1372 Minor changes util.interpolation: Support unescaped variables with more modifiers #1452 MUC: Mark source of historic messages correctly #1416 mod_auth_internal_hashed: Pass on errors #1477 mod_mam, mod_muc_mam: Improve logging of failures #1478, #1480, #1481 mod_muc, mod_muc_mam: Reschedule message expiry in case of failure mod_mam: Add flag to session when it performs a MAM query prosodyctl check: Warn about conflict between mod_pep and mod_pep_simple prosodyctl check: Warn about conflict between mod_vcard and mod_vcard_legacy #1469 core.modulemanager: Disable mod_vcard if mod_vcard_legacy is enabled to prevent conflict #1469 MUC: Strip tags with MUC-related namespaces from private messages #1427 MUC: Don't advertise registration feature on host #1451 mod_vcard_legacy: Fix handling of empty photo elements #1432 mod_vcard_legacy: Advertise lack of avatar correctly #1431 prosodyctl: Handle if the setting proxy65_address has the wrong type prosodyctl: Print a blank line to improve spacing and readability MUC: Fix role loss in Nickname change #1466 util.pposix: Fix reporting of memory usage in 2-4GB range #1445 util.startup: Fix a regression concerning directory paths #1430 mod_websocket: Don't mask WebSocket pong answers #1484 net.resolvers: Apply IDNA conversion to ascii for DNS lookups (affects only HTTP queries) #1426 net.resolvers.basic: Fix resolution of IPv6 literals (in brackets) #1459 @ text @d1 1 a1 1 $NetBSD$ d11 1 a11 1 +EGDIR = $(DESTDIR)/usr/pkg/share/examples/prosody @