pkgsrc-Changes-HG archive

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

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



details:   https://anonhg.NetBSD.org/pkgsrc/rev/33588256d5eb
branches:  trunk
changeset: 539394:33588256d5eb
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Mar 04 16:38:11 2008 +0000

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

diffstat:

 lang/Cg-compiler/Makefile            |  28 +++++++----
 lang/SmartEiffel/Makefile            |   6 +-
 lang/a60/Makefile                    |  27 ++++++----
 lang/baci/Makefile                   |  27 +++++-----
 lang/blackdown-jre13/Makefile.common |   8 ++-
 lang/brandybasic/Makefile            |  16 ++++--
 lang/ccsh/Makefile                   |   5 +-
 lang/cint/Makefile                   |  87 ++++++++++++++++++++++-------------
 lang/cu-prolog/Makefile              |  15 +++--
 lang/eieio/Makefile                  |  10 ++-
 lang/focal/Makefile                  |   9 ++-
 lang/jasmin/Makefile                 |  10 ++-
 lang/java-lang-spec/Makefile         |  12 ++--
 lang/java-vm-spec/Makefile           |  12 ++--
 lang/jbuilder-jit/Makefile           |  22 +++++---
 lang/jdk/Makefile                    |   8 ++-
 lang/jini/Makefile                   |   8 ++-
 lang/joos/Makefile                   |  10 ++-
 lang/libtcl-nothread/Makefile        |   9 ++-
 lang/mercury/Makefile                |  11 ++-
 lang/minischeme/Makefile             |  10 ++-
 lang/mit-scheme-bin/Makefile         |  18 ++++---
 lang/nawk/Makefile                   |   8 ++-
 lang/pforth/Makefile                 |  23 +++++----
 lang/py-html-docs/Makefile           |  12 ++--
 lang/py21-html-docs/Makefile         |  12 ++--
 lang/py22-html-docs/Makefile         |  12 ++--
 lang/py23-html-docs/Makefile         |  12 ++--
 lang/ruby-doc-stdlib/Makefile        |  19 ++++---
 lang/ruby/Makefile                   |   9 ++-
 lang/sather/Makefile                 |  42 +++++++++-------
 lang/smlnj/Makefile                  |  10 ++-
 lang/snobol/Makefile                 |  31 +++++++-----
 lang/sr-examples/Makefile            |  10 ++-
 lang/stalin/Makefile                 |  20 ++++---
 lang/sun-jre13/Makefile.common       |   8 ++-
 lang/sun-jre6/Makefile.common        |   8 ++-
 lang/tk-expect/Makefile              |   9 ++-
 lang/umb-scheme/Makefile             |  21 +++++---
 lang/vscm/Makefile                   |  15 +++--
 40 files changed, 386 insertions(+), 263 deletions(-)

diffs (truncated from 1500 to 300 lines):

diff -r a7e8f2398b18 -r 33588256d5eb lang/Cg-compiler/Makefile
--- a/lang/Cg-compiler/Makefile Tue Mar 04 16:23:05 2008 +0000
+++ b/lang/Cg-compiler/Makefile Tue Mar 04 16:38:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/08/23 18:20:31 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/04 16:38:11 jlam Exp $
 #
 
 DISTNAME=      CgLinux-1.3.0408-0400
@@ -15,6 +15,8 @@
 EMUL_MODULES.linux=    base
 EMUL_REQD=             suse>=7.3
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}
 BUILD_DIRS=            # empty
 RUN_LDCONFIG=          yes
