- Update to 0.6.2.

PR:		129594
Submitted by:	Ganael Laplanche <ganael dot laplanche at martymac dot com> (maintainer)

5 files changed, 32 insertions, 29 deletions

diff --git a/net/grsync/Makefile b/net/grsync/Makefile
index 2ad84c0866f8..4417f09d48b9 100644
--- a/net/grsync/Makefile
+++ b/net/grsync/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	grsync
-PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTVERSION=	0.6.2
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.opbyte.it/release/ \
 		GENTOO/distfiles \
@@ -22,17 +21,23 @@ USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
 MAN1=		grsync.1 grsync-batch.1
 
+post-patch:
+.if defined(WITHOUT_NLS)
+	@${REINPLACE_CMD} 's/^ALL_LINGUAS=.*/ALL_LINGUAS=""/' \
+		${WRKSRC}/configure
+.endif
+
 .include <bsd.port.mk>
diff --git a/net/grsync/distinfo b/net/grsync/distinfo
index 111be7129d11..e77872164910 100644
--- a/net/grsync/distinfo
+++ b/net/grsync/distinfo
@@ -1,3 +1,3 @@
-MD5 (grsync-0.6.1.tar.gz) = fe403f4c389603ba539ed1e6a79345ef
-SHA256 (grsync-0.6.1.tar.gz) = 6c7526b44bac515b1d1407bc324404aa2c7749a0252c1948468835d29f265e40
-SIZE (grsync-0.6.1.tar.gz) = 214689
+MD5 (grsync-0.6.2.tar.gz) = 5470c87807738ce9a5623c9bbefaff85
+SHA256 (grsync-0.6.2.tar.gz) = b4ba8479e03c73e3e5220d17132a07d4d12be3cb36e8b401cc9a119dce17c505
+SIZE (grsync-0.6.2.tar.gz) = 222033
diff --git a/net/grsync/files/patch-gmsgfmt b/net/grsync/files/patch-gmsgfmt
deleted file mode 100644
index c02f347cf20d..000000000000
--- a/net/grsync/files/patch-gmsgfmt
+++ /dev/null
@@ -1,20 +0,0 @@
---- po/Makefile.in.in.orig	2007-07-18 22:25:46.000000000 +0800
-+++ po/Makefile.in.in	2007-08-26 04:01:44.000000000 +0800
-@@ -34,7 +34,7 @@
- datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = $(prefix)/share/locale
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
-@@ -44,7 +44,7 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- 
--GMSGFMT = @GMSGFMT@
-+GMSGFMT = @INTLTOOL_MSGFMT@
- MSGFMT = @MSGFMT@
- XGETTEXT = @XGETTEXT@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
diff --git a/net/grsync/files/patch-po-Makefile.in.in b/net/grsync/files/patch-po-Makefile.in.in
new file mode 100644
index 000000000000..350487c18516
--- /dev/null
+++ b/net/grsync/files/patch-po-Makefile.in.in
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig	2008-12-08 11:44:27.794971692 +0100
++++ po/Makefile.in.in	2008-12-08 11:44:42.679745595 +0100
+@@ -34,7 +34,7 @@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+ DATADIRNAME = @DATADIRNAME@
+-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
++itlocaledir = $(prefix)/share/locale
+ subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p@.
diff --git a/net/grsync/pkg-plist b/net/grsync/pkg-plist
index 797522b8487f..262221efef1f 100644
--- a/net/grsync/pkg-plist
+++ b/net/grsync/pkg-plist
@@ -2,8 +2,11 @@ bin/grsync
 bin/grsync-batch
 share/applications/grsync.desktop
 share/pixmaps/grsync.png
+%%NLS%%share/locale/cs_CZ/LC_MESSAGES/grsync.mo
 %%NLS%%share/locale/de_DE/LC_MESSAGES/grsync.mo
+%%NLS%%share/locale/es_ES/LC_MESSAGES/grsync.mo
 %%NLS%%share/locale/fr_FR/LC_MESSAGES/grsync.mo
+%%NLS%%share/locale/gl_ES/LC_MESSAGES/grsync.mo
 %%NLS%%share/locale/it_IT/LC_MESSAGES/grsync.mo
 %%NLS%%share/locale/nb_NO/LC_MESSAGES/grsync.mo
 %%NLS%%share/locale/nl_NL/LC_MESSAGES/grsync.mo
@@ -11,8 +14,12 @@ share/pixmaps/grsync.png
 %%NLS%%share/locale/sv_SE/LC_MESSAGES/grsync.mo
 %%NLS%%share/locale/tr_TR/LC_MESSAGES/grsync.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/grsync.mo
+%%NLS%%@dirrmtry share/locale/cs_CZ/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/cs_CZ
 %%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/de_DE
+%%NLS%%@dirrmtry share/locale/gl_ES/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/gl_ES
 %%NLS%%@dirrmtry share/locale/it_IT/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/it_IT
 %%NLS%%@dirrmtry share/locale/nb_NO/LC_MESSAGES