From 6c92ce065bae936c680adc7165b3595bc6ce5787 Mon Sep 17 00:00:00 2001 From: sbd Date: Mon, 1 Apr 2013 06:13:12 +0000 Subject: Use ${PKGMANDIR} for manpages. --- benchmarks/phoronix-test-suite/Makefile | 5 +++-- benchmarks/phoronix-test-suite/distinfo | 4 ++-- benchmarks/phoronix-test-suite/patches/patch-install-sh | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) (limited to 'benchmarks') diff --git a/benchmarks/phoronix-test-suite/Makefile b/benchmarks/phoronix-test-suite/Makefile index 016ac3b95fe..582e011ef88 100644 --- a/benchmarks/phoronix-test-suite/Makefile +++ b/benchmarks/phoronix-test-suite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2013/03/16 07:21:19 obache Exp $ +# $NetBSD: Makefile,v 1.7 2013/04/01 06:13:12 sbd Exp $ # DISTNAME= phoronix-test-suite-${PTS_VERSION} @@ -34,7 +34,8 @@ pre-install: ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f do-install: - cd ${WRKSRC}/ && DESTDIR=${DESTDIR:Q} ./install-sh ${PREFIX:Q} + cd ${WRKSRC}/ && DESTDIR=${DESTDIR:Q} PKGMANDIR=${PKGMANDIR:Q} \ + ./install-sh ${PREFIX:Q} .include "../../lang/php/phpversion.mk" .include "${PHPPKGSRCDIR}/buildlink3.mk" diff --git a/benchmarks/phoronix-test-suite/distinfo b/benchmarks/phoronix-test-suite/distinfo index a92c9ac98c7..9e5ea7c3543 100644 --- a/benchmarks/phoronix-test-suite/distinfo +++ b/benchmarks/phoronix-test-suite/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2012/08/15 22:08:16 marino Exp $ +$NetBSD: distinfo,v 1.3 2013/04/01 06:13:12 sbd Exp $ SHA1 (phoronix-test-suite-3.4.0.tar.gz) = 10be51fc45c077fd73193a8f4bd6c850a9198f84 RMD160 (phoronix-test-suite-3.4.0.tar.gz) = 858605ba618cb8c721b68a142db70d9a298ab6d7 Size (phoronix-test-suite-3.4.0.tar.gz) = 418224 bytes -SHA1 (patch-install-sh) = 8b26a2ee586d5d3746cb6597db010eb961e250de +SHA1 (patch-install-sh) = 959bd28c7c9f60f594128be28657ebe1103ceaa6 diff --git a/benchmarks/phoronix-test-suite/patches/patch-install-sh b/benchmarks/phoronix-test-suite/patches/patch-install-sh index 5f66bb4e2d8..2ab922c0843 100644 --- a/benchmarks/phoronix-test-suite/patches/patch-install-sh +++ b/benchmarks/phoronix-test-suite/patches/patch-install-sh @@ -1,4 +1,4 @@ -$NetBSD: patch-install-sh,v 1.2 2012/08/15 22:08:16 marino Exp $ +$NetBSD: patch-install-sh,v 1.3 2013/04/01 06:13:13 sbd Exp $ * Handle pkgsrc hierarchy, especially paths to man pages. * Do not execute xdg-* during installation, let the shared-mime-info @@ -16,7 +16,7 @@ $NetBSD: patch-install-sh,v 1.2 2012/08/15 22:08:16 marino Exp $ 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/ -+mkdir -p $DESTDIR$INSTALL_PREFIX/man/man1/ ++mkdir -p $DESTDIR$INSTALL_PREFIX/$PKGMANDIR/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/ @@ -33,7 +33,7 @@ $NetBSD: patch-install-sh,v 1.2 2012/08/15 22:08:16 marino Exp $ -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/ ++cp documentation/man-pages/*.1 $DESTDIR$INSTALL_PREFIX/$PKGMANDIR/man1/ +cp pts-core/static/bash_completion $DESTDIR$INSTALL_PREFIX/share/bash-completion.d cp pts-core/static/images/phoronix-test-suite.png $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/48x48/apps/phoronix-test-suite.png cp pts-core/static/images/openbenchmarking.png $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/64x64/apps/openbenchmarking.png -- cgit v1.2.3