[pkgsrc/trunk]: pkgsrc Convert to user-destdir.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fab86dc8ecaa
branches:  trunk
changeset: 398336:fab86dc8ecaa
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Aug 29 13:24:14 2009 +0000

description:
Convert to user-destdir.

diffstat:

 mail/claws-mail/Makefile  |  17 ++++++++++-------
 net/kiax/Makefile         |   9 ++++++---
 net/kiax/distinfo         |   3 ++-
 net/kiax/patches/patch-aa |  12 ++++++++++++
 net/kphone/Makefile       |  12 ++++++------
 5 files changed, 36 insertions(+), 17 deletions(-)

diffs (136 lines):

diff -r cf44f9022bc9 -r fab86dc8ecaa mail/claws-mail/Makefile
--- a/mail/claws-mail/Makefile  Sat Aug 29 13:15:54 2009 +0000
+++ b/mail/claws-mail/Makefile  Sat Aug 29 13:24:14 2009 +0000
@@ -1,4 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2009/08/26 19:57:57 sno Exp $
+# $NetBSD: Makefile,v 1.24 2009/08/29 13:24:14 wiz Exp $
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+INSTALLATION_DIRS+=    ${EGDIR}
+INSTALLATION_DIRS+=    share/claws-mail
 
 .include "Makefile.common"
 
@@ -16,7 +20,6 @@
 PKG_SYSCONFSUBDIR=     claws-mail
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 
-
 .include "../../mk/bsd.prefs.mk"
 
 FACES_IS_INSTALLED!=   ${PKG_INFO} -e faces || ${ECHO}
@@ -57,12 +60,12 @@
 .endif
 
 post-install:
-       ${INSTALL_DATA_DIR} ${EGDIR}
-       ${INSTALL_DATA} ${FILESDIR}/mime.types ${EGDIR}
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/claws-mail
-       ${INSTALL_DATA} ${WRKSRC}/claws-mail*.png ${PREFIX}/share/claws-mail
+       ${INSTALL_DATA} ${FILESDIR}/mime.types ${DESTDIR}${EGDIR}
+       ${INSTALL_DATA} ${WRKSRC}/claws-mail*.png \
+               ${DESTDIR}${PREFIX}/share/claws-mail
 .if exists(files/shred.${OPSYS})
-       ${INSTALL_SCRIPT} files/shred.${OPSYS} ${PREFIX}/bin/claws-mail-shred
+       ${INSTALL_SCRIPT} files/shred.${OPSYS} \
+               ${DESTDIR}${PREFIX}/bin/claws-mail-shred
 PLIST_SRC=     PLIST
 PLIST_SRC+=    PLIST.shred
 .endif
diff -r cf44f9022bc9 -r fab86dc8ecaa net/kiax/Makefile
--- a/net/kiax/Makefile Sat Aug 29 13:15:54 2009 +0000
+++ b/net/kiax/Makefile Sat Aug 29 13:24:14 2009 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2009/08/26 19:58:10 sno Exp $
+# $NetBSD: Makefile,v 1.15 2009/08/29 13:31:04 wiz Exp $
 
 DISTNAME=      kiax-0.8.51-src
-PKGNAME=       kiax-0.8.51
-#PKGREVISION=  1
+PKGNAME=       ${DISTNAME:S/-src//}
 PKGREVISION=   1
 CATEGORIES=    comms net audio
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=kiax/}
@@ -12,12 +11,16 @@
 COMMENT=       Open internet telephony system
 LICENSE=       gnu-gpl-v2
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+INSTALLATION_DIRS=     bin
+
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake pkg-config
 USE_LANGUAGES=         c c++
 HAS_CONFIGURE=         yes
 MAKE_JOBS_SAFE=                no
+INSTALL_MAKE_FLAGS+=   INSTALL_ROOT=${DESTDIR:Q}
 
 do-configure:
        (cd ${WRKSRC} && ${QTDIR}/bin/qmake -o Makefile qkiax.pro)
diff -r cf44f9022bc9 -r fab86dc8ecaa net/kiax/distinfo
--- a/net/kiax/distinfo Sat Aug 29 13:15:54 2009 +0000
+++ b/net/kiax/distinfo Sat Aug 29 13:24:14 2009 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.7 2008/06/01 15:25:37 wiz Exp $
+$NetBSD: distinfo,v 1.8 2009/08/29 13:31:04 wiz Exp $
 
 SHA1 (kiax-0.8.51-src.tar.gz) = 5a67df17d478f4f1f5d802e126e6c38fb0834a6b
 RMD160 (kiax-0.8.51-src.tar.gz) = 8019d742867d0af339210363c42f1c46df422dd2
 Size (kiax-0.8.51-src.tar.gz) = 1493268 bytes
+SHA1 (patch-aa) = c310aa4a3edb242fa84f7e4c65ef5bd83885974d
 SHA1 (patch-ab) = 0c0ef51b9f4b0e26e354b15568359022a5cf7db0
 SHA1 (patch-ac) = f3f98e74209ab6a5a06e387cae494c08ad7e3238
 SHA1 (patch-ad) = 358978a9999d5ab268c65da5bee812d449dc2f92
diff -r cf44f9022bc9 -r fab86dc8ecaa net/kiax/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/kiax/patches/patch-aa Sat Aug 29 13:24:14 2009 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.4 2009/08/29 13:31:04 wiz Exp $
+
+--- bin/Makefile.orig  2009-08-29 13:25:19.000000000 +0000
++++ bin/Makefile
+@@ -2,6 +2,6 @@ DEST_PATH=/usr/pkg/bin/
+ all:
+       echo 'none'
+ install:
+-      cp -f "kiax" $(DEST_PATH)
++      cp -f "kiax" $(INSTALL_ROOT)$(DEST_PATH)
+ clean:
+       rm -f kiax
diff -r cf44f9022bc9 -r fab86dc8ecaa net/kphone/Makefile
--- a/net/kphone/Makefile       Sat Aug 29 13:15:54 2009 +0000
+++ b/net/kphone/Makefile       Sat Aug 29 13:24:14 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/08/26 19:58:10 sno Exp $
+# $NetBSD: Makefile,v 1.26 2009/08/29 13:32:57 wiz Exp $
 
 DISTNAME=              kphone-4.2
 PKGREVISION=           6
@@ -11,8 +11,8 @@
 
 WRKSRC=                        ${WRKDIR}/kphone
 
+PKG_DESTDIR_SUPPORT=   user-destdir
 
-USE_X11BASE=           yes
 GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake
@@ -32,12 +32,12 @@
 CONFIGURE_ARGS+=       --enable-alsa=no
 .endif
 
-INSTALLATION_DIRS=     bin
+INSTALLATION_DIRS=     bin share/kphone/icons
 
 do-install:
-       @${INSTALL_PROGRAM} ${WRKSRC}/kphone/kphone ${PREFIX}/bin
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/kphone/icons
-       ${INSTALL_DATA} ${WRKSRC}/icons/*.png ${PREFIX}/share/kphone/icons
+       ${INSTALL_PROGRAM} ${WRKSRC}/kphone/kphone ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_DATA} ${WRKSRC}/icons/*.png \
+               ${DESTDIR}${PREFIX}/share/kphone/icons
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"