ports/144719: [PATCH] audio/mp3splt: update to 2.2.8, fix build when WITHOUT_NLS is defined

[Anton Yuzhaninov]

The following reply was made to PR ports/144719; 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/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--