[pkgsrc/trunk]: pkgsrc/chat DESTDIR support

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0f1628fbbac6
branches:  trunk
changeset: 570727:0f1628fbbac6
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Feb 02 23:36:16 2010 +0000

description:
DESTDIR support

diffstat:

 chat/silc-client-icb/Makefile     |   8 ++++++--
 chat/silc-client/Makefile         |  14 ++++++++------
 chat/silc-client/distinfo         |   4 ++--
 chat/silc-client/patches/patch-ab |  10 +++++-----
 4 files changed, 21 insertions(+), 15 deletions(-)

diffs (124 lines):

diff -r 0c6d9cab9300 -r 0f1628fbbac6 chat/silc-client-icb/Makefile
--- a/chat/silc-client-icb/Makefile     Tue Feb 02 23:35:36 2010 +0000
+++ b/chat/silc-client-icb/Makefile     Tue Feb 02 23:36:16 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/08/09 13:19:35 tonnerre Exp $
+# $NetBSD: Makefile,v 1.20 2010/02/02 23:36:16 joerg Exp $
 #
 
 DISTNAME=      irssi-icb-0.14
@@ -12,6 +12,8 @@
 HOMEPAGE=      http://www.silcnet.org/
 COMMENT=       silc-client plugin to access ICB networks
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=      silc-client>=${SILC_CLIENT_VERSION}:../../chat/silc-client
 
 .include "../../chat/silc-client/Makefile.common"
@@ -23,12 +25,14 @@
 
 CONFIGURE_ARGS+=       --with-irssi=${IRSSI_DIR:Q}
 
+INSTALLATION_DIRS+=    share/doc/silc-client
+
 post-extract:
        ${CP} ${SILC_CLIENT_CONFIG_H} ${IRSSI_DIR}/config.h
        ${CP} ${SILC_CLIENT_CONFIG} ${IRSSI_DIR}/irssi-config
 
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/silc-client/README.icb
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/silc-client/README.icb
 
 .include "../../devel/glib/buildlink3.mk"
 
diff -r 0c6d9cab9300 -r 0f1628fbbac6 chat/silc-client/Makefile
--- a/chat/silc-client/Makefile Tue Feb 02 23:35:36 2010 +0000
+++ b/chat/silc-client/Makefile Tue Feb 02 23:36:16 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2009/08/02 19:18:40 tonnerre Exp $
+# $NetBSD: Makefile,v 1.56 2010/02/02 23:36:16 joerg Exp $
 #
 
 DISTNAME=              ${SILC_CLIENT_DISTNAME}
@@ -12,6 +12,8 @@
 HOMEPAGE=              http://www.silcnet.org/
 COMMENT=               Client for the Secure Internet Live Conferencing (SILC) protocol
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 .include "../../chat/silc-client/Makefile.common"
 
@@ -57,17 +59,17 @@
 .include "options.mk"
 
 PLIST_SRC+=            ${PKGDIR}/PLIST
