pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/archivers Mechanical changes to add full DESTDIR suppo...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/736eabe86cac
branches:  trunk
changeset: 539236:736eabe86cac
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Mar 02 03:48:36 2008 +0000

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

diffstat:

 archivers/9e/Makefile          |   5 +++--
 archivers/afio/Makefile        |   8 +++++---
 archivers/arc/Makefile         |   9 +++++----
 archivers/archangel/Makefile   |   8 +++++---
 archivers/bicom/Makefile       |   9 +++++----
 archivers/bunzip/Makefile      |   5 +++--
 archivers/gzrecover/Makefile   |   7 ++++---
 archivers/ha/Makefile          |   5 +++--
 archivers/lha/Makefile         |   8 +++++---
 archivers/lzma/Makefile        |  12 +++++++-----
 archivers/macutil/Makefile     |   9 ++++++---
 archivers/makeself/Makefile    |   6 ++++--
 archivers/mousetar/Makefile    |   8 +++++---
 archivers/mscompress/Makefile  |  13 ++++++++-----
 archivers/nomarch/Makefile     |   8 +++++---
 archivers/p7zip/Makefile       |  36 +++++++++++++++++++++++-------------
 archivers/pbzip2/Makefile      |  16 +++++++++++-----
 archivers/ppmd/Makefile        |  10 ++++++----
 archivers/ppunpack/Makefile    |   5 +++--
 archivers/rox-archive/Makefile |   6 ++++--
 archivers/sarab/Makefile       |  11 +++++++----
 archivers/squsq/Makefile       |   6 ++++--
 archivers/unace/Makefile       |  10 ++++++----
 archivers/unalz/Makefile       |   5 +++--
 archivers/unarj/Makefile       |  14 +++++++++-----
 archivers/undms/Makefile       |   5 +++--
 archivers/unlzx/Makefile       |   5 +++--
 archivers/unzoo/Makefile       |   5 +++--
 archivers/upx/Makefile         |  14 +++++++++-----
 archivers/xbin/Makefile        |   9 ++++++---
 archivers/xmill/Makefile       |   7 ++++---
 archivers/zip1/Makefile        |  15 ++++++++++-----
 32 files changed, 187 insertions(+), 112 deletions(-)

diffs (truncated from 969 to 300 lines):

diff -r 1d2639b008bb -r 736eabe86cac archivers/9e/Makefile
--- a/archivers/9e/Makefile     Sun Mar 02 03:08:02 2008 +0000
+++ b/archivers/9e/Makefile     Sun Mar 02 03:48:36 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:28:51 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=      9e
 PKGNAME=       9e-1.0
@@ -10,12 +10,13 @@
 COMMENT=       Explode Plan9 archives
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 NO_CONFIGURE=  yes
 
 INSTALLATION_DIRS=     bin
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/9e ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/9e ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1d2639b008bb -r 736eabe86cac archivers/afio/Makefile
--- a/archivers/afio/Makefile   Sun Mar 02 03:08:02 2008 +0000
+++ b/archivers/afio/Makefile   Sun Mar 02 03:48:36 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/07/23 13:57:28 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=      afio-2.5
 PKGREVISION=   1
@@ -11,6 +11,7 @@
 COMMENT=       cpio-format archive creator with data corruption handling
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 BUILD_TARGET=  afio
 
@@ -23,7 +24,8 @@
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/afio ${PREFIX}/bin/afio
-       ${INSTALL_MAN} ${WRKSRC}/afio.1 ${PREFIX}/${PKGMANDIR}/man1/afio.1
+       ${INSTALL_PROGRAM} ${WRKSRC}/afio ${DESTDIR}${PREFIX}/bin/afio
+       ${INSTALL_MAN} ${WRKSRC}/afio.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/afio.1
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1d2639b008bb -r 736eabe86cac archivers/arc/Makefile
--- a/archivers/arc/Makefile    Sun Mar 02 03:08:02 2008 +0000
+++ b/archivers/arc/Makefile    Sun Mar 02 03:48:36 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/10/04 20:45:46 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=      arc-5.21o
 CATEGORIES=    archivers
