Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 Dec 2013 00:44:04 +0000 (UTC)
From:      Danilo Egea Gondolfo <danilo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r336406 - head/emulators/bfe
Message-ID:  <201312140044.rBE0i465005985@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312140044.rBE0i465005985>