[pkgsrc/trunk]: pkgsrc/net/skype - add user-destdir support

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5e0469f81172
branches:  trunk
changeset: 553960:5e0469f81172
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Thu Feb 05 00:53:09 2009 +0000

description:
- add user-destdir support
- install the icons that the .desktop file requests in the right place
- bump PKGREVISION

diffstat:

 net/skype/Makefile |  33 ++++++++++++++++++++++++---------
 net/skype/PLIST    |   5 ++++-
 2 files changed, 28 insertions(+), 10 deletions(-)

diffs (73 lines):

diff -r 959702b64018 -r 5e0469f81172 net/skype/Makefile
--- a/net/skype/Makefile        Wed Feb 04 21:51:27 2009 +0000
+++ b/net/skype/Makefile        Thu Feb 05 00:53:09 2009 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2008/08/24 10:08:39 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2009/02/05 00:53:09 jmcneill Exp $
 #
 
 DISTNAME=              skype_static-1.4.0.118-oss
 PKGNAME=               skype-1.4.0.118
+PKGREVISION=           1
 CATEGORIES=            net
 MASTER_SITES=          http://download.skype.com/linux/
 EXTRACT_SUFX=          .tar.bz2
@@ -12,6 +13,8 @@
 HOMEPAGE=              http://www.skype.com/
 COMMENT=               P2P VoIP software
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 LICENSE=               skype-license
 RESTRICTED=            Complex terms for redistribution.
 NO_SRC_ON_FTP=         ${RESTRICTED}
@@ -39,13 +42,25 @@
        } > ${WRKSRC}/skype.sh
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/skype.sh ${PREFIX}/bin/skype
-       ${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications
-       ${INSTALL_DATA_DIR} ${DATADIR}
-       ${INSTALL_PROGRAM} ${WRKSRC}/skype ${DATADIR}
-       cd ${WRKSRC} && pax -rwppm icons sounds ${DATADIR}
-       ${INSTALL_DATA_DIR} ${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+       ${INSTALL_SCRIPT} ${WRKSRC}/skype.sh ${DESTDIR}${PREFIX}/bin/skype
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/applications
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/16x16/apps
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/32x32/apps
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/48x48/apps
+       ${INSTALL_DATA} ${WRKSRC}/skype.desktop \
+               ${DESTDIR}${PREFIX}/share/applications
+       ${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_16x16.png \
+               ${DESTDIR}${PREFIX}/share/icons/hicolor/16x16/apps/skype.png
+       ${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_32x32.png \
+               ${DESTDIR}${PREFIX}/share/icons/hicolor/32x32/apps/skype.png
+       ${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png \
+               ${DESTDIR}${PREFIX}/share/icons/hicolor/48x48/apps/skype.png
+       ${INSTALL_DATA_DIR} ${DESTDIR}${DATADIR}
+       ${INSTALL_PROGRAM} ${WRKSRC}/skype ${DESTDIR}${DATADIR}
+       cd ${WRKSRC} && pax -rwppm icons sounds ${DESTDIR}${DATADIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 959702b64018 -r 5e0469f81172 net/skype/PLIST
--- a/net/skype/PLIST   Wed Feb 04 21:51:27 2009 +0000
+++ b/net/skype/PLIST   Thu Feb 05 00:53:09 2009 +0000
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2007/08/20 13:29:52 rillig Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/02/05 00:53:09 jmcneill Exp $
 bin/skype
 share/applications/skype.desktop
 share/doc/skype/LICENSE
 share/doc/skype/README
+share/icons/hicolor/16x16/apps/skype.png
+share/icons/hicolor/32x32/apps/skype.png
+share/icons/hicolor/48x48/apps/skype.png
 share/skype/icons/SkypeBlue_16x16.png
 share/skype/icons/SkypeBlue_32x32.png
 share/skype/icons/SkypeBlue_48x48.png