diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2010-10-05 19:57:56 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2010-10-05 19:57:56 +0000 |
| commit | 7e80cde3289d108a73c54656f4fde354dd2fb09e (patch) | |
| tree | b85b705571d426ca1d0ff74b6af8f029081a6a39 /multimedia | |
| parent | 6abe3f75658b0457864b49c9fdaf298b79f2c447 (diff) | |
| download | ports-7e80cde3289d108a73c54656f4fde354dd2fb09e.tar.gz ports-7e80cde3289d108a73c54656f4fde354dd2fb09e.zip | |
Round one migration of ports from automake{19,110} to automake111
Notes
Notes:
svn path=/head/; revision=262460
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/kplayer/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/mediainfo/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/spook/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/xmms/Makefile | 7 | ||||
| -rw-r--r-- | multimedia/xmms/files/patch-aclocal.m4 | 12 |
5 files changed, 22 insertions, 4 deletions
diff --git a/multimedia/kplayer/Makefile b/multimedia/kplayer/Makefile index afddb049bb60..13c6b6b39c1c 100644 --- a/multimedia/kplayer/Makefile +++ b/multimedia/kplayer/Makefile @@ -21,7 +21,7 @@ USE_GMAKE= yes USE_KDELIBS_VER=3 USE_GETTEXT= yes USE_PERL5_BUILD=yes -USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22 +USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22 pre-configure: @(cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${SH} admin/cvs.sh dist) diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile index 182c7ba91f3d..a4fface0c0c4 100644 --- a/multimedia/mediainfo/Makefile +++ b/multimedia/mediainfo/Makefile @@ -23,7 +23,7 @@ PLIST_FILES= bin/mediainfo EXTRACT_CMD= 7z EXTRACT_BEFORE_ARGS= x -o${WRKSRC} EXTRACT_AFTER_ARGS= >/dev/null -USE_AUTOTOOLS= aclocal:110:env automake:110:env autoconf:267:env libtool:22:env +USE_AUTOTOOLS= aclocal:111:env automake:111:env autoconf:267:env libtool:22:env WRKSRC= ${WRKDIR}/MediaInfo${DISTVERSIONSUFFIX} diff --git a/multimedia/spook/Makefile b/multimedia/spook/Makefile index ed4c176c50cb..796db77bc4a9 100644 --- a/multimedia/spook/Makefile +++ b/multimedia/spook/Makefile @@ -27,7 +27,8 @@ USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf:267 aclocal:19 automake:19 +USE_AUTOTOOLS= autoconf:267 aclocal:111 automake:111 +AUTOMAKE_ARGS= --add-missing NOMAN= defined diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile index 95921c57947b..85441a0b40b0 100644 --- a/multimedia/xmms/Makefile +++ b/multimedia/xmms/Makefile @@ -23,7 +23,8 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_ICONV= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= automake:19 autoconf:267 libtool:22 +USE_AUTOTOOLS= automake:111 autoconf:267 libtool:22 +AUTOMAKE_ARGS= --add-missing CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ @@ -159,6 +160,10 @@ post-patch: .endif @${CP} ${FILESDIR}/xmms.desktop.in ${WRKSRC}/xmms.desktop +post-configure: + @${FIND} ${WRKSRC} -name Makefile | \ + ${XARGS} ${REINPLACE_CMD} -e 's|MKDIR_P|mkdir_p|g' + post-install: @${INSTALL} -d ${PREFIX}/share/xmms/Skins @${INSTALL} -d ${PREFIX}/share/applications diff --git a/multimedia/xmms/files/patch-aclocal.m4 b/multimedia/xmms/files/patch-aclocal.m4 new file mode 100644 index 000000000000..2178ed9fd5ed --- /dev/null +++ b/multimedia/xmms/files/patch-aclocal.m4 @@ -0,0 +1,12 @@ +--- aclocal.m4.orig 2007-11-16 15:54:32.000000000 -0600 ++++ aclocal.m4 2010-09-28 00:40:44.000000000 -0500 +@@ -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"]) + +@@ -3879,3 +3879,3 @@ + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +- [AM_AUTOMAKE_VERSION([1.9.6])]) ++ [AM_AUTOMAKE_VERSION([1.11.1])]) + |