NetBSD Problem Report #48819
From iamleot@gmail.com Sun May 18 16:51:37 2014
Return-Path: <iamleot@gmail.com>
Received: from mail.netbsd.org (mail.netbsd.org [149.20.53.66])
(using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
(Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK))
by mollari.NetBSD.org (Postfix) with ESMTPS id C3FAFA584F
for <gnats-bugs@gnats.netbsd.org>; Sun, 18 May 2014 16:51:37 +0000 (UTC)
Message-Id: <5378e515.86300f0a.4963.ffff9508@mx.google.com>
Date: Sun, 18 May 2014 09:51:33 -0700 (PDT)
From: Leonardo Taccari <iamleot@gmail.com>
Reply-To: Leonardo Taccari <iamleot@gmail.com>
To: gnats-bugs@gnats.NetBSD.org
Subject: Update audio/cmus to 2.5.1
X-Send-Pr-Version: 3.95
>Number: 48819
>Category: pkg
>Synopsis: Update audio/cmus to 2.5.1
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: ahoka
>State: closed
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sun May 18 16:55:00 +0000 2014
>Closed-Date: Mon Aug 18 10:47:44 +0000 2014
>Last-Modified: Mon Aug 18 10:47:44 +0000 2014
>Originator: Leonardo Taccari
>Release: NetBSD 6.1.4
>Organization:
/dev/null
>Environment:
System: NetBSD ermonnezza 6.1.4 NetBSD 6.1.4 (CELERON) #2: Wed Apr 23 16:03:38 CEST 2014 leot@ermonnezza:/usr/src/sys/arch/i386/compile/CELERON i386
Architecture: i386
Machine: i386
>Description:
audio/cmus in pkgsrc is not the latest stable version.
>How-To-Repeat:
$ cd pkgsrc/audio/cmus
$ make show-var VARNAME=PKGNAME_NOREV
>Fix:
Please apply the following patches. It seems that now cmus is available on
github and I have updated MASTER_SITES and HOMEPAGE.
While here I will attach a possible commit message the release information are
from freecode.com ( http://freecode.com/projects/cmus/releases/363723 ):
-----------------8<-------------------8<-------------------8<-----------------
Update audio/cmus to cmus-2.5.1.
Release Notes (2.5.1):
This is a maintenance release that contains a lot of accumulated bugfixes
since 2.5.0. Everyone is encouraged to upgrade.
-----------------8<-------------------8<-------------------8<-----------------
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/cmus/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- Makefile 21 Apr 2014 09:49:49 -0000 1.49
+++ Makefile 18 May 2014 16:48:16 -0000
@@ -1,14 +1,12 @@
# $NetBSD: Makefile,v 1.49 2014/04/21 09:49:49 wiz Exp $
-DISTNAME= cmus-v2.5.0
-PKGNAME= ${DISTNAME:S/-v/-/}
-PKGREVISION= 6
+DISTNAME= v2.5.1
+PKGNAME= cmus-${DISTNAME:S/v//}
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cmus/}
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= https://github.com/cmus/cmus/archive/
MAINTAINER= ahoka@NetBSD.org
-HOMEPAGE= http://cmus.sourceforge.net/
+HOMEPAGE= http://cmus.github.io/
COMMENT= Cmus is a small, fast and powerful text mode music player
LICENSE= gnu-gpl-v2
@@ -17,6 +15,8 @@
HAS_CONFIGURE= yes
USE_TOOLS+= gmake pkg-config
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
+
REPLACE_SH+= cmus-status-display
CONFIGURE_ARGS+= prefix=${PREFIX}
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/cmus/distinfo,v
retrieving revision 1.18
diff -u -r1.18 distinfo
--- distinfo 21 Apr 2014 09:49:49 -0000 1.18
+++ distinfo 18 May 2014 16:48:16 -0000
@@ -1,8 +1,7 @@
$NetBSD: distinfo,v 1.18 2014/04/21 09:49:49 wiz Exp $
-SHA1 (cmus-v2.5.0.tar.bz2) = 244975a5ff642567acb047f6bd518e4a3271c25b
-RMD160 (cmus-v2.5.0.tar.bz2) = ee7b285cbafd6449d853d669e25cb4997254cece
-Size (cmus-v2.5.0.tar.bz2) = 224675 bytes
+SHA1 (v2.5.1.tar.gz) = fd6c63c7cb405e4b4fea6a737074c454f602c202
+RMD160 (v2.5.1.tar.gz) = 74d09f38f61905be191e47e4a95bdf3e0a8bc71f
+Size (v2.5.1.tar.gz) = 276317 bytes
SHA1 (patch-mixer__sun.c) = 4a7599fc200157cbd1169125d03ce1e29b26b643
-SHA1 (patch-modplug.c) = b08ea6c1c3501de9b3b2614df9f6450c0b508895
SHA1 (patch-sun.c) = 1155871f5fcc714e3c26f21ecbd94604fee28a7f
Index: patches/patch-modplug.c
===================================================================
RCS file: patches/patch-modplug.c
diff -N patches/patch-modplug.c
--- patches/patch-modplug.c 21 Apr 2014 09:49:49 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-modplug.c,v 1.2 2014/04/21 09:49:49 wiz Exp $
-
-Adapt for header path change.
-
---- modplug.c.orig 2014-04-19 13:01:44.000000000 +0000
-+++ modplug.c
-@@ -24,7 +24,7 @@
- #include "config/modplug.h"
- #endif
-
--#include <modplug.h>
-+#include <libmodplug/modplug.h>
- #include <sys/types.h>
- #include <unistd.h>
- #include <stdlib.h>
>Release-Note:
>Audit-Trail:
From: Thomas Klausner <wiz@NetBSD.org>
To: NetBSD bugtracking <gnats-bugs@NetBSD.org>
Cc:
Subject: Re: pkg/48819: Update audio/cmus to 2.5.1
Date: Sun, 18 May 2014 22:49:36 +0200
On Sun, May 18, 2014 at 04:55:00PM +0000, Leonardo Taccari wrote:
> Please apply the following patches. It seems that now cmus is available on
> github and I have updated MASTER_SITES and HOMEPAGE.
Please set DIST_SUBDIR and regenerate distinfo, or look for a distfile
that has package name and version number instead of only version
number.
Thanks,
Thomas
From: Leonardo Taccari <iamleot@gmail.com>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: pkg/48819: Update audio/cmus to 2.5.1
Date: Sun, 18 May 2014 23:18:22 +0200
--zYM0uCDKw75PZbzx
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hello Thomas,
On Sun, May 18, 2014 at 08:50:01PM +0000, Thomas Klausner wrote:
> Please set DIST_SUBDIR and regenerate distinfo, or look for a distfile
> that has package name and version number instead of only version
> number.
I did not notice that, thanks a lot!
Now should be ok.
Ciao,
L.
--zYM0uCDKw75PZbzx
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=cmus-patches
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/cmus/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- Makefile 21 Apr 2014 09:49:49 -0000 1.49
+++ Makefile 18 May 2014 21:12:58 -0000
@@ -1,14 +1,12 @@
# $NetBSD: Makefile,v 1.49 2014/04/21 09:49:49 wiz Exp $
-DISTNAME= cmus-v2.5.0
-PKGNAME= ${DISTNAME:S/-v/-/}
-PKGREVISION= 6
+DISTNAME= v2.5.1
+PKGNAME= cmus-${DISTNAME:S/v//}
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cmus/}
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= https://github.com/cmus/cmus/archive/
MAINTAINER= ahoka@NetBSD.org
-HOMEPAGE= http://cmus.sourceforge.net/
+HOMEPAGE= http://cmus.github.io/
COMMENT= Cmus is a small, fast and powerful text mode music player
LICENSE= gnu-gpl-v2
@@ -17,6 +15,9 @@
HAS_CONFIGURE= yes
USE_TOOLS+= gmake pkg-config
+DIST_SUBDIR= ${PKGNAME_NOREV}
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
+
REPLACE_SH+= cmus-status-display
CONFIGURE_ARGS+= prefix=${PREFIX}
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/cmus/distinfo,v
retrieving revision 1.18
diff -u -r1.18 distinfo
--- distinfo 21 Apr 2014 09:49:49 -0000 1.18
+++ distinfo 18 May 2014 21:12:58 -0000
@@ -1,8 +1,7 @@
$NetBSD: distinfo,v 1.18 2014/04/21 09:49:49 wiz Exp $
-SHA1 (cmus-v2.5.0.tar.bz2) = 244975a5ff642567acb047f6bd518e4a3271c25b
-RMD160 (cmus-v2.5.0.tar.bz2) = ee7b285cbafd6449d853d669e25cb4997254cece
-Size (cmus-v2.5.0.tar.bz2) = 224675 bytes
+SHA1 (cmus-2.5.1/v2.5.1.tar.gz) = fd6c63c7cb405e4b4fea6a737074c454f602c202
+RMD160 (cmus-2.5.1/v2.5.1.tar.gz) = 74d09f38f61905be191e47e4a95bdf3e0a8bc71f
+Size (cmus-2.5.1/v2.5.1.tar.gz) = 276317 bytes
SHA1 (patch-mixer__sun.c) = 4a7599fc200157cbd1169125d03ce1e29b26b643
-SHA1 (patch-modplug.c) = b08ea6c1c3501de9b3b2614df9f6450c0b508895
SHA1 (patch-sun.c) = 1155871f5fcc714e3c26f21ecbd94604fee28a7f
Index: patches/patch-modplug.c
===================================================================
RCS file: patches/patch-modplug.c
diff -N patches/patch-modplug.c
--- patches/patch-modplug.c 21 Apr 2014 09:49:49 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-modplug.c,v 1.2 2014/04/21 09:49:49 wiz Exp $
-
-Adapt for header path change.
-
---- modplug.c.orig 2014-04-19 13:01:44.000000000 +0000
-+++ modplug.c
-@@ -24,7 +24,7 @@
- #include "config/modplug.h"
- #endif
-
--#include <modplug.h>
-+#include <libmodplug/modplug.h>
- #include <sys/types.h>
- #include <unistd.h>
- #include <stdlib.h>
--zYM0uCDKw75PZbzx--
From: "OBATA Akio" <obata@lins.jp>
To: gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/48819: Update audio/cmus to 2.5.1
Date: Mon, 19 May 2014 18:58:48 +0900
On Mon, 19 May 2014 06:20:00 +0900, Leonardo Taccari <iamleot@gmail.com> wrote:
> -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cmus/}
> -EXTRACT_SUFX= .tar.bz2
> +MASTER_SITES= https://github.com/cmus/cmus/archive/
Please just use following instead:
DISTNAME= cmus-2.5.1
MASTER_SITES= -https://github.com/cmus/cmus/archive/v${PKGVERSION_NOREV}${EXTRACT_SUFX}
With http, filename=cmus-2.5.1.tar.gz is offered so it should be used as DISTNAME.
--
OBATA Akio / obata@lins.jp
From: Leonardo Taccari <iamleot@gmail.com>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: pkg/48819: Update audio/cmus to 2.5.1
Date: Mon, 19 May 2014 12:28:34 +0200
--Kj7319i9nmIyA2yE
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hello OBATA,
On Mon, May 19, 2014 at 10:00:01AM +0000, OBATA Akio wrote:
> Please just use following instead:
> DISTNAME= cmus-2.5.1
> MASTER_SITES= -https://github.com/cmus/cmus/archive/v${PKGVERSION_NOREV}${EXTRACT_SUFX}
>
> With http, filename=cmus-2.5.1.tar.gz is offered so it should be used as DISTNAME.
This one seems the cleanest solution!
New diff attached.
Thank you,
Ciao,
L.
--Kj7319i9nmIyA2yE
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=cmus-patches
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/cmus/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- Makefile 21 Apr 2014 09:49:49 -0000 1.49
+++ Makefile 19 May 2014 10:21:12 -0000
@@ -1,14 +1,11 @@
# $NetBSD: Makefile,v 1.49 2014/04/21 09:49:49 wiz Exp $
-DISTNAME= cmus-v2.5.0
-PKGNAME= ${DISTNAME:S/-v/-/}
-PKGREVISION= 6
+DISTNAME= cmus-2.5.1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cmus/}
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= -https://github.com/cmus/cmus/archive/v${PKGVERSION_NOREV}${EXTRACT_SUFX}
MAINTAINER= ahoka@NetBSD.org
-HOMEPAGE= http://cmus.sourceforge.net/
+HOMEPAGE= http://cmus.github.io/
COMMENT= Cmus is a small, fast and powerful text mode music player
LICENSE= gnu-gpl-v2
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/cmus/distinfo,v
retrieving revision 1.18
diff -u -r1.18 distinfo
--- distinfo 21 Apr 2014 09:49:49 -0000 1.18
+++ distinfo 19 May 2014 10:21:12 -0000
@@ -1,8 +1,7 @@
$NetBSD: distinfo,v 1.18 2014/04/21 09:49:49 wiz Exp $
-SHA1 (cmus-v2.5.0.tar.bz2) = 244975a5ff642567acb047f6bd518e4a3271c25b
-RMD160 (cmus-v2.5.0.tar.bz2) = ee7b285cbafd6449d853d669e25cb4997254cece
-Size (cmus-v2.5.0.tar.bz2) = 224675 bytes
+SHA1 (cmus-2.5.1.tar.gz) = fd6c63c7cb405e4b4fea6a737074c454f602c202
+RMD160 (cmus-2.5.1.tar.gz) = 74d09f38f61905be191e47e4a95bdf3e0a8bc71f
+Size (cmus-2.5.1.tar.gz) = 276317 bytes
SHA1 (patch-mixer__sun.c) = 4a7599fc200157cbd1169125d03ce1e29b26b643
-SHA1 (patch-modplug.c) = b08ea6c1c3501de9b3b2614df9f6450c0b508895
SHA1 (patch-sun.c) = 1155871f5fcc714e3c26f21ecbd94604fee28a7f
Index: patches/patch-modplug.c
===================================================================
RCS file: patches/patch-modplug.c
diff -N patches/patch-modplug.c
--- patches/patch-modplug.c 21 Apr 2014 09:49:49 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-modplug.c,v 1.2 2014/04/21 09:49:49 wiz Exp $
-
-Adapt for header path change.
-
---- modplug.c.orig 2014-04-19 13:01:44.000000000 +0000
-+++ modplug.c
-@@ -24,7 +24,7 @@
- #include "config/modplug.h"
- #endif
-
--#include <modplug.h>
-+#include <libmodplug/modplug.h>
- #include <sys/types.h>
- #include <unistd.h>
- #include <stdlib.h>
--Kj7319i9nmIyA2yE--
Responsible-Changed-From-To: pkg-manager->ahoka
Responsible-Changed-By: obache@NetBSD.org
Responsible-Changed-When: Sun, 20 Jul 2014 13:13:37 +0000
Responsible-Changed-Why:
Over to maintainer.
From: "Guillaume Lasmayous" <gls@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/48819 CVS commit: pkgsrc/audio/cmus
Date: Mon, 18 Aug 2014 10:34:18 +0000
Module Name: pkgsrc
Committed By: gls
Date: Mon Aug 18 10:34:18 UTC 2014
Modified Files:
pkgsrc/audio/cmus: Makefile distinfo
Log Message:
Update Makefile following hints in PR pkg/48819. Muh cleaner solution.
From Leonardo Taccari, thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/audio/cmus/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/audio/cmus/distinfo
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
State-Changed-From-To: open->closed
State-Changed-By: gls@NetBSD.org
State-Changed-When: Mon, 18 Aug 2014 10:47:44 +0000
State-Changed-Why:
I've done the update to 2.6.0.
Thanks for the report!
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.39 2013/11/01 18:47:49 spz Exp $
$NetBSD: gnats_config.sh,v 1.8 2006/05/07 09:23:38 tsutsui Exp $
Copyright © 1994-2014
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.