[pkgsrc/trunk]: pkgsrc user-destdir support

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/86a5ee97958f
branches:  trunk
changeset: 395531:86a5ee97958f
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Jul 08 15:26:26 2009 +0000

description:
user-destdir support

diffstat:

 biology/rasmol/Makefile        |  10 ++++++----
 cad/dinotrace/Makefile         |   4 +++-
 cad/dinotrace/distinfo         |   3 ++-
 cad/dinotrace/patches/patch-ab |  27 +++++++++++++++++++++++++++
 cad/electric/Makefile          |   8 +++++---
 5 files changed, 43 insertions(+), 9 deletions(-)

diffs (132 lines):

diff -r 5776e0420417 -r 86a5ee97958f biology/rasmol/Makefile
--- a/biology/rasmol/Makefile   Wed Jul 08 15:14:44 2009 +0000
+++ b/biology/rasmol/Makefile   Wed Jul 08 15:26:26 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2007/01/11 11:38:50 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2009/07/08 15:26:26 joerg Exp $
 
 DISTNAME=      RasMol_2.7.3
 PKGNAME=       rasmol-2.7.3
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://www.bernstein-plus-sons.com/software/rasmol/
 COMMENT=       Molecular Graphics Visualisation Tool
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}/${DISTNAME}/src
 USE_IMAKE=     YES
 USE_TOOLS+=    gunzip mkdirhier
@@ -38,20 +40,20 @@
                rasmol.h.new && ${MV} rasmol.h.new rasmol.h
 
 post-install:
-       ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/NOTICE ${PREFIX}/share/doc/rasmol
+       ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/NOTICE ${DESTDIR}${PREFIX}/share/doc/rasmol
        for doc in manualA4.pdf.gz manualA4.ps.gz manualA4.rtf.gz       \
                        manualUS.pdf.gz manualUS.ps.gz manualUS.rtf.gz  \
                        refcardA4.pdf.gz refcardA4.ps.gz                \
                        refcardA4.rtf.gz refcardUS.pdf.gz               \
                        refcardUS.ps.gz refcardUS.rtf.gz; do            \
                ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/$$doc         \
-                       ${PREFIX}/share/doc/rasmol;                     \
+                       ${DESTDIR}${PREFIX}/share/doc/rasmol;           \
        done
        for data in 1crn.pdb 1gpd.pdb.gz 1ldb.pdb.gz 1ldm.pdb.gz        \
                        3cro.pdb 4hir.ent.gz 4ins.CIF 7lyz.pdb          \
                        IUCR9800028.cif asprin.alc pdb2mcg.ent; do      \
                ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/data/$$data       \
-                       ${PREFIX}/share/examples/rasmol;                \
+                       ${DESTDIR}${PREFIX}/share/examples/rasmol;      \
        done
 
 .include "../../x11/libXext/buildlink3.mk"
diff -r 5776e0420417 -r 86a5ee97958f cad/dinotrace/Makefile
--- a/cad/dinotrace/Makefile    Wed Jul 08 15:14:44 2009 +0000
+++ b/cad/dinotrace/Makefile    Wed Jul 08 15:26:26 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2007/03/02 02:44:13 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.41 2009/07/08 15:26:49 joerg Exp $
 #
 
 DISTNAME=      dinotrace-9.3c
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://www.veripool.com/dinotrace/
 COMMENT=       Tool for viewing the output of digital simulators
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         YES
 INFO_FILES=            YES
 USE_TOOLS+=            gmake perl
diff -r 5776e0420417 -r 86a5ee97958f cad/dinotrace/distinfo
--- a/cad/dinotrace/distinfo    Wed Jul 08 15:14:44 2009 +0000
+++ b/cad/dinotrace/distinfo    Wed Jul 08 15:26:26 2009 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2007/03/02 02:44:13 dmcmahill Exp $
+$NetBSD: distinfo,v 1.13 2009/07/08 15:26:49 joerg Exp $
 
 SHA1 (dinotrace-9.3c.tgz) = ed37f7fde4f69d42ee3904d363b35fd1be0a44bc
 RMD160 (dinotrace-9.3c.tgz) = 545d60ef99e7e878cc9380fef805deca6ad77cce
 Size (dinotrace-9.3c.tgz) = 521395 bytes
 SHA1 (patch-aa) = abe6d33f6788b6aaf418c0cc68bbd10dee44294b
+SHA1 (patch-ab) = dc03d89769f987c55a3436fd3f665729ce4d0995
diff -r 5776e0420417 -r 86a5ee97958f cad/dinotrace/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/dinotrace/patches/patch-ab    Wed Jul 08 15:26:26 2009 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-ab,v 1.4 2009/07/08 15:26:49 joerg Exp $
+
+--- Makefile.in.orig   2009-07-08 17:24:49.000000000 +0200
++++ Makefile.in
+@@ -156,11 +156,11 @@ dinotrace.dvi: dinotrace.texi
+       $(TEXI2DVI) $(srcdir)/dinotrace.texi
+ 
+ installdirs:
+-      $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir)
++      $(SHELL) ${srcdir}/mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(infodir)
+ 
+ install: all info installdirs install-info
+       for p in dinotrace; do \
+-        $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
++        $(INSTALL_PROGRAM) $$p ${DESTDIR}$(bindir)/$$p; \
+       done
+       @echo ""
+       @echo "*** Lisp files not installed, you may want to"
+@@ -171,7 +171,7 @@ install: all info installdirs install-in
+ # Don't cd, to avoid breaking install-sh references.
+ install-info: info installdirs
+       for i in *.info*; do \
+-        $(INSTALL_DATA) $$i $(infodir)/$$i; \
++        $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; \
+       done
+ 
+ uninstall:
diff -r 5776e0420417 -r 86a5ee97958f cad/electric/Makefile
--- a/cad/electric/Makefile     Wed Jul 08 15:14:44 2009 +0000
+++ b/cad/electric/Makefile     Wed Jul 08 15:26:26 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/05/09 02:42:25 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/08 15:35:48 joerg Exp $
 #
 
 DISTNAME=      electric-7.00
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://www.gnu.org/software/electric/electric.html
 COMMENT=       Electrical CAD system
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         YES
 USE_LANGUAGES=         c c++
 
@@ -20,8 +22,8 @@
                < ${WRKSRC}/src/include/config.h.bak \
                > ${WRKSRC}/src/include/config.h
 
-post-install:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install.html
+INSTALL_TARGET=        install install.html
+INSTALLATION_DIRS=     bin
 
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"