Date: Sat, 2 Mar 2024 18:07:05 GMT From: Nuno Teixeira <eduardo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 74421a5ad7a3 - main - benchmarks/phoronix-test-suite: Move man pages to share/man Message-ID: <202403021807.422I75cH071351@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=74421a5ad7a3469d3347b4a4360726cc41a0589d commit 74421a5ad7a3469d3347b4a4360726cc41a0589d Author: Nuno Teixeira <eduardo@FreeBSD.org> AuthorDate: 2024-03-02 18:06:05 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2024-03-02 18:06:05 +0000 benchmarks/phoronix-test-suite: Move man pages to share/man Approved by: portmgr (blanket) --- benchmarks/phoronix-test-suite/Makefile | 2 +- .../phoronix-test-suite/files/patch-install-sh | 24 ++++++++++------------ benchmarks/phoronix-test-suite/pkg-plist | 2 +- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/benchmarks/phoronix-test-suite/Makefile b/benchmarks/phoronix-test-suite/Makefile index be1f0aaaf7fc..0850413b09a8 100644 --- a/benchmarks/phoronix-test-suite/Makefile +++ b/benchmarks/phoronix-test-suite/Makefile @@ -1,7 +1,7 @@ PORTNAME= phoronix-test-suite DISTVERSIONPREFIX= v DISTVERSION= 10.8.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= benchmarks PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} diff --git a/benchmarks/phoronix-test-suite/files/patch-install-sh b/benchmarks/phoronix-test-suite/files/patch-install-sh index 60a31eeb59c1..c713c0d69ad6 100644 --- a/benchmarks/phoronix-test-suite/files/patch-install-sh +++ b/benchmarks/phoronix-test-suite/files/patch-install-sh @@ -1,6 +1,6 @@ ---- install-sh.orig 2016-01-01 16:41:58 UTC +--- install-sh.orig 2022-07-03 10:17:29 UTC +++ install-sh -@@ -47,16 +47,21 @@ then +@@ -47,16 +47,21 @@ rm -rf $DESTDIR$INSTALL_PREFIX/share/phoronix-test-sui fi rm -rf $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/ @@ -12,9 +12,8 @@ mkdir -p $DESTDIR$INSTALL_PREFIX/share/appdata/ mkdir -p $DESTDIR$INSTALL_PREFIX/share/applications/ mkdir -p $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/48x48/apps/ --mkdir -p $DESTDIR$INSTALL_PREFIX/share/man/man1/ +fi -+mkdir -p $DESTDIR$INSTALL_PREFIX/man/man1/ + mkdir -p $DESTDIR$INSTALL_PREFIX/share/man/man1/ mkdir -p $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/ mkdir -p $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/ -mkdir -p $DESTDIR$INSTALL_PREFIX/../etc/bash_completion.d/ @@ -25,13 +24,11 @@ #mkdir -p $DESTDIR$INSTALL_PREFIX/../usr/lib/systemd/system/ #mkdir -p $DESTDIR$INSTALL_PREFIX/../etc/init/ -@@ -69,15 +74,18 @@ cp -r * $DESTDIR$INSTALL_PREFIX/share/do - cd .. +@@ -70,15 +75,18 @@ cp documentation/man-pages/*.1 $DESTDIR$INSTALL_PREFIX rm -rf $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/man-pages/ --cp documentation/man-pages/*.1 $DESTDIR$INSTALL_PREFIX/share/man/man1/ + cp documentation/man-pages/*.1 $DESTDIR$INSTALL_PREFIX/share/man/man1/ -cp pts-core/static/bash_completion $DESTDIR$INSTALL_PREFIX/../etc/bash_completion.d/phoronix-test-suite -+cp documentation/man-pages/*.1 $DESTDIR$INSTALL_PREFIX/man/man1/ +if [ -n "$WITH_BASH_COMPLETIONS" ] +then +cp pts-core/static/bash_completion $DESTDIR$INSTALL_PREFIX/etc/bash_completion.d/phoronix-test-suite @@ -42,14 +39,15 @@ cp pts-core/static/phoronix-test-suite.desktop $DESTDIR$INSTALL_PREFIX/share/applications/ cp pts-core/static/phoronix-test-suite-launcher.desktop $DESTDIR$INSTALL_PREFIX/share/applications/ cp pts-core/static/phoronix-test-suite.appdata.xml $DESTDIR$INSTALL_PREFIX/share/appdata/ -- --mkdir -p $DESTDIR$INSTALL_PREFIX/../usr/lib/systemd/system/ --cp deploy/*-systemd/*.service $DESTDIR$INSTALL_PREFIX/../usr/lib/systemd/system/ +fi +-mkdir -p $DESTDIR$INSTALL_PREFIX/../usr/lib/systemd/system/ +-cp deploy/*-systemd/*.service $DESTDIR$INSTALL_PREFIX/../usr/lib/systemd/system/ +- # mkdir -p $DESTDIR$INSTALL_PREFIX/../etc/init/ # cp pts-core/static/upstart/*.conf $DESTDIR$INSTALL_PREFIX/../etc/init/ -@@ -92,12 +100,13 @@ rm -f $DESTDIR$INSTALL_PREFIX/share/phor + +@@ -93,12 +101,13 @@ rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suit rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/static/images/openbenchmarking.png rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/static/images/%phoronix-test-suite.png @@ -64,7 +62,7 @@ # XDG MIME OpenBenchmarking support if [ "X$DESTDIR" = "X" ] && which xdg-mime >/dev/null && which xdg-icon-resource >/dev/null then -@@ -112,15 +121,14 @@ else +@@ -113,15 +122,14 @@ fi cp pts-core/static/images/openbenchmarking.png $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png fi diff --git a/benchmarks/phoronix-test-suite/pkg-plist b/benchmarks/phoronix-test-suite/pkg-plist index 99c8e20dd0c1..acf9adebec11 100644 --- a/benchmarks/phoronix-test-suite/pkg-plist +++ b/benchmarks/phoronix-test-suite/pkg-plist @@ -6,4 +6,4 @@ bin/phoronix-test-suite %%X11%%share/icons/hicolor/48x48/apps/phoronix-test-suite.png %%X11%%share/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png %%X11%%share/mime/packages/openbenchmarking-mime.xml -man/man1/phoronix-test-suite.1.gz +share/man/man1/phoronix-test-suite.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403021807.422I75cH071351>