CVS commit: [pkgsrc-2021Q4] pkgsrc/www/e2guardian

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Wed Jan  5 16:57:17 UTC 2022

Modified Files:
        pkgsrc/www/e2guardian [pkgsrc-2021Q4]: distinfo
Added Files:
        pkgsrc/www/e2guardian/patches [pkgsrc-2021Q4]: patch-configure.ac

Log Message:
Pullup ticket #6559 - requested by sborrill
www/e2guardian: build fix

Revisions pulled up:
- www/e2guardian/distinfo                                       1.7
- www/e2guardian/patches/patch-configure.ac                     1.1

---
   Module Name: pkgsrc
   Committed By:        sborrill
   Date:                Wed Jan  5 15:53:41 UTC 2022

   Modified Files:
        pkgsrc/www/e2guardian: distinfo
   Added Files:
        pkgsrc/www/e2guardian/patches: patch-configure.ac

   Log Message:
   Fix build of e2guardian by applying commit from 5.4 branch:

   Don't expand AM_INIT_AUTOMAKE multiple times.

   https://github.com/e2guardian/e2guardian/pull/705


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.2.1 pkgsrc/www/e2guardian/distinfo
cvs rdiff -u -r0 -r1.1.2.2 pkgsrc/www/e2guardian/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/www/e2guardian/distinfo
diff -u pkgsrc/www/e2guardian/distinfo:1.6 pkgsrc/www/e2guardian/distinfo:1.6.2.1
--- pkgsrc/www/e2guardian/distinfo:1.6  Tue Oct 26 11:29:25 2021
+++ pkgsrc/www/e2guardian/distinfo      Wed Jan  5 16:57:16 2022
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:29:25 nia Exp $
+$NetBSD: distinfo,v 1.6.2.1 2022/01/05 16:57:16 bsiegert Exp $
 
 BLAKE2s (e2guardian-5.1.1.tar.gz) = 59b0d34047e6d604a9e1633e4f067137763a8351c3fc31547456f7bc3575b8cf
 SHA512 (e2guardian-5.1.1.tar.gz) = a678c6d5b5672e40985cfbb9c718b61a7aee0f67092db6e20706cc525ad58c5b87d296575987a0c3e8ec4fd61b802cfa9d9f8b8d0b3a46cdee0f1f637c9bac37
 Size (e2guardian-5.1.1.tar.gz) = 850980 bytes
+SHA1 (patch-configure.ac) = 56c44fa90fbe79f9d531f4aebcbd3709cab1e01e

Added files:

Index: pkgsrc/www/e2guardian/patches/patch-configure.ac
diff -u /dev/null pkgsrc/www/e2guardian/patches/patch-configure.ac:1.1.2.2
--- /dev/null   Wed Jan  5 16:57:17 2022
+++ pkgsrc/www/e2guardian/patches/patch-configure.ac    Wed Jan  5 16:57:16 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.ac,v 1.1.2.2 2022/01/05 16:57:16 bsiegert Exp $
+
+Don't expand AM_INIT_AUTOMAKE multiple times.
+
+https://github.com/e2guardian/e2guardian/pull/705
+-- configure.ac.orig   2022-01-05 15:31:32.533021485 +0000
++++ configure.ac       2022-01-05 15:31:52.340711618 +0000
+@@ -6,7 +6,6 @@
+ 
+ AC_PREREQ(2.57)
+ AC_INIT(e2guardian, 5.1.1)
+-AM_INIT_AUTOMAKE
+ AC_CONFIG_HEADERS([dgconfig.h])
+ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE([subdir-objects])