diff options
| author | jmcneill <jmcneill> | 2009-02-05 00:53:09 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill> | 2009-02-05 00:53:09 +0000 |
| commit | 5cc594bfb1d726a63c9666eee4c1c9201f0834f0 (patch) | |
| tree | a2d9c2a5ce0e4f8761aee808fcb8232ddfe1a77c | |
| parent | f7328c49674a10b43f6cd0636ac9dd3fa9f5112d (diff) | |
| download | pkgsrc-5cc594bfb1d726a63c9666eee4c1c9201f0834f0.tar.gz | |
- add user-destdir support
- install the icons that the .desktop file requests in the right place
- bump PKGREVISION
| -rw-r--r-- | net/skype/Makefile | 33 | ||||
| -rw-r--r-- | net/skype/PLIST | 5 |
2 files changed, 28 insertions, 10 deletions
diff --git a/net/skype/Makefile b/net/skype/Makefile index e7622cd7293..41eb0b72979 100644 --- a/net/skype/Makefile +++ b/net/skype/Makefile @@ -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 @@ MAINTAINER= pkgsrc-users@NetBSD.org 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 @@ do-build: } > ${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 --git a/net/skype/PLIST b/net/skype/PLIST index 49d1a56c142..3f2a54c446c 100644 --- a/net/skype/PLIST +++ b/net/skype/PLIST @@ -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 |