pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/converters Mechanical changes to add full DESTDIR supp...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bead6b50861f
branches:  trunk
changeset: 539302:bead6b50861f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Mar 03 05:51:07 2008 +0000

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

diffstat:

 converters/2vcard/Makefile        |  14 +++++++++-----
 converters/ack/Makefile           |   8 +++++---
 converters/base64/Makefile        |   7 ++++---
 converters/bbcim/Makefile         |   8 +++++---
 converters/bib2xml/Makefile       |   6 ++++--
 converters/bibtex2html/Makefile   |  25 ++++++++++++++++---------
 converters/cbmconvert/Makefile    |  11 +++++++----
 converters/chef/Makefile          |   5 +++--
 converters/code2html/Makefile     |   9 ++++++---
 converters/doc2html/Makefile      |   8 +++++---
 converters/dvi2tty/Makefile       |   8 +++++---
 converters/enriched2html/Makefile |   6 ++++--
 converters/hztty/Makefile         |   7 ++++---
 converters/ja-dvi2tty/Makefile    |  11 +++++++----
 converters/jcode-perl/Makefile    |   9 ++++++---
 converters/macfork/Makefile       |  10 ++++++----
 converters/p5-chkjis/Makefile     |   9 ++++++---
 converters/qkc/Makefile           |   8 +++++---
 converters/rtf2html/Makefile      |   6 ++++--
 converters/ruby-romkan/Makefile   |  18 ++++++++++--------
 converters/smbchartool/Makefile   |  12 +++++++-----
 converters/tex2rtf/Makefile       |   6 ++++--
 converters/unix2dos/Makefile      |  14 +++++++++-----
 converters/xlreader/Makefile      |   6 ++++--
 24 files changed, 145 insertions(+), 86 deletions(-)

diffs (truncated from 710 to 300 lines):

diff -r df58dbf7f668 -r bead6b50861f converters/2vcard/Makefile
--- a/converters/2vcard/Makefile        Mon Mar 03 05:33:32 2008 +0000
+++ b/converters/2vcard/Makefile        Mon Mar 03 05:51:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:49 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/03 05:51:07 jlam Exp $
 #
 
 DISTNAME=      2vcard-0.5
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://www.netmeister.org/apps/2vcard/
 COMMENT=       Convert an addressbook to the popular VCARD file format
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=    perl:run
 REPLACE_PERL=  src/2vcard
 
