Date: Mon, 13 Jun 2016 15:43:53 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r416847 - branches/2016Q2/x11/xlockmore Message-ID: <201606131543.u5DFhrh7067030@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606131543.u5DFhrh7067030>