Tue Oct 23 10:32:44 2012 UTC ()
Use std::cin consistently to reference standard input


(markd)
diff -r1.117 -r1.118 pkgsrc/audio/amarok/Makefile
diff -r1.48 -r1.49 pkgsrc/audio/amarok/distinfo
diff -r0 -r1.1 pkgsrc/audio/amarok/patches/patch-utilities_afttagger_AFTTagger.cpp
cvs diff -r1.117 -r1.118 pkgsrc/audio/amarok/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/amarok/Attic/Makefile 2012/10/08 23:01:07 1.117
+++ pkgsrc/audio/amarok/Attic/Makefile 2012/10/23 10:32:43 1.118
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.117 2012/10/08 23:01:07 adam Exp $ 1# $NetBSD: Makefile,v 1.118 2012/10/23 10:32:43 markd Exp $
2# 2#
3 3
4DISTNAME= amarok-${VERS} 4DISTNAME= amarok-${VERS}
5VERS= 2.5.0 5VERS= 2.5.0
6PKGREVISION= 10 6PKGREVISION= 11
7CATEGORIES= audio multimedia 7CATEGORIES= audio multimedia
8MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/amarok/${VERS}/src/ 8MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/amarok/${VERS}/src/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://amarok.kde.org/ 12HOMEPAGE= http://amarok.kde.org/
13COMMENT= KDE4 audio player 13COMMENT= KDE4 audio player
14LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2.1 14LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2.1
15 15
16BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4 16BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
17DEPENDS+= moodbar-[0-9]*:../../audio/moodbar 17DEPENDS+= moodbar-[0-9]*:../../audio/moodbar
18 18
19USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
cvs diff -r1.48 -r1.49 pkgsrc/audio/amarok/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/amarok/Attic/distinfo 2012/03/20 10:28:29 1.48
+++ pkgsrc/audio/amarok/Attic/distinfo 2012/10/23 10:32:44 1.49
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.48 2012/03/20 10:28:29 markd Exp $ 1$NetBSD: distinfo,v 1.49 2012/10/23 10:32:44 markd Exp $
2 2
3SHA1 (amarok-2.5.0.tar.bz2) = 9849900d20225e703c43d242650a8fa211cf15f2 3SHA1 (amarok-2.5.0.tar.bz2) = 9849900d20225e703c43d242650a8fa211cf15f2
4RMD160 (amarok-2.5.0.tar.bz2) = 4506d4b4b1b11378d25ad488f3bdba54cd9b7567 4RMD160 (amarok-2.5.0.tar.bz2) = 4506d4b4b1b11378d25ad488f3bdba54cd9b7567
5Size (amarok-2.5.0.tar.bz2) = 46607238 bytes 5Size (amarok-2.5.0.tar.bz2) = 46607238 bytes
6SHA1 (patch-ab) = dc89394f02639c27bbcef2954aa199032c6a9ca1 6SHA1 (patch-ab) = dc89394f02639c27bbcef2954aa199032c6a9ca1
7SHA1 (patch-cmake_modules_FindTagLib.cmake) = 95e195ea376746dbbc16c3fdc88b934cf711199f 7SHA1 (patch-cmake_modules_FindTagLib.cmake) = 95e195ea376746dbbc16c3fdc88b934cf711199f
8SHA1 (patch-src_context_widgets_RatingWidget.cpp) = 67d84170eacbd139ffa1f8159ad941f0f369a44a 8SHA1 (patch-src_context_widgets_RatingWidget.cpp) = 67d84170eacbd139ffa1f8159ad941f0f369a44a
9SHA1 (patch-src_dialogs_TagDialogBase.ui) = f81f7832ed0dbb4b635162dca2ef7d2145d6cd14 9SHA1 (patch-src_dialogs_TagDialogBase.ui) = f81f7832ed0dbb4b635162dca2ef7d2145d6cd14
10SHA1 (patch-src_playlist_view_listview_PrettyItemDelegate.cpp) = 1c8f8c2d310b6ad08b2894d0941000b0935adc9f 10SHA1 (patch-src_playlist_view_listview_PrettyItemDelegate.cpp) = 1c8f8c2d310b6ad08b2894d0941000b0935adc9f
11SHA1 (patch-src_playlistgenerator_constraints_TagMatchEditWidget.ui) = d11a057fd51ee9c00fef47ffdd3c66ff8fd0995b 11SHA1 (patch-src_playlistgenerator_constraints_TagMatchEditWidget.ui) = d11a057fd51ee9c00fef47ffdd3c66ff8fd0995b
 12SHA1 (patch-utilities_afttagger_AFTTagger.cpp) = b3384e44db13f877e418e9a1da7b8ae241db09b0
File Added: pkgsrc/audio/amarok/patches/Attic/patch-utilities_afttagger_AFTTagger.cpp
$NetBSD: patch-utilities_afttagger_AFTTagger.cpp,v 1.1 2012/10/23 10:32:44 markd Exp $

Use std::cin consistently to reference standard input

--- utilities/afttagger/AFTTagger.cpp.orig	2011-12-15 07:36:49.000000000 +0000
+++ utilities/afttagger/AFTTagger.cpp
@@ -88,7 +88,7 @@ AFTTagger::AFTTagger( int &argc, char **
         m_textStream.flush();
         std::string response;
         std::cin >> response;
-        cin.get();
+        std::cin.get();
 
         if( response != "y" && response != "Y")
         {