1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00

o update to 1.8.1.

o autoconf is no longer required.
o update ja.po.

PR:		33570
Submitted by:	Alan Eldridge <ports@geeksrus.net> (for update)
This commit is contained in:
FUJISHIMA Satsuki 2002-01-05 10:41:15 +00:00
parent 52c8b6b11d
commit 3c235f227d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=52607
12 changed files with 36 additions and 190 deletions

View File

@ -6,38 +6,46 @@
#
PORTNAME= wget
PORTVERSION= 1.8
PORTREVISION= 2
PORTVERSION= 1.8.1
CATEGORIES= ftp www
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.dl.ac.uk/ccp14/ftp-mirror/wget/pub/unix/util/wget/ \
ftp://ftp.informatik.hu-berlin.de/gnu/wget/ \
ftp://ftp.uni-mainz.de/pub/gnu/wget/ \
ftp://ftp.max.irk.ru/unix/net/www/wget/
ftp://ftp.max.irk.ru/unix/net/www/wget/ \
http://www3.big.or.jp/~sian/linux/products/
MASTER_SITE_SUBDIR= wget
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
${EXTRA_PO}
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= sf@FreeBSD.org
LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE}
.endif
USE_GMAKE= yes
USE_AUTOCONF= yes
CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \
LIBS=-L${LOCALBASE}/lib
MAN1= wget.1
EXTRA_PO= ${PORTNAME}-${PORTVERSION}.ja.po.gz
post-extract:
${RM} -f ${WRKSRC}/po/ja.po
${GZIP_CMD} -dc ${DISTDIR}/${EXTRA_PO} > ${WRKSRC}/po/ja.po
post-patch:
${RM} -f ${WRKSRC}/doc/wget.info*
# we don't need to run autoconf.
${TOUCH} ${WRKSRC}/configure
pre-build:
@${RM} -f ${WRKSRC}/doc/wget.info*
post-install:
install-info ${PREFIX}/info/wget.info ${PREFIX}/info/dir

View File

@ -1 +1,2 @@
MD5 (wget-1.8.tar.gz) = 000caf43722b46df1f58b6fb2deb5b58
MD5 (wget-1.8.1.tar.gz) = 6ca8e939476e840f0ce69a3b31c13060
MD5 (wget-1.8.1.ja.po.gz) = 25d56cc8cfad7fb3a526eec0584811c3

View File

