From nobody Mon Jan 22 15:51:19 2024 X-Original-To: dev-commits-ports-main@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 4TJZT42Q4Cz57fZG; Mon, 22 Jan 2024 15:51:20 +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 4TJZT40tW3z4Q43; Mon, 22 Jan 2024 15:51:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705938680; 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=j75Z0YhVIuBApjwwad1Zkw4A6WqgohhtptYDKsKe6zI=; b=HNPVqcvKnIZLd1kPsuw3fUU7T1riEFTN8cixR4ubV426y6dzsjstsQzo+MLYFquB3uxkpa l+15e+Q6ZhLBRiSPTFdhwB8pWhMa6qb3XTXn9WJeqignWymHusXUxPcOgQ4YgzZdr/3YTk gCU62R527GiS+zdxK7M8MwWIkYe4xF0c1XxPTkXYvLMcz5QqrYxX5P95Ev5KeyK4CJROh6 BtHsXvZaFPMNCtM6j/9BouI72DXeSH2YDw4JmCNTLqdtZKqNTE98Hd2wL5/4XZD8hSeBAT nh+tJcCiIaFobxWaxdjxymJf7ENP3cC0KeQ1b954i4yWejOH0hhw0tdzzsqYHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705938680; 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=j75Z0YhVIuBApjwwad1Zkw4A6WqgohhtptYDKsKe6zI=; b=Yujl+zM3AOiU23pPjPuJDFCMf8wZSZ5OWnDnSThVotgY/ZUBx6gb7IVDADnt0j5btDf21G RIycwiPKbibYwUgR8ACijaLKkdkfz4B20z873EAJxsNZFMeVpGyC5Qw0kYq5/8Rm/Ql/bn 4rIAsQ7W8L28Iafqk0NBOJZw3xy/3gCZzRUqS1wqJscaM64bLAw24MzdcormPl2zkl/jP2 h/BpU7MRZ1suskdeicHPln2Sj080yI5kZsuFAnxshije5lypd0kZgRydo69z0fM0GPgAHO ZVN5BPiI4bPE5WDxNNCY8Ml+8UKOk/w2bhrh3Nt+av8WAMdZON6NiiXZMHldXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705938680; a=rsa-sha256; cv=none; b=hgMJ/z0vfQUZxEap5IC02B7TQE5wTxER6nMy5uy0LI41MzdfIO0UMZJqT0GoH6KwjutI/G tO2y6wbSePRSZWloqLsa6a0Ny/H5/6ZozTEd1yefdtoE77X1QmxIWTqO7aMv6OXxVqvi6Q iTNGXSU2+Lb+7ey6AbC+/YNiJa6K0PFkC79U4cdYXR3q/Dqc48A6uFnmtbhd3PYPlAyylW eQx0MSHi6N5p+QUO28VJtD7bgUfOGux911MtPtW8ARQqLnFL3O1gSc1bFhiY5hoCzJq37n 1H9qzQlyy9bNax0l4nl0x3lkpBOljGW47ei6YKMVaVx5eUIV7FaBufXXJBVLAw== 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 4TJZT375G8z17Qb; Mon, 22 Jan 2024 15:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40MFpJDs045715; Mon, 22 Jan 2024 15:51:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MFpJq0045712; Mon, 22 Jan 2024 15:51:19 GMT (envelope-from git) Date: Mon, 22 Jan 2024 15:51:19 GMT Message-Id: <202401221551.40MFpJq0045712@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: dfdd03f9ff7d - main - net/msoak: Sanitize MANPREFIX List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dfdd03f9ff7dab8d3e1220be1a1db4a1f7d10754 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=dfdd03f9ff7dab8d3e1220be1a1db4a1f7d10754 commit dfdd03f9ff7dab8d3e1220be1a1db4a1f7d10754 Author: Muhammad Moinur Rahman AuthorDate: 2024-01-22 15:37:42 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-01-22 15:50:47 +0000 net/msoak: Sanitize MANPREFIX Approved by: portmgr (blanket) --- net/msoak/Makefile | 3 ++- net/msoak/files/patch-Makefile | 22 ++++++++++++++++++++++ net/msoak/pkg-plist | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/net/msoak/Makefile b/net/msoak/Makefile index dcef486210bc..ba5d8493d8fe 100644 --- a/net/msoak/Makefile +++ b/net/msoak/Makefile @@ -1,5 +1,6 @@ PORTNAME= msoak DISTVERSION= 0.8 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= ports@jpmens.net @@ -19,7 +20,7 @@ GH_ACCOUNT= jpmens CFLAGS+= -I${LUA_INCDIR} LDFLAGS+= -llua-${LUA_VER} -lmosquitto -lconfig MAKE_ARGS+= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ - BINDIR=${PREFIX}/bin MANDIR=${MANPREFIX}/man + BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/share/man post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/msoak diff --git a/net/msoak/files/patch-Makefile b/net/msoak/files/patch-Makefile new file mode 100644 index 000000000000..ecbb011441f2 --- /dev/null +++ b/net/msoak/files/patch-Makefile @@ -0,0 +1,22 @@ +--- Makefile.orig 2024-01-22 15:40:56 UTC ++++ Makefile +@@ -4,6 +4,8 @@ LDFLAGS=-L /usr/local/lib -lmosquitto -lconfig + + CFLAGS=-Wall -Werror -I. + LDFLAGS=-L /usr/local/lib -lmosquitto -lconfig ++BINDIR?= ++MANDIR?= + + detect: + @echo "detected: $(OS)" +@@ -35,9 +37,7 @@ freebsd: + + freebsd: + @$(MAKE) $(TARGET) CFLAGS="$(CFLAGS) -I/usr/local/include -I/usr/local/include/lua53/" \ +- LDFLAGS="$(LDFLAGS) -llua-5.3" \ +- BINDIR=/usr/local/bin \ +- MANDIR=/usr/local/man ++ LDFLAGS="$(LDFLAGS) -llua-5.3" + + openbsd: + @$(MAKE) $(TARGET) CFLAGS="$(CFLAGS) -I/usr/local/include -I/usr/local/include/lua-5.3/" \ diff --git a/net/msoak/pkg-plist b/net/msoak/pkg-plist index e3d38a129cdb..2c5277c662f1 100644 --- a/net/msoak/pkg-plist +++ b/net/msoak/pkg-plist @@ -1,4 +1,4 @@ bin/msoak -man/man1/msoak.1.gz +share/man/man1/msoak.1.gz %%EXAMPLESDIR%%/example.config %%EXAMPLESDIR%%/example.lua