Index: branches/2015Q3/security/vlock/Makefile
===================================================================
--- branches/2015Q3/security/vlock/Makefile	(revision 392946)
+++ branches/2015Q3/security/vlock/Makefile	(revision 392947)
@@ -1,61 +1,61 @@
 # Created by: George Reid <services@nevernet.net>
 # $FreeBSD$
 
 PORTNAME=	vlock
 PORTVERSION=	2.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://cthulhu.c3d2.de/~toidinamai/vlock/archive/
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Locks a terminal
 
 LICENSE=	GPLv2
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-plugins --enable-pam \
 		--prefix=${PREFIX} \
 		--mandir=${MANPREFIX}/man \
 		--with-modules="${VLOCKMODULES}" \
 		--with-scripts="${VLOCKSCRIPTS}" \
 		VLOCK_GROUP="nobody" \
 		EXTRA_CFLAGS="-I${LOCALBASE}/include" \
 		EXTRA_LDFLAGS="-L${LOCALBASE}/lib"
 USES=	gmake
 USE_CSTD=	gnu99
 
 OPTIONS_DEFINE=	ROOTPWD VLOCKSCRIPTS CACASAVER
 OPTIONS_DEFAULT=	ROOTPWD
 OPTIONS_SUB=	yes
 ROOTPWD_DESC=	Enable unlock using root password
 ROOTPWD_CONFIGURE_ENABLE=	root-password
 VLOCKSCRIPTS_DESC=	Install sample hook scripts
 CACASAVER_DESC=	Enable libcaca screensaver
 CACASAVER_BUILD_DEPENDS=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
 
 # Default scripts/modules
 VLOCKSCRIPTS=
 VLOCKMODULES=	all.so new.so
 
 # Vlock special group
 VLOCK_GRP=	vlock
 GROUPS=	${VLOCK_GRP}
 PLIST_SUB+=	VLOCK_GRP=${VLOCK_GRP}
 
 PORTDOCS=	ChangeLog PLUGINS README README.X11 SECURITY TODO
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MVLOCKSCRIPTS}
 VLOCKSCRIPTS+=	amarok.sh example_script.sh mplayer.sh
 .endif
 
 .if ${PORT_OPTIONS:MCACASAVER}
 VLOCKMODULES+=	caca.so
 .endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: branches/2015Q3/security/vlock/files/patch-modules-caca.c
===================================================================
--- branches/2015Q3/security/vlock/files/patch-modules-caca.c	(nonexistent)
+++ branches/2015Q3/security/vlock/files/patch-modules-caca.c	(revision 392947)
@@ -0,0 +1,12 @@
+Remove legacy header as libcucul has now been merged into libcaca.
+
+--- ./modules/caca.c.orig	2015-07-21 20:34:23.876845709 +0200
++++ ./modules/caca.c	2015-07-21 20:34:33.937820107 +0200
+@@ -37,7 +37,6 @@
+ 
+ #include <ncurses.h>
+ 
+-#include <cucul.h>
+ #include <caca.h>
+ 
+ #include "process.h"

Property changes on: branches/2015Q3/security/vlock/files/patch-modules-caca.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2015Q3
===================================================================
--- branches/2015Q3	(revision 392946)
+++ branches/2015Q3	(revision 392947)

Property changes on: branches/2015Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r392691