From owner-svn-ports-head@freebsd.org  Tue Sep 15 18:34:37 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 357F5A04E28;
 Tue, 15 Sep 2015 18:34:37 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 09C4419C3;
 Tue, 15 Sep 2015 18:34:37 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8FIYavg032963;
 Tue, 15 Sep 2015 18:34:36 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8FIYa02032962;
 Tue, 15 Sep 2015 18:34:36 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201509151834.t8FIYa02032962@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: Tue, 15 Sep 2015 18:34:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r397014 - head/x11-fm/rox-session
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: Tue, 15 Sep 2015 18:34:37 -0000

Author: amdmi3
Date: Tue Sep 15 18:34:36 2015
New Revision: 397014
URL: https://svnweb.freebsd.org/changeset/ports/397014

Log:
  - Switch to options helpers

Modified:
  head/x11-fm/rox-session/Makefile

Modified: head/x11-fm/rox-session/Makefile
==============================================================================
--- head/x11-fm/rox-session/Makefile	Tue Sep 15 18:34:31 2015	(r397013)
+++ head/x11-fm/rox-session/Makefile	Tue Sep 15 18:34:36 2015	(r397014)
@@ -26,18 +26,12 @@ USE_XORG=	x11 xext xtst xxf86vm
 PORTDOCS=	Changes DBUS-API README
 
 OPTIONS_DEFINE=	GDM DOCS
+OPTIONS_SUB=	yes
 GDM_DESC=	Install GDM login manager
 
 SUB_FILES=	${PORTNAME} rox.desktop
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGDM}
-RUN_DEPENDS+=	${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm
-PLIST_SUB+=	GDM=""
-.else
-PLIST_SUB+=	GDM="@comment "
-.endif
+GDM_RUN_DEPENDS=${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
@@ -50,20 +44,20 @@ do-build:
 	@cd ${WRKSRC}/src/po && ./dist
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC} && ${CP} -r .DirIcon AppInfo.xml AppRun \
 		Environment Login Messages Options.xml ROX-Session \
 		ROX-Session.xml RunROX SetupPanel Styles browser images \
 		*.py *.pyc *.pyo ${STAGEDIR}${DATADIR}
-.if ${PORT_OPTIONS:MGDM}
-	@${INSTALL_DATA} ${WRKDIR}/rox.desktop ${STAGEDIR}${PREFIX}/share/applications
-.endif
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-GDM-on:
+	${INSTALL_DATA} ${WRKDIR}/rox.desktop ${STAGEDIR}${PREFIX}/share/applications
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/Help/${f} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/Help/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>