From owner-svn-ports-branches@freebsd.org  Sun Jul 26 20:10:24 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8C0509AB5F7;
 Sun, 26 Jul 2015 20:10:24 +0000 (UTC)
 (envelope-from martymac@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7BD3F142;
 Sun, 26 Jul 2015 20:10:24 +0000 (UTC)
 (envelope-from martymac@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6QKAObZ044759;
 Sun, 26 Jul 2015 20:10:24 GMT (envelope-from martymac@FreeBSD.org)
Received: (from martymac@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6QKAN7O044757;
 Sun, 26 Jul 2015 20:10:23 GMT (envelope-from martymac@FreeBSD.org)
Message-Id: <201507262010.t6QKAN7O044757@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: martymac set sender to
 martymac@FreeBSD.org using -f
From: Ganael LAPLANCHE <martymac@FreeBSD.org>
Date: Sun, 26 Jul 2015 20:10:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r392947 - in branches/2015Q3/security/vlock: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Jul 2015 20:10:24 -0000

Author: martymac
Date: Sun Jul 26 20:10:23 2015
New Revision: 392947
URL: https://svnweb.freebsd.org/changeset/ports/392947

Log:
  MFH: r392691
  Approved by:	portmgr
  
  Fix build with new libcaca when CACASAVER is on

Added:
  branches/2015Q3/security/vlock/files/patch-modules-caca.c
     - copied unchanged from r392691, head/security/vlock/files/patch-modules-caca.c
Modified:
  branches/2015Q3/security/vlock/Makefile
Directory Properties:
  branches/2015Q3/   (props changed)

Modified: branches/2015Q3/security/vlock/Makefile
==============================================================================
--- branches/2015Q3/security/vlock/Makefile	Sun Jul 26 20:05:57 2015	(r392946)
+++ branches/2015Q3/security/vlock/Makefile	Sun Jul 26 20:10:23 2015	(r392947)
@@ -3,7 +3,7 @@
 
 PORTNAME=	vlock
 PORTVERSION=	2.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://cthulhu.c3d2.de/~toidinamai/vlock/archive/
 

Copied: branches/2015Q3/security/vlock/files/patch-modules-caca.c (from r392691, head/security/vlock/files/patch-modules-caca.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/security/vlock/files/patch-modules-caca.c	Sun Jul 26 20:10:23 2015	(r392947, copy of r392691, head/security/vlock/files/patch-modules-caca.c)
@@ -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"