Date: Tue, 15 Sep 2015 18:34:36 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397014 - head/x11-fm/rox-session Message-ID: <201509151834.t8FIYa02032962@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509151834.t8FIYa02032962>