From nobody Fri Feb 23 11:44:22 2024 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 4Th7TM051bz5CK6M; Fri, 23 Feb 2024 11:44:23 +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 4Th7TL6dGSz4khk; Fri, 23 Feb 2024 11:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708688662; 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=OnZEclU0xs01YL/gfQB5UI7+KAHRAjZxH6AjAOtKLV0=; b=MhfgYgWlK9QU4qgEvgCP/rchHqffhSXrmukWT3vNESoiK5kg2GR8iGmKEmWCPT5nMYk3pG H8WXeE8H+1IsCg+gx+hmOo7kDGnxfEERkqQENo1b3ICgvf61BsmJETmMQPdFQ9/ZrQk2V5 eLiAee7Iwx7gSh+fF1ielEHWLtD2ZyGAVt4SmHdwB8xNBVvXc1IGg9JAtZg6xyH64vMYRX X0ZmZ2pwTFxyMlBmRYZWcEgi1eH4AJgTRqBMrOm3yQvJ6hM92ieSyn2BbQnraTt6j3XA/P EDA2OFXxvKSgY6tuDKfbeeivc76yBX+kWEWzF24Pp+fVFHLxUlneEx+kHGewQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708688662; a=rsa-sha256; cv=none; b=Mi5En62qZgSVJ30+BdYc76XF9Uf5emI4NhRppb2x0jT8JjJH2EurSabwXsPGz7qT4fA1s1 BpKJPDVnH1j3ZYnCLA3yDCsL8IOfFAJay8qWONQabfrJnrXVNN0c8qD8z6ifoTx0b+5G0j 8jbZvlTsOgQI+zZJt/X/HissqzsWzVDohabIRlUZfnQZyD24anYEni1d6IX2KE0+UZpf8u w/0ah23rKClaqn/pzPUxXuZ6v4I3s8Z2qYQtXOdVm9eAx3DKV2gB1NxWlIVXmkr2EIIIvz 5g8WSaFxe0dNYrrpCKOeAe2z62fxpLB7JlyOAOSrd/6grG0H7EM1/ca5VkCT9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708688662; 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=OnZEclU0xs01YL/gfQB5UI7+KAHRAjZxH6AjAOtKLV0=; b=e41A3JYvj9m1vRYLWaEtkifw2T/4KbNuJkH0P2THbcmXpo+zdI29zI+9MwbX5QyADJ+tGc pdQavxeSMD9GCPAI/MwYJ95QardtypdjWOO1BGuL0NASBuBWN1+ngo54MCRGrd5s1vpz9M ufJPjjjZKalN5OiwobT1H0K16WrM9TazVCt9anJSQh2t3MXkAmkQLkqwFstJvdxJ9POlUT 5JVqLw/n3uKQ9Jw7DMz0wy8eheDmMWvQo2GQqu25kknPdyMK/jpAkfAxOVonQFRjr8c0cE mXQM1VRcTEPwZQV5pc+kGF2b0ZdHyUIT/JEoY/CxRFCSK9aZzYxQsQhevZda/g== 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 4Th7TL5gkCzDs8; Fri, 23 Feb 2024 11:44:22 +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 41NBiMBv081840; Fri, 23 Feb 2024 11:44:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41NBiMHI081837; Fri, 23 Feb 2024 11:44:22 GMT (envelope-from git) Date: Fri, 23 Feb 2024 11:44:22 GMT Message-Id: <202402231144.41NBiMHI081837@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Renato Botelho Subject: git: 2b807f83c6af - main - www/squid_radius_auth: Refactor and moved manpages 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: garga X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b807f83c6af8d681d11b07fec1589a29d8e8736 Auto-Submitted: auto-generated The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b807f83c6af8d681d11b07fec1589a29d8e8736 commit 2b807f83c6af8d681d11b07fec1589a29d8e8736 Author: Renato Botelho AuthorDate: 2024-02-23 11:42:03 +0000 Commit: Renato Botelho CommitDate: 2024-02-23 11:44:16 +0000 www/squid_radius_auth: Refactor and moved manpages - Moved manpages to share/man - Make it to respect CC/CFLAGS/LDFLAGS env vars - Replace Make.inc patch by a simple REINPLACE_CMD just replacing = by ?= for desired variables and pass them using MAKE_ENV - Use ALL_TARGET instead of patching Make.inc - Use @sample for config file Sponsored by: Rubicon Communications, LLC ("Netgate") --- www/squid_radius_auth/Makefile | 13 +++++++++---- www/squid_radius_auth/files/patch-Make.inc | 22 ---------------------- www/squid_radius_auth/pkg-plist | 5 ++--- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/www/squid_radius_auth/Makefile b/www/squid_radius_auth/Makefile index 53e7bd35ac81..e08e758ca8cd 100644 --- a/www/squid_radius_auth/Makefile +++ b/www/squid_radius_auth/Makefile @@ -7,10 +7,15 @@ MAINTAINER= ports@FreeBSD.org COMMENT= RADIUS authenticator for squid proxy 2.5 and later WWW= http://www.squid-cache.org/contrib/squid_radius_auth -.include +MAKE_ENV= BINDIR=${PREFIX}/libexec/squid \ + CONFDIR=${PREFIX}/etc/squid \ + MANDIR=${PREFIX}/share/man/man8 +ALL_TARGET= ALL post-patch: - ${REINPLACE_CMD} 's|= gcc|?= gcc|' ${WRKSRC}/Makefile - ${REINPLACE_CMD} 's|PREFIX = /usr/local|PREFIX = ${PREFIX}|' ${WRKSRC}/Make.inc + @${REINPLACE_CMD} -E '/^(CC|CFLAGS|LDFLAGS)/s/=/?=/' \ + ${WRKSRC}/Makefile + @${REINPLACE_CMD} -E '/^(PREFIX|BINDIR|CONFDIR|MANDIR)/s/=/?=/' \ + ${WRKSRC}/Make.inc -.include +.include diff --git a/www/squid_radius_auth/files/patch-Make.inc b/www/squid_radius_auth/files/patch-Make.inc deleted file mode 100644 index 06c9cae1a512..000000000000 --- a/www/squid_radius_auth/files/patch-Make.inc +++ /dev/null @@ -1,22 +0,0 @@ ---- Make.inc.orig 2008-06-10 08:48:03.000000000 -0500 -+++ Make.inc 2008-06-10 08:49:11.000000000 -0500 -@@ -3,15 +3,15 @@ - # - # - --PREFIX = /usr/local/squid --BINDIR = $(PREFIX)/libexec/ -+PREFIX = /usr/local -+BINDIR = $(PREFIX)/libexec/squid/ - MANDIR = $(PREFIX)/man/man8 - MANEXT = .8 --CONFDIR = $(PREFIX)/etc -+CONFDIR = $(PREFIX)/etc/squid/ - - INCLUDES = radius.h md5.h - --ALL: squid_radius_auth -+all: squid_radius_auth - - - attrprint.o: attrprint.c $(INCLUDES) diff --git a/www/squid_radius_auth/pkg-plist b/www/squid_radius_auth/pkg-plist index c20eadbd186c..430167fc4183 100644 --- a/www/squid_radius_auth/pkg-plist +++ b/www/squid_radius_auth/pkg-plist @@ -1,4 +1,3 @@ -etc/squid/squid_radius_auth.conf -etc/squid/squid_radius_auth.conf.default +@sample etc/squid/squid_radius_auth.conf etc/squid/squid_radius_auth.conf.default libexec/squid/squid_radius_auth -man/man8/squid_radius_auth.8.gz +share/man/man8/squid_radius_auth.8.gz