From 57ae9b895b2f6ccb5f21a249f9828587368027fc Mon Sep 17 00:00:00 2001
From: Hunter Sezen
Date: Tue, 30 Oct 2018 22:03:32 +0700
Subject: development/autoconf-archive: Update script.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 .../autoconf-archive/autoconf-archive.SlackBuild        | 17 +++++++++++++----
 development/autoconf-archive/docdir.patch               | 11 +++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 development/autoconf-archive/docdir.patch

(limited to 'development')

diff --git a/development/autoconf-archive/autoconf-archive.SlackBuild b/development/autoconf-archive/autoconf-archive.SlackBuild
index 19f260e806..4e4a9156b2 100644
--- a/development/autoconf-archive/autoconf-archive.SlackBuild
+++ b/development/autoconf-archive/autoconf-archive.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=autoconf-archive
 VERSION=${VERSION:-2018.03.13}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -49,6 +49,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# respect --docdir properly
+# http://git.savannah.nongnu.org/cgit/autoconf-archive.git/commit/?id=ad15d52fd1e552bc3d7fcfb3d7bc6a2681f364d8
+patch -p0 < $CWD/docdir.patch
+
+autoreconf -fi
+
 ./configure \
   --prefix=/usr \
   --infodir=/usr/info \
@@ -58,12 +64,15 @@ find -L . \
 make
 make install DESTDIR=$PKG
 
+# Files conflict with versions in development/gnome-common and these files are
+# not needed by games/nestopia which requires autoconf-arcdhive.
+rm -f $PKG/usr/share/aclocal/ax_check_enable_debug.m4 \
+  $PKG/usr/share/aclocal/ax_code_coverage.m4
+
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
 
-# autoconf-archive does not respect --docdir
-mkdir -p $PKG/usr/doc
-mv $PKG/usr/share/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog INSTALL NEWS TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/autoconf-archive/docdir.patch b/development/autoconf-archive/docdir.patch
new file mode 100644
index 0000000000..8f4df372c8
--- /dev/null
+++ b/development/autoconf-archive/docdir.patch
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2018-04-05 19:04:26.122231733 -0700
++++ Makefile.am	2018-04-05 19:05:26.998830911 -0700
+@@ -16,7 +16,7 @@
+ 
+ SUBDIRS                 = doc
+ 
+-dist_pkgdata_DATA       = AUTHORS COPYING COPYING.EXCEPTION README
++dist_doc_DATA           = AUTHORS COPYING COPYING.EXCEPTION README
+ aclocaldir              = $(datadir)/aclocal
+ dist_aclocal_DATA       = $(M4FILES)
+ EXTRA_DIST              = build-aux/git-version-gen build-aux/gitlog-to-changelog
-- 
cgit v1.2.3