pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/mumble mumble: Clean up the makefile. Install ico...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/42ab972374d0
branches:  trunk
changeset: 389228:42ab972374d0
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Dec 22 18:28:07 2018 +0000

description:
mumble: Clean up the makefile. Install icons directly and don't sed with quote marks.

diffstat:

 chat/mumble/Makefile |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r b25e146951fe -r 42ab972374d0 chat/mumble/Makefile
--- a/chat/mumble/Makefile      Sat Dec 22 18:17:39 2018 +0000
+++ b/chat/mumble/Makefile      Sat Dec 22 18:28:07 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/12/22 18:17:39 nia Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/22 18:28:07 nia Exp $
 
 DISTNAME=      mumble-1.2.19
 CATEGORIES=    chat audio
@@ -49,7 +49,7 @@
 SUBST_STAGE.oss=       pre-configure
 SUBST_MESSAGE.oss=     Correct path to OSS device.
 SUBST_FILES.oss+=      src/mumble/OSS.cpp
-SUBST_SED.oss=         -e "s,\"/dev/dsp\",\"${DEVOSSAUDIO}\",g"
+SUBST_SED.oss=         -e "s,/dev/dsp,${DEVOSSAUDIO},g"
 .endif
 
 INSTALLATION_DIRS+=    bin lib
@@ -71,8 +71,7 @@
        ${INSTALL_LIB} ${WRKSRC}/release/.libs/libmumble.so.${PKGVERSION_NOREV} ${DESTDIR}${PREFIX}/lib
        ${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop ${DESTDIR}${PREFIX}/share/applications
        ${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm ${DESTDIR}${PREFIX}/share/pixmaps
-       ${INSTALL_DATA} ${WRKSRC}/icons/mumble.osx.png ${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps
-       ${MV} ${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.osx.png ${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png
+       ${INSTALL_DATA} ${WRKSRC}/icons/mumble.osx.png ${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png
        ${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps
        ${INSTALL_MAN} ${WRKSRC}/man/mumble.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 



Home | Main Index | Thread Index | Old Index