- Update to 0.9.10

PR:		ports/178672
Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com> (maintainer)

4 files changed, 49 insertions, 35 deletions

diff --git a/ftp/bareftp/Makefile b/ftp/bareftp/Makefile
index f3558b4092a4..b4eacde2241c 100644
--- a/ftp/bareftp/Makefile
+++ b/ftp/bareftp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bareftp
-PORTVERSION=	0.3.9
+PORTVERSION=	0.3.10
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.bareftp.org/release/
 
@@ -10,8 +10,10 @@ MAINTAINER=	c.petrik.sosa@gmail.com
 COMMENT=	Ftp client made in C sharp
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--datarootdir="${PREFIX}/share" --libdir="${PREFIX}/lib" \
-		--localedir="${PREFIX}/share/locale" --includedir="${LOCALBASE}/include"
+CONFIGURE_ARGS=	--datarootdir="${PREFIX}/share" \
+		--libdir="${PREFIX}/lib" \
+		--localedir="${PREFIX}/share/locale" \
+		--includedir="${LOCALBASE}/include"
 
 INSTALLS_ICONS=	yes
 USES=		gettext
@@ -24,7 +26,7 @@ MAKE_JOBS_SAFE=	yes
 
 MAN1=		bareftp.1
 
-OPTIONS_DEFINE=	GNOMEKEYRING
+OPTIONS_DEFINE=	GNOMEKEYRING NLS
 OPTIONS_DEFAULT=	GNOMEKEYRING
 
 .include <bsd.port.options.mk>
@@ -37,6 +39,14 @@ RUN_DEPENDS+=	${KEYRING_DETECT}:${PORTSDIR}/security/gnome-keyring-sharp
 CONFIGURE_ARGS+=	--without-gnomekeyring
 .endif
 
+.if ${PORT_OPTIONS:MNLS}
+CONFIGURE_ARGS+=	--enable-nls
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 # TODO
 # Ugly way but configure ignore "--localedir=" fu* ;/
 pre-build:
diff --git a/ftp/bareftp/distinfo b/ftp/bareftp/distinfo
index c10dfe321b52..8deeab78ba02 100644
--- a/ftp/bareftp/distinfo
+++ b/ftp/bareftp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bareftp-0.3.9.tar.gz) = ac799d0b38695c8dbff85ef497746868a4b07ff2a86e61a901d8e61f125aeaef
-SIZE (bareftp-0.3.9.tar.gz) = 593672
+SHA256 (bareftp-0.3.10.tar.gz) = d36f10485762d93e38e81618981b540f2130945d7f41c7c0b60b6a0c059cd849
+SIZE (bareftp-0.3.10.tar.gz) = 618615
diff --git a/ftp/bareftp/files/patch-po-LINGUAS b/ftp/bareftp/files/patch-po-LINGUAS
index da538b6ef3b5..af65827701cf 100644
--- a/ftp/bareftp/files/patch-po-LINGUAS
+++ b/ftp/bareftp/files/patch-po-LINGUAS
@@ -1,8 +1,9 @@
---- po/LINGUAS.bak	2012-10-09 15:03:53.000000000 +0000
-+++ po/LINGUAS	2012-10-09 15:05:12.000000000 +0000
-@@ -1,13 +1,13 @@
+--- po/LINGUAS.bak	2013-05-15 10:26:35.000000000 +0000
++++ po/LINGUAS	2013-05-15 10:27:07.000000000 +0000
+@@ -1,14 +1,14 @@
 -ca
 -de
+-el
 -es
 -fr
 -hu
@@ -15,6 +16,7 @@
 -sk
 +ca \
 +de \
++el \
 +es \
 +fr \
 +hu \
diff --git a/ftp/bareftp/pkg-plist b/ftp/bareftp/pkg-plist
index b764e16a5389..92129ddf7332 100644
--- a/ftp/bareftp/pkg-plist
+++ b/ftp/bareftp/pkg-plist
@@ -1,20 +1,20 @@
 bin/bareftp
-lib/bareftp/bareFTP.Common.Utils.dll
-lib/bareftp/bareFTP.Connection.dll
-lib/bareftp/bareFTP.Gui.Dialog.dll
-lib/bareftp/bareFTP.Gui.FileManager.dll
-lib/bareftp/bareFTP.Gui.Preferences.dll
-lib/bareftp/bareFTP.Gui.ProgressMonitor.dll
-lib/bareftp/bareFTP.Gui.dll
-lib/bareftp/bareFTP.Preferences.dll
-lib/bareftp/bareFTP.Protocol.Ftp.dll
-lib/bareftp/bareFTP.Protocol.Sftp.dll
-lib/bareftp/bareFTP.Protocol.dll
-lib/bareftp/bareFTP.SftpPty.dll
-lib/bareftp/bareftp.exe
 lib/bareftp/libsftppty.a
 lib/bareftp/libsftppty.la
 lib/bareftp/libsftppty.so
+libexec/bareftp/bareFTP.Common.Utils.dll
+libexec/bareftp/bareFTP.Connection.dll
+libexec/bareftp/bareFTP.Gui.Dialog.dll
+libexec/bareftp/bareFTP.Gui.FileManager.dll
+libexec/bareftp/bareFTP.Gui.Preferences.dll
+libexec/bareftp/bareFTP.Gui.ProgressMonitor.dll
+libexec/bareftp/bareFTP.Gui.dll
+libexec/bareftp/bareFTP.Preferences.dll
+libexec/bareftp/bareFTP.Protocol.Ftp.dll
+libexec/bareftp/bareFTP.Protocol.Sftp.dll
+libexec/bareftp/bareFTP.Protocol.dll
+libexec/bareftp/bareFTP.SftpPty.dll
+libexec/bareftp/bareftp.exe
 share/applications/bareftp.desktop
 share/icons/hicolor/16x16/apps/bareftp.png
 share/icons/hicolor/22x22/apps/bareftp.png
@@ -23,17 +23,19 @@ share/icons/hicolor/32x32/apps/bareftp.png
 share/icons/hicolor/36x36/apps/bareftp.png
 share/icons/hicolor/48x48/apps/bareftp.png
 share/icons/hicolor/scalable/apps/bareftp.svg
-share/locale/ca/LC_MESSAGES/bareftp.mo
-share/locale/de/LC_MESSAGES/bareftp.mo
-share/locale/es/LC_MESSAGES/bareftp.mo
-share/locale/fr/LC_MESSAGES/bareftp.mo
-share/locale/it/LC_MESSAGES/bareftp.mo
-share/locale/ja/LC_MESSAGES/bareftp.mo
-share/locale/nb/LC_MESSAGES/bareftp.mo
-share/locale/pl/LC_MESSAGES/bareftp.mo
-share/locale/pt_BR/LC_MESSAGES/bareftp.mo
-share/locale/ru/LC_MESSAGES/bareftp.mo
-share/locale/sk/LC_MESSAGES/bareftp.mo
-share/locale/sv/LC_MESSAGES/bareftp.mo
-share/locale/hu/LC_MESSAGES/bareftp.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/bareftp.mo
+%%NLS%%share/locale/de/LC_MESSAGES/bareftp.mo
+%%NLS%%share/locale/el/LC_MESSAGES/bareftp.mo
+%%NLS%%share/locale/es/LC_MESSAGES/bareftp.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/bareftp.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/bareftp.mo
+%%NLS%%share/locale/it/LC_MESSAGES/bareftp.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/bareftp.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/bareftp.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/bareftp.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/bareftp.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/bareftp.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/bareftp.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/bareftp.mo
+@dirrm libexec/bareftp
 @dirrm lib/bareftp