Index: head/multimedia/w_scan2/files/patch-src_char-coding.c =================================================================== --- head/multimedia/w_scan2/files/patch-src_char-coding.c (revision 568382) +++ head/multimedia/w_scan2/files/patch-src_char-coding.c (nonexistent) @@ -1,35 +0,0 @@ ---- src/char-coding.c.orig 2020-08-22 13:49:25 UTC -+++ src/char-coding.c -@@ -340,14 +340,31 @@ void char_coding(char **inbuf, size_t * inbytesleft, c - // Fallback method: copy all printable chars from *inbuf to *outbuf. - size_t i; - size_t pos = 0; -- -+#ifdef __FreeBSD__ -+ int to_utf = user_charset_id < iconv_codes_count() && -+ !strncmp(iconv_codes[user_charset_id], "UTF", sizeof "UTF" - 1); -+#endif - for (i = 0; i < nsrc; i++) { - switch ((uint8_t) * (psrc + i)) { - //case 0x20 ... 0x7E: - //case 0xA0 ... 0xFF: - // printable chars ISO-6937-2 - // Figure A.1: Character code table 00 - Latin alphabet -+#ifdef __FreeBSD__ -+ case 0x80 ... 0xFF: -+ // the iconv used on FreeBSD doesn't know about the -+ // default DVB charset ISO-6397-2 so we'll end up here -+ // for 8-bit chars in channel names that are (usually -+ // wrongly) specified as the default charset - and if -+ // we are converting to UTF those will create invalid -+ // encodings. -+ if (to_utf) -+ continue; -+ // FALLTHRU -+ case 0x01 ... 0x7F: -+#else - case 0x01 ... 0xFF: // 20121202: don't touch anything; leave it as it is. -+#endif - *(pdest + pos++) = *(psrc + i); - default:; - } Property changes on: head/multimedia/w_scan2/files/patch-src_char-coding.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/w_scan2/Makefile =================================================================== --- head/multimedia/w_scan2/Makefile (revision 568382) +++ head/multimedia/w_scan2/Makefile (revision 568383) @@ -1,33 +1,33 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= w_scan2 -PORTVERSION= 1.0.10 +PORTVERSION= 1.0.11 CATEGORIES= multimedia MAINTAINER= rene@FreeBSD.org COMMENT= Perform frequency scans for DVB and ATSC transmissions LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= v4l_compat>=1.0.20120501:multimedia/v4l_compat GNU_CONFIGURE= yes USES= autoreconf gettext iconv localbase LDFLAGS+= ${ICONV_LIB} USE_GITHUB= yes GH_ACCOUNT= stefantalpalaru PORTDOCS= COPYING ChangeLog README.md PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz OPTIONS_DEFINE= DOCS post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include Index: head/multimedia/w_scan2/distinfo =================================================================== --- head/multimedia/w_scan2/distinfo (revision 568382) +++ head/multimedia/w_scan2/distinfo (revision 568383) @@ -1,3 +1,3 @@ -TIMESTAMP = 1615063849 -SHA256 (stefantalpalaru-w_scan2-1.0.10_GH0.tar.gz) = 7b0ebe2a6dd8ffa9ebf8411f016fafec49dd7c86fe88684d452907e22e9d4b76 -SIZE (stefantalpalaru-w_scan2-1.0.10_GH0.tar.gz) = 200582 +TIMESTAMP = 1615721275 +SHA256 (stefantalpalaru-w_scan2-1.0.11_GH0.tar.gz) = 7b8afbd0885f0fa7b6d789660eabfdac2d0462fe5b24021f3a3066585d53b6d0 +SIZE (stefantalpalaru-w_scan2-1.0.11_GH0.tar.gz) = 202634