Revbump after updating lang/lua to 5.2.2.

44 files changed, 168 insertions, 93 deletions

diff --git a/chat/prosody/Makefile b/chat/prosody/Makefile
index 0d41c90aa7a..fe14d8ef866 100644
--- a/chat/prosody/Makefile
+++ b/chat/prosody/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2013/02/06 23:21:48 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2013/07/04 21:27:56 adam Exp $
 #
 
 DISTNAME=		prosody-0.8.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		chat
 MASTER_SITES=		http://prosody.im/downloads/source/
 
diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile
index 2d7696c931f..55565719de4 100644
--- a/chat/weechat/Makefile
+++ b/chat/weechat/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2013/06/09 21:19:02 tonio Exp $
+# $NetBSD: Makefile,v 1.42 2013/07/04 21:27:56 adam Exp $
 
 DISTNAME=	weechat-0.4.1
+PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	http://www.weechat.org/files/src/
 
diff --git a/databases/lua-sqlite/Makefile b/databases/lua-sqlite/Makefile
index 09649834f70..dfb5cadbd0e 100644
--- a/databases/lua-sqlite/Makefile
+++ b/databases/lua-sqlite/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2012/10/02 21:25:21 asau Exp $
+# $NetBSD: Makefile,v 1.15 2013/07/04 21:27:56 adam Exp $
 #
 
 DISTNAME=	lsqlite_src
 PKGNAME=	lua-sqlite-20030228
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	databases
 MASTER_SITES=	http://lua-users.org/files/wiki_insecure/binary_modules/luasqlite/
 EXTRACT_SUFX=	.zip
diff --git a/databases/mysql-workbench/Makefile b/databases/mysql-workbench/Makefile
index 941c3c467ce..567e0b8c5df 100644
--- a/databases/mysql-workbench/Makefile
+++ b/databases/mysql-workbench/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2013/06/06 12:54:11 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2013/07/04 21:27:56 adam Exp $
 
 DISTNAME=	mysql-workbench-gpl-5.2.33b-src
 PKGNAME=	${DISTNAME:S/-gpl//:S/b-src$//}
-PKGREVISION=	24
+PKGREVISION=	25
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQLGUITools/}
 
diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile
index 6388efd8a64..1550ebe0fd5 100644
--- a/databases/tokyotyrant/Makefile
+++ b/databases/tokyotyrant/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2012/10/02 21:25:55 asau Exp $
+# $NetBSD: Makefile,v 1.31 2013/07/04 21:27:56 adam Exp $
 #
 
 DISTNAME=	tokyotyrant-1.1.41
+PKGREVISION=	1
 CATEGORIES=	databases net
 MASTER_SITES=	${HOMEPAGE}
 
diff --git a/devel/kyua-cli/Makefile b/devel/kyua-cli/Makefile
index 9c1f2ded501..754e974d76f 100644
--- a/devel/kyua-cli/Makefile
+++ b/devel/kyua-cli/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2013/06/15 00:31:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2013/07/04 21:27:56 adam Exp $
 #
 
 DISTNAME=	kyua-cli-0.6
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://kyua.googlecode.com/files/
 
diff --git a/devel/lutok/Makefile b/devel/lutok/Makefile
index 8ed687e72e3..2879a8f43a6 100644
--- a/devel/lutok/Makefile
+++ b/devel/lutok/Makefile
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.6 2013/06/15 00:30:31 jmmv Exp $
-#
+# $NetBSD: Makefile,v 1.7 2013/07/04 21:27:57 adam Exp $
 
 DISTNAME=	lutok-0.3
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://lutok.googlecode.com/files/
 
 MAINTAINER=	jmmv@NetBSD.org
-HOMEPAGE=	http://code.google.com/p/kyua/
+HOMEPAGE=	http://code.google.com/p/lutok/
 COMMENT=	Lightweight C++ API for Lua
 LICENSE=	modified-bsd
 