@@ -10,12 +10,13 @@
 COMMENT=       Create & extract files from DOS .ARC files
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/arc ${PREFIX}/bin/
-       ${INSTALL_PROGRAM} ${WRKSRC}/marc ${PREFIX}/bin/
-       ${INSTALL_MAN} ${WRKSRC}/arc.1 ${PREFIX}/${PKGMANDIR}/man1/
+       ${INSTALL_PROGRAM} ${WRKSRC}/arc ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/marc ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/arc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1d2639b008bb -r 736eabe86cac archivers/archangel/Makefile
--- a/archivers/archangel/Makefile      Sun Mar 02 03:08:02 2008 +0000
+++ b/archivers/archangel/Makefile      Sun Mar 02 03:48:36 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/07/23 14:11:06 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=      archangel-20050730
 PKGREVISION=   1
@@ -11,14 +11,16 @@
 
 DEPENDS+=      gnupg-[0-9]*:../../security/gnupg
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE= yes
 WRKSRC=                ${WRKDIR}/archangel
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/aatar ${PREFIX}/bin/.
-       ${INSTALL_MAN} ${WRKSRC}/aatar.1 ${PREFIX}/${PKGMANDIR}/man1/.
+       ${INSTALL_PROGRAM} ${WRKSRC}/aatar ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/aatar.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff -r 1d2639b008bb -r 736eabe86cac archivers/bicom/Makefile
--- a/archivers/bicom/Makefile  Sun Mar 02 03:08:02 2008 +0000
+++ b/archivers/bicom/Makefile  Sun Mar 02 03:48:36 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/12/15 14:34:18 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2008/03/02 03:48:36 jlam Exp $
 #
 
 DISTNAME=              bicom101
@@ -20,6 +20,7 @@
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 WRKSRC=                        ${WRKDIR}
 USE_LANGUAGES=         c++
