From owner-svn-ports-all@FreeBSD.ORG Sat Dec 14 00:44:05 2013 Return-Path: Delivered-To: svn-ports-all@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 420EADC5; Sat, 14 Dec 2013 00:44:05 +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 2E1101025; Sat, 14 Dec 2013 00:44:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBE0i4Hn005986; Sat, 14 Dec 2013 00:44:04 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBE0i465005985; Sat, 14 Dec 2013 00:44:04 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201312140044.rBE0i465005985@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Sat, 14 Dec 2013 00:44:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336406 - head/emulators/bfe X-SVN-Group: ports-head 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.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Dec 2013 00:44:05 -0000 Author: danilo Date: Sat Dec 14 00:44:04 2013 New Revision: 336406 URL: http://svnweb.freebsd.org/changeset/ports/336406 Log: - Convert "if defined(WITH_GTK2)" to options - Add stage support Modified: head/emulators/bfe/Makefile Modified: head/emulators/bfe/Makefile ============================================================================== --- head/emulators/bfe/Makefile Sat Dec 14 00:03:57 2013 (r336405) +++ head/emulators/bfe/Makefile Sat Dec 14 00:44:04 2013 (r336406) @@ -19,16 +19,15 @@ USES= pkgconfig HAS_CONFIGURE= yes CONFIGURE_SCRIPT= configure.sh -.if defined(WITH_GTK2) -USE_GNOME+= gtk20 -CONFIGURE_ARGS+= --gtk 2.0 -PKGNAMESUFFIX= -gtk2 -.else -USE_GNOME+= gtk12 -CONFIGURE_ARGS+= --gtk 1.2 -.endif +OPTIONS_SINGLE= GTK +OPTIONS_SINGLE_GTK= GTK1 GTK2 +OPTIONS_DEFAULT= GTK1 + +GTK1_USE= GNOME=gtk12 +GTK1_CONFIGURE_ON= --gtk 1.2 +GTK2_USE= GNOME=gtk20 +GTK2_CONFIGURE_ON= --gtk 2.0 -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e \ 's|%%CFLAGS%%|"${CFLAGS}"|g ; \ @@ -39,9 +38,9 @@ post-patch: ${WRKSRC}/${CONFIGURE_SCRIPT} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bfe2 ${PREFIX}/bin - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/README.bferc ${DATADIR}/bferc.sample - ${INSTALL_DATA} ${WRKSRC}/README.bferc ${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/bfe2 ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/README.bferc ${STAGEDIR}${DATADIR}/bferc.sample + ${INSTALL_DATA} ${WRKSRC}/README.bferc ${STAGEDIR}${DATADIR} .include