From nobody Tue May 09 08:33:02 2023 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 4QFryR1vYhz49v0K; Tue, 9 May 2023 08:33:03 +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 4QFryR1PfLz44Mf; Tue, 9 May 2023 08:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683621183; 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=yR6GP2r/W/OgoruNArKwl7/wf6nB/MvTLosYOXVtRBM=; b=gEqdL2aMDJeCIktnSmMpFfacXZfpn2EqCbMAMK4VZmcbeuZ7yk+9mxvgyG+U7wVOX+LINR ZxS0eoC56WvHYXLLPdfoUjuPWqAW1cxxwCfJoVAzmPV73KRaZoKebOOlZlHfMIINxk/5L8 /4UpLztFVK3Eu0dsZ7iuXeieaXny147Qn9jCBMb1w4H7OI/xiZV+MZ0jbfv1Wseq5m/uMK lQOZf5rR2ZxqtB8UEJtel+aqL9qwsXbScighkIS14KWBmpxDVYwz96XQ2QEPxdeRCMjpkJ pFuZzbpQ831zwfkZQvYK9gD/nx9kvkzR7Rm9L///nG3ibHmoWsPZT404zny2Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683621183; 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=yR6GP2r/W/OgoruNArKwl7/wf6nB/MvTLosYOXVtRBM=; b=e+Cl6a5iT1alwkuMB5TA6Y7tLX6L9d537C/uHhOIcmFimjEHTj875jvYTCpWT8W1VkXUy9 +xOqVwxUOmfOZPNy6q0U/K0LSi9Vyt0wMTWv6E+3tOHEq+hH3pzzcWaB9u/VmlWTUheEiv 9i7R0UwPjXZPVImHptZ3+4o45oVmASJ/Ws6IqUekXE/meCWxw7nfZUb/OQ5AO8k4RyKqi5 T8oGfAGF4Ta3dkMjLbgsCvX/GjmUZ2ICAXHiH4BETaeOguUmnje7XAqtyNDEwSylXBJFND 9py6SoDXueGbzHXbkAYTaw8ZkRriGLwstqK2wnQlXSMvohBT62BZ80bHGSLLjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683621183; a=rsa-sha256; cv=none; b=gM2r9cdK4QkY5zpsaZ21aig0xOb1/PCsoaEefuoI/ypxQpa6QJfvsHXhinJw2f9BydvlKD vLtYr6CXHYt5djYJyyLWhCw9RaCjArriqIADZuWiAmErOmTe1jCiRa4QGaM3LfJmXOUipH T+PpTpQ7gwq2fqxPzzMKVlheRgd9pn2eUjOXsCxzqdw0rjWIHDUJHGjggfvnRGEgu69i6O Td+qYsZK6I3NafjeNoM9eJEOGI5AYHTuR/NYPYTLeBKmj+1t80zQSTWeKUv/ZDoo8Tcuxd /sR/zS0DASP/ajg5q4Qp7LMcKuosRgaJE6H7+/Btfm9S17yPB8/YcfrbeBZoAA== 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 4QFryR0SS0zLVF; Tue, 9 May 2023 08:33:03 +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 3498X2ZZ039351; Tue, 9 May 2023 08:33:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3498X2nt039350; Tue, 9 May 2023 08:33:02 GMT (envelope-from git) Date: Tue, 9 May 2023 08:33:02 GMT Message-Id: <202305090833.3498X2nt039350@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: b08d00554da4 - 2023Q2 - mail/queue-repair: fix patch and refactor 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: b08d00554da43e6059cd407542f722510407b0d1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=b08d00554da43e6059cd407542f722510407b0d1 commit b08d00554da43e6059cd407542f722510407b0d1 Author: Robert Clausecker AuthorDate: 2023-05-08 12:55:50 +0000 Commit: Robert Clausecker CommitDate: 2023-05-09 08:32:56 +0000 mail/queue-repair: fix patch and refactor - remove stray shebang, (q)nofiles changes from patch file (I ran makepatch, which picked up REINPLACE_CMD changes) - replace homegrown REINPLACE_CMD with USES=shebangfix - set NO_ARCH=yes, NO_BUILD=yes - express options-dependent commands in more declarative manner Fixes: 809ff8bfc9d4b3221ed5c5329d70d40ba3c8e900 Reported by: danfe Approved by: portmgr (build fix, infrastructure blanket) MFH: 2023Q2 (cherry picked from commit 60abf2a4fd7b6dce1a7447259e2145cd3a243c8b) --- mail/queue-repair/Makefile | 24 +++++++++++------------- mail/queue-repair/files/patch-queue__repair.py | 15 --------------- 2 files changed, 11 insertions(+), 28 deletions(-) diff --git a/mail/queue-repair/Makefile b/mail/queue-repair/Makefile index 451c4b9f79fe..11b4937f5e53 100644 --- a/mail/queue-repair/Makefile +++ b/mail/queue-repair/Makefile @@ -1,6 +1,6 @@ PORTNAME= queue-repair PORTVERSION= 0.9.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail python MASTER_SITES= http://pyropus.ca/software/${PORTNAME}/ @@ -10,7 +10,11 @@ WWW= http://pyropus.ca/software/queue-repair/ LICENSE= GPLv2 -USES= python +USES= python shebangfix +SHEBANG_FILES= queue_repair.py + +NO_ARCH= yes +NO_BUILD= yes OPTIONS_DEFINE= DOCS QMAIL_PORT OPTIONS_DEFAULT= QMAIL_PORT @@ -18,25 +22,19 @@ QMAIL_PORT_DESC= Depend on qmail port QMAIL_PORT_USES= qmail:run -.include - PLIST_FILES= bin/queue-repair PORTDOCS= BLURB CHANGELOG TODO -do-build: - ${REINPLACE_CMD} -e 's,^#!/usr/bin/python,#!${PYTHON_CMD},' \ - ${WRKSRC}/queue_repair.py -.if ${PORT_OPTIONS:MQMAIL_PORT} +do-configure-QMAIL_PORT-on: ${REINPLACE_CMD} -e 's,nofiles,qnofiles,' ${WRKSRC}/queue_repair.py -.endif do-install: ${INSTALL_SCRIPT} ${WRKSRC}/queue_repair.py ${STAGEDIR}${PREFIX}/bin/queue-repair -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} -. for f in ${PORTDOCS} +.for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} -. endfor -.endif +.endfor .include diff --git a/mail/queue-repair/files/patch-queue__repair.py b/mail/queue-repair/files/patch-queue__repair.py index e6bbfde3be65..28da582a4410 100644 --- a/mail/queue-repair/files/patch-queue__repair.py +++ b/mail/queue-repair/files/patch-queue__repair.py @@ -2,21 +2,6 @@ https://bz-attachments.freebsd.org/attachment.cgi?id=242009 --- queue_repair.py.orig 2003-10-22 15:54:13 UTC +++ queue_repair.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/local/bin/python3.9 - '''queue_repair.py - qmail tools in Python. - Copyright (C) 2001 Charles Cazabon - -@@ -58,7 +58,7 @@ users = { - - groups = { - 'qmail' : None, -- 'nofiles' : None, -+ 'qnofiles' : None, - } - - dirs = { @@ -66,24 +66,24 @@ dirs = { # key: pathname - all paths are relative to conf-qmail # data: (user, group, mode, split)