7 files changed, 59 insertions, 90 deletions

diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index 4d778b76cdb7..be1def3bbc9f 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -6,33 +6,24 @@
 #
 
 PORTNAME=	pavuk
-PORTVERSION=	0.9.28
-PORTREVISION=	6
+PORTVERSION=	0.9.31
 CATEGORIES=	ftp www
-MASTER_SITES=	${MASTER_SITE_SUNSITE} \
-		http://www.idata.sk/~ondrej/sw/
-MASTER_SITE_SUBDIR=	apps/www/mirroring
-DISTNAME=	${PORTNAME}-0.9pl28
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTTP, FTP and Gopher mirroring tool
 
-USE_OPENSSL=	yes
+USE_BZIP2=	yes
 WANT_GNOME=	yes
+USE_GNOME=	gnometarget
+USE_OPENSSL=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--with-locale-dir=${LOCALBASE}/share/locale \
-		--disable-debug --disable-gnome --enable-threads
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+CONFIGURE_ARGS=	--with-locale-dir=${PREFIX}/share/locale \
+		--disable-debug --disable-gnome --disable-gtk2 --disable-js \
+		--enable-threads
 
 MAN1=		pavuk.1
 
@@ -41,8 +32,17 @@ LDFLAGS=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
 .if ${HAVE_GNOME:Mgtk12}!=""
-USE_GNOME=	gtk12
+PKGNAMESUFFIX=	-gtk
+USE_GNOME+=	gtk12
 CONFIGURE_ARGS+=	--with-gtk-config="${GTK_CONFIG}"
 .else
 CONFIGURE_ARGS+=	--disable-gtk
