ports/185620: [UPDATE] sysutils/gigolo to 0.4.2

Olivier Duchateau olivierd at FreeBSD.org
Thu Jan 9 22:30:01 UTC 2014 

>Number:         185620
>Category:       ports
>Synopsis:       [UPDATE] sysutils/gigolo to 0.4.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 09 22:30:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Olivier Duchateau
>Release:        
>Organization:
>Environment:
>Description:
- Update to 0.4.2
- Remove options
- Add patches to fix .mo files install
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(révision 339293)
+++ Makefile	(copie de travail)
@@ -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=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
 
 MAINTAINER=	nemysis at FreeBSD.org
 COMMENT=	Frontend to easily manage filesystem connections
@@ -20,43 +15,12 @@
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
 USE_BZIP2=	yes
-USES=		fuse pkgconfig
-USE_GNOME=	cairo gtk20 gvfs
+GNU_CONFIGURE=	yes
+USES=		fuse pkgconfig gmake gettext
+USE_GNOME=	cairo gtk20 gvfs glib20 intltool intlhack
 USE_XORG=	x11
-USE_PYTHON=	yes
-
-PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
-OPTIONS_SUB=	yes
-
-OPTIONS_DEFINE=	DOCS NLS
-
-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|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
-
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(révision 339293)
+++ distinfo	(copie de travail)
@@ -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
Index: files/patch-configure
===================================================================
--- files/patch-configure	(révision 0)
+++ files/patch-configure	(copie de travail)
@@ -0,0 +1,11 @@
+--- ./configure.orig	2014-01-09 19:58:21.000000000 +0000
++++ ./configure	2014-01-09 22:36:48.000000000 +0000
+@@ -6191,7 +6191,7 @@
+ else
+ 
+     if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
++      localedir=$datadir/locale
+     else
+       localedir=$datadir/locale
+     fi

Index: files/patch-po__Makefile.in.in
===================================================================
--- files/patch-po__Makefile.in.in	(révision 0)
+++ files/patch-po__Makefile.in.in	(copie de travail)
@@ -0,0 +1,31 @@
+--- ./po/Makefile.in.in.orig	2014-01-09 19:58:20.000000000 +0000
++++ ./po/Makefile.in.in	2014-01-09 22:29:42.000000000 +0000
+@@ -34,7 +34,7 @@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+ DATADIRNAME = @DATADIRNAME@
+-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
++localedir = @localedir@
+ subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p at .
+@@ -109,7 +109,7 @@
+ install-data-yes: all
+ 	linguas="$(USE_LINGUAS)"; \
+ 	for lang in $$linguas; do \
+-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
++	  dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkdir_p) $$dir; \
+ 	  if test -r $$lang.gmo; then \
+ 	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+@@ -143,8 +143,8 @@
+ uninstall:
+ 	linguas="$(USE_LINGUAS)"; \
+ 	for lang in $$linguas; do \
+-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
++	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
++	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+ 	done
+ 
+ check: all $(GETTEXT_PACKAGE).pot

Index: pkg-plist
===================================================================
--- pkg-plist	(révision 339293)
+++ pkg-plist	(copie de travail)
@@ -1,46 +1,67 @@
 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
-%%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
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/NEWS
+%%DOCSDIR%%/README
+%%DOCSDIR%%/TODO
+share/locale/ar/LC_MESSAGES/gigolo.mo
+share/locale/ast/LC_MESSAGES/gigolo.mo
+share/locale/bg/LC_MESSAGES/gigolo.mo
+share/locale/ca/LC_MESSAGES/gigolo.mo
+share/locale/cs/LC_MESSAGES/gigolo.mo
+share/locale/de/LC_MESSAGES/gigolo.mo
+share/locale/el/LC_MESSAGES/gigolo.mo
+share/locale/en_AU/LC_MESSAGES/gigolo.mo
+share/locale/eo/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/he/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/is/LC_MESSAGES/gigolo.mo
+share/locale/it/LC_MESSAGES/gigolo.mo
+share/locale/ja/LC_MESSAGES/gigolo.mo
+share/locale/kk/LC_MESSAGES/gigolo.mo
+share/locale/ko/LC_MESSAGES/gigolo.mo
+share/locale/lt/LC_MESSAGES/gigolo.mo
+share/locale/lv/LC_MESSAGES/gigolo.mo
+share/locale/nl/LC_MESSAGES/gigolo.mo
+share/locale/oc/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/sl/LC_MESSAGES/gigolo.mo
+share/locale/sr/LC_MESSAGES/gigolo.mo
+share/locale/sv/LC_MESSAGES/gigolo.mo
+share/locale/te/LC_MESSAGES/gigolo.mo
+share/locale/tr/LC_MESSAGES/gigolo.mo
+share/locale/ug/LC_MESSAGES/gigolo.mo
+share/locale/uk/LC_MESSAGES/gigolo.mo
+share/locale/ur/LC_MESSAGES/gigolo.mo
+share/locale/ur_PK/LC_MESSAGES/gigolo.mo
+share/locale/zh_CN/LC_MESSAGES/gigolo.mo
+share/locale/zh_TW/LC_MESSAGES/gigolo.mo
+ at dirrmtry share/locale/ur_PK/LC_MESSAGES
+ at dirrmtry share/locale/ur_PK
+ at dirrmtry share/locale/ur/LC_MESSAGES
+ at dirrmtry share/locale/ur
+ at dirrmtry share/locale/ug/LC_MESSAGES
+ at dirrmtry share/locale/ug
+ at dirrmtry share/locale/te/LC_MESSAGES
+ at dirrmtry share/locale/te
+ at dirrmtry share/locale/oc/LC_MESSAGES
+ at dirrmtry share/locale/oc
+ at dirrmtry share/locale/kk/LC_MESSAGES
+ at dirrmtry share/locale/kk
+ at dirrmtry share/locale/ast/LC_MESSAGES
+ at dirrmtry share/locale/ast
+ at dirrm %%DOCSDIR%%


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list