ports/144718: [PATCH] audio/libmp3splt: update to 0.5.9, fix build when WITHOUT_NLS is defined

[Anton Yuzhaninov]

The following reply was made to PR ports/144718; it has been noted by GNATS.

From: Anton Yuzhaninov <citrin at citrin.ru>
To: bug-followup at FreeBSD.org, sunpoet at sunpoet.net
Cc:  
Subject: Re: ports/144718: [PATCH] audio/libmp3splt: update to 0.5.9, fix
 build when WITHOUT_NLS is defined
Date: Thu, 22 Apr 2010 16:55:39 +0400

 This is a multi-part message in MIME format.
 --------------050703080704000106090108
 Content-Type: text/plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
 
 Yes, I can repeat build error. I can build when WITHOUT_NLS is defined only when
 gettext is installed.
 
 Slightly updated patch is attached.
 
 --------------050703080704000106090108
 Content-Type: text/plain;
  name="libmp3splt-0.5.9.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="libmp3splt-0.5.9.patch"
 
 ===> Generating patch
 ===> Viewing diff with more
 diff -ruN --exclude=CVS /usr/ports/audio/libmp3splt/Makefile /usr/home/citrin/libmp3splt/Makefile
 --- /usr/ports/audio/libmp3splt/Makefile	2010-04-13 19:57:02.000000000 +0400
 +++ /usr/home/citrin/libmp3splt/Makefile	2010-04-22 12:50:06.000000000 +0400
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	libmp3splt
 -PORTVERSION=	0.5.8a
 +PORTVERSION=	0.5.9
  CATEGORIES=	audio
  MASTER_SITES=	SF/mp3splt/${PORTNAME}/${PORTVERSION}
  
 @@ -16,6 +16,7 @@
  GNU_CONFIGURE=	yes
  USE_LDCONFIG=	yes
  USE_AUTOTOOLS=	libltdl
 +MAKE_JOBS_SAFE=	yes
  
  OPTIONS=	MP3	"mp3 support"	on \
  		ID3	"id3tag support for the mp3"	on \
 diff -ruN --exclude=CVS /usr/ports/audio/libmp3splt/distinfo /usr/home/citrin/libmp3splt/distinfo
 --- /usr/ports/audio/libmp3splt/distinfo	2010-04-13 19:57:02.000000000 +0400
 +++ /usr/home/citrin/libmp3splt/distinfo	2010-04-22 00:43:16.000000000 +0400
 @@ -1,3 +1,3 @@
 -MD5 (libmp3splt-0.5.8a.tar.gz) = 56ee6cdb72c5dd6e8a62299772b202c5
 -SHA256 (libmp3splt-0.5.8a.tar.gz) = cd0ae2fdece161904fcaff566190c2608f10af9e874c4daa8f9a257f9e7226dc
 -SIZE (libmp3splt-0.5.8a.tar.gz) = 499985
 +MD5 (libmp3splt-0.5.9.tar.gz) = 2a29c8a8965d45ae89582a3f112f48e3
 +SHA256 (libmp3splt-0.5.9.tar.gz) = ea25c307ff5ceab720eb1ce03d14f7ade43dda6f0f1f08dfcbba5a05e25a248a
 +SIZE (libmp3splt-0.5.9.tar.gz) = 506810
 diff -ruN --exclude=CVS /usr/ports/audio/libmp3splt/files/patch-disable-nsl /usr/home/citrin/libmp3splt/files/patch-disable-nsl
 --- /usr/ports/audio/libmp3splt/files/patch-disable-nsl	1970-01-01 03:00:00.000000000 +0300
 +++ /usr/home/citrin/libmp3splt/files/patch-disable-nsl	2010-04-22 12:49:25.000000000 +0400
 @@ -0,0 +1,40 @@
 +--- include/libmp3splt/splt.h.orig	2010-04-22 12:28:38.000000000 +0400
 ++++ include/libmp3splt/splt.h	2010-04-22 12:31:02.000000000 +0400
 +@@ -52,7 +52,9 @@
 + #endif
 + 
 + #include <limits.h>
 ++#ifdef ENABLE_NLS
 + #include <libintl.h>
 ++#endif
 + #include <locale.h>
 + 
 + #if !HAVE_FSEEKO
 +@@ -60,7 +62,11 @@
 + #define ftello ftell
 + #endif
 + 
 ++#ifdef ENABLE_NLS
 + #define _(STR) dgettext(MP3SPLT_LIB_GETTEXT_DOMAIN, STR)
 ++#else
 ++#define _(STR) STR
 ++#endif
 + 
 + /**********************************/
 + /* splt normal or syncerror split */
 +--- src/mp3splt.c.orig	2010-04-22 12:48:29.000000000 +0400
 ++++ src/mp3splt.c	2010-04-22 12:49:02.000000000 +0400
 +@@ -58,11 +58,13 @@ splt_state *mp3splt_new_state(int *error
 +   }
 +   else
 +   {
 ++#ifdef ENABLE_NLS
 + #ifndef __WIN32__
 +     bindtextdomain(MP3SPLT_LIB_GETTEXT_DOMAIN, LOCALEDIR);
 + #endif
 + 
 +     bind_textdomain_codeset(MP3SPLT_LIB_GETTEXT_DOMAIN, "UTF-8");
 ++#endif
 + 
 +     state = splt_t_new_state(state, err);
 +   }
 ===> Done
 
 --------------050703080704000106090108--