From nobody@FreeBSD.org  Sat Feb 15 20:50:48 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 6C9E3914
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 15 Feb 2014 20:50:48 +0000 (UTC)
Received: from newred.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 3E59D1826
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 15 Feb 2014 20:50:48 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by newred.freebsd.org (8.14.7/8.14.7) with ESMTP id s1FKomSQ051982
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 15 Feb 2014 20:50:48 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.7/8.14.7/Submit) id s1FKom3U051961;
	Sat, 15 Feb 2014 20:50:48 GMT
	(envelope-from nobody)
Message-Id: <201402152050.s1FKom3U051961@cgiserv.freebsd.org>
Date: Sat, 15 Feb 2014 20:50:48 GMT
From: Kevin Zheng <kevinz5000@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer-update] Convert cad/gspiceui to STAGE
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         186800
>Category:       ports
>Synopsis:       [maintainer-update] Convert cad/gspiceui to STAGE
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 15 21:00:00 UTC 2014
>Closed-Date:    Mon Feb 17 23:11:05 UTC 2014
>Last-Modified:  Mon Feb 17 23:20:00 UTC 2014
>Originator:     Kevin Zheng
>Release:        10.0-RELEASE
>Organization:
>Environment:
FreeBSD foxtrot.local 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014     root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Convert cad/gspiceui to STAGE support. Meanwhile, define LICENSE_FILE and switch to USES.
>How-To-Repeat:

>Fix:
Apply the attached patch.

Patch attached with submission follows:

diff --git a/cad/gspiceui/Makefile b/cad/gspiceui/Makefile
index 8280246..9a058cd0 100644
--- a/cad/gspiceui/Makefile
+++ b/cad/gspiceui/Makefile
@@ -12,6 +12,7 @@ MAINTAINER=	kevinz5000@gmail.com
 COMMENT=	GUI frontend to gnucap and ngspice circuit simulators
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/License
 
 RUN_DEPENDS=	# none if no options are set
 
@@ -28,18 +29,17 @@ 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}
@@ -61,21 +61,21 @@ 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
+	    ${STAGEDIR}${PREFIX}/share/pixmaps
+	${INSTALL_MAN} ${WRKSRC}/gspiceui.1 ${STAGEDIR}${MANPREFIX}/man/man1
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for dir in html
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${DOCSDIR} \
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${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


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Mon Feb 17 21:23:17 UTC 2014 
Responsible-Changed-Why:  


http://www.freebsd.org/cgi/query-pr.cgi?pr=186800 
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Mon Feb 17 23:11:04 UTC 2014 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186800 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/186800: commit references a PR
Date: Mon, 17 Feb 2014 23:10:46 +0000 (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"
 
>Unformatted:
