Revbump after updating lang/lua to 5.2.2.

4 files changed, 86 insertions, 19 deletions

diff --git a/multimedia/vlc2/Makefile b/multimedia/vlc2/Makefile
index df373cd5c68..96ce6cc063c 100644
--- a/multimedia/vlc2/Makefile
+++ b/multimedia/vlc2/Makefile
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.33 2013/06/06 12:54:53 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.34 2013/07/04 21:27:58 adam Exp $
 
-DISTNAME=		vlc-${VLC_VERSION}
-PKGREVISION=		6
-CATEGORIES=		multimedia
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vlc/} \
-			http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
-EXTRACT_SUFX=		.tar.xz
+DISTNAME=	vlc-${VLC_VERSION}
+PKGREVISION=	7
+CATEGORIES=	multimedia
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vlc/} \
+		http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
+EXTRACT_SUFX=	.tar.xz
 
-VLC_VERSION=		2.0.6
+VLC_VERSION=	2.0.6
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.videolan.org/
-COMMENT=		VLC media player and streaming server
-LICENSE=		gnu-gpl-v2
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.videolan.org/
+COMMENT=	VLC media player and streaming server
+LICENSE=	gnu-gpl-v2
 
 CONFLICTS=		vlc07-[0-9]* vlc08-[0-9]*
 
diff --git a/multimedia/vlc2/distinfo b/multimedia/vlc2/distinfo
index 3cea7b4f047..1fcc3d34264 100644
--- a/multimedia/vlc2/distinfo
+++ b/multimedia/vlc2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2013/06/15 23:05:36 wiz Exp $
+$NetBSD: distinfo,v 1.17 2013/07/04 21:27:58 adam Exp $
 
 SHA1 (vlc-2.0.6.tar.xz) = 2ce21c949275702452bb1327febf6e98748a7972
 RMD160 (vlc-2.0.6.tar.xz) = 836d07c84da5980e321dce5c3f45b5b1b4814d84
@@ -18,6 +18,7 @@ SHA1 (patch-at) = bf48ded3571358d6b718af47b28804c3155d84ef
 SHA1 (patch-au) = 5ea53969efefe3d9a6e3121b5453b573c633124b
 SHA1 (patch-av) = c82b711947ea4bdca9b011e36af6c87d9b6f62a6
 SHA1 (patch-ba) = 1898a7a9bf6a45ab4915f1c46df325e6d41ada23
+SHA1 (patch-configure.ac) = 5909636b965fa4dcebdb978c74a1d28771313756
 SHA1 (patch-modules_access_directory.c) = e36df1da5b788e12e9fc7d94663dd69d86fe4f7a
 SHA1 (patch-modules_access_rtp_Modules.am) = 14aea82ffab2fcfa5b0916ac2e86363d1efdcbf3
 SHA1 (patch-modules_audio__output_pulse.c) = 941ee669e62c9d757fc096c74a2aec58cf265b15
diff --git a/multimedia/vlc2/options.mk b/multimedia/vlc2/options.mk
index 79326083a79..b0a78f9457d 100644
--- a/multimedia/vlc2/options.mk
+++ b/multimedia/vlc2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2013/04/16 22:11:24 cheusov Exp $
+# $NetBSD: options.mk,v 1.9 2013/07/04 21:27:58 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.vlc
 PKG_SUPPORTED_OPTIONS=		debug faad skins sdl pulseaudio x11
@@ -73,12 +73,12 @@ CONFIGURE_ARGS+=	--enable-notify
 .include "../../sysutils/libnotify/buildlink3.mk"
 
 # telepathy needs dbus, but its also gnome-ish
-.if !empty(PKG_OPTIONS:Mgnome)
-.include "../../chat/libtelepathy/buildlink3.mk"
+.  if !empty(PKG_OPTIONS:Mgnome)
+.  include "../../chat/libtelepathy/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-telepathy
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-telepathy
-.endif
+.  endif
 
 PLIST.dbus=		yes
 
diff --git a/multimedia/vlc2/patches/patch-configure.ac b/multimedia/vlc2/patches/patch-configure.ac
new file mode 100644
index 00000000000..7169c9adc7d
--- /dev/null
+++ b/multimedia/vlc2/patches/patch-configure.ac
@@ -0,0 +1,67 @@
+$NetBSD: patch-configure.ac,v 1.3 2013/07/04 21:27:58 adam Exp $
+
+Fix configuring on Darwin with newer Xcode.
+
+--- configure.ac.orig	2013-05-09 21:53:17.000000000 +0000
++++ configure.ac
+@@ -135,22 +135,6 @@ case "${host_os}" in
+     ;;
+   darwin*)
+ 
+-    dnl Force gcc "-arch" flag
+-    ARCH_flag=""
+-    case "${host}" in
+-      i?86*)
+-        ARCH_flag="-arch i386"
+-      ;;
+-      ppc64*)
+-        ARCH_flag="-arch ppc64"
+-      ;;
+-      ppc*)
+-        ARCH_flag="-arch ppc"
+-      ;;
+-      x86_64*)
+-        ARCH_flag="-arch x86_64"
+-      ;;
+-    esac
+ 
+     SYS=darwin
+     CFLAGS_save="${CFLAGS_save} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"; CFLAGS="${CFLAGS_save}"
+@@ -175,37 +159,6 @@ case "${host_os}" in
+             AC_LIBOBJ([strndup])
+             AC_LIBOBJ([strnlen])],)
+ 
+-    dnl
+-    dnl  Check for Mac OS X SDK settings
+-    dnl
+-    AC_ARG_WITH(macosx-sdk,
+-      [AS_HELP_STRING([--with-macosx-sdk=DIR],
+-        [compile using the SDK in DIR])])
+-    test "${with_macosx_sdk}" = "" && with_macosx_sdk=/Developer/SDKs/MacOSX10.6.sdk
+-    test ! -d "${with_macosx_sdk}" && AC_MSG_ERROR([SDK "${with_macosx_sdk}" not found])
+-    CPP="${CPP} -isysroot ${with_macosx_sdk}"
+-    CC="${CC} -isysroot ${with_macosx_sdk}"
+-    CXX="${CXX} -isysroot ${with_macosx_sdk}"
+-    OBJC="${OBJC} -isysroot ${with_macosx_sdk}"
+-    LD="${LD} -syslibroot ${with_macosx_sdk}"
+-    AC_ARG_WITH(macosx-version-min,
+-      [AS_HELP_STRING([--with-macosx-version-min=VERSION],
+-        [compile for MacOS X VERSION and above])])
+-    if test "${with_macosx_version_min}" = "" ; then
+-       with_macosx_version_min=10.5
+-    fi 
+-    if test "${with_macosx_version_min}" != "" ; then
+-        CPP="${CPP} -mmacosx-version-min=${with_macosx_version_min}"
+-        CC="${CC} -mmacosx-version-min=${with_macosx_version_min}"
+-        CXX="${CXX} -mmacosx-version-min=${with_macosx_version_min}"
+-        OBJC="${OBJC} -mmacosx-version-min=${with_macosx_version_min}"
+-        LD="${LD} -macosx_version_min=${with_macosx_version_min}"
+-        CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"; CFLAGS="${CFLAGS_save}"
+-        CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"; CXXFLAGS="${CXXFLAGS_save}"
+-        OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"; OBJCFLAGS="${OBJCFLAGS_save}"
+-        MACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}
+-        export MACOSX_DEPLOYMENT_TARGET
+-    fi
+     ;;
+   *mingw32* | *cygwin* | *wince* | *mingwce*)
+     AC_CHECK_TOOL(WINDRES, windres, :)