From sunpoet@sunpoet.net  Sat Mar 13 19:06:48 2010
Return-Path: <sunpoet@sunpoet.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D2BDE106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 13 Mar 2010 19:06:48 +0000 (UTC)
	(envelope-from sunpoet@sunpoet.net)
Received: from mail-gw0-f54.google.com (mail-gw0-f54.google.com [74.125.83.54])
	by mx1.freebsd.org (Postfix) with ESMTP id 977858FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 13 Mar 2010 19:06:48 +0000 (UTC)
Received: by gwj15 with SMTP id 15so1013916gwj.13
        for <FreeBSD-gnats-submit@freebsd.org>; Sat, 13 Mar 2010 11:06:47 -0800 (PST)
Received: by 10.101.179.30 with SMTP id g30mr1426914anp.90.1268507207522;
        Sat, 13 Mar 2010 11:06:47 -0800 (PST)
Received: from sunpoet.net (sunpoet.net [220.133.12.240])
        by mx.google.com with ESMTPS id 22sm859970yxe.19.2010.03.13.11.06.46
        (version=TLSv1/SSLv3 cipher=RC4-MD5);
        Sat, 13 Mar 2010 11:06:46 -0800 (PST)
Received: by sunpoet.net (Postfix, from userid 1000)
	id AFA5A2AEC658; Sun, 14 Mar 2010 03:05:59 +0800 (CST)
Message-Id: <20100313190559.AFA5A2AEC658@sunpoet.net>
Date: Sun, 14 Mar 2010 03:05:59 +0800 (CST)
From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: citrin@citrin.ru
Subject: [PATCH] audio/mp3splt: update to 2.2.8, fix build when WITHOUT_NLS is defined
X-Send-Pr-Version: 3.113
X-GNATS-Notify: citrin@citrin.ru

>Number:         144719
>Category:       ports
>Synopsis:       [PATCH] audio/mp3splt: update to 2.2.8, fix build when WITHOUT_NLS is defined
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    vsevolod
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 13 19:10:03 UTC 2010
>Closed-Date:    Thu Apr 22 15:13:40 UTC 2010
>Last-Modified:  Thu Apr 22 15:20:03 UTC 2010
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 8.0-STABLE amd64
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.0-STABLE FreeBSD 8.0-STABLE #0: Fri Feb 12 20:20:34 CST 2010
>Description:
- Update to 2.2.8
- Fix build when WITHOUT_NLS is defined
  (Prerequisite: libmp3splt is build with option WITHOUT_NLS)

Added file(s):
- files/patch-src-mp3splt.c

