pkgsrc-Changes-HG archive

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

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



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1ebd4a90393f
branches:  trunk
changeset: 539407:1ebd4a90393f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Mar 04 19:21:10 2008 +0000

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

diffstat:

 misc/9menu/Makefile                 |   8 ++-
 misc/JMdict/Makefile                |  16 ++++---
 misc/ascii/Makefile                 |  13 ++++--
 misc/astrolog/Makefile              |  24 +++++++------
 misc/bbdb/Makefile                  |  12 +++--
 misc/chipmunk/Makefile              |   5 +-
 misc/colorize/Makefile              |  26 ++++++++-----
 misc/cowsay/Makefile                |  14 ++++---
 misc/cuecat/Makefile                |  10 +++--
 misc/cuetools/Makefile              |  23 +++++++----
 misc/dnetc/Makefile                 |  18 +++++----
 misc/dtach/Makefile                 |  13 ++++--
 misc/dvorakng/Makefile              |   5 +-
 misc/easymenu/Makefile              |  38 +++++++++++---------
 misc/edict/Makefile                 |  14 ++++---
 misc/elscreen/Makefile              |  12 +++--
 misc/emacs-wiki/Makefile            |  32 ++++++++++-------
 misc/figlet-fonts/Makefile          |  18 ++++++---
 misc/firelib/Makefile               |  15 ++++---
 misc/gkrellm-launch/Makefile        |   7 ++-
 misc/gnuls/Makefile                 |  12 +++--
 misc/granulate/Makefile             |  10 +++--
 misc/ipbt/Makefile                  |  13 ++++--
 misc/jhd/Makefile                   |   8 ++-
 misc/kanjidic/Makefile              |  14 ++++---
 misc/kanjidic2/Makefile             |  19 ++++++----
 misc/latin-words-bin/Makefile       |  17 +++++---
 misc/mirmon/Makefile                |  19 +++++----
 misc/mmv/Makefile                   |   9 +++-
 misc/mtail/Makefile                 |  12 ++++--
 misc/multitail/Makefile             |  17 ++++++---
 misc/parchive/Makefile              |   6 ++-
 misc/proj-doc/Makefile              |   8 ++-
 misc/reed/Makefile                  |  20 ++++++----
 misc/routeplanner-cli/Makefile      |  12 +++--
 misc/rox-memo/Makefile              |   6 ++-
 misc/sch/Makefile                   |   6 ++-
 misc/softmaker-office-demo/Makefile |  10 +++--
 misc/splitvt/Makefile               |   8 ++-
 misc/ttyrec/Makefile                |  16 ++++---
 misc/ukpostcodes/Makefile           |   9 +++-
 misc/vera/Makefile                  |   6 ++-
 misc/vfu/Makefile                   |  10 +++--
 misc/wdic/Makefile                  |   5 +-
 misc/xjdic/Makefile                 |  67 +++++++++++++++++++-----------------
 45 files changed, 387 insertions(+), 275 deletions(-)

diffs (truncated from 1624 to 300 lines):

diff -r 527fda8e01a7 -r 1ebd4a90393f misc/9menu/Makefile
--- a/misc/9menu/Makefile       Tue Mar 04 19:08:06 2008 +0000
+++ b/misc/9menu/Makefile       Tue Mar 04 19:21:10 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/02/02 17:07:48 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2008/03/04 19:21:10 jlam Exp $
 
 DISTNAME=              9menu-1.8
 PKGREVISION=           1
@@ -9,6 +9,8 @@
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 COMMENT=               Simple menu patterned after the plan9 user interface
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 MAKE_FILE=             Makefile.noimake
 BUILD_TARGET=          9menu
 
@@ -16,8 +18,8 @@
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/9menu ${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/9menu.1 ${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_PROGRAM} ${WRKSRC}/9menu ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/9menu.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 527fda8e01a7 -r 1ebd4a90393f misc/JMdict/Makefile
--- a/misc/JMdict/Makefile      Tue Mar 04 19:08:06 2008 +0000
+++ b/misc/JMdict/Makefile      Tue Mar 04 19:21:10 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/07/08 09:43:48 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/04 19:21:10 jlam Exp $
 #
 # Update instructions:
 # . bump PKGNAME to today's date
@@ -18,6 +18,8 @@
 HOMEPAGE=      http://www.csse.monash.edu.au/~jwb/edict.html
 COMMENT=       Japanese-Multilingual electronic dictionary
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}
 DIST_SUBDIR=   ${PKGNAME_NOREV}
 EXTRACT_ONLY=  JMdict.gz
