1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-11 07:22:22 +00:00

Hack around fallout from recent update to automake-1.14

This commit is contained in:
Ade Lovett 2013-07-23 21:39:06 +00:00
parent 11e564a1d5
commit 0d7b7f5e50
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=323553
5 changed files with 19 additions and 2 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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}

View File

@ -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; \