Bug 186145 - x11/wbarconf : patch for stage support
Summary: x11/wbarconf : patch for stage support
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: Jason Helfman
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-26 23:10 UTC by olivier
Modified: 2014-01-30 23:30 UTC (History)
0 users

See Also:


Attachments
file.diff (2.24 KB, patch)
2014-01-26 23:10 UTC, olivier
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description olivier 2014-01-26 23:10:00 UTC
Here is a patch that improve the port:
- staging
- license
- PORT_OPTIONS:MDOCS

Fix: Patch attached with submission follows:
Comment 1 Jason Helfman freebsd_committer freebsd_triage 2014-01-29 08:01:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->jgh

I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2014-01-30 23:26:34 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"
Comment 3 Jason Helfman freebsd_committer freebsd_triage 2014-01-30 23:26:43 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!