diff options
| author | ade <ade@FreeBSD.org> | 2010-12-23 04:05:49 +0800 |
|---|---|---|
| committer | ade <ade@FreeBSD.org> | 2010-12-23 04:05:49 +0800 |
| commit | b3eaac16d9d3e7dd232308127eb5799f815ef821 (patch) | |
| tree | c68d1b2f0ef56bab6c4f255c67470c55cf424f79 /multimedia | |
| parent | 7ff69e2f85702b7c6b49ce09c3f75364c4e21f85 (diff) | |
| download | freebsd-ports-gnome-b3eaac16d9d3e7dd232308127eb5799f815ef821.tar.gz freebsd-ports-gnome-b3eaac16d9d3e7dd232308127eb5799f815ef821.tar.zst freebsd-ports-gnome-b3eaac16d9d3e7dd232308127eb5799f815ef821.zip | |
Sync to final (for now) bsd.autotools.mk
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/libquicktime/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/xmms/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/xmms/files/patch-aclocal.m4 | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile index f1bdc4a70883..5538cfd9da50 100644 --- a/multimedia/libquicktime/Makefile +++ b/multimedia/libquicktime/Makefile @@ -152,8 +152,10 @@ CONFIGURE_ARGS+= --without-schroedinger .endif +AUTOTOOLSFILES= aclocal.m4 + post-patch: - @${REINPLACE_CMD} -e 's|2.61|2.68|g' ${WRKSRC}/aclocal.m4 + @${REINPLACE_CMD} -e 's|2.64|%%AUTOCONF_VERSION%%|g' ${WRKSRC}/aclocal.m4 @${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' \ ${WRKSRC}/plugins/audiocodec/* \ ${WRKSRC}/plugins/videocodec/* diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile index d8199a1b270e..13ee36933eb6 100644 --- a/multimedia/xmms/Makefile +++ b/multimedia/xmms/Makefile @@ -24,6 +24,7 @@ USE_GETTEXT= yes USE_ICONV= yes USE_LDCONFIG= yes USE_AUTOTOOLS= automake autoconf libtool +AUTOTOOLSFILES= aclocal.m4 AUTOMAKE_ARGS= --add-missing CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" \ diff --git a/multimedia/xmms/files/patch-aclocal.m4 b/multimedia/xmms/files/patch-aclocal.m4 index 2178ed9fd5ed..2466d0d246fb 100644 --- a/multimedia/xmms/files/patch-aclocal.m4 +++ b/multimedia/xmms/files/patch-aclocal.m4 @@ -3,10 +3,10 @@ @@ -3872,3 +3872,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%%"]) @@ -3879,3 +3879,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%%])]) |