pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Fix backslashed characters.



Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Fri Jun 25 22:49:51 2021 +0200
Changeset:	d081ed1cb0fdebd1e265931d5e085afc4b56aea0

Modified Files:
	fbida/distinfo
	fbida/patches/patch-aa
Added Files:
	fbida/patches/patch-mk_Autoconf.mk

Log Message:
Fix backslashed characters.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d081ed1cb0fdebd1e265931d5e085afc4b56aea0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 fbida/distinfo                     |  3 ++-
 fbida/patches/patch-aa             | 16 +++++++++++++---
 fbida/patches/patch-mk_Autoconf.mk | 15 +++++++++++++++
 3 files changed, 30 insertions(+), 4 deletions(-)

diffs:
diff --git a/fbida/distinfo b/fbida/distinfo
index a46026423b..fe66fcbc74 100644
--- a/fbida/distinfo
+++ b/fbida/distinfo
@@ -4,5 +4,6 @@ SHA1 (fbida-2.09.tar.gz) = 5838b2cb7188481fece6159fccb3b121acd906e7
 RMD160 (fbida-2.09.tar.gz) = bbc237471d77505a628e67e4152dca80de51301b
 SHA512 (fbida-2.09.tar.gz) = b939ca656fc28e3df652610821b9c11f7ab20ad1bd393c40de74f631fad0af463bfaf4f0520484edc12922b1fc288d08fae7c92789c711ce96b0caf50dde25ba
 Size (fbida-2.09.tar.gz) = 248086 bytes
-SHA1 (patch-aa) = dacfc252e272ad8bc4b7d109dc69635b9318dfb6
+SHA1 (patch-aa) = 60cb0e06b48f2c42ae6d5e95462de1392b275490
 SHA1 (patch-ab) = 8659d8ee2e99ffbca40c200a072db1bb0cd0eeca
+SHA1 (patch-mk_Autoconf.mk) = f050df1269b3790373059ff59327fa3f5e0d07bc
diff --git a/fbida/patches/patch-aa b/fbida/patches/patch-aa
index bfb6e8c841..13e04d9b39 100644
--- a/fbida/patches/patch-aa
+++ b/fbida/patches/patch-aa
@@ -1,8 +1,18 @@
 $NetBSD: patch-aa,v 1.2 2011/10/20 12:20:56 rhialto Exp $
 
---- GNUmakefile.orig	2011-06-01 07:31:59.000000000 +0000
-+++ GNUmakefile
-@@ -36,7 +36,7 @@ ac_jpeg_ver = $(shell \
+Fix backslashed character.
+Fix directory.
+
+--- GNUmakefile.orig	2012-02-22 18:13:36.000000000 +0100
++++ GNUmakefile	2021-06-17 15:42:00.423259628 +0200
+@@ -30,13 +30,13 @@
+ 
+ ac_jpeg_ver = $(shell \
+ 	$(call ac_init,for libjpeg version);\
+-	$(call ac_s_cmd,echo -e '\#include <jpeglib.h>\nJPEG_LIB_VERSION' \
++	$(call ac_s_cmd,echo -e '#include <jpeglib.h>\nJPEG_LIB_VERSION' \
+ 		| cpp | tail -n 1);\
+ 	$(call ac_fini))
  
  define make-config
  LIB		:= $(LIB)
diff --git a/fbida/patches/patch-mk_Autoconf.mk b/fbida/patches/patch-mk_Autoconf.mk
new file mode 100644
index 0000000000..67bd55be47
--- /dev/null
+++ b/fbida/patches/patch-mk_Autoconf.mk
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix backslashed character.
+
+--- mk/Autoconf.mk.orig	2021-06-25 20:43:29.271325608 +0000
++++ mk/Autoconf.mk
+@@ -56,7 +56,7 @@ ac_uname_arch = $(shell \
+ # args: header file
+ ac_header = $(shell \
+ 	$(call ac_init,for $(1));\
+-	$(call ac_b_cmd,echo '\#include <$(1)>' |\
++	$(call ac_b_cmd,echo '#include <$(1)>' |\
+ 		$(CC) $(CFLAGS) -E -);\
+ 	$(call ac_fini))
+ 


Home | Main Index | Thread Index | Old Index