ports/146059: [MAINTAINER] [PATCH] ftp/bareftp Update to 0.3.2, unbreak

[Rob Farmer]

>Number:         146059
>Category:       ports
>Synopsis:       [MAINTAINER] [PATCH] ftp/bareftp Update to 0.3.2, unbreak
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 26 09:40:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Rob Farmer
>Release:        9.0-CURRENT
>Organization:
>Environment:
FreeBSD pentium4.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Fri Apr 23 04:17:21 PDT 2010     rfarmer at pentium4.predatorlabs.net:/usr/obj/usr/src/sys/PENTIUM4  i386
>Description:
* Update to 0.3.2
* Unbreak configure script with new "sed -r" behavior in current
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/bareftp/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	28 Mar 2010 06:34:28 -0000	1.9
+++ Makefile	25 Apr 2010 22:47:13 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	bareftp
-PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTVERSION=	0.3.2
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.bareftp.org/release/ \
 		http://www.predatorlabs.net/dl/
@@ -17,7 +16,8 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datarootdir="${PREFIX}/share" --libdir="${PREFIX}/lib" \
-		--localedir="${PREFIX}/share/locale" --includedir="${LOCALBASE}/include"
+		--localedir="${PREFIX}/share/locale" --includedir="${LOCALBASE}/include" \
+		--without-gnomekeyring
 
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
@@ -30,11 +30,6 @@
 
 MAN1=		bareftp.1
 
-# should use configure --without-gnome-keyring but it is broken
-post-patch:
-	@${REINPLACE_CMD} -e 's|with_keyring=yes|with_keyring=no|' \
-		${WRKSRC}/configure
-
 # TODO
 # Ugly way but configure ignore "--localedir=" fu* ;/
 pre-build:
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/ftp/bareftp/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	17 Jan 2010 04:12:54 -0000	1.2
+++ distinfo	25 Apr 2010 22:05:02 -0000
@@ -1,3 +1,3 @@
-MD5 (bareftp-0.3.1.tar.gz) = 8bd9d0f323346b15d1737637c11b8dba
-SHA256 (bareftp-0.3.1.tar.gz) = ad4a65b66abab244ad1371cbe24501dad748be610b2ba2b8dbff9eaca7bdd503
-SIZE (bareftp-0.3.1.tar.gz) = 550943
+MD5 (bareftp-0.3.2.tar.gz) = 721aea1d090f1d5393767a2bfa4f11fa
+SHA256 (bareftp-0.3.2.tar.gz) = bf346b5e60b68f1b7a86d4f9f3f8f7f89e32b6d1cff212664f924c33878b4511
+SIZE (bareftp-0.3.2.tar.gz) = 553906
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/ftp/bareftp/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	17 Jan 2010 04:12:54 -0000	1.2
+++ pkg-plist	25 Apr 2010 22:54:47 -0000
@@ -31,4 +31,5 @@
 share/locale/nb/LC_MESSAGES/bareftp.mo
 share/locale/pl/LC_MESSAGES/bareftp.mo
 share/locale/pt_BR/LC_MESSAGES/bareftp.mo
+share/locale/sv/LC_MESSAGES/bareftp.mo
 @dirrm lib/bareftp
Index: files/patch-configure
===================================================================
RCS file: files/patch-configure
diff -N files/patch-configure
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-configure	26 Apr 2010 08:54:04 -0000
@@ -0,0 +1,11 @@
+--- configure.orig	2010-04-26 01:53:28.000000000 -0700
++++ configure	2010-04-26 01:53:48.000000000 -0700
+@@ -12981,7 +12981,7 @@
+ 	#IT_PROG_INTLTOOL([0.35.0])
+ 	#AC_PROG_INTLTOOL([0.21])
+ 
+-	ALL_LINGUAS=`grep -v '^#' $srcdir/po/LINGUAS | sed -r ':a;N;$!ba;s/\n/ /g; s/[ ]+/ /g'`
++	ALL_LINGUAS=`cat $srcdir/po/LINGUAS`
+ 	GETTEXT_PACKAGE=$PACKAGE
+ 
+ 
Index: files/patch-po-LINGUAS
===================================================================
RCS file: files/patch-po-LINGUAS
diff -N files/patch-po-LINGUAS
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-po-LINGUAS	25 Apr 2010 22:51:11 -0000
@@ -0,0 +1,20 @@
+--- po/LINGUAS.orig	2010-04-25 15:50:34.000000000 -0700
++++ po/LINGUAS	2010-04-25 15:50:52.000000000 -0700
+@@ -1,9 +1,9 @@
+-ca
+-de
+-es
+-fr
+-it
+-nb
+-pl
+-pt_BR
++ca \
++de \
++es \
++fr \
++it \
++nb \
++pl \
++pt_BR \
+ sv


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