@@ -25,14 +27,14 @@
 NO_BUILD=      yes
 
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/JMdict
-       ${INSTALL_DATA} ${WRKSRC}/JMdict ${PREFIX}/share/JMdict
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/JMdict
+       ${INSTALL_DATA} ${WRKSRC}/JMdict ${DESTDIR}${PREFIX}/share/JMdict
        ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/JMdict.dtd \
-               ${PREFIX}/share/JMdict
+               ${DESTDIR}${PREFIX}/share/JMdict
        ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/JMdict.gz \
-               ${PREFIX}/share/JMdict
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/JMdict
+               ${DESTDIR}${PREFIX}/share/JMdict
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/JMdict
        ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/jmdict_proj_desc.html \
-               ${PREFIX}/share/doc/JMdict
+               ${DESTDIR}${PREFIX}/share/doc/JMdict
 
 .include "../../mk/bsd.pkg.mk"
diff -r 527fda8e01a7 -r 1ebd4a90393f misc/ascii/Makefile
--- a/misc/ascii/Makefile       Tue Mar 04 19:08:06 2008 +0000
+++ b/misc/ascii/Makefile       Tue Mar 04 19:21:10 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/02/22 19:01:22 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/03/04 19:21:11 jlam Exp $
 #
 
 DISTNAME=      ascii-3.0
@@ -9,14 +9,17 @@
 HOMEPAGE=      http://www.catb.org/~esr/ascii/
 COMMENT=       ASCII character table program
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 BUILD_TARGET= ascii
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/ascii ${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/ascii.1 ${PREFIX}/${PKGMANDIR}/man1
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ascii
-       ${INSTALL_DATA} ${WRKSRC}/ascii.cgi ${PREFIX}/share/examples/ascii
+       ${INSTALL_PROGRAM} ${WRKSRC}/ascii ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/ascii.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/ascii
+       ${INSTALL_DATA} ${WRKSRC}/ascii.cgi \
+               ${DESTDIR}${PREFIX}/share/examples/ascii
 
 .include "../../mk/bsd.pkg.mk"
diff -r 527fda8e01a7 -r 1ebd4a90393f misc/astrolog/Makefile
--- a/misc/astrolog/Makefile    Tue Mar 04 19:08:06 2008 +0000
+++ b/misc/astrolog/Makefile    Tue Mar 04 19:21:10 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2007/02/22 19:26:48 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2008/03/04 19:21:11 jlam Exp $
 
 DISTNAME=      ast54unx
 PKGNAME=       astrolog-5.40
@@ -18,6 +18,8 @@
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}
 EPHEM=         LRZ5_24 CHI_24 CPJV_24
 EXTRACT_ONLY=  ${DISTNAME}.shr
@@ -30,23 +32,23 @@
 INSTALLATION_DIRS=     bin
 
 do-install:
-       @${INSTALL_DATA_DIR} ${PREFIX}/lib/astrolog
+       @${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/astrolog
        cd ${DISTDIR}/${DIST_SUBDIR} && \
-               ${INSTALL_DATA} ${EPHEM} ${PREFIX}/lib/astrolog
+               ${INSTALL_DATA} ${EPHEM} ${DESTDIR}${PREFIX}/lib/astrolog
        cd ${WRKSRC} && \
-               if [ -f ${PREFIX}/lib/astrolog/astrolog.dat ] ; then \
-                       ${INSTALL_DATA} astrolog.dat ${PREFIX}/lib/astrolog/astrolog.dat-dist; \
+               if [ -f ${DESTDIR}${PREFIX}/lib/astrolog/astrolog.dat ] ; then \
+                       ${INSTALL_DATA} astrolog.dat ${DESTDIR}${PREFIX}/lib/astrolog/astrolog.dat-dist; \
                else \
-                       ${INSTALL_DATA} astrolog.dat ${PREFIX}/lib/astrolog; \
+                       ${INSTALL_DATA} astrolog.dat ${DESTDIR}${PREFIX}/lib/astrolog; \
                fi
-       cd ${WRKSRC} && ${INSTALL_PROGRAM} astrolog ${PREFIX}/bin
-       @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/astrolog
+       cd ${WRKSRC} && ${INSTALL_PROGRAM} astrolog ${DESTDIR}${PREFIX}/bin
+       @${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/astrolog
        cd ${WRKSRC} && \
-               ${INSTALL_DATA} Helpfile.540 ${PREFIX}/share/doc/astrolog
+               ${INSTALL_DATA} Helpfile.540 ${DESTDIR}${PREFIX}/share/doc/astrolog
        cd ${WRKSRC} && \
-               ${INSTALL_DATA} Update.540 ${PREFIX}/share/doc/astrolog
+               ${INSTALL_DATA} Update.540 ${DESTDIR}${PREFIX}/share/doc/astrolog
        cd ${WRKSRC} && \
-               ${INSTALL_DATA} README.540 ${PREFIX}/share/doc/astrolog
+               ${INSTALL_DATA} README.540 ${DESTDIR}${PREFIX}/share/doc/astrolog
        @${ECHO}
        @${ECHO} "See the file ${PREFIX}/share/doc/astrolog/Helpfile.540 for"
        @${ECHO} "help and tune ${PREFIX}/lib/astrolog/astrolog.dat"
diff -r 527fda8e01a7 -r 1ebd4a90393f misc/bbdb/Makefile
--- a/misc/bbdb/Makefile        Tue Mar 04 19:08:06 2008 +0000
+++ b/misc/bbdb/Makefile        Tue Mar 04 19:21:10 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/05/30 14:09:08 uebayasi Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/04 19:21:11 jlam Exp $
 #
 
 DISTNAME=              bbdb-2.34
@@ -15,6 +15,8 @@
 EMACS_VERSIONS_ACCEPTED=       emacs22 emacs22nox emacs21 emacs21nox emacs20 emacs20nox
 CONFLICTS+=            xemacs-packages-[0-9]*
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 BUILD_TARGET=          all mhe
@@ -31,12 +33,12 @@
 INSTALL_TARGET=                install-pkg
 .else
 do-install:
-       ${MKDIR} ${LISPDIR}
-       ${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${LISPDIR}
-       ${INSTALL_DATA} ${WRKSRC}/lisp/*.elc ${LISPDIR}
+       ${MKDIR} ${DESTDIR}${LISPDIR}
+       ${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${DESTDIR}${LISPDIR}
+       ${INSTALL_DATA} ${WRKSRC}/lisp/*.elc ${DESTDIR}${LISPDIR}
        cd ${WRKSRC}/texinfo; for f in bbdb.info bbdb.info-[0-9]*; do   \
                ${TEST} ! -f "$$f" ||                                   \
-               ${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};          \
+               ${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};\
        done
 .endif
 
diff -r 527fda8e01a7 -r 1ebd4a90393f misc/chipmunk/Makefile
--- a/misc/chipmunk/Makefile    Tue Mar 04 19:08:06 2008 +0000
+++ b/misc/chipmunk/Makefile    Tue Mar 04 19:21:10 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:48 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2008/03/04 19:21:11 jlam Exp $
 #
 
 DISTNAME=      chipmunk-1.4
@@ -12,6 +12,7 @@
 
 ONLY_FOR_PLATFORM=     NetBSD-*-i386
 
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 BUILD_TARGET=  chipmunk
 MAKE_ENV+=     CONFIG_OPTIONS=${CPPFLAGS:M*:Q}
@@ -20,7 +21,7 @@
 INSTALLATION_DIRS=     sbin
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/chipmunk ${PREFIX}/sbin/chipmunk
+       ${INSTALL_PROGRAM} ${WRKSRC}/chipmunk ${DESTDIR}${PREFIX}/sbin/chipmunk
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 527fda8e01a7 -r 1ebd4a90393f misc/colorize/Makefile
--- a/misc/colorize/Makefile    Tue Mar 04 19:08:06 2008 +0000
+++ b/misc/colorize/Makefile    Tue Mar 04 19:21:10 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/01/04 06:04:42 obache Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/04 19:21:11 jlam Exp $
 #
 
 DISTNAME=      colorize_0.3.0
@@ -12,6 +12,8 @@
 HOMEPAGE=      # http://colorize.raszi.hu/
 COMMENT=       Log colorize perl script
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 NO_BUILD=      yes
 
@@ -32,16 +34,20 @@
        ${GUNZIP_CMD} ${WRKSRC}/examples/colorize-tail.sh.gz
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/colorize.pl ${PREFIX}/bin/colorize
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/colorize
-       ${INSTALL_DATA} ${WRKSRC}/colorizerc ${PREFIX}/share/examples/colorize
-       ${INSTALL_MAN} ${WRKSRC}/colorize.pl.1 ${PREFIX}/${PKGMANDIR}/man1/colorize.1
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/colorize
-       cd ${WRKSRC} && ${INSTALL_DATA} README TIPS ${PREFIX}/share/doc/colorize
+       ${INSTALL_SCRIPT} ${WRKSRC}/colorize.pl ${DESTDIR}${PREFIX}/bin/colorize
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/colorize
+       ${INSTALL_DATA} ${WRKSRC}/colorizerc                            \
+               ${DESTDIR}${PREFIX}/share/examples/colorize
+       ${INSTALL_MAN} ${WRKSRC}/colorize.pl.1                          \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/colorize.1
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/colorize
+       cd ${WRKSRC} && ${INSTALL_DATA} README TIPS                     \
+               ${DESTDIR}${PREFIX}/share/doc/colorize
        ${INSTALL_SCRIPT} ${WRKSRC}/examples/colorize-fifo.sh           \
-               ${PREFIX}/share/examples/colorize
+               ${DESTDIR}${PREFIX}/share/examples/colorize
        ${INSTALL_SCRIPT} ${WRKSRC}/examples/colorize-tail.sh           \
-               ${PREFIX}/share/examples/colorize
-       ${INSTALL_DATA} ${WRKSRC}/examples/Xlog.tar.gz ${PREFIX}/share/examples/colorize
+               ${DESTDIR}${PREFIX}/share/examples/colorize
+       ${INSTALL_DATA} ${WRKSRC}/examples/Xlog.tar.gz                  \
+               ${DESTDIR}${PREFIX}/share/examples/colorize
 
 .include "../../mk/bsd.pkg.mk"
diff -r 527fda8e01a7 -r 1ebd4a90393f misc/cowsay/Makefile
--- a/misc/cowsay/Makefile      Tue Mar 04 19:08:06 2008 +0000
+++ b/misc/cowsay/Makefile      Tue Mar 04 19:21:10 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:00 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2008/03/04 19:21:11 jlam Exp $
 
 DISTNAME=              cowsay-3.03
 PKGREVISION=           1
@@ -9,6 +9,8 @@
 HOMEPAGE=              http://www.nog.net/~tony/warez/cowsay.shtml
 COMMENT=               Configurable talking cow
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=            perl:run
 
 SUBST_CLASSES+=                pap
@@ -23,10 +25,10 @@
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/cows
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/cowsay ${PREFIX}/bin
-       cd ${PREFIX}/bin; ${LN} -s cowsay cowthink
-       ${INSTALL_DATA} ${WRKSRC}/cowsay.1 ${PREFIX}/${PKGMANDIR}/man1
-       cd ${PREFIX}/${PKGMANDIR}/man1; ${LN} -s cowsay.1 cowthink.1
-       ${INSTALL_DATA} ${WRKSRC}/cows/*.cow ${PREFIX}/share/cows
+       ${INSTALL_SCRIPT} ${WRKSRC}/cowsay ${DESTDIR}${PREFIX}/bin
+       cd ${DESTDIR}${PREFIX}/bin; ${LN} -s cowsay cowthink
+       ${INSTALL_DATA} ${WRKSRC}/cowsay.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; ${LN} -s cowsay.1 cowthink.1
+       ${INSTALL_DATA} ${WRKSRC}/cows/*.cow ${DESTDIR}${PREFIX}/share/cows
 
 .include "../../mk/bsd.pkg.mk"
diff -r 527fda8e01a7 -r 1ebd4a90393f misc/cuecat/Makefile
--- a/misc/cuecat/Makefile      Tue Mar 04 19:08:06 2008 +0000
+++ b/misc/cuecat/Makefile      Tue Mar 04 19:21:10 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:10 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/04 19:21:11 jlam Exp $



Home | Main Index | Thread Index | Old Index