@@ -61,7 +61,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/pavukrc.sample ${PREFIX}/etc
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for f in AUTHORS BUGS CREDITS ChangeLog FAQ MAILINGLIST NEWS README
+.for f in AUTHORS BUGS CREDITS ChangeLog FAQ MAILINGLIST NEWS README \
+	wget-pavuk.HOWTO
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
diff --git a/ftp/pavuk/distinfo b/ftp/pavuk/distinfo
index d6ef4a911baa..2c71864b147d 100644
--- a/ftp/pavuk/distinfo
+++ b/ftp/pavuk/distinfo
@@ -1,2 +1,2 @@
-MD5 (pavuk-0.9pl28.tgz) = d0f7b77bd11322add1f7d52d62afbf78
-SIZE (pavuk-0.9pl28.tgz) = 968336
+MD5 (pavuk-0.9.31.tar.bz2) = 41ad4df0a6c48a7bf4ec37fbd8095a97
+SIZE (pavuk-0.9.31.tar.bz2) = 640384
diff --git a/ftp/pavuk/files/patch-src::ainterface.c b/ftp/pavuk/files/patch-src::ainterface.c
new file mode 100644
index 000000000000..25781045ec0c
--- /dev/null
+++ b/ftp/pavuk/files/patch-src::ainterface.c
@@ -0,0 +1,22 @@
+--- src/ainterface.c.orig	Wed Nov  3 15:51:10 2004
++++ src/ainterface.c	Fri Nov 12 03:29:00 2004
+@@ -448,13 +448,17 @@
+ {
+   int i;
+ 
++#ifdef I_FACE
++#ifdef HAVE_MT
++  _config_struct_priv_t privcfg;
++#endif
++#endif
++
+   if(cfg.mode == MODE_MIRROR)
+     return;
+ 
+ #ifdef I_FACE
+ #ifdef HAVE_MT
+-  _config_struct_priv_t privcfg;
+-
+   privcfg_make_copy(&privcfg);
+   pthread_setspecific(cfg.privcfg_key, (void *) (&privcfg));
+   pthread_cleanup_push((void *) privcfg_free, (void *) (&privcfg));
diff --git a/ftp/pavuk/files/patch-src::digest_auth.c b/ftp/pavuk/files/patch-src::digest_auth.c
deleted file mode 100644
index 8aa305958d1d..000000000000
--- a/ftp/pavuk/files/patch-src::digest_auth.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/digest_auth_orig.c	2000-12-03 08:25:44.000000000 -0600
-+++ src/digest_auth.c	2004-07-24 13:45:50.000000000 -0500
-@@ -87,6 +87,7 @@
- 	return retv;
- }
- 
-+/* PRE: Assumes 'buf' can store 2K */
- char *http_get_digest_auth_str(auth_digest, method, user, pass, urlp, buf)
- http_digest_info *auth_digest;
- char *method;
-@@ -99,14 +100,15 @@
- 	char *a1,*a2,*a3;
- 	char *d = url_encode_str(urlp->p.http.document, URL_PATH_UNSAFE);
- 
--	sprintf(pom, "%s:%s:%s", user, auth_digest->realm, pass);
-+	snprintf(pom, sizeof(pom), "%s:%s:%s", user, auth_digest->realm, pass);
- 	a1 = _md5(pom);
--	sprintf(pom, "%s:%s", method, d);
-+	snprintf(pom, sizeof(pom), "%s:%s", method, d);
- 	a2 = _md5(pom);
--	sprintf(pom, "%s:%s:%s", a1, auth_digest->nonce, a2);
-+	snprintf(pom, sizeof(pom), "%s:%s:%s", a1, auth_digest->nonce, a2);
- 	a3 = _md5(pom);
- 
--	sprintf(buf,
-+	snprintf(buf,
-+		2048,
- 		"Digest username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", response=\"%s\"" , 
- 		user, auth_digest->realm, auth_digest->nonce, d, a3);
- 
diff --git a/ftp/pavuk/files/patch-src_http.c b/ftp/pavuk/files/patch-src_http.c
deleted file mode 100644
index 4feaab46c206..000000000000
--- a/ftp/pavuk/files/patch-src_http.c
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- src/http.c.orig	Mon Jul 30 00:06:40 2001
-+++ src/http.c	Fri Jul  2 18:08:05 2004
-@@ -1111,8 +1111,8 @@
- 	if (!loc)
- 		return -1;
- 
--	if (sscanf(loc, "http://%[.0-9A-Za-z_-]:%d", proxy, &port) < 1)
--		if (sscanf(loc, "%[.0-9A-Za-z_-]:%d", proxy, &port) !=2)
-+	if (sscanf(loc, "http://%255[.0-9A-Za-z_-]:%d", proxy, &port) < 1)
-+		if (sscanf(loc, "%255[.0-9A-Za-z_-]:%d", proxy, &port) !=2)
- 			return -1;
- 
- 	_free(docp->http_proxy);
diff --git a/ftp/pavuk/pkg-descr b/ftp/pavuk/pkg-descr
index ce8b5e1b2420..a280543a7dcf 100644
--- a/ftp/pavuk/pkg-descr
+++ b/ftp/pavuk/pkg-descr
@@ -1,18 +1,5 @@
-   Pavuk is a HTTP, FTP and Gopher mirroring tool.
+Pavuk is UNIX program used to mirror contents of WWW documents or files. It
+transfers documents from HTTP, FTP, Gopher and optionaly from HTTPS (HTTP
+over SSL) servers. Pavuk has an optional GUI based on GTK2 widget set.
 
-   What this program does :
-
-   - recursive HTTP , HTTP over SSL , FTP and Gopher document retrieving
-   - synchronizing retrieved local copies of document with remote
-   - partial content retrieving on servers which supports it (FTP and HTTP/1.1)
-   - follows moved documents
-   - supports "robots.txt" standard
-   - supports HTTP and FTP proxy server
-   - supports HTTP authentication
-   - shows document tree
-   - have interface to "at" command for scheduling
-   - have X-windows user interface (built with own widgets based on plain Xt)
-   - may be built with or without X-windows user interface
-   - can handle setup files
-
-WWW: http://www.idata.sk/~ondrej/pavuk/
+WWW: http://pavuk.sourceforge.net/
diff --git a/ftp/pavuk/pkg-plist b/ftp/pavuk/pkg-plist
index a933611a1445..14dac22cdc2f 100644
--- a/ftp/pavuk/pkg-plist
+++ b/ftp/pavuk/pkg-plist
@@ -1,4 +1,6 @@
 bin/pavuk
+bin/pavuk.sh
+bin/tperf.sh
 etc/pavuk_authinfo.sample
 etc/pavukrc.sample
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
@@ -9,18 +11,21 @@ etc/pavukrc.sample
 %%PORTDOCS%%%%DOCSDIR%%/MAILINGLIST
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%DATADIR%%/icons/pavuk_16x16.xpm
-%%DATADIR%%/icons/pavuk_32x32.xpm
-%%DATADIR%%/icons/pavuk_64x64.xpm
-%%DATADIR%%/icons/pavuk_as_icon.xpm
-%%DATADIR%%/icons/pavuk_prg_icon.xpm
+%%PORTDOCS%%%%DOCSDIR%%/wget-pavuk.HOWTO
 %%NLS%%share/locale/cs/LC_MESSAGES/pavuk.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pavuk.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pavuk.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pavuk.mo
 %%NLS%%share/locale/it/LC_MESSAGES/pavuk.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pavuk.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pavuk.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/pavuk.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pavuk.mo
+%%DATADIR%%/icons/pavuk_16x16.xpm
+%%DATADIR%%/icons/pavuk_32x32.xpm
+%%DATADIR%%/icons/pavuk_64x64.xpm
+%%DATADIR%%/icons/pavuk_as_icon.xpm
+%%DATADIR%%/icons/pavuk_prg_icon.xpm
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%