-INSTALLATION_DIRS+=    ${PREFIX}/libexec/${PKGBASE}/scripts
+INSTALLATION_DIRS+=    lib/${PKGBASE} libexec/${PKGBASE}/scripts
 
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/apps/irssi/config.h ${SILC_CLIENT_CONFIG_H}
-       ${INSTALL_DATA} ${WRKSRC}/apps/irssi/irssi-config ${SILC_CLIENT_CONFIG}
+       ${INSTALL_DATA} ${WRKSRC}/apps/irssi/config.h ${DESTDIR}${SILC_CLIENT_CONFIG_H}
+       ${INSTALL_DATA} ${WRKSRC}/apps/irssi/irssi-config ${DESTDIR}${SILC_CLIENT_CONFIG}
 .if !empty(PKG_OPTIONS:Mperl)
        ${INSTALL_DATA} ${WRKSRC}/apps/irssi/scripts/*.pl       \
-               ${PREFIX}/libexec/${PKGBASE}/scripts
+           ${DESTDIR}${PREFIX}/libexec/${PKGBASE}/scripts
 # Create PLIST fragment for Perl modules.
 #
-       @cd ${PREFIX} &&                                                     \
+       @cd ${DESTDIR}${PREFIX} &&                                                   \
                ${FIND} lib/${PKGBASE}/perl5 -type f > ${WRKDIR}/PLIST.perl
 .endif
 
diff -r 0c6d9cab9300 -r 0f1628fbbac6 chat/silc-client/distinfo
--- a/chat/silc-client/distinfo Tue Feb 02 23:35:36 2010 +0000
+++ b/chat/silc-client/distinfo Tue Feb 02 23:36:16 2010 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.36 2009/11/26 18:59:17 joerg Exp $
+$NetBSD: distinfo,v 1.37 2010/02/02 23:36:16 joerg Exp $
 
 SHA1 (silc-client-1.1.8.tar.bz2) = 5936ab682e746ae413f938ce9c9b72215d6524c0
 RMD160 (silc-client-1.1.8.tar.bz2) = a010384b5e498a62cc6cd69e97602f3118b64d2f
 Size (silc-client-1.1.8.tar.bz2) = 1532816 bytes
 SHA1 (patch-aa) = 52cc285982176c1680f74059de47d1bde456a871
-SHA1 (patch-ab) = 873c65a78da7195b8baddb33d1c71300fce704f1
+SHA1 (patch-ab) = 40aa1a2722d483afd99a27dc65f715b5bae30ea5
 SHA1 (patch-ac) = 576299d98ea63f6c42cc341bf31ad7ec903f93c8
 SHA1 (patch-ad) = 490e3b2a99e14683b9a0005494d29b5a91186755
 SHA1 (patch-ae) = c5b21eb9d65cb0bbc685f5e771849f1ccf07681b
diff -r 0c6d9cab9300 -r 0f1628fbbac6 chat/silc-client/patches/patch-ab
--- a/chat/silc-client/patches/patch-ab Tue Feb 02 23:35:36 2010 +0000
+++ b/chat/silc-client/patches/patch-ab Tue Feb 02 23:36:16 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.13 2008/07/13 12:04:11 tonnerre Exp $
+$NetBSD: patch-ab,v 1.14 2010/02/02 23:36:16 joerg Exp $
 
 --- apps/irssi/Makefile.in.orig        2007-11-06 15:45:06.000000000 +0100
 +++ apps/irssi/Makefile.in     2007-12-07 17:25:54.000000000 +0100
@@ -16,8 +16,8 @@
  
  doc-install-client:
 -      $(INSTALL_DATA) $(silc_top_srcdir)/apps/irssi/silc.conf $(docdir)/example_silc.conf
-+      $(INSTALL) -d $(examplesdir)/
-+      $(INSTALL_DATA) $(silc_top_srcdir)/apps/irssi/silc.conf $(examplesdir)/silc.conf.default
++      $(INSTALL) -d ${DESTDIR}$(examplesdir)/
++      $(INSTALL_DATA) $(silc_top_srcdir)/apps/irssi/silc.conf ${DESTDIR}$(examplesdir)/silc.conf.default
        -@if test -f $(silc_top_srcdir)/doc/silc.1 ; then \
         $(INSTALL_DATA) $(silc_top_srcdir)/doc/silc.1 $(mandir)/man1; \
        fi
@@ -26,10 +26,10 @@
        -@if test -d $(silc_top_srcdir)/apps/irssi ; then \
          mkdir -p $(etcdir) ; \
 -        if test '!' -f $(etcdir)/silc.conf ; then \
-+        if test '!' -f $(examplesdir)/silc.conf.default ; then \
++        if test '!' -f ${DESTDIR}$(examplesdir)/silc.conf.default ; then \
            $(INSTALL_DATA) $(silc_top_srcdir)/apps/irssi/silc.conf \
 -              $(etcdir)/silc.conf; \
-+              $(examplesdir)/silc.conf.default; \
++              ${DESTDIR}$(examplesdir)/silc.conf.default; \
          fi; \
        fi