svn commit: r324063 - in head/sysutils/xcdroast: . files

[Oliver Lehmann]

Author: oliver
Date: Wed Jul 31 17:02:53 2013
New Revision: 324063
URL: http://svnweb.freebsd.org/changeset/ports/324063

Log:
  add cdda2wav version patch from http://www.xcdroast.org/xcdr098/patches/
  
  PR:		ports/180957
  Submitted by:	Gerard Seibert <gerard at seibercom.net>

Added:
  head/sysutils/xcdroast/files/
  head/sysutils/xcdroast/files/patch-cdda2wav_version   (contents, props changed)
Modified:
  head/sysutils/xcdroast/Makefile

Modified: head/sysutils/xcdroast/Makefile
==============================================================================
--- head/sysutils/xcdroast/Makefile	Wed Jul 31 16:52:45 2013	(r324062)
+++ head/sysutils/xcdroast/Makefile	Wed Jul 31 17:02:53 2013	(r324063)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xcdroast
 PORTVERSION=	0.98.a.16
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.98alpha16 \
 		http://www.xcdroast.org/download/

Added: head/sysutils/xcdroast/files/patch-cdda2wav_version
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/xcdroast/files/patch-cdda2wav_version	Wed Jul 31 17:02:53 2013	(r324063)
@@ -0,0 +1,53 @@
+--- src/io.c	2008-08-21 15:11:40.000000000 +0200
++++ src/io.c	2009-12-29 22:54:08.571188849 +0100
+@@ -10062,6 +10062,7 @@
+ 
+ gint check_version_cdda2wav(gchar *match, gchar *found) {
+ gchar line[MAXLINE];
++gchar vline[MAXLINE];
+ gchar ver[MAXLINE];
+ FILE *fpin;
+ gchar *p;
+@@ -10076,32 +10077,38 @@
+         }
+ 
+ 	strcpy(line,"");
++	strcpy(vline,"");
+         for (;;) {
+                 if (fgets(line,MAXLINE,fpin) == NULL) 
+                         break;
+ 		dodebug(10,"got: %s",line);
++
++	        /* only get first line */
++        	if (strcmp(vline,"") == 0) {
++                	strncpy(vline, line, MAXLINE);
++        	}
+         }
+ 
+         if (pclose(fpin) == -1) {
+                 g_error("pclose error\n");
+         }
+ 
+-	if (strcmp(line,"") == 0 || strstr(line,"sh:") != NULL) {
++	if (strcmp(vline,"") == 0 || strstr(vline,"sh:") != NULL) {
+ 		/* failed to open - permission denied */
+ 		return 2;
+ 	}
+ 
+-	/* now line contains the version string of cdda2wav */
++	/* now vline contains the version string of cdda2wav */
+ 	/* try to extract the version number */
+ 
+-	p = strstr(line,"version");
++	p = strstr(vline,"version");
+ 	if (p != NULL) {
+ 		p = strtok(p+8, " _");
+ 		if (p != NULL) {
+ 			strcpy(ver,p);
+ 		}
+ 	} else {
+-		p = strstr(line,"cdda2wav");
++		p = strstr(vline,"cdda2wav");
+ 		if (p != NULL) {
+ 			p = strtok(p+9, " ");
+ 			if (p != NULL) {