pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Mechanical changes to add full DESTDIR support to pack...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/625b0d018fcf
branches:  trunk
changeset: 539290:625b0d018fcf
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Mar 03 00:51:43 2008 +0000

description:
Mechanical changes to add full DESTDIR support to packages that install
their files via a custom do-install target.

diffstat:

 benchmarks/benchfft/Makefile      |  11 +++++++----
 benchmarks/bytebench/Makefile     |  18 +++++++++---------
 benchmarks/dhrystone/Makefile     |  15 +++++++++------
 benchmarks/fib/Makefile           |   5 +++--
 benchmarks/flops/Makefile         |   9 +++++----
 benchmarks/forkbomb/Makefile      |   8 +++++---
 benchmarks/heapsort/Makefile      |   5 +++--
 benchmarks/hint/Makefile          |   9 +++++----
 benchmarks/iozone/Makefile        |  12 +++++++-----
 benchmarks/linpack-bench/Makefile |   7 ++++---
 benchmarks/nbench/Makefile        |   6 ++++--
 benchmarks/netpipe/Makefile       |  11 +++++++----
 benchmarks/nsieve/Makefile        |   5 +++--
 benchmarks/nttcp/Makefile         |  10 ++++++----
 benchmarks/paranoia/Makefile      |   5 +++--
 benchmarks/pipebench/Makefile     |   6 ++++--
 benchmarks/postmark/Makefile      |   5 +++--
 benchmarks/randread/Makefile      |   5 +++--
 benchmarks/skampi/Makefile        |  28 +++++++++++++++-------------
 benchmarks/whetstone/Makefile     |   5 +++--
 benchmarks/zelibm/Makefile        |   6 ++++--
 biology/arka/Makefile             |  18 ++++++++++--------
 biology/azara/Makefile            |   9 ++++++---
 biology/clustalw/Makefile         |  10 ++++++----
 biology/coalesce/Makefile         |  18 ++++++++++--------
 biology/fastDNAml/Makefile        |  14 +++++++++-----
 biology/fluctuate/Makefile        |  18 ++++++++++--------
 biology/genesplicer/Makefile      |  12 +++++++-----
 biology/glimmer/Makefile          |  16 +++++++++-------
 biology/lucy/Makefile             |  12 +++++++-----
 biology/mummer/Makefile           |  13 ++++++++-----
 biology/pdbalign/Makefile         |  10 ++++++----
 biology/phylip/Makefile           |  15 +++++++++------
 biology/profit/Makefile           |  15 +++++++++------
 biology/sewer/Makefile            |  11 +++++++----
 biology/stride/Makefile           |   6 ++++--
 biology/xylem/Makefile            |  18 +++++++++++-------
 37 files changed, 240 insertions(+), 166 deletions(-)

diffs (truncated from 1207 to 300 lines):

diff -r b9e4e81deee0 -r 625b0d018fcf benchmarks/benchfft/Makefile
--- a/benchmarks/benchfft/Makefile      Mon Mar 03 00:36:09 2008 +0000
+++ b/benchmarks/benchfft/Makefile      Mon Mar 03 00:51:43 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2008/01/19 09:16:17 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2008/03/03 00:51:43 jlam Exp $
 
 DISTNAME=              benchfft-2.0
-PKGREVISION=   2
+PKGREVISION=           2
 CATEGORIES=            benchmarks math
 MASTER_SITES=          ftp://ftp.fftw.org/pub/fftw/ \
                        ftp://ftp.fftw.org/pub/fftw/old/benchfft/
@@ -12,6 +12,7 @@
 COMMENT=               Benchmark your machine with a number of FFT algorithms
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            gmake
@@ -28,8 +29,10 @@
 CONFIGURE_DIRS=                ${WRKDIR}/fftw-2.0.1 ${WRKSRC}
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/bench ${PREFIX}/bin/bench-fft
-       ${INSTALL_SCRIPT} ${WRKSRC}/submit-script ${PREFIX}/bin/run-fftbench
+       ${INSTALL_PROGRAM} ${WRKSRC}/bench \
+               ${DESTDIR}${PREFIX}/bin/bench-fft
+       ${INSTALL_SCRIPT} ${WRKSRC}/submit-script \
+               ${DESTDIR}${PREFIX}/bin/run-fftbench
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r b9e4e81deee0 -r 625b0d018fcf benchmarks/bytebench/Makefile
--- a/benchmarks/bytebench/Makefile     Mon Mar 03 00:36:09 2008 +0000
+++ b/benchmarks/bytebench/Makefile     Mon Mar 03 00:51:43 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/01/19 09:16:17 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=              unixbench-4.1.0
 PKGNAME=               ${DISTNAME:S/unix/byte/}
@@ -11,7 +11,7 @@
 COMMENT=               BYTE Magazine's Public Domain benchmark for UNIX
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
-
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 BENCHMARK_ENV+=                BINDIR=${WRKSRC}/pgms
 BENCHMARK_ENV+=                SCRPDIR=${WRKSRC}/pgms