Port maintainer (citrin@citrin.ru) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- mp3splt-2.2.8.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/audio/mp3splt/Makefile /usr/ports/sunpoet/mp3splt/Makefile
--- /usr/ports/audio/mp3splt/Makefile	2010-01-07 17:34:10.000000000 +0800
+++ /usr/ports/sunpoet/mp3splt/Makefile	2010-03-14 02:53:53.000000000 +0800
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mp3splt
-PORTVERSION=	2.2.7a
+PORTVERSION=	2.2.8
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
diff -ruN --exclude=CVS /usr/ports/audio/mp3splt/distinfo /usr/ports/sunpoet/mp3splt/distinfo
--- /usr/ports/audio/mp3splt/distinfo	2010-01-07 17:34:10.000000000 +0800
+++ /usr/ports/sunpoet/mp3splt/distinfo	2010-03-14 02:21:22.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (mp3splt-2.2.7a.tar.gz) = 7e782063ccb16f05a714be7d6f342cac
-SHA256 (mp3splt-2.2.7a.tar.gz) = a18705093d1766f9d2680fd71aac01b659af01472fbbc78dcb188f8328148725
-SIZE (mp3splt-2.2.7a.tar.gz) = 216521
+MD5 (mp3splt-2.2.8.tar.gz) = 2e6f53d6385912c7e8395813048cd28c
+SHA256 (mp3splt-2.2.8.tar.gz) = e5581d953fad596cb6fb22f220414e8aa69cb5324aa123a6b7b9b7a2142225d8
+SIZE (mp3splt-2.2.8.tar.gz) = 218621
diff -ruN --exclude=CVS /usr/ports/audio/mp3splt/files/patch-src-mp3splt.c /usr/ports/sunpoet/mp3splt/files/patch-src-mp3splt.c
--- /usr/ports/audio/mp3splt/files/patch-src-mp3splt.c	1970-01-01 08:00:00.000000000 +0800
+++ /usr/ports/sunpoet/mp3splt/files/patch-src-mp3splt.c	2010-03-14 02:37:24.000000000 +0800
@@ -0,0 +1,42 @@
+--- src/mp3splt.c.orig	2010-02-18 04:23:39.000000000 +0800
++++ src/mp3splt.c	2010-03-14 02:36:52.000000000 +0800
+@@ -54,7 +54,11 @@
+ #define MP3SPLT_CDDBFILE "query.cddb"
+ 
+ #define MP3SPLT_GETTEXT_DOMAIN "mp3splt"
++#ifdef ENABLE_NLS
+ #define _(STR) gettext(STR)
++#else
++#define _(STR) STR
++#endif
+ 
+ //in case of STDIN/STDOUT usage, we change the console file handle
+ //-yeah indeed, global variables might suck
+@@ -1801,9 +1805,11 @@
+ //main program starts here
+ int main(int argc, char **orig_argv)
+ {
++#ifdef ENABLE_NLS
+   //gettext
+   setlocale(LC_ALL, "");
+   textdomain(MP3SPLT_GETTEXT_DOMAIN);
++#endif
+ 
+   console_out = stdout;
+   console_err = stderr;
+@@ -1814,6 +1820,7 @@
+ 
+   main_data *data = create_main_struct(argc, orig_argv);
+ 
++#ifdef ENABLE_NLS
+ #ifdef __WIN32__
+   char mp3splt_uninstall_file[2048] = { '\0' };
+   DWORD dwType, dwSize = sizeof(mp3splt_uninstall_file) - 1;
+@@ -1873,6 +1880,7 @@
+ #endif
+ 
+   bind_textdomain_codeset(MP3SPLT_GETTEXT_DOMAIN, "UTF-8");
++#endif
+ 
+   data->state = mp3splt_new_state(&err);
+   process_confirmation_error(err, data);
--- mp3splt-2.2.8.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Mar 13 19:10:24 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=144719 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: citrin@citrin.ru
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/144719: [PATCH] audio/mp3splt: update to 2.2.8, fix build when WITHOUT_NLS is defined
Date: Sat, 13 Mar 2010 19:10:21 UT

 Maintainer of audio/mp3splt,
 
 Please note that PR ports/144719 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/144719
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Anton Yuzhaninov <citrin@citrin.ru>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/144719: [PATCH] audio/mp3splt: update to 2.2.8, fix build
 when WITHOUT_NLS is defined
Date: Fri, 16 Apr 2010 20:56:07 +0400

 Thanks, I will test this patch in next few days
 
 -- 
  Anton Yuzhaninov

From: Anton Yuzhaninov <citrin@citrin.ru>
To: bug-followup@FreeBSD.org, sunpoet@sunpoet.net
Cc:  
Subject: Re: ports/144719: [PATCH] audio/mp3splt: update to 2.2.8, fix build
 when WITHOUT_NLS is defined
Date: Thu, 22 Apr 2010 17:03:32 +0400

 This is a multi-part message in MIME format.
 --------------040400030106060909050502
 Content-Type: text/plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
 
 Slightly updated patch is attached.
 
 --------------040400030106060909050502
 Content-Type: text/plain;
  name="mp3splt-2.2.8.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="mp3splt-2.2.8.patch"
 
 ===> Generating patch
 ===> Viewing diff with more
 diff -ruN --exclude=CVS /usr/ports/audio/mp3splt/Makefile /usr/home/citrin/mp3splt/Makefile
 --- /usr/ports/audio/mp3splt/Makefile	2010-04-13 19:57:07.000000000 +0400
 +++ /usr/home/citrin/mp3splt/Makefile	2010-04-22 14:04:55.000000000 +0400
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	mp3splt
 -PORTVERSION=	2.2.7a
 +PORTVERSION=	2.2.8
  CATEGORIES=	audio
  MASTER_SITES=	SF
  
 @@ -26,7 +26,8 @@
  MAN1=		oggsplt.1 mp3splt.1
  PLIST_FILES=	bin/mp3splt bin/oggsplt
  
 -post-install:
 +.include <bsd.port.pre.mk>
 +
  .if defined(WITHOUT_NLS)
  CONFIGURE_ARGS+=	--disable-nls
  .else
 @@ -37,4 +38,4 @@
  .endfor
  .endif
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 diff -ruN --exclude=CVS /usr/ports/audio/mp3splt/distinfo /usr/home/citrin/mp3splt/distinfo
 --- /usr/ports/audio/mp3splt/distinfo	2010-04-13 19:57:07.000000000 +0400
 +++ /usr/home/citrin/mp3splt/distinfo	2010-04-22 13:58:26.000000000 +0400
 @@ -1,3 +1,3 @@
 -MD5 (mp3splt-2.2.7a.tar.gz) = 7e782063ccb16f05a714be7d6f342cac
 -SHA256 (mp3splt-2.2.7a.tar.gz) = a18705093d1766f9d2680fd71aac01b659af01472fbbc78dcb188f8328148725
 -SIZE (mp3splt-2.2.7a.tar.gz) = 216521
 +MD5 (mp3splt-2.2.8.tar.gz) = 2e6f53d6385912c7e8395813048cd28c
 +SHA256 (mp3splt-2.2.8.tar.gz) = e5581d953fad596cb6fb22f220414e8aa69cb5324aa123a6b7b9b7a2142225d8
 +SIZE (mp3splt-2.2.8.tar.gz) = 218621
 diff -ruN --exclude=CVS /usr/ports/audio/mp3splt/files/patch-disable-nsl /usr/home/citrin/mp3splt/files/patch-disable-nsl
 --- /usr/ports/audio/mp3splt/files/patch-disable-nsl	1970-01-01 03:00:00.000000000 +0300
 +++ /usr/home/citrin/mp3splt/files/patch-disable-nsl	2010-04-22 14:17:27.000000000 +0400
 @@ -0,0 +1,61 @@
 +--- src/mp3splt.c.orig	2010-04-22 14:06:08.000000000 +0400
 ++++ src/mp3splt.c	2010-04-22 14:16:50.000000000 +0400
 +@@ -30,7 +30,6 @@
 + #include <ctype.h>
 + #include <getopt.h>
 + #include <locale.h>
 +-#include <libintl.h>
 + 
 + #ifdef __WIN32__
 + #include <windows.h>
 +@@ -46,6 +45,10 @@
 + #define PACKAGE_NAME "mp3splt"
 + #endif
 + 
 ++#ifdef ENABLE_NLS
 ++#include <libintl.h>
 ++#endif
 ++
 + #define MP3SPLT_DATE "17/02/10"
 + #define MP3SPLT_AUTHOR1 "Matteo Trotta"
 + #define MP3SPLT_AUTHOR2 "Alexandru Munteanu"
 +@@ -54,7 +57,11 @@
 + #define MP3SPLT_CDDBFILE "query.cddb"
 + 
 + #define MP3SPLT_GETTEXT_DOMAIN "mp3splt"
 ++#ifdef ENABLE_NLS
 + #define _(STR) gettext(STR)
 ++#else
 ++#define _(STR) STR
 ++#endif
 + 
 + //in case of STDIN/STDOUT usage, we change the console file handle
 + //-yeah indeed, global variables might suck
 +@@ -1801,9 +1808,11 @@ split:
 + //main program starts here
 + int main(int argc, char **orig_argv)
 + {
 ++#ifdef ENABLE_NLS
 +   //gettext
 +   setlocale(LC_ALL, "");
 +   textdomain(MP3SPLT_GETTEXT_DOMAIN);
 ++#endif
 + 
 +   console_out = stdout;
 +   console_err = stderr;
 +@@ -1814,6 +1823,7 @@ int main(int argc, char **orig_argv)
 + 
 +   main_data *data = create_main_struct(argc, orig_argv);
 + 
 ++#ifdef ENABLE_NLS
 + #ifdef __WIN32__
 +   char mp3splt_uninstall_file[2048] = { '\0' };
 +   DWORD dwType, dwSize = sizeof(mp3splt_uninstall_file) - 1;
 +@@ -1873,6 +1883,7 @@ int main(int argc, char **orig_argv)
 + #endif
 + 
 +   bind_textdomain_codeset(MP3SPLT_GETTEXT_DOMAIN, "UTF-8");
 ++#endif
 + 
 +   data->state = mp3splt_new_state(&err);
 +   process_confirmation_error(err, data);
 ===> Done
 
 --------------040400030106060909050502--
State-Changed-From-To: feedback->closed 
State-Changed-By: vsevolod 
State-Changed-When: Thu Apr 22 15:13:05 UTC 2010 
State-Changed-Why:  
Committed, thank you. 


Responsible-Changed-From-To: freebsd-ports-bugs->vsevolod 
Responsible-Changed-By: vsevolod 
Responsible-Changed-When: Thu Apr 22 15:13:05 UTC 2010 
Responsible-Changed-Why:  
I'll handle this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=144719 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/144719: commit references a PR
Date: Thu, 22 Apr 2010 15:13:07 +0000 (UTC)

 vsevolod    2010-04-22 15:12:55 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/mp3splt        Makefile distinfo 
   Added files:
     audio/mp3splt/files  patch-disable-nls 
   Log:
   * Update to 0.5.9 [1]
   * Fix build when WITHOUT_NLS is defined [2]
   
   PR:             144719
   Submitted by:   Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> [1], maintainer [2]
   Approved by:    maintainer
   
   Revision  Changes    Path
   1.27      +4 -3      ports/audio/mp3splt/Makefile
   1.13      +3 -3      ports/audio/mp3splt/distinfo
   1.1       +61 -0     ports/audio/mp3splt/files/patch-disable-nls (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
