From b5ba84c9c06a2bab6296546e623a1d0b632eee8b Mon Sep 17 00:00:00 2001
From: Vasil Dimov <vd@FreeBSD.org>
Date: Sat, 20 Feb 2010 11:38:09 +0000
Subject: * Upgrade ftp/wget from 1.11.4 to 1.12 * Do not remove .gmo files
 because this causes the .po files not to be   installed * Make the
 post-patch: commands visible

Feature safe:	yes
---
 ftp/wget/Makefile                    |  6 ++----
 ftp/wget/distinfo                    |  6 +++---
 ftp/wget/files/patch-doc_Makefile.in | 25 ++++++++-----------------
 ftp/wget/pkg-plist                   |  4 ++++
 4 files changed, 17 insertions(+), 24 deletions(-)

(limited to 'ftp')

diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index a3b05fc320e7..32f3138bc7e2 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	wget
-DISTVERSION=	1.11.4
-PORTREVISION=	1
+DISTVERSION=	1.12
 CATEGORIES=	ftp www ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	wget
@@ -67,9 +66,8 @@ PLIST_SUB=	NLS="@comment "
 MAN1=		wget.1
 INFO=		wget
 
+# eliminate gmakism
 post-patch:
-	${RM} -f ${WRKSRC}/doc/wget.info* ${WRKSRC}/po/*.mo ${WRKSRC}/po/*.gmo
-	@# eliminate gmakism
 	${REINPLACE_CMD} -e 's,$$<,$$(srcdir)/wget.texi,' \
 		${WRKSRC}/doc/Makefile.in
 	${REINPLACE_CMD} -e 's,/usr/local/etc/wgetrc,${PREFIX}/etc/wgetrc,' \
diff --git a/ftp/wget/distinfo b/ftp/wget/distinfo
index 5e61510b04c9..96e81f2dae7e 100644
--- a/ftp/wget/distinfo
+++ b/ftp/wget/distinfo
@@ -1,3 +1,3 @@
-MD5 (wget-1.11.4.tar.bz2) = f5076a8c2ec2b7f334cb6e3059820f9c
-SHA256 (wget-1.11.4.tar.bz2) = 8b7f52e2861b89c3ee0cc10c3665af5b705d0cb7fc00bca59a9b1e2b50e027fb
-SIZE (wget-1.11.4.tar.bz2) = 954561
+MD5 (wget-1.12.tar.bz2) = 308a5476fc096a8a525d07279a6f6aa3
+SHA256 (wget-1.12.tar.bz2) = c823d938e2f849305a101c0860229b123d7564c26470fdac9118d85e3c7dba9a
+SIZE (wget-1.12.tar.bz2) = 1609032
diff --git a/ftp/wget/files/patch-doc_Makefile.in b/ftp/wget/files/patch-doc_Makefile.in
index 65f9c47ca3ee..f771e6cc54c1 100644
--- a/ftp/wget/files/patch-doc_Makefile.in
+++ b/ftp/wget/files/patch-doc_Makefile.in
@@ -1,20 +1,11 @@
---- doc/Makefile.in.orig	2008-05-01 04:57:18.613091552 -0400
-+++ doc/Makefile.in	2008-05-01 04:58:14.768389781 -0400
-@@ -22,7 +22,7 @@
- SHELL = /bin/sh
- 
- # Program to format Texinfo source into Info files.
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- # Program to format Texinfo source into DVI files.
- TEXI2DVI = texi2dvi
- # Program to convert DVI files to PostScript
-@@ -51,7 +51,7 @@
- TEXI2POD     = $(srcdir)/texi2pod.pl
- POD2MAN      = @POD2MAN@
- MAN          = wget.$(manext)
--WGETRC       = $(sysconfdir)/wgetrc
-+WGETRC       = $(sysconfdir)/wgetrc.sample
+--- doc/Makefile.in.orig	2010-02-14 16:28:59.000000000 +0200
++++ doc/Makefile.in	2010-02-14 16:29:43.000000000 +0200
+@@ -598,7 +598,7 @@
+ RM = rm -f
+ TEXI2POD = $(srcdir)/texi2pod.pl
+ MAN = wget.$(manext)
+-WGETRC = $(sysconfdir)/wgetrc
++WGETRC = $(sysconfdir)/wgetrc.sample
  SAMPLERCTEXI = sample.wgetrc.munged_for_texi_inclusion
  
  #
diff --git a/ftp/wget/pkg-plist b/ftp/wget/pkg-plist
index 6a34504a34df..68a0f877f48e 100644
--- a/ftp/wget/pkg-plist
+++ b/ftp/wget/pkg-plist
@@ -7,7 +7,10 @@ etc/wgetrc.sample
 %%NLS%%share/locale/da/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/de/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/el/LC_MESSAGES/wget.mo
+%%NLS%%share/locale/en@boldquot/LC_MESSAGES/wget.mo
+%%NLS%%share/locale/en@quot/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/wget.mo
+%%NLS%%share/locale/en_US/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/es/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/et/LC_MESSAGES/wget.mo
@@ -22,6 +25,7 @@ etc/wgetrc.sample
 %%NLS%%share/locale/id/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/it/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/wget.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/wget.mo
-- 
cgit v1.2.3