agg: fix build with newer automake.

Skip the examples directory. Switch to using autoreconf.

4 files changed, 31 insertions, 8 deletions

diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile
index 8667e6e63d9..db0a7f00618 100644
--- a/graphics/agg/Makefile
+++ b/graphics/agg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2015/04/25 14:23:07 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2018/12/14 17:03:04 bsiegert Exp $
 #
 
 DISTNAME=	agg-2.5
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.antigrain.com/
 
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v2
 
 MAKE_JOBS_SAFE=		no
 USE_TOOLS+=	gmake msgfmt pkg-config aclocal autoheader \
-            automake autoconf
+            automake autoconf autoreconf
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=            yes
 GNU_CONFIGURE=          yes
@@ -21,7 +21,7 @@ GNU_CONFIGURE=          yes
 PKGCONFIG_OVERRIDE+=	libagg.pc.in
 
 pre-configure:
-	cd ${WRKSRC}; chmod +x autogen.sh; ./autogen.sh
+	cd ${WRKSRC}; ${TOOLS_PATH.autoreconf} -vi
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/graphics/agg/distinfo b/graphics/agg/distinfo
index 018d174e30b..a00174849d1 100644
--- a/graphics/agg/distinfo
+++ b/graphics/agg/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 21:33:52 agc Exp $
+$NetBSD: distinfo,v 1.5 2018/12/14 17:03:04 bsiegert Exp $
 
 SHA1 (agg-2.5.tar.gz) = 08f23da64da40b90184a0414369f450115cdb328
 RMD160 (agg-2.5.tar.gz) = fac24d8ea56ee0a87307189f73c432b07b6d3c50
 SHA512 (agg-2.5.tar.gz) = e2c79f0bf6da80e16e5b50e69638647224fbe778a42a83d72e9de444b3ea711735177de92bf16134da313b9f75e63eb76bd7b0aaf390059f4d0785454e8a6fcf
 Size (agg-2.5.tar.gz) = 564313 bytes
-SHA1 (patch-configure.in) = 41f853a7f5e0948ff23674a1069c5725a7b604cb
+SHA1 (patch-Makefile.am) = ccf9219f9d6c74b7f5699548144df3933d770e0a
+SHA1 (patch-configure.in) = fc9c90e9ab9b9bf1a626b8caae9ba37bd2fc07aa
 SHA1 (patch-include_agg__renderer__outline__aa.h) = 157cd8287d171bf67039b80ecce1a5ac8360cea8
diff --git a/graphics/agg/patches/patch-Makefile.am b/graphics/agg/patches/patch-Makefile.am
new file mode 100644
index 00000000000..6c0ddabf64e
--- /dev/null
+++ b/graphics/agg/patches/patch-Makefile.am
@@ -0,0 +1,12 @@
+$NetBSD: patch-Makefile.am,v 1.1 2018/12/14 17:03:04 bsiegert Exp $
+
+Skip examples subdirectory, we do not install examples.
+
+--- Makefile.am.orig	2006-10-09 04:06:36.000000000 +0000
++++ Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = gpc src font_freetype font_win32_tt include examples
++SUBDIRS = gpc src font_freetype font_win32_tt include
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libagg.pc
diff --git a/graphics/agg/patches/patch-configure.in b/graphics/agg/patches/patch-configure.in
index ccd46e163ab..1cb81cf4725 100644
--- a/graphics/agg/patches/patch-configure.in
+++ b/graphics/agg/patches/patch-configure.in
@@ -1,10 +1,20 @@
-$NetBSD: patch-configure.in,v 1.1 2012/05/05 00:55:47 wiz Exp $
+$NetBSD: patch-configure.in,v 1.2 2018/12/14 17:03:04 bsiegert Exp $
 
 Remove obsolete macro. Fixes build with automake-1.12.
 
 --- configure.in.orig	2006-10-09 04:06:36.000000000 +0000
 +++ configure.in
-@@ -8,7 +8,6 @@ dnl Checks for programs.
+@@ -1,14 +1,14 @@
+-AC_INIT(src/agg_arc.cpp) # give me a source file, any source file...
++AC_INIT(agg, 2.5.0)
++AC_CONFIG_SRCDIR(src/agg_arc.cpp) # give me a source file, any source file...
+ AC_CANONICAL_TARGET
+ AC_CONFIG_HEADERS(include/config.h)
+-AM_INIT_AUTOMAKE(agg, 2.5.0)
++AM_INIT_AUTOMAKE(foreign)
+ 
+ 
+ dnl Checks for programs.
  AC_PROG_CC
  AC_PROG_CXX
  AC_ISC_POSIX