diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2010-12-23 04:05:49 +0800 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2010-12-23 04:05:49 +0800 |
| commit | 843f8123d49e579e80de26ff1dd62c8c1acf3fac (patch) | |
| tree | c7ef29d508548833364cb92d3bd5bcf810816e88 /dns | |
| parent | 55d09a7758330e40bc25cb90b27b1ae9b034af02 (diff) | |
| download | freebsd-ports-gnome-843f8123d49e579e80de26ff1dd62c8c1acf3fac.tar.gz freebsd-ports-gnome-843f8123d49e579e80de26ff1dd62c8c1acf3fac.tar.zst freebsd-ports-gnome-843f8123d49e579e80de26ff1dd62c8c1acf3fac.zip | |
Sync to final (for now) bsd.autotools.mk
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/dnswall/Makefile | 9 | ||||
| -rw-r--r-- | dns/nss_mdns/Makefile | 1 | ||||
| -rw-r--r-- | dns/nss_mdns/files/patch-aclocal.m4 | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/dns/dnswall/Makefile b/dns/dnswall/Makefile index 6ac97cb27240..703028b86e13 100644 --- a/dns/dnswall/Makefile +++ b/dns/dnswall/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ehaupt@FreeBSD.org COMMENT= A daemon that filters out private IP addresses in DNS responses PROJECTHOST= google-dnswall -USE_AUTOTOOLS= automake +USE_AUTOTOOLS= automake autoconf:env USE_DOS2UNIX= yes MAKE_JOBS_SAFE= yes @@ -26,9 +26,12 @@ AUTOFILES= depcomp install-sh missing PORTDOCS= README PLIST_FILES= bin/dnswall +AUTOTOOLSFILES= aclocal.m4 + post-patch: - @${REINPLACE_CMD} -e 's|1.10|1.11.1|g' ${WRKSRC}/aclocal.m4 - @${REINPLACE_CMD} -e 's|2.61|2.68|g' ${WRKSRC}/aclocal.m4 + @${REINPLACE_CMD} -e 's|1.10|%%AUTOMAKE_APIVER%%|g' \ + -e 's|2.61|%%AUTOCONF_VERSION%%|g' \ + ${WRKSRC}/aclocal.m4 .if defined(NOPORTDOCS) @${REINPLACE_CMD} -e '/^dist_doc_DATA/d' ${WRKSRC}/Makefile.am .endif diff --git a/dns/nss_mdns/Makefile b/dns/nss_mdns/Makefile index 0d4665ae874b..8b11c2e934d1 100644 --- a/dns/nss_mdns/Makefile +++ b/dns/nss_mdns/Makefile @@ -18,6 +18,7 @@ COMMENT= NSS module implementing multicast DNS name resolution USE_AUTOTOOLS= autoconf automake libtool USE_GMAKE= yes USE_LDCONFIG= yes +AUTOTOOLSFILES= aclocal.m4 LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app diff --git a/dns/nss_mdns/files/patch-aclocal.m4 b/dns/nss_mdns/files/patch-aclocal.m4 index 08516a72e6c8..dde3af35c180 100644 --- a/dns/nss_mdns/files/patch-aclocal.m4 +++ b/dns/nss_mdns/files/patch-aclocal.m4 @@ -3,10 +3,10 @@ @@ -6392,3 +6392,3 @@ # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) -+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.11"]) ++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="%%AUTOMAKE_VERSION%%"]) @@ -6399,3 +6399,3 @@ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) -+ [AM_AUTOMAKE_VERSION([1.11.1])]) ++ [AM_AUTOMAKE_VERSION([%%AUTOMAKE_APIVER%%])]) |