-GNU_CONFIGURE=		yes
-MAKE_JOBS_SAFE=		yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS=		pkg-config
+GNU_CONFIGURE=		yes
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lutok
 PKG_SUPPORTED_OPTIONS=	tests
diff --git a/devel/lutok/buildlink3.mk b/devel/lutok/buildlink3.mk
index 4c1fdb190a1..698a9cb203a 100644
--- a/devel/lutok/buildlink3.mk
+++ b/devel/lutok/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2013/06/15 00:30:31 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2013/07/04 21:27:57 adam Exp $
 
 BUILDLINK_TREE+=	lutok
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	lutok
 LUTOK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.lutok+=	lutok>=0.3
+BUILDLINK_ABI_DEPENDS.lutok?=	lutok>=0.3nb1
 BUILDLINK_PKGSRCDIR.lutok?=	../../devel/lutok
 
 .include "../../lang/lua/buildlink3.mk"
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 75cd739347a..e25ca6c9a24 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.82 2013/05/31 12:40:01 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2013/07/04 21:27:57 adam Exp $
 #
 
 DISTNAME=	monotone-1.0
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	devel scm
 MASTER_SITES=	http://monotone.ca/downloads/1.0/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile
index ccf67d9016e..6e4bd1b453b 100644
--- a/devel/ptlib/Makefile
+++ b/devel/ptlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2013/02/06 23:20:53 jperkin Exp $
+# $NetBSD: Makefile,v 1.20 2013/07/04 21:27:57 adam Exp $
 
 DISTNAME=	ptlib-2.10.7
-PKGREVISION= 3
+PKGREVISION= 4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/ptlib/2.10/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/devel/tolua++/Makefile b/devel/tolua++/Makefile
index 09724262cc8..fa211dfc929 100644
--- a/devel/tolua++/Makefile
+++ b/devel/tolua++/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2012/10/31 11:19:51 asau Exp $
+# $NetBSD: Makefile,v 1.3 2013/07/04 21:27:57 adam Exp $
 #
 
 DISTNAME=	tolua++-1.0.93
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.codenix.com/~tolua/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/tolua++/buildlink3.mk b/devel/tolua++/buildlink3.mk
index c005a8774c0..02595dbc016 100644
--- a/devel/tolua++/buildlink3.mk
+++ b/devel/tolua++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2012/05/08 09:34:17 imil Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2013/07/04 21:27:57 adam Exp $
 
 BUILDLINK_TREE+=	toluapp
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	toluapp
 TOLUAPP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.toluapp+=	tolua++>=1.0.93
+BUILDLINK_ABI_DEPENDS.toluapp?=	tolua++>=1.0.93nb1
 BUILDLINK_PKGSRCDIR.toluapp?=	../../devel/tolua++
 
 .include "../../lang/lua/buildlink3.mk"
diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile
index 8481a880b0e..4cd0fef5d17 100644
--- a/games/fillets-ng/Makefile
+++ b/games/fillets-ng/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2013/06/04 22:16:05 tron Exp $
+# $NetBSD: Makefile,v 1.29 2013/07/04 21:27:57 adam Exp $
 #
 
 DISTNAME=	fillets-ng-0.7.3
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fillets/}
 
diff --git a/games/onscripter/Makefile b/games/onscripter/Makefile
index 835501b58f4..5abacf5a40e 100644
--- a/games/onscripter/Makefile
+++ b/games/onscripter/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2013/06/14 15:43:49 tsutsui Exp $
+# $NetBSD: Makefile,v 1.27 2013/07/04 21:27:57 adam Exp $
 #
 
 DISTNAME=		onscripter-20130411
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		http://onscripter.sourceforge.jp/
 
diff --git a/games/pushover/Makefile b/games/pushover/Makefile
index fb6179a5873..9cf8510a522 100644
--- a/games/pushover/Makefile
+++ b/games/pushover/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2013/06/04 22:16:10 tron Exp $
+# $NetBSD: Makefile,v 1.4 2013/07/04 21:27:57 adam Exp $
 #
 
 DISTNAME=	pushover-0.0.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pushover/}
 
diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile
index 4a4c634de4e..57c28579aac 100644
--- a/games/stratagus/Makefile
+++ b/games/stratagus/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2013/02/16 11:21:28 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2013/07/04 21:27:57 adam Exp $
 #
 
 DISTNAME=		stratagus-2.1-src
 PKGNAME=		${DISTNAME:S/-src//}
-PKGREVISION=		16
+PKGREVISION=		17
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=stratagus/}
 
diff --git a/graphics/edje/Makefile b/graphics/edje/Makefile
index 3afed314c4c..834674d30e8 100644
--- a/graphics/edje/Makefile
+++ b/graphics/edje/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2013/06/16 18:56:04 sno Exp $
+# $NetBSD: Makefile,v 1.9 2013/07/04 21:27:57 adam Exp $
 #
 
 DISTNAME=	edje-1.7.7
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.enlightenment.org/releases/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/edje/buildlink3.mk b/graphics/edje/buildlink3.mk
index 2676f8f4a21..d811ded446c 100644
--- a/graphics/edje/buildlink3.mk
+++ b/graphics/edje/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2013/06/16 18:56:04 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2013/07/04 21:27:57 adam Exp $
 
 BUILDLINK_TREE+=	edje
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	edje
 EDJE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.edje+=	edje>=1.7.7
-BUILDLINK_ABI_DEPENDS.edje?=	edje>=1.7.7
+BUILDLINK_ABI_DEPENDS.edje?=	edje>=1.7.7nb1
 BUILDLINK_PKGSRCDIR.edje?=	../../graphics/edje
 
 .include	"../../devel/ecore/buildlink3.mk"
diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index af5664a709e..cc1c383ba34 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.79 2013/06/06 12:54:30 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2013/07/04 21:27:57 adam Exp $
 
 DISTNAME=	gnuplot-4.6.3
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES+=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnuplot/}
 
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 8c8415d65fb..900735fd874 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.120 2013/06/06 12:54:31 wiz Exp $
+# $NetBSD: Makefile,v 1.121 2013/07/04 21:27:57 adam Exp $
 
 DISTNAME=	graphviz-2.26.3
-PKGREVISION=	27
+PKGREVISION=	28
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/stable/SOURCES/
 
diff --git a/inputmethod/ibus-pinyin/Makefile b/inputmethod/ibus-pinyin/Makefile
index 4801eba326e..15e218022c8 100644
--- a/inputmethod/ibus-pinyin/Makefile
+++ b/inputmethod/ibus-pinyin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2013/05/09 07:40:01 adam Exp $
+# $NetBSD: Makefile,v 1.20 2013/07/04 21:27:57 adam Exp $
 #
 
 DISTNAME=	ibus-pinyin-1.4.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	inputmethod chinese
 MASTER_SITES=	http://ibus.googlecode.com/files/
 DISTFILES=	${DEFAULT_DISTFILES} ${DBTAR}
diff --git a/inputmethod/sj3-server/Makefile b/inputmethod/sj3-server/Makefile
index e893f3e74b8..2c1ad879928 100644
--- a/inputmethod/sj3-server/Makefile
+++ b/inputmethod/sj3-server/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2012/10/06 14:25:18 asau Exp $
-#
+# $NetBSD: Makefile,v 1.13 2013/07/04 21:27:57 adam Exp $
 
 .include "../../inputmethod/sj3/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/sj3-/sj3-server-/}
+PKGREVISION=	1
 
 COMMENT=	SJ3 Japanese input method server
 
@@ -34,6 +34,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/dict/sj3main.dic \
 		${DESTDIR}${PREFIX}/libdata/sj3main.dic
 
-
 .include "../../lang/lua/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/OSBF-lua/Makefile b/mail/OSBF-lua/Makefile