@ -1,32 +0,0 @@
Index: configure.in
===================================================================
RCS file: /pack/anoncvs/wget/configure.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- configure.in 2001/12/06 10:45:26 1.30
+++ configure.in 2001/12/11 06:20:22 1.31
@@ -340,18 +340,18 @@
dnl Find an md5 implementation.
dnl
-dnl On Solaris, we use libmd5. If we're compiled with OpenSSL, use
-dnl OpenSSL's md5 support. Otherwise, use our own md5.
-
if test x$wget_need_md5 = xyes
then
MD5_OBJ='gen-md5$o'
found_md5=no
- dnl First check for Solaris md5.
+ dnl Check for the system MD5 library on Solaris. We don't check for
+ dnl something simple like "MD5Update" because there are a number of
+ dnl MD5 implementations that use that name. md5_calc is, hopefully,
+ dnl specific to the Solaris MD5 library.
if test x$found_md5 = xno; then
- AC_CHECK_LIB(md5, MD5Update, [
+ AC_CHECK_LIB(md5, md5_calc, [
AC_DEFINE(HAVE_SOLARIS_MD5)
LIBS="-lmd5 $LIBS"
found_md5=yes

View File

@ -1,20 +0,0 @@
Index: src/main.c
===================================================================
RCS file: /pack/anoncvs/wget/src/main.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- src/main.c 2001/12/06 07:14:35 1.66
+++ src/main.c 2001/12/09 19:44:20 1.67
@@ -738,10 +738,7 @@
{
char *rewritten = rewrite_shorthand_url (argv[optind]);
if (rewritten)
- {
- printf ("Converted %s to %s\n", argv[optind], rewritten);
- url[i] = rewritten;
- }
+ url[i] = rewritten;
else
url[i] = xstrdup (argv[optind]);
}

View File

@ -1,17 +0,0 @@
Index: src/progress.c
===================================================================
RCS file: /pack/anoncvs/wget/src/progress.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- src/progress.c 2001/12/09 01:24:40 1.21 WGET_1_8
+++ src/progress.c 2001/12/09 04:51:40 1.22
@@ -647,7 +647,7 @@
/* Hours not printed: pad with three spaces (two digits and
colon). */
APPEND_LITERAL (" ");
- else if (eta_hrs >= 10)
+ else if (eta_hrs < 10)
/* Hours printed with one digit: pad with one space. */
*p++ = ' ';
else

View File

@ -1,17 +0,0 @@
Index: src/recur.c
===================================================================
RCS file: /pack/anoncvs/wget/src/recur.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- src/recur.c 2001/12/13 19:18:31 1.37
+++ src/recur.c 2001/12/18 15:22:03 1.38
@@ -237,7 +237,7 @@
int oldrec = opt.recursive;
opt.recursive = 0;
- status = retrieve_url (url, &file, &redirected, NULL, &dt);
+ status = retrieve_url (url, &file, &redirected, referer, &dt);
opt.recursive = oldrec;
if (file && status == RETROK

View File

@ -6,38 +6,46 @@
#
PORTNAME= wget
PORTVERSION= 1.8
PORTREVISION= 2
PORTVERSION= 1.8.1
CATEGORIES= ftp www
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.dl.ac.uk/ccp14/ftp-mirror/wget/pub/unix/util/wget/ \
ftp://ftp.informatik.hu-berlin.de/gnu/wget/ \
ftp://ftp.uni-mainz.de/pub/gnu/wget/ \
ftp://ftp.max.irk.ru/unix/net/www/wget/
ftp://ftp.max.irk.ru/unix/net/www/wget/ \
http://www3.big.or.jp/~sian/linux/products/
MASTER_SITE_SUBDIR= wget
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
${EXTRA_PO}
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= sf@FreeBSD.org
LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE}
.endif
USE_GMAKE= yes
USE_AUTOCONF= yes
CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \
LIBS=-L${LOCALBASE}/lib
MAN1= wget.1
EXTRA_PO= ${PORTNAME}-${PORTVERSION}.ja.po.gz
post-extract:
${RM} -f ${WRKSRC}/po/ja.po
${GZIP_CMD} -dc ${DISTDIR}/${EXTRA_PO} > ${WRKSRC}/po/ja.po
post-patch:
${RM} -f ${WRKSRC}/doc/wget.info*
# we don't need to run autoconf.
${TOUCH} ${WRKSRC}/configure
pre-build:
@${RM} -f ${WRKSRC}/doc/wget.info*
post-install:
install-info ${PREFIX}/info/wget.info ${PREFIX}/info/dir

View File

@ -1 +1,2 @@
MD5 (wget-1.8.tar.gz) = 000caf43722b46df1f58b6fb2deb5b58
MD5 (wget-1.8.1.tar.gz) = 6ca8e939476e840f0ce69a3b31c13060
MD5 (wget-1.8.1.ja.po.gz) = 25d56cc8cfad7fb3a526eec0584811c3

View File

@ -1,32 +0,0 @@
Index: configure.in
===================================================================
RCS file: /pack/anoncvs/wget/configure.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- configure.in 2001/12/06 10:45:26 1.30
+++ configure.in 2001/12/11 06:20:22 1.31
@@ -340,18 +340,18 @@
dnl Find an md5 implementation.
dnl
-dnl On Solaris, we use libmd5. If we're compiled with OpenSSL, use
-dnl OpenSSL's md5 support. Otherwise, use our own md5.
-
if test x$wget_need_md5 = xyes
then
MD5_OBJ='gen-md5$o'
found_md5=no
- dnl First check for Solaris md5.
+ dnl Check for the system MD5 library on Solaris. We don't check for
+ dnl something simple like "MD5Update" because there are a number of
+ dnl MD5 implementations that use that name. md5_calc is, hopefully,
+ dnl specific to the Solaris MD5 library.
if test x$found_md5 = xno; then
- AC_CHECK_LIB(md5, MD5Update, [
+ AC_CHECK_LIB(md5, md5_calc, [
AC_DEFINE(HAVE_SOLARIS_MD5)
LIBS="-lmd5 $LIBS"
found_md5=yes

View File

@ -1,20 +0,0 @@
Index: src/main.c
===================================================================
RCS file: /pack/anoncvs/wget/src/main.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- src/main.c 2001/12/06 07:14:35 1.66
+++ src/main.c 2001/12/09 19:44:20 1.67
@@ -738,10 +738,7 @@
{
char *rewritten = rewrite_shorthand_url (argv[optind]);
if (rewritten)
- {
- printf ("Converted %s to %s\n", argv[optind], rewritten);
- url[i] = rewritten;
- }
+ url[i] = rewritten;
else
url[i] = xstrdup (argv[optind]);
}

View File

@ -1,17 +0,0 @@
Index: src/progress.c
===================================================================
RCS file: /pack/anoncvs/wget/src/progress.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- src/progress.c 2001/12/09 01:24:40 1.21 WGET_1_8
+++ src/progress.c 2001/12/09 04:51:40 1.22
@@ -647,7 +647,7 @@
/* Hours not printed: pad with three spaces (two digits and
colon). */
APPEND_LITERAL (" ");
- else if (eta_hrs >= 10)
+ else if (eta_hrs < 10)
/* Hours printed with one digit: pad with one space. */
*p++ = ' ';
else

View File

@ -1,17 +0,0 @@
Index: src/recur.c
===================================================================
RCS file: /pack/anoncvs/wget/src/recur.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- src/recur.c 2001/12/13 19:18:31 1.37
+++ src/recur.c 2001/12/18 15:22:03 1.38
@@ -237,7 +237,7 @@
int oldrec = opt.recursive;
opt.recursive = 0;
- status = retrieve_url (url, &file, &redirected, NULL, &dt);
+ status = retrieve_url (url, &file, &redirected, referer, &dt);
opt.recursive = oldrec;
if (file && status == RETROK