From nobody Sat Mar 2 18:07:05 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 4TnCbF20RMz5Ch6D; Sat, 2 Mar 2024 18:07:05 +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 4TnCbF1XmBz4KMV; Sat, 2 Mar 2024 18:07:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709402825; 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=t+HGfm9Ti4z2xlTYQINl5RaPd26C13VJmgHO8lZ8jwg=; b=JqNjAbOJYRXhhacdgnioaax1XcDWZUmEGVOOWDO1u62ouEu8I4BgEKoxV1haNvTC/0W4pa 88l5zKMHb6VL7Epk+k+tKHJakXoYnA9cwbrgrivgACl+0eIVrZZC3y7DXfppFtCmLMrF1J 1sd5xB6Hcp4XiX4ogSaoBq6JtrGmPzRFjYK5OU3TQUoJTg9PdlIQnUernGopXbG3lUgkDa suwD1T/1RfKwCtYqmUhTvUc8/9aJ8vYo29fRG6V9djVVQvVgNEATj1Rh5z4xQMe+0n67SS JpDTVs0k2caG41NtdsZ//CY9tVlqjR45JNWL8w174P1lbphaUQ3ThrlrF62MTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709402825; a=rsa-sha256; cv=none; b=Sfr+TJ3U21yGPRWyvcmGAyWZnIGeyAD8JDzhB1BmBredULSAtTSDg0bd6hFOx+lcZIXJpG fM0PIiKLUjIIXQbY4HSEkd5tOyPgwaivSv0OOXYmg/7oX+OP1FRbkuCee+kqNDs1f2Wu2f VH12HSFREf6ndx/vFC1GrP7p0iKrl3PMrj1be7bph7yCT83Ik+k7UwnzdBM0vp95ejd+io ZZcGvuq2pj5ZpU6lPHrJ/3ESNdjCTWe4rbgzbY5PuZ0aAHAeZOncmBU7QQBN03jfOFtUWU aiVTqqZ2WN2MWC++nMyKO7v5cJO4C2/Aol3jUaxdRUbtk+JhnUzTsgSVqRWCWg== 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=1709402825; 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=t+HGfm9Ti4z2xlTYQINl5RaPd26C13VJmgHO8lZ8jwg=; b=mcmDAmJj+TYr7rodKAbgiFq0Y/XQYivpE8IND9s8/xfLWSxrGTdZjU03VXAFSLHEBRgRd9 efL92ZZWvqIA4tWx3HLqgcLpcQHJWShgF0mDmbbXdiI13ghwUqUpMkBnkhPG388ehvRBAC aK67T7jxrfrxOFckPbUZXpkB551DKLIBdkTRzQO106pN+KcjrmptQKnal3cXQ15O049mpl Sau6Xy3OqkOHpiONb5D1K0VwImS5rsrOi45E+Wsjdn8tWIU1ClFJ+242vos/I0vAtZisU1 RlXi7+AKOd86OGKKd6adtBReomXVpEr+x2oZCtQCYQFUKiLD8PXiZ1OvggGFsQ== 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 4TnCbF14kxz1KDq; Sat, 2 Mar 2024 18:07:05 +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 422I75Js071354; Sat, 2 Mar 2024 18:07:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 422I75cH071351; Sat, 2 Mar 2024 18:07:05 GMT (envelope-from git) Date: Sat, 2 Mar 2024 18:07:05 GMT Message-Id: <202403021807.422I75cH071351@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 74421a5ad7a3 - main - benchmarks/phoronix-test-suite: Move man pages 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74421a5ad7a3469d3347b4a4360726cc41a0589d Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=74421a5ad7a3469d3347b4a4360726cc41a0589d commit 74421a5ad7a3469d3347b4a4360726cc41a0589d Author: Nuno Teixeira AuthorDate: 2024-03-02 18:06:05 +0000 Commit: Nuno Teixeira 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