Fri Dec 14 17:03:04 2018 UTC ()
agg: fix build with newer automake.

Skip the examples directory. Switch to using autoreconf.


(bsiegert)
diff -r1.11 -r1.12 pkgsrc/graphics/agg/Makefile
diff -r1.4 -r1.5 pkgsrc/graphics/agg/distinfo
diff -r0 -r1.1 pkgsrc/graphics/agg/patches/patch-Makefile.am
diff -r1.1 -r1.2 pkgsrc/graphics/agg/patches/patch-configure.in
cvs diff -r1.11 -r1.12 pkgsrc/graphics/agg/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/agg/Makefile 2015/04/25 14:23:07 1.11
+++ pkgsrc/graphics/agg/Makefile 2018/12/14 17:03:04 1.12
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: Makefile,v 1.11 2015/04/25 14:23:07 tnn Exp $ 1# $NetBSD: Makefile,v 1.12 2018/12/14 17:03:04 bsiegert Exp $
2# 2#
3 3
4DISTNAME= agg-2.5 4DISTNAME= agg-2.5
5PKGREVISION= 4 5PKGREVISION= 5
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= http://www.antigrain.com/ 7MASTER_SITES= http://www.antigrain.com/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.antigrain.com/ 10HOMEPAGE= http://www.antigrain.com/
11COMMENT= High Quality Rendering Engine for C++ 11COMMENT= High Quality Rendering Engine for C++
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14MAKE_JOBS_SAFE= no 14MAKE_JOBS_SAFE= no
15USE_TOOLS+= gmake msgfmt pkg-config aclocal autoheader \ 15USE_TOOLS+= gmake msgfmt pkg-config aclocal autoheader \
16 automake autoconf 16 automake autoconf autoreconf
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20 20
21PKGCONFIG_OVERRIDE+= libagg.pc.in 21PKGCONFIG_OVERRIDE+= libagg.pc.in
22 22
23pre-configure: 23pre-configure:
24 cd ${WRKSRC}; chmod +x autogen.sh; ./autogen.sh 24 cd ${WRKSRC}; ${TOOLS_PATH.autoreconf} -vi
25 25
26.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
27 27
28.if ${X11_TYPE} == "modular" 28.if ${X11_TYPE} == "modular"
29CONFIGURE_ARGS+= --x-includes=${PREFIX}/include 29CONFIGURE_ARGS+= --x-includes=${PREFIX}/include
30CONFIGURE_ARGS+= --x-libraries=${PREFIX}/lib 30CONFIGURE_ARGS+= --x-libraries=${PREFIX}/lib
31.endif 31.endif
32 32
33.include "../../x11/libX11/buildlink3.mk" 33.include "../../x11/libX11/buildlink3.mk"
34.include "../../graphics/freetype2/buildlink3.mk" 34.include "../../graphics/freetype2/buildlink3.mk"
35.include "../../devel/SDL/buildlink3.mk" 35.include "../../devel/SDL/buildlink3.mk"
36.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/graphics/agg/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/agg/distinfo 2015/11/03 21:33:52 1.4
+++ pkgsrc/graphics/agg/distinfo 2018/12/14 17:03:04 1.5
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.4 2015/11/03 21:33:52 agc Exp $ 1$NetBSD: distinfo,v 1.5 2018/12/14 17:03:04 bsiegert Exp $
2 2
3SHA1 (agg-2.5.tar.gz) = 08f23da64da40b90184a0414369f450115cdb328 3SHA1 (agg-2.5.tar.gz) = 08f23da64da40b90184a0414369f450115cdb328
4RMD160 (agg-2.5.tar.gz) = fac24d8ea56ee0a87307189f73c432b07b6d3c50 4RMD160 (agg-2.5.tar.gz) = fac24d8ea56ee0a87307189f73c432b07b6d3c50
5SHA512 (agg-2.5.tar.gz) = e2c79f0bf6da80e16e5b50e69638647224fbe778a42a83d72e9de444b3ea711735177de92bf16134da313b9f75e63eb76bd7b0aaf390059f4d0785454e8a6fcf 5SHA512 (agg-2.5.tar.gz) = e2c79f0bf6da80e16e5b50e69638647224fbe778a42a83d72e9de444b3ea711735177de92bf16134da313b9f75e63eb76bd7b0aaf390059f4d0785454e8a6fcf
6Size (agg-2.5.tar.gz) = 564313 bytes 6Size (agg-2.5.tar.gz) = 564313 bytes
7SHA1 (patch-configure.in) = 41f853a7f5e0948ff23674a1069c5725a7b604cb 7SHA1 (patch-Makefile.am) = ccf9219f9d6c74b7f5699548144df3933d770e0a
 8SHA1 (patch-configure.in) = fc9c90e9ab9b9bf1a626b8caae9ba37bd2fc07aa
8SHA1 (patch-include_agg__renderer__outline__aa.h) = 157cd8287d171bf67039b80ecce1a5ac8360cea8 9SHA1 (patch-include_agg__renderer__outline__aa.h) = 157cd8287d171bf67039b80ecce1a5ac8360cea8
File Added: pkgsrc/graphics/agg/patches/patch-Makefile.am
$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
cvs diff -r1.1 -r1.2 pkgsrc/graphics/agg/patches/patch-configure.in (expand / switch to unified diff)

--- pkgsrc/graphics/agg/patches/patch-configure.in 2012/05/05 00:55:47 1.1
+++ pkgsrc/graphics/agg/patches/patch-configure.in 2018/12/14 17:03:04 1.2
@@ -1,14 +1,24 @@ @@ -1,14 +1,24 @@
1$NetBSD: patch-configure.in,v 1.1 2012/05/05 00:55:47 wiz Exp $ 1$NetBSD: patch-configure.in,v 1.2 2018/12/14 17:03:04 bsiegert Exp $
2 2
3Remove obsolete macro. Fixes build with automake-1.12. 3Remove obsolete macro. Fixes build with automake-1.12.
4 4
5--- configure.in.orig 2006-10-09 04:06:36.000000000 +0000 5--- configure.in.orig 2006-10-09 04:06:36.000000000 +0000
6+++ configure.in 6+++ configure.in
7@@ -8,7 +8,6 @@ dnl Checks for programs. 7@@ -1,14 +1,14 @@
 8-AC_INIT(src/agg_arc.cpp) # give me a source file, any source file...
 9+AC_INIT(agg, 2.5.0)
 10+AC_CONFIG_SRCDIR(src/agg_arc.cpp) # give me a source file, any source file...
 11 AC_CANONICAL_TARGET
 12 AC_CONFIG_HEADERS(include/config.h)
 13-AM_INIT_AUTOMAKE(agg, 2.5.0)
 14+AM_INIT_AUTOMAKE(foreign)
 15
 16
 17 dnl Checks for programs.
8 AC_PROG_CC 18 AC_PROG_CC
9 AC_PROG_CXX 19 AC_PROG_CXX
10 AC_ISC_POSIX 20 AC_ISC_POSIX
11-AM_C_PROTOTYPES 21-AM_C_PROTOTYPES
12 if test "x$U" != "x"; then 22 if test "x$U" != "x"; then
13 AC_MSG_ERROR(Compiler not ANSI compliant) 23 AC_MSG_ERROR(Compiler not ANSI compliant)
14 fi 24 fi