From owner-svn-ports-head@FreeBSD.ORG  Wed Feb 19 16:51:28 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 61B36C99;
 Wed, 19 Feb 2014 16:51:28 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4E6531B4B;
 Wed, 19 Feb 2014 16:51:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1JGpS4c062977;
 Wed, 19 Feb 2014 16:51:28 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1JGpSRq062961;
 Wed, 19 Feb 2014 16:51:28 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201402191651.s1JGpSRq062961@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Wed, 19 Feb 2014 16:51:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r345116 - head/x11-wm/flwm
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Feb 2014 16:51:28 -0000

Author: gahr
Date: Wed Feb 19 16:51:27 2014
New Revision: 345116
URL: http://svnweb.freebsd.org/changeset/ports/345116
QAT: https://qat.redports.org/buildarchive/r345116/

Log:
  - Fix build with fltk-devel

Modified:
  head/x11-wm/flwm/Makefile

Modified: head/x11-wm/flwm/Makefile
==============================================================================
--- head/x11-wm/flwm/Makefile	Wed Feb 19 16:43:42 2014	(r345115)
+++ head/x11-wm/flwm/Makefile	Wed Feb 19 16:51:27 2014	(r345116)
@@ -15,15 +15,14 @@ LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-
 
 USE_XORG=	x11 xt
 GNU_CONFIGURE=	yes
-
-CFLAGS+=	-DFL_LIBRARY
+CONFIGURE_ENV+=	CXXFLAGS="-DFL_LIBRARY `${LOCALBASE}/bin/fltk-devel/fltk-config --cflags`"
 
 PLIST_FILES=	bin/flwm \
 		man/man1/flwm.1.gz
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g; /^main/s|^|int |g' ${WRKSRC}/${CONFIGURE_SCRIPT}
-	${REINPLACE_CMD} -e 's|^LIBS =.*|LIBS = `fltk-config --ldflags`|' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's|^LIBS =.*|LIBS = `${LOCALBASE}/bin/fltk-devel/fltk-config --ldflags`|' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/flwm ${STAGEDIR}${PREFIX}/bin