4 files changed, 17 insertions, 78 deletions

diff --git a/ftp/mget/Makefile b/ftp/mget/Makefile
index c71f5d410de5..f8a6616fc96b 100644
--- a/ftp/mget/Makefile
+++ b/ftp/mget/Makefile
@@ -7,23 +7,26 @@
 #
 
 PORTNAME=	mget
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES=	ftp ipv6
-MASTER_SITES=	http://www.cse.iitk.ac.in/users/dbera/
+MASTER_SITES=	http://cs-people.bu.edu/dbera/activities/projects/mget/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Multi Threaded Wget
+COMMENT=	Multithreaded commandline web-download manager
 
-PLIST_FILES=	bin/mget
 USE_GETOPT_LONG=	yes
 CFLAGS+=	-DHAS_HERROR -DHAVE_GETOPT_LONG -DHAVE_INET_NTOP -DHAVE_IPV6 \
-		${PTHREAD_CFLAGS:S/"//g}
-LDFLAGS+=	${PTHREAD_LIBS:S/"//g}
+		${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
+
+MAN1=		mget.1
+PLIST_FILES=	bin/mget
 
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o mget *.c ${LDFLAGS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mget ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/mget.1 ${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/ftp/mget/distinfo b/ftp/mget/distinfo
index 0d5c836eb15b..e312a22e15b2 100644
--- a/ftp/mget/distinfo
+++ b/ftp/mget/distinfo
@@ -1,2 +1,2 @@
-MD5 (mget-1.4.1.tar.gz) = 224a5e149098274313009fb660b566dd
-SIZE (mget-1.4.1.tar.gz) = 34653
+MD5 (mget-1.4.2.tar.gz) = 1450256d6484d357cae54b01c1b16e7f
+SIZE (mget-1.4.2.tar.gz) = 65498
diff --git a/ftp/mget/files/patch-mget.c b/ftp/mget/files/patch-mget.c
deleted file mode 100644
index 3f5b70f3b619..000000000000
--- a/ftp/mget/files/patch-mget.c
+++ /dev/null
@@ -1,68 +0,0 @@
---- mget.c.orig	Mon Aug  4 13:23:05 2003
-+++ mget.c	Mon Aug  4 13:28:01 2003
-@@ -41,36 +41,36 @@
- void print_usage(void){
- 	fprintf( \
- 	stderr,
--	"Usage: mget %s 
--		[-n number_segments{1}] 
-+	"Usage: mget %s\n\
-+		[-n number_segments{1}]\n\
- 		-f file_name\n" 
- #ifdef HAVE_GETOPT_LONG
--"		[--use_ftp_proxy[=<ftp_proxy_name:ftp_proxy_port{80}>]]
-+"		[--use_ftp_proxy[=<ftp_proxy_name:ftp_proxy_port{80}>]]\n\
- 		[--use_http_proxy[=<http_proxy_name:http_proxy_port{80}>]]\n"
- #elif HAVE_GETOPT_GETOPT_H
--"		[--use_ftp_proxy[=<ftp_proxy_name:ftp_proxy_port{80}>]]
-+"		[--use_ftp_proxy[=<ftp_proxy_name:ftp_proxy_port{80}>]]\n\
- 		[--use_http_proxy[=<http_proxy_name:http_proxy_port{80}>]]\n"
- #endif
--"		[-F<ftp_proxy_name:ftp_proxy_port{80}>]
--		[-x<ftp_proxy_name:ftp_proxy_port{80}>]
--		[-H<http_proxy_name:http_proxy_port{80}>]
--		[-h<http_proxy_name:http_proxy_port{80}>]
--		[-p port{80}] 
--		[-O Output_file_name]
-+"		[-F<ftp_proxy_name:ftp_proxy_port{80}>]\n\
-+		[-x<ftp_proxy_name:ftp_proxy_port{80}>]\n\
-+		[-H<http_proxy_name:http_proxy_port{80}>]\n\
-+		[-h<http_proxy_name:http_proxy_port{80}>]\n\
-+		[-p port{80}]\n\
-+		[-O Output_file_name]\n\
- 		[-C]\n"
- #ifdef TRY_SIGNAL		
- "		[-l {log_file}]\n"
- #endif
--"		[-t timeout_seconds{60}]
--		[-R referrer]
--		[-r rollback{0} bytes]
--		[-v]
--		[-V]
---------------------------------------------------------------------------
--proxy option can be given as -H(F) proxyhost:proxyport or 
--as --use_http(or ftp)_proxy=proxyhost:proxyport. If port is not given, 
--port is assumed to be 80. [Works differently in Solaris, refer manpage].
--	On some machines getopt doesnot allow '-H <proxy_name>' i.e. the space is not allowed between H and hostname.
-+"		[-t timeout_seconds{60}]\n\
-+		[-R referrer]\n\
-+		[-r rollback{0} bytes]\n\
-+		[-v]\n\
-+		[-V]\n\
-+-------------------------------------------------------------------------\n\
-+proxy option can be given as -H(F) proxyhost:proxyport or\n\
-+as --use_http(or ftp)_proxy=proxyhost:proxyport. If port is not given,\n\
-+port is assumed to be 80. [Works differently in Solaris, refer manpage].\n\
-+On some machines getopt doesnot allow '-H <proxy_name>' i.e. the space is not allowed between H and hostname.\n\
- 		   \n", VERSION);
- 	exit(1);
- }
-@@ -308,7 +308,7 @@
- 	if(PROTO_HTTP==FALSE)
- 		port=21;
- 
--	VERBOSEPRINT(fprintf(outfile,"
-+	VERBOSEPRINT(fprintf(outfile,"\
- 		%sDocument %s requested from %s,with address %s in %d segments,\n,proxy:%s:%d\n%s",
- 		sep,save_file_name,host_name,file_name,num_segment,proxy,proxy_port,sep))
- }
diff --git a/ftp/mget/pkg-descr b/ftp/mget/pkg-descr
index 3b7c83f483b5..c98cb12aa366 100644
--- a/ftp/mget/pkg-descr
+++ b/ftp/mget/pkg-descr
@@ -1,3 +1,7 @@
-Multi Threaded Wget
+mGet is a command line download manager. It splits the file into a number
+of segments and uses several separate threads to download each segment.
+It can handle proxies and can tunnel through them to get files blocked by
+proxies.  Currently mGet only handles HTTP downloads directly, while FTP
+downloads must go through a proxy.
 
-WWW: http://www.cse.iitk.ac.in/users/dbera/mget.php
+WWW: http://cs-people.bu.edu/dbera/activities/projects/mget/mget.php