From owner-svn-ports-head@freebsd.org  Wed Dec  2 14:44:51 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 04A84A3FB1C;
 Wed,  2 Dec 2015 14:44:51 +0000 (UTC)
 (envelope-from amdmi3@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 C1D551277;
 Wed,  2 Dec 2015 14:44:50 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB2Einl6008525;
 Wed, 2 Dec 2015 14:44:49 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB2EinFw008524;
 Wed, 2 Dec 2015 14:44:49 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201512021444.tB2EinFw008524@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 2 Dec 2015 14:44:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r402829 - head/x11-wm/wmfs
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Dec 2015 14:44:51 -0000

Author: amdmi3
Date: Wed Dec  2 14:44:49 2015
New Revision: 402829
URL: https://svnweb.freebsd.org/changeset/ports/402829

Log:
  - Fix options handling
  - Respect LOCALBASE
  
  PR:		194739
  Reported by:	zhmylove@narod.ru

Modified:
  head/x11-wm/wmfs/Makefile

Modified: head/x11-wm/wmfs/Makefile
==============================================================================
--- head/x11-wm/wmfs/Makefile	Wed Dec  2 14:28:31 2015	(r402828)
+++ head/x11-wm/wmfs/Makefile	Wed Dec  2 14:44:49 2015	(r402829)
@@ -25,22 +25,22 @@ CONFIGURE_ARGS=	--prefix ${PREFIX} \
 		--man-prefix ${MANPREFIX}/man \
 		--xdg-config-dir ${PREFIX}/etc/xdg
 
-CFLAGS+=	-I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/freetype2
-
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		XRANDR XINERAMA IMLIB
 OPTIONS_DEFAULT=	XRANDR XINERAMA IMLIB
 
 XRANDR_USE=		XORG=xrandr
-XRANDR_CONFIGURE_WITH=	xrandr
+XRANDR_CONFIGURE_OFF=	--without-xrandr
 XINERAMA_USE=		XORG=xinerama
-XINERAMA_CONFIGURE_WITH=	xinerama
+XINERAMA_CONFIGURE_OFF=	--without-xinerama
 IMLIB_LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
-IMLIB_CONFIGURE_WITH=	imlib2
+IMLIB_CONFIGURE_OFF=	--without-imlib2
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>