pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/editors Mechanical changes to add DESTDIR support to p...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd469e091093
branches:  trunk
changeset: 539324:cd469e091093
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Mar 03 18:25:52 2008 +0000

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

diffstat:

 editors/biew/Makefile            |  22 ++++++++++++----------
 editors/easyedit/Makefile        |   9 ++++++---
 editors/gice/Makefile            |   6 ++++--
 editors/heme/Makefile            |   7 ++++---
 editors/hnb/Makefile             |   8 +++++---
 editors/jave/Makefile            |  10 ++++++----
 editors/jde/Makefile             |  18 +++++++++++-------
 editors/matlab-mode/Makefile     |   8 +++++---
 editors/mflteco/Makefile         |  29 +++++++++++++++--------------
 editors/mg2a/Makefile            |  10 ++++++----
 editors/mule-ucs/Makefile        |  20 +++++++++++---------
 editors/ne/Makefile              |  13 ++++++++-----
 editors/ng/Makefile              |  26 +++++++++++++-------------
 editors/pico/Makefile            |  14 ++++++++------
 editors/rox-edit/Makefile        |   6 ++++--
 editors/speedbar/Makefile        |  13 ++++++++-----
 editors/ted-cs/Makefile          |   7 +++++--
 editors/ted-da/Makefile          |   7 +++++--
 editors/ted-de/Makefile          |   7 +++++--
 editors/ted-en-gb/Makefile       |   7 +++++--
 editors/ted-en-us/Makefile       |   7 +++++--
 editors/ted-es/Makefile          |   7 +++++--
 editors/ted-fr/Makefile          |   7 +++++--
 editors/ted-it/Makefile          |   7 +++++--
 editors/ted-nl/Makefile          |   7 +++++--
 editors/ted-no/Makefile          |   7 +++++--
 editors/ted-pl/Makefile          |  12 ++++++++----
 editors/ted-pt/Makefile          |   7 +++++--
 editors/ted-sv/Makefile          |   7 +++++--
 editors/ted/Makefile             |  20 +++++++++++---------
 editors/ve/Makefile              |  10 ++++++----
 editors/xcoral/Makefile          |  14 ++++++++------
 editors/xemacs-packages/Makefile |  20 ++++++++++++--------
 33 files changed, 231 insertions(+), 148 deletions(-)

diffs (truncated from 1088 to 300 lines):

diff -r 1ccac7faf116 -r cd469e091093 editors/biew/Makefile
--- a/editors/biew/Makefile     Mon Mar 03 18:15:35 2008 +0000
+++ b/editors/biew/Makefile     Mon Mar 03 18:25:52 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/09/09 02:41:58 obache Exp $
+# $NetBSD: Makefile,v 1.20 2008/03/03 18:25:52 jlam Exp $
 #
 
 DISTNAME=      biew562
@@ -14,6 +14,8 @@
 
 ONLY_FOR_PLATFORM=     *-*-i386
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=    gmake
 MAKE_FILE=     makefile
 WRKSRC=                ${WRKDIR}/biew-562
