From owner-svn-ports-all@freebsd.org  Mon Jun 13 15:43:54 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 C4DECAF06C1;
 Mon, 13 Jun 2016 15:43:54 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 923D724A5;
 Mon, 13 Jun 2016 15:43:54 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5DFhrOM067031;
 Mon, 13 Jun 2016 15:43:53 GMT (envelope-from jgh@FreeBSD.org)
Received: (from jgh@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5DFhrh7067030;
 Mon, 13 Jun 2016 15:43:53 GMT (envelope-from jgh@FreeBSD.org)
Message-Id: <201606131543.u5DFhrh7067030@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jgh set sender to jgh@FreeBSD.org
 using -f
From: Jason Helfman <jgh@FreeBSD.org>
Date: Mon, 13 Jun 2016 15:43:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r416847 - branches/2016Q2/x11/xlockmore
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jun 2016 15:43:54 -0000

Author: jgh
Date: Mon Jun 13 15:43:53 2016
New Revision: 416847
URL: https://svnweb.freebsd.org/changeset/ports/416847

Log:
  MFH: r416638 r416686
  
  - add/enable xinerama support (default)
  
  - fix for MESAGL
  /usr/local/include/FTGL/ftgl.h:32:10: fatal error: 'ft2build.h' file not found
  Reported by:	dhw
  
  Approved by:	ports-secteam (with hat)

Modified:
  branches/2016Q2/x11/xlockmore/Makefile
Directory Properties:
  branches/2016Q2/   (props changed)

Modified: branches/2016Q2/x11/xlockmore/Makefile
==============================================================================
--- branches/2016Q2/x11/xlockmore/Makefile	Mon Jun 13 15:22:32 2016	(r416846)
+++ branches/2016Q2/x11/xlockmore/Makefile	Mon Jun 13 15:43:53 2016	(r416847)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xlockmore
 PORTVERSION=	5.46
+PORTREVISION=	1
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.tux.org/~bagleyd/xlock/ \
 		LOCAL/jgh/x11/${PORTNAME}/
@@ -22,7 +23,9 @@ USE_XORG=	x11 xaw ice
 LIB_DEPENDS+=	libfreetype.so:print/freetype2
 
 OPTIONS_DEFINE=	MESAGL MB SYSLOG DISABLE_ALLOW_ROOT NICE_ONLY BLANK_ONLY \
-		KERBEROS4 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION MAGICK JP
+		KERBEROS4 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION MAGICK JP \
+		XINERAMA
+OPTIONS_DEFAULT=	XINERAMA
 OPTIONS_SUB=	yes
 
 MESAGL_DESC=	Mesa 3D (for GL modes)
@@ -64,7 +67,7 @@ KRB5LIB=	-L${KRB5_HOME}/lib
 CONFIGURE_ARGS+=	--with-mesa
 MESALIB=	-lpthread
 USE_GL=	yes
-CFLAGS+=	-I${LOCALBASE}/include/FTGL
+CFLAGS+=	-I${LOCALBASE}/include/FTGL -I${LOCALBASE}/include/freetype2
 .else
 CONFIGURE_ARGS+=	--without-mesa --without-opengl
 .endif
@@ -140,6 +143,10 @@ CONFIGURE_ENV+=		XLOCKLIBS="${KRB5LIB} $
 CONFIGURE_ARGS+=	--disable-allow-root
 .endif
 
+.if ${PORT_OPTIONS:MXINERAMA}
+CONFIGURE_ARGS+=	--with-xinerama
+.endif
+
 .if ${PORT_OPTIONS:MPAM} && empty(PORT_OPTIONS:MBAD_PAM)
 pre-extract:
 	@${ECHO}