index 133ba6ac470..b3b784b2697 100644
--- a/mail/OSBF-lua/Makefile
+++ b/mail/OSBF-lua/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2013/02/01 22:25:26 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2013/07/04 21:27:57 adam Exp $
 #
 
 DISTNAME=	osbf-lua-2.0.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://luaforge.net/frs/download.php/2094/
 
diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index 5c9be1d6b74..a905939b02e 100644
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2013/02/06 23:22:45 jperkin Exp $
+# $NetBSD: Makefile,v 1.35 2013/07/04 21:27:57 adam Exp $
 
 DISTNAME=		imapfilter-2.0.6
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		mail
 MASTER_SITES=		http://imapfilter.hellug.gr/source/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/misc/celestia/Makefile b/misc/celestia/Makefile
index e029ff8a836..fc4333558fb 100644
--- a/misc/celestia/Makefile
+++ b/misc/celestia/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2013/06/06 12:54:45 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2013/07/04 21:27:58 adam Exp $
 
 DISTNAME=	celestia-1.4.1
-PKGREVISION=	34
+PKGREVISION=	35
 CATEGORIES=	misc x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=celestia/}
 
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, :)
diff --git a/net/libquvi/Makefile b/net/libquvi/Makefile
index c5b54c0a3cc..8fb6fcaebf6 100644
--- a/net/libquvi/Makefile
+++ b/net/libquvi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2013/04/06 14:22:40 rodent Exp $
+# $NetBSD: Makefile,v 1.8 2013/07/04 21:27:58 adam Exp $
 #
 
 DISTNAME=	libquvi-0.4.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=quvi/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/libquvi/buildlink3.mk b/net/libquvi/buildlink3.mk
index c9a8dd8c248..64b85c03b81 100644
--- a/net/libquvi/buildlink3.mk
+++ b/net/libquvi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2011/10/16 08:08:29 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2013/07/04 21:27:58 adam Exp $
 
 BUILDLINK_TREE+=	libquvi
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	libquvi
 LIBQUVI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libquvi+=	libquvi>=0.4.0
+BUILDLINK_ABI_DEPENDS.libquvi?=	libquvi>=0.4.1nb3
 BUILDLINK_PKGSRCDIR.libquvi?=	../../net/libquvi
 
 .include "../../lang/lua/buildlink3.mk"
diff --git a/net/powerdns-recursor/Makefile b/net/powerdns-recursor/Makefile
index 72ed66dd16d..9c307a8df17 100644
--- a/net/powerdns-recursor/Makefile
+++ b/net/powerdns-recursor/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2013/06/14 22:13:03 dholland Exp $
+# $NetBSD: Makefile,v 1.12 2013/07/04 21:27:58 adam Exp $
 #
 
 DISTNAME=		pdns-recursor-3.3
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		http://downloads.powerdns.com/releases/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/quvi/Makefile b/net/quvi/Makefile
index ffcf7f08300..c669ba70c40 100644
--- a/net/quvi/Makefile
+++ b/net/quvi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2013/02/06 23:23:23 jperkin Exp $
+# $NetBSD: Makefile,v 1.19 2013/07/04 21:27:58 adam Exp $
 #
 
 DISTNAME=	quvi-0.4.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=quvi/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/print/podofo/Makefile b/print/podofo/Makefile
index a90296409c9..d2ec329da42 100644
--- a/print/podofo/Makefile
+++ b/print/podofo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2013/06/04 22:16:59 tron Exp $
+# $NetBSD: Makefile,v 1.16 2013/07/04 21:27:58 adam Exp $
 #
 
 DISTNAME=	podofo-0.9.1
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=podofo/}
 
diff --git a/security/ap-modsecurity2/Makefile b/security/ap-modsecurity2/Makefile
index d9699666342..3210c3381aa 100644
--- a/security/ap-modsecurity2/Makefile
+++ b/security/ap-modsecurity2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2013/02/06 23:23:34 jperkin Exp $
+# $NetBSD: Makefile,v 1.25 2013/07/04 21:27:58 adam Exp $
 
 DISTNAME=	modsecurity-apache_2.5.13
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/apache_//}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	www security
 MASTER_SITES=	http://www.modsecurity.org/download/
 LICENSE=	gnu-gpl-v2
