3 files changed, 6 insertions, 50 deletions

diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index e2fb9d91108f..1f9befa4e078 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -22,7 +22,7 @@
 ###########################################################################
 
 PORTNAME=	cdrtools
-PORTVERSION=	2.01.01a63
+PORTVERSION=	2.01.01a66
 PORTEPOCH=	1
 CATEGORIES=	sysutils audio
 MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/alpha/ \
@@ -73,7 +73,8 @@ PLIST_SUB=	RSCSI="@comment "
 .endif
 PKGNAMESUFFIX?=	-devel
 
-MAKE_ENV=	CCOM=cc LANG=C INS_BASE=${LOCALBASE} INS_RBASE=${LOCALBASE}
+MAKE_ENV=	CCOM=cc GMAKE_NOWARN=true INS_BASE=${LOCALBASE} \
+		INS_RBASE=${LOCALBASE}
 CDRTLSTARGET=	${ARCH}-freebsd-cc
 
 .include <bsd.port.pre.mk>
diff --git a/sysutils/cdrtools-devel/distinfo b/sysutils/cdrtools-devel/distinfo
index 80742f095c40..40d0e4991117 100644
--- a/sysutils/cdrtools-devel/distinfo
+++ b/sysutils/cdrtools-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (cdrtools-2.01.01a63.tar.bz2) = 01902f004cc139f798783e5f82ec0b7e
-SHA256 (cdrtools-2.01.01a63.tar.bz2) = 1226aaaa55d11206a572491ce4776e9f960b6937c9d81bf15afa4a27217ff56b
-SIZE (cdrtools-2.01.01a63.tar.bz2) = 1828967
+MD5 (cdrtools-2.01.01a66.tar.bz2) = 813ec0e673597ae3038521dd1e2cfcbf
+SHA256 (cdrtools-2.01.01a66.tar.bz2) = b43c8f35973393772f21b052de66d7239ac3ea84ceb32b179fcca21792e4813d
+SIZE (cdrtools-2.01.01a66.tar.bz2) = 1842467
diff --git a/sysutils/cdrtools-devel/files/patch-libsiconv-sic_nls.c b/sysutils/cdrtools-devel/files/patch-libsiconv-sic_nls.c
deleted file mode 100644
index cc0422f71bb3..000000000000
--- a/sysutils/cdrtools-devel/files/patch-libsiconv-sic_nls.c
+++ /dev/null
@@ -1,45 +0,0 @@
-###########################################################################
-# This patch was contributed by Jung-uk Kim <jkim@FreeBSD.org>.
-###########################################################################
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# See the file CDDL.Schily.txt in this distribution for details.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file CDDL.Schily.txt from this distribution.
-###########################################################################
-# The file CDDL.Schily.txt can be found in the original cdrtools tarball,
-# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
-###########################################################################
-
---- libsiconv/sic_nls.c.orig	2007-11-27 16:49:03.000000000 -0500
-+++ libsiconv/sic_nls.c	2008-02-09 03:13:23.000000000 -0500
-@@ -440,12 +440,15 @@
- 	siconvt_t	*sp;
- 	iconv_t		to;
- 	iconv_t		from;
--	char		*nm = sip->sic_name;
-+	char		*nm;
- 
- 	if ((sp = (siconvt_t *)malloc(sizeof (siconvt_t)))
- 							== NULL) {
- 		return ((siconvt_t *)NULL);
- 	}
-+	nm = sip->sic_name;
-+	if (strncmp("iconv:", sip->sic_name, 6) == 0)
-+		nm = &sip->sic_name[6];
- 	if ((from = iconv_open("UCS-2BE", nm)) == (iconv_t)-1) {
- 		free(sp);
- 		return ((siconvt_t *)NULL);
-@@ -455,7 +458,7 @@
- 		iconv_close(from);
- 		return ((siconvt_t *)NULL);
- 	}
--	sp->sic_name = nm;	/* Allow to compare name pointers */
-+	sp->sic_name = sip->sic_name;	/* Allow to compare name pointers */
- 	sp->sic_uni2cs = NULL;
- 	sp->sic_cs2uni = NULL;
- 	sp->sic_cd2uni = from;