cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "unknown" version

Browse Source 
Fix and diff from maintainer Lucas
This commit is contained in:
rsadowski 2021-08-23 05:38:49 +00:00
parent a53f965825
commit 61968c7305
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/prosody/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.63 2021/08/23 05:37:42 rsadowski Exp $
# $OpenBSD: Makefile,v 1.64 2021/08/23 05:38:49 rsadowski Exp $
COMMENT = communications server for Jabber/XMPP written in Lua
DISTNAME = prosody-0.11.10
CATEGORIES = net
HOMEPAGE = https://prosody.im/
REVISION = 0
MAINTAINER = Lucas <lucas@sexy.is>

28
net/prosody/patches/patch-makefile
View File

@ -1,4 +1,8 @@
$OpenBSD: patch-makefile,v 1.1 2019/02/07 19:23:39 danj Exp $
$OpenBSD: patch-makefile,v 1.2 2021/08/23 05:38:49 rsadowski Exp $
- First hunk: fix directories
- Second hunk: fix `prosody.version` target to stop reporting prosody
version as `unknown`
Index: makefile
--- makefile.orig
@ -18,3 +22,25 @@ Index: makefile
INSTALLEDSOURCE = $(LIBDIR)/prosody
INSTALLEDCONFIG = $(SYSCONFDIR)
@@ -90,12 +90,12 @@ prosody.cfg.lua.install: prosody.cfg.lua.dist
sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > $@
prosody.version:
- test -f prosody.release && \
- cp prosody.release $@ || \
- test -f .hg_archival.txt && \
- sed -n 's/^node: \(............\).*/\1/p' .hg_archival.txt > $@ || \
- test -f .hg/dirstate && \
- hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || \
- echo unknown > $@
-
-
+ if [ -f prosody.release ]; then \
+ cp prosody.release $@; \
+ elif [ -f .hg_archival.txt ]; then \
+ sed -n 's/^node: \(............\).*/\1/p' .hg_archival.txt > $@; \
+ elif [ -f .hg/dirstate ]; then \
+ hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@; \
+ else \
+ echo unknown > $@; \
+ fi