svn commit: r331215 - head/sysutils/gigolo

[Rusmir Dusko]

Author: nemysis
Date: Tue Oct 22 00:23:34 2013
New Revision: 331215
URL: http://svnweb.freebsd.org/changeset/ports/331215

Log:
  - Change maintainer email to @FreeBSD.org
  - USE_GNOME cairo instead of graphics/cairo
  - Support STAGEDIR
  
  Approved by:	pawel / wg (mentors, implicit)

Modified:
  head/sysutils/gigolo/Makefile
  head/sysutils/gigolo/pkg-plist

Modified: head/sysutils/gigolo/Makefile
==============================================================================
--- head/sysutils/gigolo/Makefile	Tue Oct 22 00:22:41 2013	(r331214)
+++ head/sysutils/gigolo/Makefile	Tue Oct 22 00:23:34 2013	(r331215)
@@ -12,59 +12,51 @@ DISTFILES=	${PORTNAME}-${DISTVERSION}${E
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	nemysis at gmx.ch
+MAINTAINER=	nemysis at FreeBSD.org
 COMMENT=	Frontend to easily manage filesystem connections
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo
 
 USE_BZIP2=	yes
 USES=		fuse pkgconfig
-USE_GNOME=	gtk20 gvfs
+USE_GNOME=	cairo gtk20 gvfs
 USE_XORG=	x11
 USE_PYTHON=	yes
 
-MAN1=		gigolo.1
-
 PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
+OPTIONS_SUB=	yes
 
 OPTIONS_DEFINE=	DOCS NLS
-OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	Does not compile
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|COPYING ||' ${WRKSRC}/wscript
-
-.if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's|bld.install_files|#bld.install_files|' ${WRKSRC}/wscript
-.endif
 
 .if ! ${PORT_OPTIONS:MNLS}
 	${REINPLACE_CMD} -e "s|= 'po'|= ''|" ${WRKSRC}/wscript
 .endif
 
 do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf configure --mandir=${MANPREFIX}/man
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf configure --prefix=${STAGEDIR}${PREFIX} \
+		--mandir=${STAGEDIR}${MANPREFIX}/man
 
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf build
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf install
-	${INSTALL_DATA} ${_DISTDIR}/network.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
+	${INSTALL_DATA} ${_DISTDIR}/network.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/sysutils/gigolo/pkg-plist
==============================================================================
--- head/sysutils/gigolo/pkg-plist	Tue Oct 22 00:22:41 2013	(r331214)
+++ head/sysutils/gigolo/pkg-plist	Tue Oct 22 00:23:34 2013	(r331215)
@@ -1,4 +1,5 @@
 bin/gigolo
+man/man1/gigolo.1.gz
 share/applications/gigolo.desktop
 %%NLS%%share/locale/ast/LC_MESSAGES/gigolo.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/gigolo.mo