3 files changed, 32 insertions, 35 deletions

diff --git a/sysutils/gigolo/Makefile b/sysutils/gigolo/Makefile
index bd2354e8d982..7b18fb7eda24 100644
--- a/sysutils/gigolo/Makefile
+++ b/sysutils/gigolo/Makefile
@@ -2,15 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	gigolo
-PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTVERSION=	0.4.2
 CATEGORIES=	sysutils
-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}
+MASTER_SITES=	XFCE
+MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
 
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Frontend to easily manage filesystem connections
@@ -20,16 +15,17 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
 USE_BZIP2=	yes
-USES=		fuse pkgconfig
-USE_GNOME=	cairo gtk20 gvfs
+USES=		gmake fuse pkgconfig
+USE_GNOME=	cairo gtk20 gvfs intlhack
 USE_XORG=	x11
-USE_PYTHON=	yes
+GNU_CONFIGURE=	yes
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
-OPTIONS_SUB=	yes
 
 OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
 
+NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 
 ONLY_FOR_ARCHS=	i386 amd64
@@ -38,24 +34,13 @@ ONLY_FOR_ARCHS_REASON=	Does not compile
 .include <bsd.port.options.mk>
 
 post-patch:
-	${REINPLACE_CMD} -e 's|bld.install_files|#bld.install_files|' ${WRKSRC}/wscript
-
-.if ! ${PORT_OPTIONS:MNLS}
-	${REINPLACE_CMD} -e "s|= 'po'|= ''|" ${WRKSRC}/wscript
-.endif
-
-do-configure:
-	@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 \
-		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
+	@${REINPLACE_CMD} -e 's|^DOCFILES.*|DOCFILES =|' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|$$(prefix)/$$(DATADIRNAME)/locale|$$(datarootdir)/locale|' \
+		${WRKSRC}/po/Makefile.in.in
 
+post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
diff --git a/sysutils/gigolo/distinfo b/sysutils/gigolo/distinfo
index 12832cd5306a..05a44ddf00d7 100644
--- a/sysutils/gigolo/distinfo
+++ b/sysutils/gigolo/distinfo
@@ -1,4 +1,2 @@
-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
+SHA256 (gigolo-0.4.2.tar.bz2) = 553fc78fe4e7bd2f01f3851baea7e63f6414fe652dfb4b08c60b5c4b2b909164
+SIZE (gigolo-0.4.2.tar.bz2) = 243877
diff --git a/sysutils/gigolo/pkg-plist b/sysutils/gigolo/pkg-plist
index 88dfe47faf84..cbe7989e1180 100644
--- a/sysutils/gigolo/pkg-plist
+++ b/sysutils/gigolo/pkg-plist
@@ -1,45 +1,59 @@
 bin/gigolo
 man/man1/gigolo.1.gz
 share/applications/gigolo.desktop
+%%NLS%%share/locale/ar/LC_MESSAGES/gigolo.mo
 %%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/en_AU/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/eo/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/he/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/is/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/ko/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/gigolo.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/gigolo.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/oc/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/sl/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/gigolo.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/te/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%%share/locale/zh_TW/LC_MESSAGES/gigolo.mo
 %%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/te/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/te
+%%NLS%%@dirrmtry share/locale/oc/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/oc
 %%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/kk
 %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES