Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Nov 2020 21:46:49 +0000 (UTC)
From:      Diane Bruce <db@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r555793 - in head/comms/fldigi: . files
Message-ID:  <202011202146.0AKLknN1072925@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: db
Date: Fri Nov 20 21:46:49 2020
New Revision: 555793
URL: https://svnweb.freebsd.org/changeset/ports/555793

Log:
  updated Asciidoc results in embedded \r in guide.cxx which confused compiler
  Hack in an additional sed to remove \r into existing sed

Added:
  head/comms/fldigi/files/patch-src_Makefile.am   (contents, props changed)
Modified:
  head/comms/fldigi/Makefile

Modified: head/comms/fldigi/Makefile
==============================================================================
--- head/comms/fldigi/Makefile	Fri Nov 20 21:41:59 2020	(r555792)
+++ head/comms/fldigi/Makefile	Fri Nov 20 21:46:49 2020	(r555793)
@@ -2,6 +2,7 @@
 
 PORTNAME=	fldigi
 PORTVERSION=	4.1.16
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
@@ -38,7 +39,7 @@ OSS_DESC=		Support OSS
 PULSEAUDIO_DESC=	PulseAudio support
 HAMLIB_DESC=		Support rig control via hamlib
 
-OPTIONS_DEFAULT=	FLARQ OSS HAMLIB
+OPTIONS_DEFAULT=	FLARQ OSS HAMLIB NATIVE_OPT
 OPTIONS_SUB=		yes
 
 NATIVE_OPT_CONFIGURE_ON=	--enable-optimizations=native

Added: head/comms/fldigi/files/patch-src_Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/fldigi/files/patch-src_Makefile.am	Fri Nov 20 21:46:49 2020	(r555793)
@@ -0,0 +1,11 @@
+--- src/Makefile.am.orig	2020-10-22 03:19:34 UTC
++++ src/Makefile.am
+@@ -488,7 +488,7 @@ $(builddir)/../doc/guide.html: $(builddir)/../doc/guid
+ 
+ $(builddir)/dialogs/guide.cxx: $(builddir)/../doc/guide.html
+ 	@mkdir -p $(builddir)/dialogs
+-	$(call silent,GUIDE ,$@)sed 's/\\/\\\\/g; s/"/\\"/g; s/$$/\\n\\/g; 1 s/.*/const char* szBeginner = "&/; $$ s/.*/&n";/' $< > $@
++	$(call silent,GUIDE ,$@)sed 's/\r//g; s/\\/\\\\/g; s/"/\\"/g; s/$$/\\n\\/g; 1 s/.*/const char* szBeginner = "&/; $$ s/.*/&n";/' $< > $@
+ dialogs/htmlstrings.cxx: $(builddir)/dialogs/guide.cxx
+ 
+ distclean-local:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011202146.0AKLknN1072925>