Bug 186800 - [maintainer-update] Convert cad/gspiceui to STAGE
Summary: [maintainer-update] Convert cad/gspiceui to STAGE
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Pawel Pekala
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-02-15 21:00 UTC by Kevin Zheng
Modified: 2014-02-17 23:20 UTC (History)
0 users

See Also:


Attachments
file.diff (1.90 KB, patch)
2014-02-15 21:00 UTC, Kevin Zheng
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Kevin Zheng 2014-02-15 21:00:00 UTC
Convert cad/gspiceui to STAGE support. Meanwhile, define LICENSE_FILE and switch to USES.

Fix: Apply the attached patch.

Patch attached with submission follows:
Comment 1 Pawel Pekala freebsd_committer freebsd_triage 2014-02-17 21:23:17 UTC
Responsible Changed
From-To: freebsd-ports-bugs->pawel
Comment 2 dfilter service freebsd_committer freebsd_triage 2014-02-17 23:10:46 UTC
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 <bsd.port.options.mk>
-
-.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 <bsd.port.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Pawel Pekala freebsd_committer freebsd_triage 2014-02-17 23:11:04 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!