3 files changed, 85 insertions, 48 deletions

diff --git a/sysutils/gigolo/Makefile b/sysutils/gigolo/Makefile
index 93f4e415b7f5..c1d61a9ac674 100644
--- a/sysutils/gigolo/Makefile
+++ b/sysutils/gigolo/Makefile
@@ -1,10 +1,16 @@
-# Created by: nemysis@gmx.ch
+# Created by: nemysis <nemysis@gmx.ch>
 # $FreeBSD$
 
 PORTNAME=	gigolo
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://files.uvena.de/gigolo/
+MASTER_SITES=	http://files.uvena.de/gigolo/ \
+		http://www.uvena.de/gigolo/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		network.png:icons
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Frontend to easily manage filesystem connections
@@ -15,22 +21,49 @@ BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo
 
 USE_BZIP2=	yes
+USES=		fuse
 USE_GNOME=	gtk20 gvfs
 USE_XORG=	x11
 USE_PYTHON=	yes
-USES=		gettext
 
 MAN1=		gigolo.1
 
-PORTDOCS=	AUTHORS ChangeLog NEWS README TODO COPYING
+PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
+
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+
+NLS_USES=	gettext
+
+ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCHS_REASON=	Does not compile
+
+.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=${PREFIX}/man
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf configure --mandir=${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
+
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/gigolo/distinfo b/sysutils/gigolo/distinfo
index a4ba27b8fb74..12832cd5306a 100644
--- a/sysutils/gigolo/distinfo
+++ b/sysutils/gigolo/distinfo
@@ -1,2 +1,4 @@
-SHA256 (gigolo-0.4.1.tar.bz2) = 82f3b5f0ce3ff19c1facac1c89117d67bdf1d4fac66e42fb7a98a8b0d74a17f9
-SIZE (gigolo-0.4.1.tar.bz2) = 194112
+SHA256 (gigolo/gigolo-0.4.1.tar.bz2) = 82f3b5f0ce3ff19c1facac1c89117d67bdf1d4fac66e42fb7a98a8b0d74a17f9
+SIZE (gigolo/gigolo-0.4.1.tar.bz2) = 194112
+SHA256 (gigolo/network.png) = c2307b0ac5b091fefd8d09fa83eae9bae236096d84de31c49a455bfc583807c6
+SIZE (gigolo/network.png) = 5689
diff --git a/sysutils/gigolo/pkg-plist b/sysutils/gigolo/pkg-plist
index 106950f1c542..533e6fba456e 100644
--- a/sysutils/gigolo/pkg-plist
+++ b/sysutils/gigolo/pkg-plist
@@ -1,44 +1,46 @@
 bin/gigolo
 share/applications/gigolo.desktop
-share/locale/bg/LC_MESSAGES/gigolo.mo
-share/locale/ca/LC_MESSAGES/gigolo.mo
-share/locale/cs/LC_MESSAGES/gigolo.mo
-share/locale/da/LC_MESSAGES/gigolo.mo
-share/locale/de/LC_MESSAGES/gigolo.mo
-share/locale/el/LC_MESSAGES/gigolo.mo
-share/locale/es/LC_MESSAGES/gigolo.mo
-share/locale/eu/LC_MESSAGES/gigolo.mo
-share/locale/fi/LC_MESSAGES/gigolo.mo
-share/locale/fr/LC_MESSAGES/gigolo.mo
-share/locale/gl/LC_MESSAGES/gigolo.mo
-share/locale/hr/LC_MESSAGES/gigolo.mo
-share/locale/hu/LC_MESSAGES/gigolo.mo
-share/locale/id/LC_MESSAGES/gigolo.mo
-share/locale/it/LC_MESSAGES/gigolo.mo
-share/locale/ja/LC_MESSAGES/gigolo.mo
-share/locale/lv/LC_MESSAGES/gigolo.mo
-share/locale/nl/LC_MESSAGES/gigolo.mo
-share/locale/pl/LC_MESSAGES/gigolo.mo
-share/locale/pt/LC_MESSAGES/gigolo.mo
-share/locale/pt_BR/LC_MESSAGES/gigolo.mo
-share/locale/ru/LC_MESSAGES/gigolo.mo
-share/locale/sk/LC_MESSAGES/gigolo.mo
-share/locale/sv/LC_MESSAGES/gigolo.mo
-share/locale/tr/LC_MESSAGES/gigolo.mo
-share/locale/uk/LC_MESSAGES/gigolo.mo
-share/locale/zh_CN/LC_MESSAGES/gigolo.mo
-share/locale/ast/LC_MESSAGES/gigolo.mo
-share/locale/kk/LC_MESSAGES/gigolo.mo
-share/locale/ug/LC_MESSAGES/gigolo.mo
-share/locale/ur/LC_MESSAGES/gigolo.mo
-share/locale/ur_PK/LC_MESSAGES/gigolo.mo
-@dirrmtry share/locale/ur_PK/LC_MESSAGES
-@dirrmtry share/locale/ur_PK
-@dirrmtry share/locale/ur
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
+%%NLS%%share/locale/ast/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/da/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/el/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/id/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gigolo.mo
+share/pixmaps/gigolo.png
+%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur_PK
+%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur
+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/kk
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
 @dirrmtry share/applications