From nobody Tue Dec 06 15:48:30 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NRPvz0jF3z4jyTV; Tue, 6 Dec 2022 15:48:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NRPvz0BMYz40SC; Tue, 6 Dec 2022 15:48:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670341711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ap0ht1yBFRWPEwZJLqIQGmK/ONbCTJf94aF3o8hrozk=; b=rL8njGwEd4ocL16Fbr6GrR/DaoTT1oqW6h2oblmSRcOHoIQ/FgRDRmse3PIRdqiY1XbZQo 0gcvi+NQE3kovJpbJOzm0Ut6c6LRajFXQb+h4BqhRDHFnGg+zcZI9kZmLxHynuJ7D3m2xC LWWJVT8vMyLOZXk40NgvQtzCMhTLJYSckfuZEtS6AWH0K54oN6eDW+o2VCWSjBmqwuitJY 3GzWBY1Ih3KIJosy+e0skX4s2aIMkFXxXoENa+8fJ/Nr7tdUs/48lZ7h98ZVb2S0fzolk/ W/jbFQPQxd4W0ricF/mJkXjEI1OvBVS5DqzwG6Gai4+n9orNjObBuf3RfYv1Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670341711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ap0ht1yBFRWPEwZJLqIQGmK/ONbCTJf94aF3o8hrozk=; b=NeKAGkFrjimqwtZ1adfRaDd/YhUT1cQjgdYLr6MaEBcINPyZnMBESHG5L3R07V+J0DCBI+ k0WiOWPoArQW8cvxh4qkTNtIed45+AoKJkSTeA7ExdpWqXbDJMPABntZdCZPU6OrGhIlJg bHh2umb40aoNghG5TALk8MLJ05IgduhrnIjnBgH3fd/1wg5+AYFHcaQpZBH/yvHQRtNF5W IWhlWFfw4qd1Hi1wDnSD4RJ44ebsj8ZSnb3VbOWvfCbBpw/sd9hCcqFRJ5cFLGUqjZLBW3 HDe2gTDAwpxy6qX2qsf9gNpOv4icx4kQ1789WJh0j5rSvZE7GBrj3ekvwQSU8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670341711; a=rsa-sha256; cv=none; b=YYD7uVarjKvV9sfH+WsdclQjf2zkwHHEfKzG+jJeR1jWl3bDRPizOgg2Nn5SbpOS+wDM2a wJSmbUGDYsZQOaDTWIuvQqok3cT/FpJUCVLjIsyIePVdTbGOFGey97ddYFTY5LwL2CBaty P2A6kRNS7fkoKXPFWJcKa1Iaml/j1Iy2aVjHxlCbrfAhWrYmQ6zu//o7y6qxEqEnwm4kIl 7D6A0vBGNhfL8cVnLJmwkFYXgoomsjvqQSidVRKaej4Ien5mx/War7XTA4lLDWiI1ZsAyT oDb9dhVuKEoO1lmpgo6IB40mgXqyJl8aZN3wvcVFOcXtj6i3C1JxZgu6aMBw/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NRPvy6LLXzjdN; Tue, 6 Dec 2022 15:48:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B6FmUjU020388; Tue, 6 Dec 2022 15:48:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B6FmU3l020387; Tue, 6 Dec 2022 15:48:30 GMT (envelope-from git) Date: Tue, 6 Dec 2022 15:48:30 GMT Message-Id: <202212061548.2B6FmU3l020387@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: 8f6592a3ccd3 - main - www/ot-recorder: Update to 0.9.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f6592a3ccd34d5c7c06e327c0aedabbfd5322eb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=8f6592a3ccd34d5c7c06e327c0aedabbfd5322eb commit 8f6592a3ccd34d5c7c06e327c0aedabbfd5322eb Author: Dan Langille AuthorDate: 2022-12-06 15:47:40 +0000 Commit: Dan Langille CommitDate: 2022-12-06 15:48:28 +0000 www/ot-recorder: Update to 0.9.2 Add patch to fix linking issues, already patched upstream. --- www/ot-recorder/Makefile | 10 ++++++---- www/ot-recorder/distinfo | 6 +++--- www/ot-recorder/files/patch-config.mk.in | 22 ++++++++++++++++------ 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/www/ot-recorder/Makefile b/www/ot-recorder/Makefile index 8961caed901f..2fe9cd4fac3b 100644 --- a/www/ot-recorder/Makefile +++ b/www/ot-recorder/Makefile @@ -1,5 +1,5 @@ PORTNAME= ot-recorder -PORTVERSION= 0.9.1 +PORTVERSION= 0.9.2 CATEGORIES= www MAINTAINER= dvl@FreeBSD.org @@ -10,12 +10,14 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= curl>0:ftp/curl \ + e2fsprogs-libuuid>0:misc/e2fsprogs-libuuid \ libconfig>0:devel/libconfig \ lmdb>0:databases/lmdb \ - mosquitto>0:net/mosquitto + mosquitto>0:net/mosquitto \ + pkgconf>0:devel/pkgconf -LIB_DEPENDS= libcurl.so:ftp/curl \ - libconfig.so:devel/libconfig \ +LIB_DEPENDS= libconfig.so:devel/libconfig \ + libcurl.so:ftp/curl \ liblmdb.so:databases/lmdb \ libmosquitto.so:net/mosquitto diff --git a/www/ot-recorder/distinfo b/www/ot-recorder/distinfo index 4e43504f1227..2f6325b98900 100644 --- a/www/ot-recorder/distinfo +++ b/www/ot-recorder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660158594 -SHA256 (owntracks-recorder-0.9.1_GH0.tar.gz) = b74c571706d2bd9546b6817951c71490d058fc480c5634d57d9d7a8b81bf68d2 -SIZE (owntracks-recorder-0.9.1_GH0.tar.gz) = 3306544 +TIMESTAMP = 1670173683 +SHA256 (owntracks-recorder-0.9.2_GH0.tar.gz) = d3632895e46c36c1e484c021958e7bfee3b8977942ab28e7d47cf69c974f988e +SIZE (owntracks-recorder-0.9.2_GH0.tar.gz) = 3306898 diff --git a/www/ot-recorder/files/patch-config.mk.in b/www/ot-recorder/files/patch-config.mk.in index f1c0656e6950..8b43ee7368c9 100644 --- a/www/ot-recorder/files/patch-config.mk.in +++ b/www/ot-recorder/files/patch-config.mk.in @@ -1,6 +1,16 @@ ---- config.mk.in.orig 2022-05-24 07:25:09 UTC +--- config.mk.in.orig 2022-09-29 12:04:51 UTC +++ config.mk.in -@@ -20,10 +20,10 @@ +@@ -13,17 +13,19 @@ + # $ cd /usr/ports/devel/libconfig; make install + # $ cd /usr/ports/net/mosquitto; make install + # $ cd /usr/ports/devel/gmake; make install ++# $ cd /usr/ports/devel/pkgconf; make install ++# $ cd /usr/ports/misc/e2fsprogs-libuuid; make install + # + # Or as a package: + # +-# $ sudo pkg install lmdb curl libconfig mosquitto gmake ++# $ sudo pkg install pkgconf lmdb curl libconfig mosquitto gmake e2fsprogs-libuuid # # Uncomment the following lines and replace "no" with "yes": # @@ -10,12 +20,12 @@ -FREEBSD ?= no +CC = clang +CFLAGS += -I/usr/local/include -+MORELIBS += -L /usr/local/lib ++MORELIBS += -L /usr/local/lib -luuid +FREEBSD ?= YES # # Now build recorder with the "gmake" command: # -@@ -57,10 +57,10 @@ WITH_GREENWICH ?= no +@@ -61,10 +63,10 @@ WITH_GREENWICH ?= no # Where should the recorder store its data? This directory must # exist and be writeable by recorder (and readable by ocat) @@ -28,7 +38,7 @@ # Define the precision for reverse-geo lookups. The higher # the number, the more granular reverse-geo will be: -@@ -83,7 +83,7 @@ GHASHPREC = 7 +@@ -87,7 +89,7 @@ GHASHPREC = 7 JSON_INDENT ?= no # Location of optional default configuration file @@ -36,4 +46,4 @@ +CONFIGFILE = /usr/local/etc/ot-recorder/ot-recorder.conf # Optionally specify the path to the Mosquitto libs, include here - MOSQUITTO_INC = -I/usr/include + MOSQUITTO_CFLAGS = `$(PKG_CONFIG) --cflags libmosquitto`