Date: Tue, 23 Jul 2013 21:39:07 +0000 (UTC) From: Ade Lovett <ade@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323553 - in head: devel/git-merge-changelog mail/anubis mail/opensmtpd/files net/torsocks net/torsocks/files Message-ID: <201307232139.r6NLd7Cl073330@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ade Date: Tue Jul 23 21:39:06 2013 New Revision: 323553 URL: http://svnweb.freebsd.org/changeset/ports/323553 Log: Hack around fallout from recent update to automake-1.14 Added: head/mail/opensmtpd/files/patch-bootstrap (contents, props changed) head/net/torsocks/files/patch-Makefile.in (contents, props changed) Modified: head/devel/git-merge-changelog/Makefile (contents, props changed) head/mail/anubis/Makefile head/net/torsocks/Makefile (contents, props changed) Modified: head/devel/git-merge-changelog/Makefile ============================================================================== --- head/devel/git-merge-changelog/Makefile Tue Jul 23 21:16:10 2013 (r323552) +++ head/devel/git-merge-changelog/Makefile Tue Jul 23 21:39:06 2013 (r323553) @@ -17,7 +17,7 @@ MAINTAINER= knu@FreeBSD.org COMMENT= Git "merge" driver for GNU style ChangeLog files EXTRACT_DEPENDS= ${GNULIB_DIR}/lib/${PORTNAME}.c:${GNULIB_PORTDIR} \ - automake-1.12:${PORTSDIR}/devel/automake \ + automake-1.14:${PORTSDIR}/devel/automake \ autoconf-2.69:${PORTSDIR}/devel/autoconf GNU_CONFIGURE= yes Modified: head/mail/anubis/Makefile ============================================================================== --- head/mail/anubis/Makefile Tue Jul 23 21:16:10 2013 (r323552) +++ head/mail/anubis/Makefile Tue Jul 23 21:39:06 2013 (r323553) @@ -30,7 +30,7 @@ SOCKS_DESC= SOCKS proxy support USE_RC_SUBR= anubis USE_AUTOTOOLS= aclocal autoheader autoconf automake ACLOCAL_ARGS= -I m4 -I am -AUTOMAKE_ARGS= --force +AUTOMAKE_ARGS= --force --add-missing MAN1= anubis.1 INFO= anubis Added: head/mail/opensmtpd/files/patch-bootstrap ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/opensmtpd/files/patch-bootstrap Tue Jul 23 21:39:06 2013 (r323553) @@ -0,0 +1,7 @@ +--- bootstrap.orig 2013-06-04 08:13:28.000000000 +0000 ++++ bootstrap 2013-07-23 20:06:15.000000000 +0000 +@@ -38,3 +38,3 @@ + amvers="no" +-for v in 13 12 11 10 9 8 7 6 5; do ++for v in 14 13 12 11 10 9 8 7 6 5; do + if automake-1.${v} --version >/dev/null 2>&1; then Modified: head/net/torsocks/Makefile ============================================================================== --- head/net/torsocks/Makefile Tue Jul 23 21:16:10 2013 (r323552) +++ head/net/torsocks/Makefile Tue Jul 23 21:39:06 2013 (r323553) @@ -101,6 +101,7 @@ post-patch: @${REINPLACE_CMD} -e 's|MAP_ANONYMOUS|MAP_ANON|' ${WRKSRC}/src/dead_pool.c @${MV} ${WRKSRC}/doc/torsocks.conf ${WRKSRC}/doc/torsocks.conf.sample @${MV} ${WRKSRC}/configure.in ${WRKSRC}/configure.ac + @${MKDIR} ${WRKSRC}/m4 post-install: .if ${PORT_OPTIONS:MDOCS} Added: head/net/torsocks/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/torsocks/files/patch-Makefile.in Tue Jul 23 21:39:06 2013 (r323553) @@ -0,0 +1,9 @@ +--- Makefile.in.orig 2011-10-24 20:23:39.000000000 +0000 ++++ Makefile.in 2013-07-23 21:02:35.000000000 +0000 +@@ -238,4 +238,4 @@ + *$$dep*) \ +- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ +- $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ ++ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign --add-missing'; \ ++ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign --add-missing \ + && exit 0; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307232139.r6NLd7Cl073330>