From nobody@FreeBSD.org  Sun Jan 26 23:02:21 2014
Return-Path: <nobody@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 0E4DDB80
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 26 Jan 2014 23:02:21 +0000 (UTC)
Received: from oldred.freebsd.org (oldred.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 D4C9A14E2
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 26 Jan 2014 23:02:20 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id s0QN2KI0007686
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 26 Jan 2014 23:02:20 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id s0QN2Kjt007678;
	Sun, 26 Jan 2014 23:02:20 GMT
	(envelope-from nobody)
Message-Id: <201401262302.s0QN2Kjt007678@oldred.freebsd.org>
Date: Sun, 26 Jan 2014 23:02:20 GMT
From: Olivier Cochard-Labb <olivier@cochard.me>
To: freebsd-gnats-submit@FreeBSD.org
Subject: x11/wbarconf : patch for stage support
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         186145
>Category:       ports
>Synopsis:       x11/wbarconf : patch for stage support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jgh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 26 23:10:00 UTC 2014
>Closed-Date:    Thu Jan 30 23:26:44 UTC 2014
>Last-Modified:  Thu Jan 30 23:30:00 UTC 2014
>Originator:     Olivier Cochard-Labb
>Release:        10.0
>Organization:
>Environment:
>Description:
Here is a patch that improve the port:
- staging
- license
- PORT_OPTIONS:MDOCS
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: x11/wbarconf/Makefile
===================================================================
--- x11/wbarconf/Makefile	(revision 341293)
+++ x11/wbarconf/Makefile	(working copy)
@@ -3,13 +3,15 @@
 
 PORTNAME=	wbarconf
 PORTVERSION=	0.7.2.2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://koti.kapsi.fi/ighea/wbarconf/
-DISTNAME=	wbarconf-${PORTVERSION}
 
 MAINTAINER=	olivier@cochard.me
 COMMENT=	Configuration GUI for wbar
 
+LICENSE=	GPLv3
+
 RUN_DEPENDS=	wbar:${PORTSDIR}/x11/wbar
 
 USE_GNOME=	pygobject pygtk2 gtk20
@@ -19,19 +21,20 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PORTDOCS=	README COPYING
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	${MKDIR} ${DATADIR}/wbarbacks
-	(cd ${WRKSRC}/wbarbacks/ && ${COPYTREE_SHARE} \* ${DATADIR}/wbarbacks/)
-	${INSTALL_DATA} ${WRKSRC}/messages.pot ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/wbarconf.png ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/wbarconf.desktop ${PREFIX}/share/applications
-	(cd ${WRKSRC}/locale/ && ${COPYTREE_SHARE} \* ${PREFIX}/share/locale/)
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}/wbarbacks
+	(cd ${WRKSRC}/wbarbacks/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/wbarbacks/)
+	${INSTALL_DATA} ${WRKSRC}/messages.pot ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/wbarconf.png ${STAGEDIR}${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/wbarconf.desktop ${STAGEDIR}${PREFIX}/share/applications
+	(cd ${WRKSRC}/locale/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/share/locale/)
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: x11/wbarconf/pkg-descr
===================================================================
--- x11/wbarconf/pkg-descr	(revision 341293)
+++ x11/wbarconf/pkg-descr	(working copy)
@@ -1,3 +1,3 @@
 wbarconf is graphical configuration utility for wbar written in Python/GTK
 
-WWW:	http://koti.kapsi.fi/ighea/wbarconf/
+WWW: http://koti.kapsi.fi/ighea/wbarconf/


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jgh 
Responsible-Changed-By: jgh 
Responsible-Changed-When: Wed Jan 29 08:01:08 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186145 
State-Changed-From-To: open->closed 
State-Changed-By: jgh 
State-Changed-When: Thu Jan 30 23:26:43 UTC 2014 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/186145: commit references a PR
Date: Thu, 30 Jan 2014 23:26:34 +0000 (UTC)

 Author: jgh
 Date: Thu Jan 30 23:26:26 2014
 New Revision: 341900
 URL: http://svnweb.freebsd.org/changeset/ports/341900
 QAT: https://qat.redports.org/buildarchive/r341900/
 
 Log:
   - support staging
   - add license
   - while here remove patch and shift to uses framework [2]
   
   PR:		186145
   Submitted by:	olivier@cochard.me (maintainer)
   Approved by:	maintainer [2]
 
 Deleted:
   head/x11/wbarconf/files/
 Modified:
   head/x11/wbarconf/Makefile
   head/x11/wbarconf/pkg-descr
 
 Modified: head/x11/wbarconf/Makefile
 ==============================================================================
 --- head/x11/wbarconf/Makefile	Thu Jan 30 23:20:24 2014	(r341899)
 +++ head/x11/wbarconf/Makefile	Thu Jan 30 23:26:26 2014	(r341900)
 @@ -3,35 +3,38 @@
  
  PORTNAME=	wbarconf
  PORTVERSION=	0.7.2.2
 +PORTREVISION=	1
  CATEGORIES=	x11
  MASTER_SITES=	http://koti.kapsi.fi/ighea/wbarconf/
 -DISTNAME=	wbarconf-${PORTVERSION}
  
  MAINTAINER=	olivier@cochard.me
  COMMENT=	Configuration GUI for wbar
  
 +LICENSE=	GPLv3
 +
  RUN_DEPENDS=	wbar:${PORTSDIR}/x11/wbar
  
  USE_GNOME=	pygobject pygtk2 gtk20
  USE_PYTHON=	yes
 -USES=		gettext
 +USES=		gettext desktop-file-utils shebangfix
 +SHEBANG_LANG=	python
 +SHEBANG_FILES=	${WRKSRC}/wbarconf
 +python_OLD_CMD=	/usr/bin/env python2
  NO_BUILD=	yes
  WRKSRC=		${WRKDIR}/${PORTNAME}
  PORTDOCS=	README COPYING
 +INSTALLS_ICONS=	yes
  
 -NO_STAGE=	yes
  do-install:
 -	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 -	${MKDIR} ${DATADIR}
 -	${MKDIR} ${DATADIR}/wbarbacks
 -	(cd ${WRKSRC}/wbarbacks/ && ${COPYTREE_SHARE} \* ${DATADIR}/wbarbacks/)
 -	${INSTALL_DATA} ${WRKSRC}/messages.pot ${DATADIR}
 -	${INSTALL_DATA} ${WRKSRC}/wbarconf.png ${PREFIX}/share/pixmaps
 -	${INSTALL_DATA} ${WRKSRC}/wbarconf.desktop ${PREFIX}/share/applications
 -	(cd ${WRKSRC}/locale/ && ${COPYTREE_SHARE} \* ${PREFIX}/share/locale/)
 -.if !defined(NOPORTDOCS)
 -	${MKDIR} ${DOCSDIR}
 -	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 -.endif
 +	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 +	${MKDIR} ${STAGEDIR}${DATADIR}
 +	${MKDIR} ${STAGEDIR}${DATADIR}/wbarbacks
 +	(cd ${WRKSRC}/wbarbacks/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/wbarbacks/)
 +	${INSTALL_DATA} ${WRKSRC}/messages.pot ${STAGEDIR}${DATADIR}
 +	${INSTALL_DATA} ${WRKSRC}/wbarconf.png ${STAGEDIR}${PREFIX}/share/pixmaps
 +	${INSTALL_DATA} ${WRKSRC}/wbarconf.desktop ${STAGEDIR}${PREFIX}/share/applications
 +	(cd ${WRKSRC}/locale/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/share/locale/)
 +	${MKDIR} ${STAGEDIR}${DOCSDIR}
 +	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
  
  .include <bsd.port.mk>
 
 Modified: head/x11/wbarconf/pkg-descr
 ==============================================================================
 --- head/x11/wbarconf/pkg-descr	Thu Jan 30 23:20:24 2014	(r341899)
 +++ head/x11/wbarconf/pkg-descr	Thu Jan 30 23:26:26 2014	(r341900)
 @@ -1,3 +1,3 @@
  wbarconf is graphical configuration utility for wbar written in Python/GTK
  
 -WWW:	http://koti.kapsi.fi/ighea/wbarconf/
 +WWW: http://koti.kapsi.fi/ighea/wbarconf/
 _______________________________________________
 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:
