From owner-svn-ports-all@FreeBSD.ORG Mon Feb 17 23:10:40 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8413EC7F; Mon, 17 Feb 2014 23:10:40 +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 5837F1BFA; Mon, 17 Feb 2014 23:10:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1HNAexZ099045; Mon, 17 Feb 2014 23:10:40 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1HNAeJO099044; Mon, 17 Feb 2014 23:10:40 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201402172310.s1HNAeJO099044@svn.freebsd.org> From: Pawel Pekala Date: Mon, 17 Feb 2014 23:10:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344830 - head/cad/gspiceui 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: Mon, 17 Feb 2014 23:10:40 -0000 Author: pawel Date: Mon Feb 17 23:10:39 2014 New Revision: 344830 URL: http://svnweb.freebsd.org/changeset/ports/344830 QAT: https://qat.redports.org/buildarchive/r344830/ Log: - Support staging [1] - Use option helpers and install docs and examples files implicitly allowing to remove bsd.port.options.mk inclusion PR: ports/186800 [1] Submitted by: maintainer Modified: head/cad/gspiceui/Makefile Modified: head/cad/gspiceui/Makefile ============================================================================== --- head/cad/gspiceui/Makefile Mon Feb 17 23:02:06 2014 (r344829) +++ head/cad/gspiceui/Makefile Mon Feb 17 23:10:39 2014 (r344830) @@ -28,27 +28,19 @@ OPTIONS_DEFAULT= NGSPICE USE_WX= 2.6+ WX_UNICODE= yes USE_GCC= yes -USE_GMAKE= yes +USES= gmake DESKTOP_ENTRIES= "GSpiceUI" "Circuit Simulator GUI" \ "${PREFIX}/share/pixmaps/gspiceui-48x48.xpm" \ "gspiceui" "Science;Electronics;" false -MAN1= gspiceui.1 PORTDOCS= * PORTEXAMPLES= * -PLIST_FILES= bin/gspiceui share/pixmaps/gspiceui-48x48.xpm +PLIST_FILES= bin/gspiceui share/pixmaps/gspiceui-48x48.xpm \ + man/man1/gspiceui.1.gz -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MGNUCAP} -RUN_DEPENDS+= gnucap:${PORTSDIR}/cad/gnucap -.endif - -.if ${PORT_OPTIONS:MNGSPICE} -RUN_DEPENDS+= ngspice:${PORTSDIR}/cad/ngspice_rework -.endif +GNUCAP_RUN_DEPENDS= gnucap:${PORTSDIR}/cad/gnucap +NGSPICE_RUN_DEPENDS= ngspice:${PORTSDIR}/cad/ngspice_rework post-patch: @${REINPLACE_CMD} -e \ @@ -61,23 +53,17 @@ post-patch: ${WRKSRC}/src/main/HelpTasks.cpp do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/gspiceui ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/bin/gspiceui ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/src/icons/gspiceui-48x48.xpm \ - ${PREFIX}/share/pixmaps - ${INSTALL_MAN} ${WRKSRC}/gspiceui.1 ${MANPREFIX}/man/man1 -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} -.for dir in html - @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${DOCSDIR} \ + ${STAGEDIR}${PREFIX}/share/pixmaps + ${INSTALL_MAN} ${WRKSRC}/gspiceui.1 ${STAGEDIR}${MANPREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @(cd ${WRKSRC} && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR} \ "! -name Makefile") -.endfor -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for dir in lib sch - @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${EXAMPLESDIR} \ + @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${EXAMPLESDIR} \ "! -name Makefile") .endfor -.endif .include