Patch out an unnecessary configure test that blows up with the latest

autoconf. While here, mop up some pkglint.

3 files changed, 32 insertions, 10 deletions

diff --git a/graphics/mng/Makefile b/graphics/mng/Makefile
index bab81ac351a..9bca38bb7b2 100644
--- a/graphics/mng/Makefile
+++ b/graphics/mng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2010/12/23 11:44:43 dsainty Exp $
+# $NetBSD: Makefile,v 1.37 2012/04/29 17:17:59 dholland Exp $
 
 DISTNAME=	libmng-1.0.10
 PKGNAME=	mng-1.0.10
@@ -18,7 +18,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		automake
+USE_TOOLS+=		aclocal autoconf automake
+LIBTOOLIZE=		${LIBTOOL:S/libtool$/libtoolize/}
 
 CONFIGURE_ARGS+=	--with-jpeg=${JPEGBASE}
 CONFIGURE_ARGS+=	--with-lcms=${BUILDLINK_PREFIX.lcms}
@@ -29,13 +30,12 @@ DOCDIR=			${PREFIX}/share/doc/mng
 INSTALLATION_DIRS=	${PKGMANDIR}/man3 ${PKGMANDIR}/man5 ${DOCDIR}
 
 pre-configure:
-	cd ${WRKSRC};							\
-	${RM} -f configure.in && ${LN} -sf makefiles/configure.in .;	\
-	${RM} -f Makefile.am && ${LN} -sf makefiles/Makefile.am .;	\
-	aclocal;							\
-	${LOCALBASE}/bin/libtoolize --automake;				\
-	automake -a --foreign -i;					\
-	autoconf
+	${RM} -f ${WRKSRC}/configure.in ${WRKSRC}/Makefile.am
+	${LN} -s makefiles/configure.in makefiles/Makefile.am ${WRKSRC}
+	cd ${WRKSRC} && aclocal
+	cd ${WRKSRC} && ${LIBTOOLIZE} --automake
+	cd ${WRKSRC} && automake -a --foreign -i
+	cd ${WRKSRC} && autoconf
 
 post-install:
 	cd ${WRKSRC}/doc && \
diff --git a/graphics/mng/distinfo b/graphics/mng/distinfo
index bc46501a755..1fb02d011f9 100644
--- a/graphics/mng/distinfo
+++ b/graphics/mng/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.11 2007/07/17 10:35:55 drochner Exp $
+$NetBSD: distinfo,v 1.12 2012/04/29 17:17:59 dholland Exp $
 
 SHA1 (libmng-1.0.10.tar.gz) = 78ad516a1de79d00de720bf2a7c9afea2c896b09
 RMD160 (libmng-1.0.10.tar.gz) = ed09e537ebb129f5e13cba56d9d2c2a106955393
 Size (libmng-1.0.10.tar.gz) = 1093337 bytes
+SHA1 (patch-makefiles-configure_in) = 803aac04dd21f557ba98bda0a5b2482be7e6e83f
diff --git a/graphics/mng/patches/patch-makefiles-configure_in b/graphics/mng/patches/patch-makefiles-configure_in
new file mode 100644
index 00000000000..7816292a7fe
--- /dev/null
+++ b/graphics/mng/patches/patch-makefiles-configure_in
@@ -0,0 +1,21 @@
+$NetBSD: patch-makefiles-configure_in,v 1.1 2012/04/29 17:17:59 dholland Exp $
+
+Disable stuff that is not supported by the latest autoconf.
+
+--- makefiles/configure.in~	2005-01-30 10:28:00.000000000 +0000
++++ makefiles/configure.in
+@@ -15,10 +15,10 @@ AC_SUBST(VERSION)
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_ISC_POSIX
+-AM_C_PROTOTYPES
+-if test "x$U" != "x"; then
+-  AC_MSG_ERROR(Compiler not ANSI compliant)
+-fi
++dnl AM_C_PROTOTYPES
++dnl if test "x$U" != "x"; then
++dnl   AC_MSG_ERROR(Compiler not ANSI compliant)
++dnl fi
+ AM_PROG_LIBTOOL
+ AC_PROG_INSTALL
+