[pkgsrc/trunk]: pkgsrc/devel/frama-c Need to patch Makefile.in, not Makefile....

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/frama-c Need to patch Makefile.in, not Makefile....
From: dholland <dholland%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 07:48:16 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/48a3584a5f83
branches:  trunk
changeset: 367706:48a3584a5f83
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Tue Sep 05 07:42:00 2017 +0000

description:
Need to patch Makefile.in, not Makefile. Oops.

diffstat:

 devel/frama-c/distinfo                                     |   4 +-
 devel/frama-c/patches/patch-src_plugins_e-acsl_Makefile    |  64 --------------
 devel/frama-c/patches/patch-src_plugins_e-acsl_Makefile.in |  64 ++++++++++++++
 3 files changed, 66 insertions(+), 66 deletions(-)

diffs (154 lines):

diff -r c4b0dfc8ad63 -r 48a3584a5f83 devel/frama-c/distinfo
--- a/devel/frama-c/distinfo    Tue Sep 05 07:41:35 2017 +0000
+++ b/devel/frama-c/distinfo    Tue Sep 05 07:42:00 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2017/09/05 07:30:00 dholland Exp $
+$NetBSD: distinfo,v 1.8 2017/09/05 07:42:00 dholland Exp $
 
 SHA1 (frama-c-Phosphorus-20170501.tar.gz) = d9372127ba80636cc1c692a141a7a02dee8325da
 RMD160 (frama-c-Phosphorus-20170501.tar.gz) = 24a5b8578491d3c15aa539da69062803d0c6d137
@@ -8,7 +8,7 @@
 SHA1 (patch-configure) = a415684ab5ecb4fed276dede90439fa8ba6a09ed
 SHA1 (patch-share_Makefile.common) = f5230aee768e6af4c7458d96f1f210172daa9bb2
 SHA1 (patch-src_libraries_utils_c__bindings.c) = b37db1c51e9082e4a328a6a7189f57db3f12d624
-SHA1 (patch-src_plugins_e-acsl_Makefile) = 02542a247a7f4b266c7e9139c4ee555dda5fd1bb
+SHA1 (patch-src_plugins_e-acsl_Makefile.in) = 8b1c4838ecd609504c1070917c0b61433f1e1f12
 SHA1 (patch-src_plugins_wp_configure) = 6f0fb756d2460b6abf27313d367672e293a8d9e7
 SHA1 (patch-src_plugins_wp_configure.ac) = 3b15ff7b551da79ad1580b134258631f1527bc42
 SHA1 (patch-src_plugins_wp_share_coqwp_Zbits.v) = 26fac23dc015087b7126e40a47d566eb49a24293
