From nobody Sun Jan 21 17:43:41 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 4TJ1193CC8z57NCP; Sun, 21 Jan 2024 17:43:41 +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 4TJ1192MyGz4HRc; Sun, 21 Jan 2024 17:43:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705859021; 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=7J9YbAgmnOcTc4o6fborBvuPbSEk8rtPSE2RYXBZv/U=; b=lYnIUAe/4T+u6nlTpnhvxhP2u0rZmnE0nGqXVseD1SbwyahYRP9b/N/Q0IbDg9oL4xLOQ8 p5NOTpq692jDQ1txbqIYgNzFChdvuX893hIi3ZdDyi77DFZMfF3CL3dFj97hxIjBUKon90 D6L9Sa+REN9y3kC7aH2TRg8k1yFbd4N/t0MEZAw0/KoeenbkYeXu9TzQHhf/+BYD45yvnL bpYz20PkMaXrqqeJtVd4Vo5dchhtElB6nJbXa522dWVrRjnBf+41XkBpKXwVw987yX+Lap p+fyQRnp/U5RjwxMOvfIBs/ZJf1xiJch+vQRWNXpYEgPpMJt8hukJlOEw7Hw/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705859021; 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=7J9YbAgmnOcTc4o6fborBvuPbSEk8rtPSE2RYXBZv/U=; b=hh/0oir1lCaDjqU8F/l4q7+tuxh3Y2xfVZ+NiIgg5mqxTBRhDnwWEko5qc2RbN/f8bRFYM J4aRag9NB6aeMti1CSoV5SysekITkV/3iV6Ht7lfV/PGU9HqoH31bBcRXK6j0wgRpILS2y paTLOZMuRSHJ9vT1Y5oacpY/jZSBzLof/6zFiKZweytxAU1fhdSlrjbAuMFmrQL1G9c6bo hfOYr1+GgvpdV+qHhlXDHbLz6/JjHSAzJBXfSpJy1wSXFY7Fx+eGm1fk7OnbAe3oU3eCsB dTzv87w20WML6TrUoTepMhBvDrGhF0sssYlD6rcW9RyjGDDUOiH+afOmeEUdCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705859021; a=rsa-sha256; cv=none; b=uY2ckSvcnfpbGRe+++yDHxo7vVGtwlJT1grmziQr8wz7dKtHK2y9uInLO9V6c9LR3I1Z+W QKgi5RpsZqN5R3XXLcJoho9qGXAXwZPaqiU9aU6i/1HNknjajvS3ewe/EkxxmcIKloFSQ1 ooH3AwvSGLNxL0R0NrZ6WytbyfX7T+5Vnp+iLznjPchYwc2HOGC22Y2D3gXrXMYtzoBcY7 EuWRfJoHfriWfP6Mv0XKArRL20UM70JQtrL2t0QDtz2J+kYsyn1GKxZb6C+ZiaEI/ygP9+ 0BQG9lU+SgVPRZd1H18cl0rP/NoISr90Ng7QF6U0gHEM1kA8JuRzUqJZgWS/hQ== 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 4TJ1191T1BzS9W; Sun, 21 Jan 2024 17:43:41 +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 40LHhfU0099021; Sun, 21 Jan 2024 17:43:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40LHhfR3099018; Sun, 21 Jan 2024 17:43:41 GMT (envelope-from git) Date: Sun, 21 Jan 2024 17:43:41 GMT Message-Id: <202401211743.40LHhfR3099018@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: a595dde18d0e - main - sysutils/magicrescue: Move manpages to share/man 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: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a595dde18d0e9ae0f77ea9722c705d3632c75564 Auto-Submitted: auto-generated The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=a595dde18d0e9ae0f77ea9722c705d3632c75564 commit a595dde18d0e9ae0f77ea9722c705d3632c75564 Author: Emanuel Haupt AuthorDate: 2024-01-21 16:37:08 +0000 Commit: Emanuel Haupt CommitDate: 2024-01-21 17:43:25 +0000 sysutils/magicrescue: Move manpages to share/man --- sysutils/magicrescue/Makefile | 15 +++++++++------ sysutils/magicrescue/files/patch-Makefile.in | 26 ++++++++++++++++++++++++++ sysutils/magicrescue/pkg-plist | 6 +++--- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/sysutils/magicrescue/Makefile b/sysutils/magicrescue/Makefile index 43513981e07b..0a7894afc1be 100644 --- a/sysutils/magicrescue/Makefile +++ b/sysutils/magicrescue/Makefile @@ -1,6 +1,7 @@ PORTNAME= magicrescue -PORTVERSION= 1.1.10 DISTVERSIONPREFIX= v +DISTVERSION= 1.1.10 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= ehaupt@FreeBSD.org @@ -11,18 +12,20 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= perl5 shebangfix -USE_PERL5= run - -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} - USE_GITHUB= yes GH_ACCOUNT= jbj +USE_PERL5= run SHEBANG_FILES= magicsort tools/*.pl tools/checkrecipe +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --prefix=${PREFIX} + MAKE_ENV+= STAGEDIR=${STAGEDIR} +# remove after manprefix migration +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/magicrescue \ ${STAGEDIR}${PREFIX}/bin/dupemap diff --git a/sysutils/magicrescue/files/patch-Makefile.in b/sysutils/magicrescue/files/patch-Makefile.in new file mode 100644 index 000000000000..80c92e55a3ba --- /dev/null +++ b/sysutils/magicrescue/files/patch-Makefile.in @@ -0,0 +1,26 @@ +--- Makefile.in.orig 2018-11-24 19:21:20 UTC ++++ Makefile.in +@@ -58,12 +58,12 @@ install: all + install: all + mkdir -p $(INSTALLDIR)/share/magicrescue/tools \ + $(INSTALLDIR)/share/magicrescue/recipes \ +- $(INSTALLDIR)/man/man1 \ ++ $(INSTALLDIR)/share/man/man1 \ + $(INSTALLDIR)/bin + + cp magicrescue$(EXE) dupemap$(EXE) magicsort $(INSTALLDIR)/bin/ + cp recipes/* $(INSTALLDIR)/share/magicrescue/recipes/ +- cp $(DOCS) $(INSTALLDIR)/man/man1 ++ cp $(DOCS) $(INSTALLDIR)/share/man/man1 + + for f in tools/*; do \ + if [ -x "$$f" ]; then \ +@@ -77,7 +77,7 @@ uninstall: + rm -f $(INSTALLDIR)/bin/dupemap$(EXE) + rm -f $(INSTALLDIR)/bin/magicsort + for f in $(DOCS); do \ +- rm -f "$(INSTALLDIR)/man/man1/`basename $$f`"; \ ++ rm -f "$(INSTALLDIR)/share/man/man1/`basename $$f`"; \ + done + rm -rf $(INSTALLDIR)/share/magicrescue/tools + rm -rf $(INSTALLDIR)/share/magicrescue/recipes diff --git a/sysutils/magicrescue/pkg-plist b/sysutils/magicrescue/pkg-plist index 47c79878dc86..6711bbfaaa05 100644 --- a/sysutils/magicrescue/pkg-plist +++ b/sysutils/magicrescue/pkg-plist @@ -1,9 +1,9 @@ bin/dupemap bin/magicrescue bin/magicsort -man/man1/dupemap.1.gz -man/man1/magicrescue.1.gz -man/man1/magicsort.1.gz +share/man/man1/dupemap.1.gz +share/man/man1/magicrescue.1.gz +share/man/man1/magicsort.1.gz %%DATADIR%%/recipes/avi %%DATADIR%%/recipes/canon-cr2 %%DATADIR%%/recipes/elf