Sat Dec 22 18:28:08 2018 UTC ()
mumble: Clean up the makefile. Install icons directly and don't sed with quote marks.


(nia)
diff -r1.1 -r1.2 pkgsrc/chat/mumble/Makefile
cvs diff -r1.1 -r1.2 pkgsrc/chat/mumble/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/mumble/Makefile 2018/12/22 18:17:39 1.1
+++ pkgsrc/chat/mumble/Makefile 2018/12/22 18:28:07 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2018/12/22 18:17:39 nia Exp $ 1# $NetBSD: Makefile,v 1.2 2018/12/22 18:28:07 nia Exp $
2 2
3DISTNAME= mumble-1.2.19 3DISTNAME= mumble-1.2.19
4CATEGORIES= chat audio 4CATEGORIES= chat audio
5MASTER_SITES= ${MASTER_SITE_GITHUB:=mumble-voip/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=mumble-voip/}
6GITHUB_PROJECT= mumble 6GITHUB_PROJECT= mumble
7GITHUB_RELEASE= ${PKGVERSION_NOREV} 7GITHUB_RELEASE= ${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://wiki.mumble.info/wiki/Main_Page 10HOMEPAGE= https://wiki.mumble.info/wiki/Main_Page
11COMMENT= Low latency VOIP software 11COMMENT= Low latency VOIP software
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
@@ -39,50 +39,49 @@ CONFIG_OPTIONS+= CONFIG+=no-g15 @@ -39,50 +39,49 @@ CONFIG_OPTIONS+= CONFIG+=no-g15
39# requires missing ZeroC utilities 39# requires missing ZeroC utilities
40CONFIG_OPTIONS+= CONFIG+=no-ice 40CONFIG_OPTIONS+= CONFIG+=no-ice
41 41
42# required by protobuf 42# required by protobuf
43CONFIG_OPTIONS+= CONFIG+=c++11 43CONFIG_OPTIONS+= CONFIG+=c++11
44 44
45.include "../../mk/oss.buildlink3.mk" 45.include "../../mk/oss.buildlink3.mk"
46 46
47.if ${OSS_TYPE} != "none" 47.if ${OSS_TYPE} != "none"
48SUBST_CLASSES+= oss 48SUBST_CLASSES+= oss
49SUBST_STAGE.oss= pre-configure 49SUBST_STAGE.oss= pre-configure
50SUBST_MESSAGE.oss= Correct path to OSS device. 50SUBST_MESSAGE.oss= Correct path to OSS device.
51SUBST_FILES.oss+= src/mumble/OSS.cpp 51SUBST_FILES.oss+= src/mumble/OSS.cpp
52SUBST_SED.oss= -e "s,\"/dev/dsp\",\"${DEVOSSAUDIO}\",g" 52SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
53.endif 53.endif
54 54
55INSTALLATION_DIRS+= bin lib 55INSTALLATION_DIRS+= bin lib
56INSTALLATION_DIRS+= share/applications 56INSTALLATION_DIRS+= share/applications
57INSTALLATION_DIRS+= share/icons/hicolor/128x128/apps 57INSTALLATION_DIRS+= share/icons/hicolor/128x128/apps
58INSTALLATION_DIRS+= share/icons/hicolor/scalable/apps 58INSTALLATION_DIRS+= share/icons/hicolor/scalable/apps
59INSTALLATION_DIRS+= share/pixmaps 59INSTALLATION_DIRS+= share/pixmaps
60INSTALLATION_DIRS+= ${PKGMANDIR}/man1 60INSTALLATION_DIRS+= ${PKGMANDIR}/man1
61 61
62do-configure: 62do-configure:
63 cd ${WRKSRC} && ${QTDIR}/bin/qmake -unix -recursive main.pro \ 63 cd ${WRKSRC} && ${QTDIR}/bin/qmake -unix -recursive main.pro \
64 ${CONFIG_OPTIONS} ${MAKE_ENV} \ 64 ${CONFIG_OPTIONS} ${MAKE_ENV} \
65 QMAKE_CFLAGS=${CFLAGS:Q} QMAKE_CXXFLAGS=${CXXFLAGS:Q} 65 QMAKE_CFLAGS=${CFLAGS:Q} QMAKE_CXXFLAGS=${CXXFLAGS:Q}
66 66
67do-install: 67do-install:
68 ${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${DESTDIR}${PREFIX}/bin 68 ${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${DESTDIR}${PREFIX}/bin
69 ${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${DESTDIR}${PREFIX}/bin 69 ${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${DESTDIR}${PREFIX}/bin
70 ${INSTALL_LIB} ${WRKSRC}/release/.libs/libcelt0.so.0.11.0 ${DESTDIR}${PREFIX}/lib/libcelt-mumble.so.0.7.0 70 ${INSTALL_LIB} ${WRKSRC}/release/.libs/libcelt0.so.0.11.0 ${DESTDIR}${PREFIX}/lib/libcelt-mumble.so.0.7.0
71 ${INSTALL_LIB} ${WRKSRC}/release/.libs/libmumble.so.${PKGVERSION_NOREV} ${DESTDIR}${PREFIX}/lib 71 ${INSTALL_LIB} ${WRKSRC}/release/.libs/libmumble.so.${PKGVERSION_NOREV} ${DESTDIR}${PREFIX}/lib
72 ${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop ${DESTDIR}${PREFIX}/share/applications 72 ${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop ${DESTDIR}${PREFIX}/share/applications
73 ${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm ${DESTDIR}${PREFIX}/share/pixmaps 73 ${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm ${DESTDIR}${PREFIX}/share/pixmaps
74 ${INSTALL_DATA} ${WRKSRC}/icons/mumble.osx.png ${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps 74 ${INSTALL_DATA} ${WRKSRC}/icons/mumble.osx.png ${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png
75 ${MV} ${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.osx.png ${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png 
76 ${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps 75 ${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps
77 ${INSTALL_MAN} ${WRKSRC}/man/mumble.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 76 ${INSTALL_MAN} ${WRKSRC}/man/mumble.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
78 77
79.include "options.mk" 78.include "options.mk"
80.include "../../audio/libopus/buildlink3.mk" 79.include "../../audio/libopus/buildlink3.mk"
81.include "../../audio/libsndfile/buildlink3.mk" 80.include "../../audio/libsndfile/buildlink3.mk"
82.include "../../audio/speech-dispatcher/buildlink3.mk" 81.include "../../audio/speech-dispatcher/buildlink3.mk"
83.include "../../audio/speexdsp/buildlink3.mk" 82.include "../../audio/speexdsp/buildlink3.mk"
84.include "../../audio/speex/buildlink3.mk" 83.include "../../audio/speex/buildlink3.mk"
85.include "../../devel/boost-headers/buildlink3.mk" 84.include "../../devel/boost-headers/buildlink3.mk"
86.include "../../devel/boost-libs/buildlink3.mk" 85.include "../../devel/boost-libs/buildlink3.mk"
87.include "../../devel/libltdl/buildlink3.mk" 86.include "../../devel/libltdl/buildlink3.mk"
88.include "../../devel/protobuf/buildlink3.mk" 87.include "../../devel/protobuf/buildlink3.mk"