@@ -18,9 +20,11 @@
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/src/2vcard ${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/doc/2vcard.1 ${PREFIX}/${PKGMANDIR}/man1/
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/2vcard
-       ${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/html/2vcard
+       ${INSTALL_SCRIPT} ${WRKSRC}/src/2vcard ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/doc/2vcard.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/html/2vcard
+       ${INSTALL_DATA} ${WRKSRC}/doc/html/* \
+               ${DESTDIR}${PREFIX}/share/doc/html/2vcard
 
 .include "../../mk/bsd.pkg.mk"
diff -r df58dbf7f668 -r bead6b50861f converters/ack/Makefile
--- a/converters/ack/Makefile   Mon Mar 03 05:33:32 2008 +0000
+++ b/converters/ack/Makefile   Mon Mar 03 05:51:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:49 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/03 05:51:07 jlam Exp $
 
 DISTNAME=      ack139
 PKGNAME=       ack-1.39
@@ -8,12 +8,14 @@
 MAINTAINER=    kei_sun%ba2.so-net.ne.jp@localhost
 COMMENT=       Japanese code converter
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 BUILD_TARGET=     ack
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/ja_JP.EUC/man1
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/ack ${PREFIX}/bin/ack
-       ${INSTALL_DATA} ${WRKSRC}/ack.1 ${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/ack.1
+       ${INSTALL_PROGRAM} ${WRKSRC}/ack ${DESTDIR}${PREFIX}/bin/ack
+       ${INSTALL_DATA} ${WRKSRC}/ack.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/ack.1
 
 .include "../../mk/bsd.pkg.mk"
diff -r df58dbf7f668 -r bead6b50861f converters/base64/Makefile
--- a/converters/base64/Makefile        Mon Mar 03 05:33:32 2008 +0000
+++ b/converters/base64/Makefile        Mon Mar 03 05:51:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/12/16 16:14:32 adam Exp $
+# $NetBSD: Makefile,v 1.21 2008/03/03 05:51:07 jlam Exp $
 
 DISTNAME=      base64-1.5
 CATEGORIES=    converters
@@ -9,6 +9,7 @@
 COMMENT=       Encode and decode base64 files
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=         yes
 BUILD_TARGET=          prog
@@ -16,7 +17,7 @@
 INSTALLATION_DIRS=     bin
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/base64 ${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/base64.1 ${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_PROGRAM} ${WRKSRC}/base64 ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/base64.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff -r df58dbf7f668 -r bead6b50861f converters/bbcim/Makefile
--- a/converters/bbcim/Makefile Mon Mar 03 05:33:32 2008 +0000
+++ b/converters/bbcim/Makefile Mon Mar 03 05:51:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:14 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/03 05:51:07 jlam Exp $
 #
 
 DISTNAME=      bbcim095-5
@@ -11,6 +11,8 @@
 MAINTAINER=    skrll%NetBSD.org@localhost
 COMMENT=       File and diskimage conversion utility for BBC Micro software
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}/bbcim
 MAN_PAGE=      ${FILESDIR}/bbcim.1
 
@@ -20,7 +22,7 @@
        (cd ${WRKSRC} && ${WRKSRC}/mkbbcim)
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/bbcim ${PREFIX}/bin/
-       ${INSTALL_MAN} ${MAN_PAGE} ${PREFIX}/${PKGMANDIR}/man1/
+       ${INSTALL_PROGRAM} ${WRKSRC}/bbcim ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${MAN_PAGE} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff -r df58dbf7f668 -r bead6b50861f converters/bib2xml/Makefile
--- a/converters/bib2xml/Makefile       Mon Mar 03 05:33:32 2008 +0000
+++ b/converters/bib2xml/Makefile       Mon Mar 03 05:51:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/10/04 20:52:11 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/03/03 05:51:07 jlam Exp $
 #
 
 DISTNAME=      bib2xml-10062002
@@ -11,6 +11,8 @@
 HOMEPAGE=      http://www-plan.cs.colorado.edu/henkel/stuff/bib2xml/
 COMMENT=       BibTeX to XML converter
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}/bib2xml
 GNU_CONFIGURE= YES
 BUILD_DIRS=    ${WRKSRC}/progs
@@ -18,7 +20,7 @@
 INSTALLATION_DIRS=     bin
 
 do-install:
-       ${INSTALL_PROGRAM} ${BUILD_DIRS}/bib2xml ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${BUILD_DIRS}/bib2xml ${DESTDIR}${PREFIX}/bin
 
 .include "../../textproc/btparse/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r df58dbf7f668 -r bead6b50861f converters/bibtex2html/Makefile
--- a/converters/bibtex2html/Makefile   Mon Mar 03 05:33:32 2008 +0000
+++ b/converters/bibtex2html/Makefile   Mon Mar 03 05:51:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/01/10 18:15:29 tonio Exp $
+# $NetBSD: Makefile,v 1.25 2008/03/03 05:51:07 jlam Exp $
 
 DISTNAME=      bibtex2html-1.89
 CATEGORIES=    converters
@@ -10,6 +10,8 @@
 
 BUILD_DEPENDS+=        hevea-[0-9]*:../../textproc/hevea
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE= yes
 USE_TOOLS+=    perl:run
 TEX_ACCEPTED=  teTeX3
@@ -28,14 +30,19 @@
        cd ${WRKSRC}; ${MAKE} doc
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/aux2bib ${PREFIX}/bin
-       ${INSTALL_PROGRAM} ${WRKSRC}/bibtex2html ${PREFIX}/bin
-       ${INSTALL_PROGRAM} ${WRKSRC}/bib2bib ${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/bibtex2html.1 ${PREFIX}/${PKGMANDIR}/man1
-       ${INSTALL_MAN} ${WRKSRC}/bibtex2html.1 ${PREFIX}/${PKGMANDIR}/man1/bib2bib.1
-       ${INSTALL_MAN} ${WRKSRC}/aux2bib.1 ${PREFIX}/${PKGMANDIR}/man1/aux2bib.1
-       ${INSTALL_DATA} ${WRKSRC}/manual.html ${PREFIX}/share/doc/${PKGBASE}
-       ${INSTALL_DATA} ${WRKSRC}/manual.ps ${PREFIX}/share/doc/${PKGBASE}
+       ${INSTALL_SCRIPT} ${WRKSRC}/aux2bib ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/bibtex2html ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/bib2bib ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/bibtex2html.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${WRKSRC}/bibtex2html.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/bib2bib.1
+       ${INSTALL_MAN} ${WRKSRC}/aux2bib.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/aux2bib.1
+       ${INSTALL_DATA} ${WRKSRC}/manual.html \
+               ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+       ${INSTALL_DATA} ${WRKSRC}/manual.ps \
+               ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/tex.buildlink3.mk"
diff -r df58dbf7f668 -r bead6b50861f converters/cbmconvert/Makefile
--- a/converters/cbmconvert/Makefile    Mon Mar 03 05:33:32 2008 +0000
+++ b/converters/cbmconvert/Makefile    Mon Mar 03 05:51:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/09/09 02:41:55 obache Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/03 05:51:07 jlam Exp $
 
 DISTNAME=              cbmconvert-2.1.2
 CATEGORIES=            converters archivers
@@ -7,15 +7,18 @@
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 COMMENT=               Converts files to and from various C64/C128/CBM formats
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 MAKE_FILE=             Makefile.unix
 MAKE_FLAGS+=           CFLAGS=${CFLAGS:M*:Q}
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/doc/cbmconvert
 
 do-install:
 .for f in cbmconvert disk2zip zip2disk
-       ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin/
-       ${INSTALL_MAN} ${WRKSRC}/${f}.1 ${PREFIX}/${PKGMANDIR}/man1/
+       ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/${f}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 .endfor
-       ${INSTALL_DATA} ${WRKSRC}/cbmconvert.html ${PREFIX}/share/doc/cbmconvert/
+       ${INSTALL_DATA} ${WRKSRC}/cbmconvert.html \
+               ${DESTDIR}${PREFIX}/share/doc/cbmconvert
 
 .include "../../mk/bsd.pkg.mk"
diff -r df58dbf7f668 -r bead6b50861f converters/chef/Makefile
--- a/converters/chef/Makefile  Mon Mar 03 05:33:32 2008 +0000
+++ b/converters/chef/Makefile  Mon Mar 03 05:51:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/01/18 11:51:33 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/03 05:51:08 jlam Exp $
 #
 
 DISTNAME=      chef-19920415
@@ -11,6 +11,7 @@
 COMMENT=       Convert from English to (mock) Swedish - Bork Bork Bork!
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 NO_CONFIGURE=  yes
 USE_TOOLS+=    lex
@@ -28,6 +29,6 @@
        ${LINK.c} -o ${WRKSRC}/chef ${WRKSRC}/lex.yy.c -ll
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/chef ${PREFIX}/bin/
+       ${INSTALL_PROGRAM} ${WRKSRC}/chef ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff -r df58dbf7f668 -r bead6b50861f converters/code2html/Makefile
--- a/converters/code2html/Makefile     Mon Mar 03 05:33:32 2008 +0000
+++ b/converters/code2html/Makefile     Mon Mar 03 05:51:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:49 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/03 05:51:08 jlam Exp $
 #
 
 DISTNAME=      code2html-0.9.1
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://www.palfrader.org/code2html/
 COMMENT=       Convert a program source code to syntax highlighted HTML
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 NO_BUILD=      yes
 REPLACE_PERL=  code2html
 USE_TOOLS+=    perl:run
@@ -16,7 +18,8 @@
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/code2html ${PREFIX}/bin/
-       ${INSTALL_MAN} ${WRKSRC}/code2html.1 ${PREFIX}/${PKGMANDIR}/man1/
+       ${INSTALL_SCRIPT} ${WRKSRC}/code2html ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/code2html.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff -r df58dbf7f668 -r bead6b50861f converters/doc2html/Makefile
--- a/converters/doc2html/Makefile      Mon Mar 03 05:33:32 2008 +0000
+++ b/converters/doc2html/Makefile      Mon Mar 03 05:51:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:29:06 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/03 05:51:08 jlam Exp $
 #
 
 DISTNAME=      doc2html
@@ -16,6 +16,8 @@
 DEPENDS+=      xpdf-[0-9]*:../../print/xpdf
 DEPENDS+=      catdoc-[0-9]*:../../textproc/catdoc
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=    gs:run perl:run
 
 INSTALLATION_DIRS=     bin
@@ -30,7 +32,7 @@
 .endfor
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/doc2html ${PREFIX}/bin/doc2html
-       ${INSTALL_SCRIPT} ${WRKSRC}/pdf2html ${PREFIX}/bin/pdf2html
+       ${INSTALL_SCRIPT} ${WRKSRC}/doc2html ${DESTDIR}${PREFIX}/bin/doc2html
+       ${INSTALL_SCRIPT} ${WRKSRC}/pdf2html ${DESTDIR}${PREFIX}/bin/pdf2html
 



Home | Main Index | Thread Index | Old Index