diff -r c4b0dfc8ad63 -r 48a3584a5f83 devel/frama-c/patches/patch-src_plugins_e-acsl_Makefile
--- a/devel/frama-c/patches/patch-src_plugins_e-acsl_Makefile   Tue Sep 05 07:41:35 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-$NetBSD: patch-src_plugins_e-acsl_Makefile,v 1.1 2017/09/05 07:30:00 dholland Exp $
-
-Don't install nonexecutables with execute permission.
-
---- src/plugins/e-acsl/Makefile~       2017-09-05 07:10:24.721100926 +0000
-+++ src/plugins/e-acsl/Makefile
-@@ -157,7 +157,7 @@ EACSL_JEMALLOC_LIB = $(EACSL_LIBDIR)/$(E
- $(EACSL_JEMALLOC_LIB):
-       cd $(EACSL_JEMALLOC_DIR) && $(MAKE) $(MAKEOPTS)
-       $(MKDIR) $(EACSL_LIBDIR)
--      $(CP) $(EACSL_JEMALLOC_DIR)/lib/libjemalloc.a $@
-+      $(CPNX) $(EACSL_JEMALLOC_DIR)/lib/libjemalloc.a $@
- 
- EACSL_GMP_DIR := $(EACSL_PLUGIN_DIR)/contrib/libgmp
- EACSL_GMP_LIBNAME = libeacsl-gmp.a
-@@ -187,7 +187,7 @@ else
- $(EACSL_GMP_LIB):
-       cd $(EACSL_GMP_DIR) && $(MAKE) $(MAKEOPTS)
-       $(MKDIR) $(EACSL_LIBDIR)
--      $(CP) $(EACSL_GMP_DIR)/.libs/libgmp.a $@
-+      $(CPNX) $(EACSL_GMP_DIR)/.libs/libgmp.a $@
- endif
- 
- all:: $(EACSL_JEMALLOC_LIB) $(EACSL_GMP_LIB)
-@@ -367,32 +367,32 @@ MANUALS=$(wildcard $(E_ACSL_DIR)/doc/man
- install::
-       $(PRINT_INSTALL) E-ACSL share files
-       $(MKDIR) $(FRAMAC_DATADIR)/e-acsl
--      $(CP) $(E_ACSL_DIR)/share/e-acsl/*.[ch] $(FRAMAC_DATADIR)/e-acsl
-+      $(CPNX) $(E_ACSL_DIR)/share/e-acsl/*.[ch] $(FRAMAC_DATADIR)/e-acsl
-       $(MKDIR) $(FRAMAC_DATADIR)/e-acsl/bittree_model \
-                $(FRAMAC_DATADIR)/e-acsl/segment_model \
-                $(FRAMAC_DATADIR)/e-acsl/glibc
--      $(CP) $(E_ACSL_DIR)/share/e-acsl/bittree_model/* \
-+      $(CPNX) $(E_ACSL_DIR)/share/e-acsl/bittree_model/* \
-             $(FRAMAC_DATADIR)/e-acsl/bittree_model
--      $(CP) $(E_ACSL_DIR)/share/e-acsl/segment_model/* \
-+      $(CPNX) $(E_ACSL_DIR)/share/e-acsl/segment_model/* \
-             $(FRAMAC_DATADIR)/e-acsl/segment_model
--      $(CP) $(E_ACSL_DIR)/share/e-acsl/glibc/* \
-+      $(CPNX) $(E_ACSL_DIR)/share/e-acsl/glibc/* \
-             $(FRAMAC_DATADIR)/e-acsl/glibc
-         # manuals are not present in standard distribution.
-         # Don't fail because of that.
- ifneq ("$(MANUALS)","")
-       $(PRINT_INSTALL) E-ACSL manuals
-       $(MKDIR) $(FRAMAC_DATADIR)/manuals
--      $(CP) $(MANUALS) $(FRAMAC_DATADIR)/manuals;
-+      $(CPNX) $(MANUALS) $(FRAMAC_DATADIR)/manuals;
- endif
-       $(PRINT_INSTALL) E-ACSL libraries
-       $(MKDIR) $(LIBDIR)
--      $(CP) $(EACSL_LIBDIR)/libeacsl-*.a $(LIBDIR)
-+      $(CPNX) $(EACSL_LIBDIR)/libeacsl-*.a $(LIBDIR)
-       $(PRINT_INSTALL) E-ACSL scripts
-       $(MKDIR) $(BINDIR)
-       $(CP) $(E_ACSL_DIR)/scripts/e-acsl-gcc.sh $(BINDIR)/
-       $(PRINT_INSTALL) E-ACSL man pages
-       $(MKDIR) $(MANDIR)/man1
--      $(CP) $(E_ACSL_DIR)/man/e-acsl-gcc.sh.1 $(MANDIR)/man1/
-+      $(CPNX) $(E_ACSL_DIR)/man/e-acsl-gcc.sh.1 $(MANDIR)/man1/
- 
- uninstall::
-       $(PRINT_RM) E-ACSL share files
diff -r c4b0dfc8ad63 -r 48a3584a5f83 devel/frama-c/patches/patch-src_plugins_e-acsl_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/frama-c/patches/patch-src_plugins_e-acsl_Makefile.in        Tue Sep 05 07:42:00 2017 +0000
@@ -0,0 +1,64 @@
+$NetBSD: patch-src_plugins_e-acsl_Makefile.in,v 1.1 2017/09/05 07:42:00 dholland Exp $
+
+Don't install nonexecutables with execute permission.
+
+--- src/plugins/e-acsl/Makefile.in~    2017-09-05 07:10:24.721100926 +0000
++++ src/plugins/e-acsl/Makefile.in
+@@ -157,7 +157,7 @@ EACSL_JEMALLOC_LIB = $(EACSL_LIBDIR)/$(E
+ $(EACSL_JEMALLOC_LIB):
+       cd $(EACSL_JEMALLOC_DIR) && $(MAKE) $(MAKEOPTS)
+       $(MKDIR) $(EACSL_LIBDIR)
+-      $(CP) $(EACSL_JEMALLOC_DIR)/lib/libjemalloc.a $@
++      $(CPNX) $(EACSL_JEMALLOC_DIR)/lib/libjemalloc.a $@
+ 
+ EACSL_GMP_DIR := $(EACSL_PLUGIN_DIR)/contrib/libgmp
+ EACSL_GMP_LIBNAME = libeacsl-gmp.a
+@@ -187,7 +187,7 @@ else
+ $(EACSL_GMP_LIB):
+       cd $(EACSL_GMP_DIR) && $(MAKE) $(MAKEOPTS)
+       $(MKDIR) $(EACSL_LIBDIR)
+-      $(CP) $(EACSL_GMP_DIR)/.libs/libgmp.a $@
++      $(CPNX) $(EACSL_GMP_DIR)/.libs/libgmp.a $@
+ endif
+ 
+ all:: $(EACSL_JEMALLOC_LIB) $(EACSL_GMP_LIB)
+@@ -367,32 +367,32 @@ MANUALS=$(wildcard $(E_ACSL_DIR)/doc/man
+ install::
+       $(PRINT_INSTALL) E-ACSL share files
+       $(MKDIR) $(FRAMAC_DATADIR)/e-acsl
+-      $(CP) $(E_ACSL_DIR)/share/e-acsl/*.[ch] $(FRAMAC_DATADIR)/e-acsl
++      $(CPNX) $(E_ACSL_DIR)/share/e-acsl/*.[ch] $(FRAMAC_DATADIR)/e-acsl
+       $(MKDIR) $(FRAMAC_DATADIR)/e-acsl/bittree_model \
+                $(FRAMAC_DATADIR)/e-acsl/segment_model \
+                $(FRAMAC_DATADIR)/e-acsl/glibc
+-      $(CP) $(E_ACSL_DIR)/share/e-acsl/bittree_model/* \
++      $(CPNX) $(E_ACSL_DIR)/share/e-acsl/bittree_model/* \
+             $(FRAMAC_DATADIR)/e-acsl/bittree_model
+-      $(CP) $(E_ACSL_DIR)/share/e-acsl/segment_model/* \
++      $(CPNX) $(E_ACSL_DIR)/share/e-acsl/segment_model/* \
+             $(FRAMAC_DATADIR)/e-acsl/segment_model
+-      $(CP) $(E_ACSL_DIR)/share/e-acsl/glibc/* \
++      $(CPNX) $(E_ACSL_DIR)/share/e-acsl/glibc/* \
+             $(FRAMAC_DATADIR)/e-acsl/glibc
+         # manuals are not present in standard distribution.
+         # Don't fail because of that.
+ ifneq ("$(MANUALS)","")
+       $(PRINT_INSTALL) E-ACSL manuals
+       $(MKDIR) $(FRAMAC_DATADIR)/manuals
+-      $(CP) $(MANUALS) $(FRAMAC_DATADIR)/manuals;
++      $(CPNX) $(MANUALS) $(FRAMAC_DATADIR)/manuals;
+ endif
+       $(PRINT_INSTALL) E-ACSL libraries
+       $(MKDIR) $(LIBDIR)
+-      $(CP) $(EACSL_LIBDIR)/libeacsl-*.a $(LIBDIR)
++      $(CPNX) $(EACSL_LIBDIR)/libeacsl-*.a $(LIBDIR)
+       $(PRINT_INSTALL) E-ACSL scripts
+       $(MKDIR) $(BINDIR)
+       $(CP) $(E_ACSL_DIR)/scripts/e-acsl-gcc.sh $(BINDIR)/
+       $(PRINT_INSTALL) E-ACSL man pages
+       $(MKDIR) $(MANDIR)/man1
+-      $(CP) $(E_ACSL_DIR)/man/e-acsl-gcc.sh.1 $(MANDIR)/man1/
++      $(CPNX) $(E_ACSL_DIR)/man/e-acsl-gcc.sh.1 $(MANDIR)/man1/
+ 
+ uninstall::
+       $(PRINT_RM) E-ACSL share files
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc - frama-c
Next by Date: [pkgsrc/trunk]: pkgsrc/www/squid3 PR 52514 Angel Adames: squid-ipf doesn't wo...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc - frama-c
Next by Thread: [pkgsrc/trunk]: pkgsrc/www/squid3 PR 52514 Angel Adames: squid-ipf doesn't wo...
Indexes:
Home | Main Index | Thread Index | Old Index