@@ -37,13 +37,13 @@
        ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
 
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/libexec/bytebench
-       ${INSTALL_SCRIPT} ${WRKSRC}/pgms/* ${PREFIX}/libexec/bytebench
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/bytebench
-       ${INSTALL_DATA} ${WRKSRC}/testdir/* ${PREFIX}/share/bytebench
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bytebench
-       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/bytebench
-       ${INSTALL_SCRIPT} ${WRKSRC}/run-byte ${PREFIX}/bin
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/libexec/bytebench
+       ${INSTALL_SCRIPT} ${WRKSRC}/pgms/* ${DESTDIR}${PREFIX}/libexec/bytebench
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/bytebench
+       ${INSTALL_DATA} ${WRKSRC}/testdir/* ${DESTDIR}${PREFIX}/share/bytebench
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/bytebench
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/bytebench
+       ${INSTALL_SCRIPT} ${WRKSRC}/run-byte ${DESTDIR}${PREFIX}/bin
 
 benchmark:
        @if [ `${ID} -u` != 0 ]; then                                   \
diff -r b9e4e81deee0 -r 625b0d018fcf benchmarks/dhrystone/Makefile
--- a/benchmarks/dhrystone/Makefile     Mon Mar 03 00:36:09 2008 +0000
+++ b/benchmarks/dhrystone/Makefile     Mon Mar 03 00:51:43 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/01/19 09:16:17 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=              dhry2.1
 PKGNAME=               dhrystone-2.1
@@ -10,17 +10,20 @@
 COMMENT=               Reinhold Weicker's DHRYSTONE 2.1 integer benchmark
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 WRKSRC=                        ${WRKDIR}
 
 INSTALLATION_DIRS=     bin
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/dry2 ${PREFIX}/bin/dry2
-       ${INSTALL_PROGRAM} ${WRKSRC}/dry2reg ${PREFIX}/bin/dry2reg
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dhrystone
-       ${INSTALL_DATA} ${WRKSRC}/clarify.doc ${PREFIX}/share/doc/dhrystone
-       ${INSTALL_DATA} ${WRKSRC}/Rationale ${PREFIX}/share/doc/dhrystone
+       ${INSTALL_PROGRAM} ${WRKSRC}/dry2 ${DESTDIR}${PREFIX}/bin/dry2
+       ${INSTALL_PROGRAM} ${WRKSRC}/dry2reg ${DESTDIR}${PREFIX}/bin/dry2reg
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/dhrystone
+       ${INSTALL_DATA} ${WRKSRC}/clarify.doc \
+               ${DESTDIR}${PREFIX}/share/doc/dhrystone
+       ${INSTALL_DATA} ${WRKSRC}/Rationale \
+               ${DESTDIR}${PREFIX}/share/doc/dhrystone
 
 benchmark:
        -@${ECHO} 5000000 | ${WRKSRC}/dry2 | tee ${WRKSRC}/dry.out
diff -r b9e4e81deee0 -r 625b0d018fcf benchmarks/fib/Makefile
--- a/benchmarks/fib/Makefile   Mon Mar 03 00:36:09 2008 +0000
+++ b/benchmarks/fib/Makefile   Mon Mar 03 00:51:43 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/01/19 09:16:17 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=              fib.c
 PKGNAME=               fib-980203
@@ -10,6 +10,7 @@
 COMMENT=               Mathematical benchmark
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 WRKSRC=                        ${WRKDIR}
 
@@ -23,7 +24,7 @@
        (cd ${WRKSRC} ; ${CC} ${CFLAGS} -DUNIX -o fib fib.c -lm)
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/fib ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/fib ${DESTDIR}${PREFIX}/bin
 
 benchmark:
        -@${WRKSRC}/fib | tee ${WRKSRC}/fib.out
diff -r b9e4e81deee0 -r 625b0d018fcf benchmarks/flops/Makefile
--- a/benchmarks/flops/Makefile Mon Mar 03 00:36:09 2008 +0000
+++ b/benchmarks/flops/Makefile Mon Mar 03 00:51:43 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/01/19 09:16:18 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=              flops
 PKGNAME=               flops-2.0
@@ -11,6 +11,7 @@
 COMMENT=               Floating point benchmark to give your MFLOPS rating
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 WRKSRC=                        ${WRKDIR}
 
@@ -25,9 +26,9 @@
        (cd ${WRKSRC} ; ${CC} ${CFLAGS} -DUNIX -o flops flops.c -lm)
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/flops ${PREFIX}/bin
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/flops
-       ${INSTALL_DATA} ${WRKSRC}/flops.doc ${PREFIX}/share/doc/flops
+       ${INSTALL_PROGRAM} ${WRKSRC}/flops ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/flops
+       ${INSTALL_DATA} ${WRKSRC}/flops.doc ${DESTDIR}${PREFIX}/share/doc/flops
 
 benchmark:
        -@${WRKSRC}/flops | tee ${WRKSRC}/flops.out
diff -r b9e4e81deee0 -r 625b0d018fcf benchmarks/forkbomb/Makefile
--- a/benchmarks/forkbomb/Makefile      Mon Mar 03 00:36:09 2008 +0000
+++ b/benchmarks/forkbomb/Makefile      Mon Mar 03 00:51:43 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/03/04 21:29:01 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/03 00:51:44 jlam Exp $
 #
 
 DISTNAME=      forkbomb-1.4
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://home.tiscali.cz:8080/~cz210552/forkbomb.html
 COMMENT=       Classic Unix fork() bomber
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 INSTALLATION_DIRS+=    bin man/man8
 
 do-build:
@@ -16,8 +18,8 @@
                ${WRKSRC}/forkbomb
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/forkbomb ${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/forkbomb.8 ${PREFIX}/${PKGMANDIR}/man8
+       ${INSTALL_PROGRAM} ${WRKSRC}/forkbomb ${DESTDIR}${PREFIX}/bin
+       1${INSTALL_MAN} ${WRKSRC}/forkbomb.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b9e4e81deee0 -r 625b0d018fcf benchmarks/heapsort/Makefile
--- a/benchmarks/heapsort/Makefile      Mon Mar 03 00:36:09 2008 +0000
+++ b/benchmarks/heapsort/Makefile      Mon Mar 03 00:51:43 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/01/19 09:16:18 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=              heapsort.c
 PKGNAME=               heapsort-1.0
@@ -10,6 +10,7 @@
 COMMENT=               Benchmark program for variable sized arrays
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 WRKSRC=                        ${WRKDIR}
 
@@ -23,7 +24,7 @@
        (cd ${WRKSRC} ; ${CC} ${CFLAGS} -DUNIX -o heapsort heapsort.c -lm)
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/heapsort ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/heapsort ${DESTDIR}${PREFIX}/bin
 
 benchmark:
        -@${WRKSRC}/heapsort | tee ${WRKSRC}/heapsort.out
diff -r b9e4e81deee0 -r 625b0d018fcf benchmarks/hint/Makefile
--- a/benchmarks/hint/Makefile  Mon Mar 03 00:36:09 2008 +0000
+++ b/benchmarks/hint/Makefile  Mon Mar 03 00:51:43 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/01/07 09:13:47 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=      hint_unix_serial
 PKGNAME=       hint.serial-98.06.12
@@ -11,6 +11,7 @@
 COMMENT=       Scalable benchmark for testing CPU and memory performance
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 BUILD_TARGET=  DOUBLE INT
 
@@ -22,9 +23,9 @@
        ${CP} ${FILESDIR}/hint.1 ${WRKSRC}/hint.1
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/DOUBLE ${PREFIX}/bin/hint-double
-       ${INSTALL_PROGRAM} ${WRKSRC}/INT ${PREFIX}/bin/hint-int
-       ${INSTALL_MAN} ${WRKSRC}/hint.1 ${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_PROGRAM} ${WRKSRC}/DOUBLE ${DESTDIR}${PREFIX}/bin/hint-double
+       ${INSTALL_PROGRAM} ${WRKSRC}/INT ${DESTDIR}${PREFIX}/bin/hint-int
+       ${INSTALL_MAN} ${WRKSRC}/hint.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 benchmark:
        cd ${WRKSRC} ; ${MKDIR} data ; ./DOUBLE | tee hint.out
diff -r b9e4e81deee0 -r 625b0d018fcf benchmarks/iozone/Makefile
--- a/benchmarks/iozone/Makefile        Mon Mar 03 00:36:09 2008 +0000
+++ b/benchmarks/iozone/Makefile        Mon Mar 03 00:51:43 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2008/01/19 09:16:18 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=      iozone3_263
 PKGNAME=       iozone-3.263
@@ -16,6 +16,7 @@
 NOT_FOR_PLATFORM=      Interix-*-* # has only 32-bit off_t
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/src/current
 MAKE_FILE=             makefile
@@ -42,11 +43,12 @@
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/iozone ${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 ${PREFIX}/${PKGMANDIR}/man1
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/IOzone
+       ${INSTALL_PROGRAM} ${WRKSRC}/iozone ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/IOzone
        ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/Iozone_ps.gz \
-               ${PREFIX}/share/doc/IOzone
+               ${DESTDIR}${PREFIX}/share/doc/IOzone
 
 benchmark:
        cd ${WRKSRC}; ./iozone -Ea | ${TEE} iozone.out
diff -r b9e4e81deee0 -r 625b0d018fcf benchmarks/linpack-bench/Makefile
--- a/benchmarks/linpack-bench/Makefile Mon Mar 03 00:36:09 2008 +0000
+++ b/benchmarks/linpack-bench/Makefile Mon Mar 03 00:51:43 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/01/19 09:16:18 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/03 00:51:44 jlam Exp $
 
 DISTNAME=              linpackc
 PKGNAME=               linpack-bench-940225
@@ -10,6 +10,7 @@
 COMMENT=               Collection of benchmarks for floating point
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 WRKSRC=                        ${WRKDIR}
 



Home | Main Index | Thread Index | Old Index