@@ -21,15 +23,15 @@
 INSTALLATION_DIRS=     bin
 
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/biew
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/biew
-       ${INSTALL_PROGRAM} ${WRKSRC}/biew ${PREFIX}/bin
-       ${INSTALL_DATA} ${WRKSRC}/bin_rc/biew.hlp ${PREFIX}/share/biew
-       ${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/assembly.skn ${PREFIX}/share/biew
-       ${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/golded.skn ${PREFIX}/share/biew
-       ${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/insight.skn ${PREFIX}/share/biew
-       ${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/standard.skn ${PREFIX}/share/biew
-       ${INSTALL_DATA} ${WRKSRC}/doc/biew_en.txt ${PREFIX}/share/doc/biew
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/biew
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/biew
+       ${INSTALL_PROGRAM} ${WRKSRC}/biew ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_DATA} ${WRKSRC}/bin_rc/biew.hlp ${DESTDIR}${PREFIX}/share/biew
+       ${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/assembly.skn ${DESTDIR}${PREFIX}/share/biew
+       ${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/golded.skn ${DESTDIR}${PREFIX}/share/biew
+       ${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/insight.skn ${DESTDIR}${PREFIX}/share/biew
+       ${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/standard.skn ${DESTDIR}${PREFIX}/share/biew
+       ${INSTALL_DATA} ${WRKSRC}/doc/biew_en.txt ${DESTDIR}${PREFIX}/share/doc/biew
 
 .include "../../devel/libslang/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1ccac7faf116 -r cd469e091093 editors/easyedit/Makefile
--- a/editors/easyedit/Makefile Mon Mar 03 18:15:35 2008 +0000
+++ b/editors/easyedit/Makefile Mon Mar 03 18:25:52 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:52 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/03 18:25:52 jlam Exp $
 #
 
 DISTNAME=      ee-1.4.6.src
@@ -11,12 +11,15 @@
 HOMEPAGE=      http://mahon.cwx.net/
 COMMENT=       Easy to use text editor
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/ee ${PREFIX}/bin/easyedit
-       ${INSTALL_MAN} ${WRKSRC}/ee.1 ${PREFIX}/${PKGMANDIR}/man1/easyedit.1
+       ${INSTALL_PROGRAM} ${WRKSRC}/ee ${DESTDIR}${PREFIX}/bin/easyedit
+       ${INSTALL_MAN} ${WRKSRC}/ee.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/easyedit.1
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1ccac7faf116 -r cd469e091093 editors/gice/Makefile
--- a/editors/gice/Makefile     Mon Mar 03 18:15:35 2008 +0000
+++ b/editors/gice/Makefile     Mon Mar 03 18:25:52 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/04/17 13:46:22 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2008/03/03 18:25:52 jlam Exp $
 #
 
 DISTNAME=              gice-0.6.2
@@ -11,6 +11,8 @@
 HOMEPAGE=              http://gice.sourceforge.net/
 COMMENT=               Powerful C text editor with advanced features
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}/gice
 USE_TOOLS+=            gmake pkg-config
 GNU_CONFIGURE=         YES
@@ -21,6 +23,6 @@
 .include "../../x11/gtk2/buildlink3.mk"
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/gice ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/gice ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1ccac7faf116 -r cd469e091093 editors/heme/Makefile
--- a/editors/heme/Makefile     Mon Mar 03 18:15:35 2008 +0000
+++ b/editors/heme/Makefile     Mon Mar 03 18:25:52 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/01/07 09:13:52 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/03 18:25:52 jlam Exp $
 #
 
 DISTNAME=              heme-0.4
@@ -11,6 +11,7 @@
 COMMENT=               Fast and portable console hex editor
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 BUILD_TARGET=          heme
 USE_NCURSES=           # mvwchgat
@@ -21,7 +22,7 @@
 .include "../../devel/ncurses/buildlink3.mk"
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/heme ${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/heme.1 ${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_PROGRAM} ${WRKSRC}/heme ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/heme.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1ccac7faf116 -r cd469e091093 editors/hnb/Makefile
--- a/editors/hnb/Makefile      Mon Mar 03 18:15:35 2008 +0000
+++ b/editors/hnb/Makefile      Mon Mar 03 18:25:52 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:52 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2008/03/03 18:25:52 jlam Exp $
 #
 
 DISTNAME=      hnb-1.9.17
@@ -12,6 +12,8 @@
 
 INCOMPAT_CURSES=       NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-U]-*
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=            gmake
 
 BUILD_DIRS=            ${WRKSRC}/src
@@ -20,8 +22,8 @@
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/src/hnb ${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/doc/hnb.1 ${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_PROGRAM} ${WRKSRC}/src/hnb ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/doc/hnb.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1ccac7faf116 -r cd469e091093 editors/jave/Makefile
--- a/editors/jave/Makefile     Mon Mar 03 18:15:35 2008 +0000
+++ b/editors/jave/Makefile     Mon Mar 03 18:25:52 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/03/10 23:39:24 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/03 18:25:52 jlam Exp $
 
 DISTNAME=              jave_6.0_M7
 PKGNAME=               jave-6.0m7
@@ -12,6 +12,8 @@
 HOMEPAGE=              http://www.jave.de/
 COMMENT=               Java ASCII Versatile Editor
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_JAVA=              run
 PKG_JVMS_ACCEPTED=     sun-jdk14 sun-jdk15
 
@@ -27,9 +29,9 @@
                < ${FILESDIR:Q}/jave > ${WRKDIR:Q}/jave
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKDIR:Q}/jave ${PREFIX:Q}/bin
-       ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/jave
-       (cd ${WRKDIR:Q}/.workdir && ${PAX} -rw * ${PREFIX:Q}/share/jave)
+       ${INSTALL_SCRIPT} ${WRKDIR:Q}/jave ${DESTDIR}${PREFIX:Q}/bin
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/jave
+       (cd ${WRKDIR:Q}/.workdir && ${PAX} -rw * ${DESTDIR}${PREFIX:Q}/share/jave)
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1ccac7faf116 -r cd469e091093 editors/jde/Makefile
--- a/editors/jde/Makefile      Mon Mar 03 18:15:35 2008 +0000
+++ b/editors/jde/Makefile      Mon Mar 03 18:25:52 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/07/05 18:21:20 jnemeth Exp $
+# $NetBSD: Makefile,v 1.23 2008/03/03 18:25:52 jlam Exp $
 #
 
 DISTNAME=      jde-2.3.2
@@ -18,6 +18,8 @@
 DEPENDS+=      ${EMACS_PKGNAME_PREFIX}semantic>=1.4rc13:../../devel/semantic
 DEPENDS+=      ${EMACS_PKGNAME_PREFIX}elib>=1.0:../../devel/elib
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}/${DISTNAME}/lisp
 
 .include "../../mk/emacs.mk"
@@ -38,17 +40,19 @@
        @${RMDIR} ${WRKDIR}/${DISTNAME}/java/classes
 
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jde
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/jde
-       ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/jde
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/jde
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/jde
+       ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/jde
        cd ${WRKDIR}/${DISTNAME}/doc &&                                 \
                ${PAX} -s',^src.*,,' -s',.*\.nosearch.*,,'              \
-                       -rw * ${PREFIX}/share/doc/jde
+                       -rw * ${DESTDIR}${PREFIX}/share/doc/jde
        cd ${WRKDIR}/${DISTNAME} &&                                     \
                ${PAX} -s',^java/classes.*,,' -s',^java/src.*,,'        \
-                       -s',.*\.nosearch.*,,' -rw java ${PREFIX}/share/jde
+                       -s',.*\.nosearch.*,,' -rw java                  \
+                       ${DESTDIR}${PREFIX}/share/jde
        cd ${WRKDIR}/${DISTNAME} &&                                     \
-               ${PAX} -rw -s ',.*\.orig$$,,' lisp ${EMACS_LISPPREFIX}/jde
+               ${PAX} -rw -s ',.*\.orig$$,,' lisp                      \
+                       ${DESTDIR}${EMACS_LISPPREFIX}/jde
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1ccac7faf116 -r cd469e091093 editors/matlab-mode/Makefile
--- a/editors/matlab-mode/Makefile      Mon Mar 03 18:15:35 2008 +0000
+++ b/editors/matlab-mode/Makefile      Mon Mar 03 18:25:52 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:57 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/03 18:25:52 jlam Exp $
 #
 
 DISTNAME=              matlab.el
@@ -15,6 +15,8 @@
 HOMEPAGE=              http://www.mathworks.com/matlabcentral/fileexchange/loadFile.do?objectId=104&objectType=file
 COMMENT=               Matlab mode for Emacs
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}
 DIST_SUBDIR=           ${BASEPKGNAME}
 
@@ -35,7 +37,7 @@
        done
 
 do-install:
-       ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/${PKGBASE:C|^xemacs-||}
-       cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} ${EMACS_LISPPREFIX}/${PKGBASE}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE:C|^xemacs-||}
+       cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE}
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1ccac7faf116 -r cd469e091093 editors/mflteco/Makefile
--- a/editors/mflteco/Makefile  Mon Mar 03 18:15:35 2008 +0000
+++ b/editors/mflteco/Makefile  Mon Mar 03 18:25:52 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/02/22 19:01:18 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/03 18:25:52 jlam Exp $
 #
 
 PKGNAME=               mflteco-19920331
@@ -10,25 +10,26 @@
 HOMEPAGE=              http://www.catb.org/~esr/retro/
 COMMENT=               MFL clone of Tape Editor and COrrector
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 BUILD_TARGET=          te
 
 DOCS=                  ${LOCALBASE}/share/doc/mflteco
 XMPL=                  ${LOCALBASE}/share/examples/mflteco
 
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/te ${LOCALBASE}/bin
-       ${INSTALL_DATA_DIR} ${DOCS}
-       ${INSTALL_DATA_DIR} ${XMPL}
-       ${INSTALL_DATA} ${WRKSRC}/00README ${DOCS}
-       ${INSTALL_DATA} ${WRKSRC}/teco.doc ${DOCS}
-       ${INSTALL_DATA} ${WRKSRC}/teco.doc.1 ${DOCS}
-       ${INSTALL_DATA} ${WRKSRC}/.tecorc ${XMPL}
-       ${INSTALL_DATA} ${WRKSRC}/pi.tec ${XMPL}
-       ${INSTALL_DATA} ${WRKSRC}/sample_tecorc.old ${XMPL}
-       ${INSTALL_DATA} ${WRKSRC}/tecorc.mch ${XMPL}
-
-
 pre-patch:
        cp ${WRKSRC}/Makefile.sun4 ${WRKSRC}/Makefile
 
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/te ${DESTDIR}${LOCALBASE}/bin
+       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCS}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${XMPL}
+       ${INSTALL_DATA} ${WRKSRC}/00README ${DESTDIR}${DOCS}
+       ${INSTALL_DATA} ${WRKSRC}/teco.doc ${DESTDIR}${DOCS}
+       ${INSTALL_DATA} ${WRKSRC}/teco.doc.1 ${DESTDIR}${DOCS}
+       ${INSTALL_DATA} ${WRKSRC}/.tecorc ${DESTDIR}${XMPL}
+       ${INSTALL_DATA} ${WRKSRC}/pi.tec ${DESTDIR}${XMPL}



Home | Main Index | Thread Index | Old Index