From 6d726b6c09094afd97f1528cfff8b27850279b0d Mon Sep 17 00:00:00 2001 From: Ade Lovett Date: Fri, 11 May 2012 20:38:09 +0000 Subject: Update autoconf to 2.69 and automake to 1.12 PR: 166836 Tested by: Multiple -exp runs (pav) --- ftp/tnftpd/Makefile | 1 + ftp/tnftpd/files/patch-configure.ac | 20 +++++++------------- ftp/tnftpd/files/patch-libnetbsd-Makefile.am | 7 +++++++ 3 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 ftp/tnftpd/files/patch-libnetbsd-Makefile.am (limited to 'ftp/tnftpd') diff --git a/ftp/tnftpd/Makefile b/ftp/tnftpd/Makefile index 97a5a8bf2612..0e3057a6f691 100644 --- a/ftp/tnftpd/Makefile +++ b/ftp/tnftpd/Makefile @@ -14,6 +14,7 @@ MAINTAINER= cejkar@fit.vutbr.cz COMMENT= Enhanced ftp server from NetBSD USE_AUTOTOOLS= aclocal automake libtool +AUTOMAKE_ARGS= --add-missing ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal .include diff --git a/ftp/tnftpd/files/patch-configure.ac b/ftp/tnftpd/files/patch-configure.ac index 9383d31a434b..a8b66edcbf37 100644 --- a/ftp/tnftpd/files/patch-configure.ac +++ b/ftp/tnftpd/files/patch-configure.ac @@ -1,14 +1,8 @@ -Feature silent-rules needs atleast autoconf 1.11, however we still have -at most autoconf 1.10 in ports tree (2010/09/10). - ---- configure.ac.orig 2010-03-24 13:31:39.000000000 +0100 -+++ configure.ac 2010-03-24 13:31:39.000000000 +0200 -@@ -18,7 +18,7 @@ - AC_CONFIG_HEADERS([tnftpd_config.h]) - AC_CONFIG_LIBOBJ_DIR([libnetbsd]) - --AM_INIT_AUTOMAKE([-Wall -Werror foreign nostdinc silent-rules]) -+AM_INIT_AUTOMAKE([-Wall -Werror foreign nostdinc]) - AM_MAINTAINER_MODE - +--- configure.ac.orig 2010-03-24 05:31:39.000000000 -0700 ++++ configure.ac 2012-05-03 15:55:32.000000000 -0700 +@@ -87,3 +87,4 @@ # +-AC_PROG_CC ++AM_PROG_CC_C_O ++AM_PROG_AR + AC_PROG_AWK diff --git a/ftp/tnftpd/files/patch-libnetbsd-Makefile.am b/ftp/tnftpd/files/patch-libnetbsd-Makefile.am new file mode 100644 index 000000000000..564d9dc47fd1 --- /dev/null +++ b/ftp/tnftpd/files/patch-libnetbsd-Makefile.am @@ -0,0 +1,7 @@ +--- libnetbsd/Makefile.am.orig 2010-01-03 21:46:29.000000000 -0800 ++++ libnetbsd/Makefile.am 2012-05-03 15:58:12.000000000 -0700 +@@ -6,3 +6,3 @@ + +-CPPFLAGS = \ ++AM_CPPFLAGS = \ + -I$(srcdir) \ -- cgit v1.2.3