@@ -40,9 +41,9 @@
                        -o bicom *.o ../bialib/*.o
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/bicom/bicom ${PREFIX}/bin
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bicom
+       ${INSTALL_PROGRAM} ${WRKSRC}/bicom/bicom ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/bicom
        ${INSTALL_DATA} ${WRKSRC}/README.TXT \
-               ${PREFIX}/share/doc/bicom/readme.txt
+               ${DESTDIR}${PREFIX}/share/doc/bicom/readme.txt
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1d2639b008bb -r 736eabe86cac archivers/bunzip/Makefile
--- a/archivers/bunzip/Makefile Sun Mar 02 03:08:02 2008 +0000
+++ b/archivers/bunzip/Makefile Sun Mar 02 03:48:36 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:28:52 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=      bunzip021.c
 PKGNAME=       bunzip-0.21
@@ -11,6 +11,7 @@
 COMMENT=       Decompressor for bzip .bz files
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 WRKSRC=                ${WRKDIR}
 
@@ -20,6 +21,6 @@
        cd ${WRKSRC} && ${CC} ${CFLAGS} -o bunzip ${DISTNAME}
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/bunzip ${PREFIX}/bin/bunzip
+       ${INSTALL_PROGRAM} ${WRKSRC}/bunzip ${DESTDIR}${PREFIX}/bin/bunzip
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1d2639b008bb -r 736eabe86cac archivers/gzrecover/Makefile
--- a/archivers/gzrecover/Makefile      Sun Mar 02 03:08:02 2008 +0000
+++ b/archivers/gzrecover/Makefile      Sun Mar 02 03:48:36 2008 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:49 tv Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/02 03:48:36 jlam Exp $
 #
 
 DISTNAME=              gzrt-0.2
 PKGNAME=               gzrecover-0.2
-PKGREVISION=   1
+PKGREVISION=           1
 CATEGORIES=            archivers
 MASTER_SITES=          http://www.urbanophile.com/arenn/hacking/gzrt/
 
@@ -12,13 +12,14 @@
 COMMENT=               GZip Recovery Toolkit
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 BUILD_TARGET=          gzrecover
 
 INSTALLATION_DIRS=     bin
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/gzrecover ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/gzrecover ${DESTDIR}${PREFIX}/bin
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1d2639b008bb -r 736eabe86cac archivers/ha/Makefile
--- a/archivers/ha/Makefile     Sun Mar 02 03:08:02 2008 +0000
+++ b/archivers/ha/Makefile     Sun Mar 02 03:48:36 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/09/09 02:41:54 obache Exp $
+# $NetBSD: Makefile,v 1.28 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=      ha0999
 PKGNAME=       ha-0.999b
@@ -11,6 +11,7 @@
 COMMENT=       The HA archiver using the HSC compression method
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 WRKSRC=                ${WRKDIR}
 
@@ -21,6 +22,6 @@
 INSTALLATION_DIRS=     bin
 
 do-install:
-       cd ${WRKSRC}; ${INSTALL_PROGRAM} ha ${PREFIX}/bin
+       cd ${WRKSRC}; ${INSTALL_PROGRAM} ha ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1d2639b008bb -r 736eabe86cac archivers/lha/Makefile
--- a/archivers/lha/Makefile    Sun Mar 02 03:08:02 2008 +0000
+++ b/archivers/lha/Makefile    Sun Mar 02 03:48:36 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2007/05/28 21:21:09 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=      lha-114i
 PKGNAME=       lha-114.9
@@ -18,6 +18,7 @@
 NO_BIN_ON_CDROM=${RESTRICTED}
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -32,7 +33,8 @@
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/ja_JP.EUC/man1
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/src/lha ${PREFIX}/bin/
-       ${INSTALL_MAN} ${WRKSRC}/man/lha.n ${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/lha.1
+       ${INSTALL_PROGRAM} ${WRKSRC}/src/lha ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/man/lha.n \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/lha.1
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1d2639b008bb -r 736eabe86cac archivers/lzma/Makefile
--- a/archivers/lzma/Makefile   Sun Mar 02 03:08:02 2008 +0000
+++ b/archivers/lzma/Makefile   Sun Mar 02 03:48:36 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/02/17 12:07:28 obache Exp $
+# $NetBSD: Makefile,v 1.2 2008/03/02 03:48:36 jlam Exp $
 #
 
 DISTNAME=              lzma443
@@ -11,15 +11,17 @@
 HOMEPAGE=              http://www.7-zip.org/sdk.html
 COMMENT=               LZMA compression utility from 7zip
 
-USE_LANGUAGES=         c c++
+PKG_DESTDIR_SUPPORT=   user-destdir
 
-WRKSRC=                ${WRKDIR}/C/7zip/Compress/LZMA_Alone
-
+USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake
 
+WRKSRC=                        ${WRKDIR}/C/7zip/Compress/LZMA_Alone
 MAKE_FILE=             makefile.gcc
 
+INSTALLATION_DIRS=     bin
+
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/lzma ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/lzma ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1d2639b008bb -r 736eabe86cac archivers/macutil/Makefile
--- a/archivers/macutil/Makefile        Sun Mar 02 03:08:02 2008 +0000
+++ b/archivers/macutil/Makefile        Sun Mar 02 03:48:36 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/09/09 02:41:54 obache Exp $
+# $NetBSD: Makefile,v 1.24 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=              macutil2.0b3
 PKGNAME=               macutil-2.0b3
@@ -10,6 +10,7 @@
 COMMENT=               Create & extract Mac archive files
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 MAKE_FILE=             makefile
 MAKE_ENV+=             CF=${CFLAGS:M*:Q}
@@ -25,7 +26,8 @@
                           ${WRKSRC}/mixed/macstream \
                           ${WRKSRC}/binhex/binhex \
                           ${WRKSRC}/comm/tomac \
-                          ${WRKSRC}/comm/frommac ${PREFIX}/bin
+                          ${WRKSRC}/comm/frommac \
+               ${DESTDIR}${PREFIX}/bin



Home | Main Index | Thread Index | Old Index