Date: Sun, 21 Jan 2024 17:43:41 GMT From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a595dde18d0e - main - sysutils/magicrescue: Move manpages to share/man Message-ID: <202401211743.40LHhfR3099018@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=a595dde18d0e9ae0f77ea9722c705d3632c75564 commit a595dde18d0e9ae0f77ea9722c705d3632c75564 Author: Emanuel Haupt <ehaupt@FreeBSD.org> AuthorDate: 2024-01-21 16:37:08 +0000 Commit: Emanuel Haupt <ehaupt@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401211743.40LHhfR3099018>