Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Jun 2014 08:19:04 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r358676 - head/sysutils/dar/files
Message-ID:  <201406210819.s5L8J4B8041955@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Sat Jun 21 08:19:04 2014
New Revision: 358676
URL: http://svnweb.freebsd.org/changeset/ports/358676
QAT: https://qat.redports.org/buildarchive/r358676/

Log:
  sysutils/dar: Use alternate sed argument to unbreak DragonFly
  
  The new version of dar uses the gnu sed -r switch which is not recognized
  by DragonFly's BSD sed.  Switch this to the equivalent -E switch so both
  FreeBSD and DragonFly are happy.
  
  Approved by:	general blanket

Added:
  head/sysutils/dar/files/patch-src_libdar_Makefile.in   (contents, props changed)

Added: head/sysutils/dar/files/patch-src_libdar_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/dar/files/patch-src_libdar_Makefile.in	Sat Jun 21 08:19:04 2014	(r358676)
@@ -0,0 +1,11 @@
+--- src/libdar/Makefile.in.orig	2014-06-15 16:44:07.000000000 +0000
++++ src/libdar/Makefile.in
+@@ -337,7 +337,7 @@ AM_LDFLAGS = @LTLIBINTL@  $(LD_PROF)
+ lib_LTLIBRARIES = $(MYLIB)
+ LIBDAR_MAJOR = `grep LIBDAR_COMPILE_TIME_MAJOR libdar.hpp | cut -f 2 -d "=" | cut -f 1 -d ';' | sed -e 's% %%g'`
+ LIBDAR_MEDIUM = `grep LIBDAR_COMPILE_TIME_MEDIUM libdar.hpp | cut -f 2 -d "=" | cut -f 1 -d ';' | sed -e 's% %%g'`
+-LIBDAR_MEDIUM_000 = `grep LIBDAR_COMPILE_TIME_MEDIUM libdar.hpp | cut -f 2 -d "=" | cut -f 1 -d ';' | sed -r -e 's% %%g' -e 's%([^0-9]|^)([0-9]{1})([^0-9]|$$)%0\2%' -e 's%([^0-9]|^)([0-9]{2})([^0-9]|$$)%0\2%'`
++LIBDAR_MEDIUM_000 = `grep LIBDAR_COMPILE_TIME_MEDIUM libdar.hpp | cut -f 2 -d "=" | cut -f 1 -d ';' | sed -E -e 's% %%g' -e 's%([^0-9]|^)([0-9]{1})([^0-9]|$$)%0\2%' -e 's%([^0-9]|^)([0-9]{2})([^0-9]|$$)%0\2%'`
+ LIBDAR_MINOR = `grep LIBDAR_COMPILE_TIME_MINOR libdar.hpp | cut -f 2 -d "=" | cut -f 1 -d ';' | sed -e 's% %%g'`
+ LIBDAR_LIBTOOL_CURRENT = $(LIBDAR_MAJOR)$(LIBDAR_MEDIUM_000)
+ LIBDAR_LIBTOOL_REVISION = $(LIBDAR_MINOR)



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