@@ -22,15 +24,19 @@
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man3 share
 
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/include/Cg
-       ${INSTALL_DATA_DIR} ${PREFIX}/include/CgFX
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/NVIDIA-Cg-linux
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/NVIDIA-Cg-linux
-       ${INSTALL_PROGRAM} ${WRKSRC}/usr/bin/cgc ${PREFIX}/bin
-       ${INSTALL_DATA} ${WRKSRC}/usr/include/Cg/* ${PREFIX}/include/Cg
-       ${INSTALL_DATA} ${WRKSRC}/usr/include/CgFX/* ${PREFIX}/include/CgFX
-       ${INSTALL_DATA} ${WRKSRC}/usr/lib/* ${EMULDIR}/lib
-       ${INSTALL_MAN} ${WRKSRC}/usr/share/man/man3/* ${PREFIX}/${PKGMANDIR}/man3
-       cd ${WRKSRC}/usr/local && ${PAX} -rwppm . ${PREFIX}/share/NVIDIA-Cg-linux
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/Cg
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/CgFX
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/NVIDIA-Cg-linux
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/NVIDIA-Cg-linux
+       ${INSTALL_PROGRAM} ${WRKSRC}/usr/bin/cgc ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_DATA} ${WRKSRC}/usr/include/Cg/* \
+               ${DESTDIR}${PREFIX}/include/Cg
+       ${INSTALL_DATA} ${WRKSRC}/usr/include/CgFX/* \
+               ${DESTDIR}${PREFIX}/include/CgFX
+       ${INSTALL_DATA} ${WRKSRC}/usr/lib/* ${DESTDIR}${EMULDIR}/lib
+       ${INSTALL_MAN} ${WRKSRC}/usr/share/man/man3/* \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
+       cd ${WRKSRC}/usr/local && ${PAX} -rwppm . \
+               ${DESTDIR}${PREFIX}/share/NVIDIA-Cg-linux
 
 .include "../../mk/bsd.pkg.mk"
diff -r a7e8f2398b18 -r 33588256d5eb lang/SmartEiffel/Makefile
--- a/lang/SmartEiffel/Makefile Tue Mar 04 16:23:05 2008 +0000
+++ b/lang/SmartEiffel/Makefile Tue Mar 04 16:38:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:24 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/04 16:38:11 jlam Exp $
 
 DISTNAME=      se
 PKGNAME=       SmartEiffel-2.0
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://smarteiffel.loria.fr/
 COMMENT=       The GNU Eiffel Compiler
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}/SmartEiffel
 
 DIST_SUBDIR=   ${PKGNAME_NOREV}
@@ -31,6 +33,6 @@
        ${RM} -f ${WRKSRC}/sys/system.se~
 
 do-install:
-       ${CP} -r ${WRKSRC} ${PREFIX}
+       ${CP} -r ${WRKSRC} ${DESTDIR}${PREFIX}
 
 .include "../../mk/bsd.pkg.mk"
diff -r a7e8f2398b18 -r 33588256d5eb lang/a60/Makefile
--- a/lang/a60/Makefile Tue Mar 04 16:23:05 2008 +0000
+++ b/lang/a60/Makefile Tue Mar 04 16:38:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/04 16:38:11 jlam Exp $
 
 DISTNAME=      a60-0.20a
 CATEGORIES=    lang
@@ -7,6 +7,8 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Algol 60 interpreter
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE= yes
 
 CPPFLAGS+=     -Dunix
@@ -16,23 +18,26 @@
 INSTALLATION_DIRS=     bin ${PKGINFODIR} ${PKGMANDIR}/man1
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/a60 ${PREFIX}/bin/
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/a60/
-       ${INSTALL_DATA} ${WRKSRC}/a60-mkc.inc ${PREFIX}/share/a60/
+       ${INSTALL_PROGRAM} ${WRKSRC}/a60 ${DESTDIR}${PREFIX}/bin/
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/a60/
+       ${INSTALL_DATA} ${WRKSRC}/a60-mkc.inc                           \
+               ${DESTDIR}${PREFIX}/share/a60/
        cd ${WRKSRC}; for f in                                          \
                RRA60.info RRA60.info-[0-9]*                            \
                a60.info a60.info-[0-9]*;                               \
        do                                                              \
                ${TEST} ! -f "$$f" ||                                   \
-               ${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};          \
+               ${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};\
        done
-       ${INSTALL_MAN} ${WRKSRC}/a60.man ${PREFIX}/${PKGMANDIR}/man1/a60.1
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/a60/
+       ${INSTALL_MAN} ${WRKSRC}/a60.man                                \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/a60.1
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/a60/
        cd ${WRKSRC}/examples && ${INSTALL_DATA} *.a60 README           \
-               ${PREFIX}/share/examples/a60/
-       ${INSTALL_DATA} ${WRKSRC}/xa60.* ${PREFIX}/share/examples/a60/
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/a60/
+               ${DESTDIR}${PREFIX}/share/examples/a60/
+       ${INSTALL_DATA} ${WRKSRC}/xa60.*                                \
+               ${DESTDIR}${PREFIX}/share/examples/a60/
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/a60/
        cd ${WRKSRC} && ${INSTALL_DATA} a60.ps RRA60.ps                 \
-               ${PREFIX}/share/doc/a60/
+               ${DESTDIR}${PREFIX}/share/doc/a60/
 
 .include "../../mk/bsd.pkg.mk"
diff -r a7e8f2398b18 -r 33588256d5eb lang/baci/Makefile
--- a/lang/baci/Makefile        Tue Mar 04 16:23:05 2008 +0000
+++ b/lang/baci/Makefile        Tue Mar 04 16:38:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:37 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/04 16:38:11 jlam Exp $
 #
 
 DISTNAME=      bacisrc
@@ -14,25 +14,24 @@
 
 DEPENDS+=      bison-[0-9]*:../../devel/bison
 
-USE_TOOLS+=    flex
+PKG_DESTDIR_SUPPORT=   user-destdir
 
-PLIST_SRC=     ${WRKDIR}/PLIST
+USE_TOOLS+=    flex
 
 INSTALLATION_DIRS=     bin
 
 do-build:
-               cd ${WRKSRC}/ccomp && ${MAKE}
-               cd ${WRKSRC}/disasm && ${MAKE}
-               cd ${WRKSRC}/interp && ${MAKE}
-               cd ${WRKSRC}/pascomp && ${MAKE}
+       cd ${WRKSRC}/ccomp && ${MAKE}
+       cd ${WRKSRC}/disasm && ${MAKE}
+       cd ${WRKSRC}/interp && ${MAKE}
+       cd ${WRKSRC}/pascomp && ${MAKE}
 
 do-install:
-               ${INSTALL_PROGRAM} ${WRKSRC}/ccomp/bacc ${PREFIX}/bin
-               ${INSTALL_PROGRAM} ${WRKSRC}/disasm/badis ${PREFIX}/bin
-               ${INSTALL_PROGRAM} ${WRKSRC}/interp/bainterp ${PREFIX}/bin
-               ${INSTALL_PROGRAM} ${WRKSRC}/pascomp/bapas ${PREFIX}/bin
-               ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/baci
-               ${INSTALL_DATA} ${WRKDIR}/bacidoc/* ${PREFIX}/share/doc/baci
-               ${CP} ${PKGDIR}/PLIST ${WRKDIR}
+       ${INSTALL_PROGRAM} ${WRKSRC}/ccomp/bacc ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/disasm/badis ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/interp/bainterp ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/pascomp/bapas ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/baci
+       ${INSTALL_DATA} ${WRKDIR}/bacidoc/* ${DESTDIR}${PREFIX}/share/doc/baci
 
 .include "../../mk/bsd.pkg.mk"
diff -r a7e8f2398b18 -r 33588256d5eb lang/blackdown-jre13/Makefile.common
--- a/lang/blackdown-jre13/Makefile.common      Tue Mar 04 16:23:05 2008 +0000
+++ b/lang/blackdown-jre13/Makefile.common      Tue Mar 04 16:38:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2008/01/19 09:32:52 he Exp $
+# $NetBSD: Makefile.common,v 1.31 2008/03/04 16:38:11 jlam Exp $
 #
 
 RELVERSION=    1.3.1
@@ -18,6 +18,8 @@
 EMUL_MODULES.linux+=   base
 EMUL_REQD=             suse>=7.3
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 BLACKDOWN_ARCH.${EMUL_ARCH}=   ${EMUL_ARCH}
@@ -54,5 +56,5 @@
        ${FIND} ${WRKSRC} -name '*.1.gz' -print | ${XARGS} ${GUNZIP_CMD}
 
 do-install:
-       ${INSTALL_PROGRAM_DIR} ${JVM_HOME}
-       cd ${WRKSRC} && ${PAX} -rw . ${JVM_HOME}
+       ${INSTALL_PROGRAM_DIR} ${DESTDIR}${JVM_HOME}
+       cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${JVM_HOME}
diff -r a7e8f2398b18 -r 33588256d5eb lang/brandybasic/Makefile
--- a/lang/brandybasic/Makefile Tue Mar 04 16:23:05 2008 +0000
+++ b/lang/brandybasic/Makefile Tue Mar 04 16:38:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/11/20 22:11:50 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/04 16:38:11 jlam Exp $
 #
 
 DISTNAME=      b116
@@ -15,6 +15,8 @@
 
 NOT_FOR_PLATFORM=      SunOS-*-* # needs porting
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}/brandy-1.0.16
 DOCDIR=                ${PREFIX}/share/doc/brandy
 EXAMPLEDIR=    ${PREFIX}/share/examples/brandy
@@ -24,10 +26,12 @@
 INSTALLATION_DIRS=     bin
 
 do-install:
-       ${INSTALL_DATA_DIR} ${DOCDIR}
-       ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
-       cd ${WRKSRC}/docs && ${GTAR} -cf - `ls |grep -v .orig` | (cd ${DOCDIR} && tar xf -)
-       cd ${WRKSRC}/examples && ${GTAR} -cf - [a-z]* | (cd ${EXAMPLEDIR} && tar xf -)
-       ${INSTALL_PROGRAM} ${WRKSRC}/brandy ${PREFIX}/bin/brandy
+       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLEDIR}
+       cd ${WRKSRC}/docs && ${GTAR} -cf - `ls |grep -v .orig` | \
+               (cd ${DESTDIR}${DOCDIR} && tar xf -)
+       cd ${WRKSRC}/examples && ${GTAR} -cf - [a-z]* | \
+               (cd ${DESTDIR}${EXAMPLEDIR} && tar xf -)
+       ${INSTALL_PROGRAM} ${WRKSRC}/brandy ${DESTDIR}${PREFIX}/bin/brandy
 
 .include "../../mk/bsd.pkg.mk"
diff -r a7e8f2398b18 -r 33588256d5eb lang/ccsh/Makefile
--- a/lang/ccsh/Makefile        Tue Mar 04 16:23:05 2008 +0000
+++ b/lang/ccsh/Makefile        Tue Mar 04 16:38:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/04/22 09:22:10 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/04 16:38:11 jlam Exp $
 #
 
 DISTNAME=              ccsh-0.0.4
@@ -11,6 +11,7 @@
 COMMENT=               C-like syntax scripting
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_TOOLS+=            gmake
 
@@ -23,6 +24,6 @@
 INSTALLATION_DIRS+=    bin
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/ccsh ${PREFIX}/bin/ccsh
+       ${INSTALL_PROGRAM} ${WRKSRC}/ccsh ${DESTDIR}${PREFIX}/bin/ccsh
 
 .include "../../mk/bsd.pkg.mk"
diff -r a7e8f2398b18 -r 33588256d5eb lang/cint/Makefile
--- a/lang/cint/Makefile        Tue Mar 04 16:23:05 2008 +0000
+++ b/lang/cint/Makefile        Tue Mar 04 16:38:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/11/09 11:12:06 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2008/03/04 16:38:11 jlam Exp $
 
 DISTNAME=              cint5.15
 PKGNAME=               cint-5.15.174
@@ -11,6 +11,8 @@
 HOMEPAGE=              http://root.cern.ch/root/Cint.html
 COMMENT=               C/C++ interpreter
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 #same distribution file name for minor versions
 DIST_SUBDIR=           ${PKGNAME_NOREV}
 WRKSRC=                        ${WRKDIR}
@@ -44,37 +46,56 @@
        esac
 
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/cint
-       ${INSTALL_PROGRAM} ${WRKDIR}/cint ${PREFIX}/cint
-       ${INSTALL_PROGRAM} ${WRKDIR}/makecint ${PREFIX}/cint
-       ${SED} "s;XXXPREFIXXXX;${PREFIX};g" <${FILESDIR}/cint.sh >${PREFIX}/bin/cint
-       ${CHMOD} +x ${PREFIX}/bin/cint
-       rm -f ${PREFIX}/bin/makecint
-       ${LN} ${PREFIX}/bin/cint ${PREFIX}/bin/makecint
-       ${INSTALL_DATA} ${WRKDIR}/MAKEINFO ${PREFIX}/cint
-       ${CP} -r ${WRKDIR}/include ${WRKDIR}/stl ${PREFIX}/cint
-       ${RM} ${PREFIX}/cint/include/Makeit ${PREFIX}/cint/include/make*
-       ${INSTALL_DATA_DIR} ${PREFIX}/cint/lib
-       ${CP} -r ${WRKDIR}/lib/prec_stl ${PREFIX}/cint/lib
-       ${INSTALL_DATA} ${WRKDIR}/G__ci.h ${PREFIX}/cint
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cint
-       ${INSTALL_DATA} ${WRKSRC}/doc/bytecode.txt ${PREFIX}/share/doc/cint



Home | Main Index | Thread Index | Old Index