diff --git a/security/libprelude-lua/Makefile b/security/libprelude-lua/Makefile
index 69b0c11d079..0696f4e532d 100644
--- a/security/libprelude-lua/Makefile
+++ b/security/libprelude-lua/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2012/10/23 18:16:34 asau Exp $
+# $NetBSD: Makefile,v 1.7 2013/07/04 21:27:58 adam Exp $
 
 PKGNAME=		libprelude-lua-${VERSION}
-PKGREVISION=		3
+PKGREVISION=		4
 COMMENT=                Lua bindings to LibPrelude
 
 .include "../../security/libprelude/Makefile.common"
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index aa6dc75251b..46764ff6e8f 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2013/06/06 12:55:02 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2013/07/04 21:27:58 adam Exp $
 #
 
 DISTNAME=	conky-1.9.0
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=conky/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/wm/awesome/Makefile b/wm/awesome/Makefile
index c19036188d8..81e79bef8b7 100644
--- a/wm/awesome/Makefile
+++ b/wm/awesome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2013/06/19 14:41:39 jperkin Exp $
+# $NetBSD: Makefile,v 1.40 2013/07/04 21:27:58 adam Exp $
 #
 
 DISTNAME=	awesome-3.4.13
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://awesome.naquadah.org/download/
 EXTRACT_SUFX=	.tar.xz
diff --git a/wm/ion/Makefile b/wm/ion/Makefile
index b262526cae1..84ac587e17a 100644
--- a/wm/ion/Makefile
+++ b/wm/ion/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2012/10/08 12:42:21 asau Exp $
+# $NetBSD: Makefile,v 1.41 2013/07/04 21:27:58 adam Exp $
 #
 
 DISTNAME=	ion-2-20040729
 PKGNAME=	${DISTNAME:S/-2-/-/}
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	wm x11
 MASTER_SITES=	http://iki.fi/tuomov/dl/archives/
 
diff --git a/wm/notion/Makefile b/wm/notion/Makefile
index e7b2b441a39..0755481521e 100644
--- a/wm/notion/Makefile
+++ b/wm/notion/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2012/10/23 10:24:14 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2013/07/04 21:27:58 adam Exp $
 #
 
 DISTNAME=	notion-3-2012042300-src
 PKGNAME=	${DISTNAME:S/3-/3./:S/-src//}
+PKGREVISION=	1
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=notion/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index f91f90106e4..d4e9555c2de 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2013/06/20 09:06:45 taca Exp $
+# $NetBSD: Makefile,v 1.19 2013/07/04 21:27:58 adam Exp $
 
 DISTNAME=	httpd-2.4.4
 PKGNAME=	${DISTNAME:S/httpd/apache/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=httpd/} \
 		http://archive.apache.org/dist/httpd/ \
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index a070440942b..e5b3eb34e3a 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2013/02/06 23:23:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.52 2013/07/04 21:27:59 adam Exp $
 
 DISTNAME=		elinks-0.12pre6
 PKGNAME=		${DISTNAME:S/pre/rc/}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		www
 MASTER_SITES=		http://elinks.or.cz/download/ \
 			http://ftp.icm.edu.pl/packages/elinks/
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 3eecd4af0ff..fba78447c8a 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2013/03/13 13:28:09 obache Exp $
+# $NetBSD: Makefile,v 1.41 2013/07/04 21:27:59 adam Exp $
 
 DISTNAME=	lighttpd-1.4.32
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://download.lighttpd.net/lighttpd/releases-1.4.x/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/screws/Makefile b/www/screws/Makefile
index d465a5aa5f5..6ba5b113254 100644
--- a/www/screws/Makefile
+++ b/www/screws/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2013/05/31 12:42:54 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2013/07/04 21:27:59 adam Exp $
 #
 
 DISTNAME=	screws-0.56
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.nopcode.org/prj/screws/