Update to pl9, and now use gtk12

PR:		11273
Submitted by:	Chris Piazza <cpiazza@home.net>

4 files changed, 39 insertions, 28 deletions

diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index 26227786ed85..a21acfb04ff6 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -3,24 +3,22 @@
 # Date created:				19 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.2 1998/12/22 08:22:08 asami Exp $
+# $Id: Makefile,v 1.3 1999/03/15 01:50:13 steve Exp $
 #
 
-DISTNAME=		pavuk-0.9pl5
-PKGNAME=		pavuk-0.9.5
+DISTNAME=		pavuk-0.9pl9
+PKGNAME=		pavuk-0.9.9
 CATEGORIES=		net www
-MASTER_SITES=		ftp://ftp.idata.sk/pub/unix/www/ \
-			ftp://ftp.max.irk.ru/pub/unix/net/www/wget/ \
-			${MASTER_SITE_SUNSITE}
+MASTER_SITES=		${MASTER_SITE_SUNSITE} \
+			ftp://ftp.idata.sk/pub/unix/www/
 MASTER_SITE_SUBDIR=	apps/www/mirroring
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		andy@icc.surw.chel.su
 
 LIB_DEPENDS=		Xpm.4:${PORTSDIR}/graphics/xpm \
-			gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
+			gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
 
-USE_XLIB=		yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 
@@ -34,7 +32,7 @@ do-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/pavuk_authinfo.sample ${PREFIX}/etc
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${PREFIX}/share/doc/pavuk
-.for file in AUTHORS COPYING ChangeLog README THANK_TO TODO
+.for file in AUTHORS ChangeLog README THANK_TO TODO
 	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/pavuk
 .endfor
 .endif
diff --git a/ftp/pavuk/distinfo b/ftp/pavuk/distinfo
index c3737b502e34..3dad24f17b57 100644
--- a/ftp/pavuk/distinfo
+++ b/ftp/pavuk/distinfo
@@ -1 +1 @@
-MD5 (pavuk-0.9pl5.tgz) = 27cb8ed2df6e8535e09d4736a47f430c
+MD5 (pavuk-0.9pl9.tgz) = db4c870fe1fd99fbf86d60a1e582b98a
diff --git a/ftp/pavuk/files/patch-ab b/ftp/pavuk/files/patch-ab
index 8fb78d9dfe8c..1380df0a7dc2 100644
--- a/ftp/pavuk/files/patch-ab
+++ b/ftp/pavuk/files/patch-ab
@@ -1,22 +1,36 @@
---- src/net.c	Sun Feb  1 10:53:47 1998
-+++ /home/andy/tmp/wrk/src/net.c	Fri Mar 20 22:00:21 1998
-@@ -129,7 +129,9 @@
- 			
- 		}
- 
+--- src/net.c.orig	Sun Apr 18 06:53:46 1999
++++ src/net.c	Wed Apr 21 22:44:24 1999
+@@ -101,9 +101,9 @@
+ 	{
+ 		return -1;
+ 	}
+-
 +#ifndef __FreeBSD__
- 		fcntl(sock , F_SETFL , O_SYNC);
+ 	fcntl(sock , F_SETFL , O_NONBLOCK);
+-
 +#endif
- 		if ((connect(sock, (struct sockaddr*)&addr, sizeof(addr)) == -1) &&
- 		     (errno && (errno != EISCONN)))
- 		{
-@@ -259,7 +261,9 @@
- 			}
- 		}
+ 	rv = connect(sock, (struct sockaddr*)&addr, sizeof(addr));
+ 	if (rv && (errno != EINPROGRESS) && (errno != EISCONN))
+ 	{
+@@ -121,8 +121,8 @@
+ #endif
+ 
+ #ifdef GTK_FACE
+-		cfg.gtk.inid = gtk_timeout_add(cfg.ctimeout * 60000 ,
+-					(GtkFunction)TOut , NULL);
++		cfg.gtk.inid = cfg.ctimeout ? gtk_timeout_add(cfg.ctimeout * 60000 ,
++					(GtkFunction)TOut , NULL) : 0;
+ #endif
+ 
  
+@@ -261,8 +261,9 @@
+ #ifdef I_FACE
+ 	if (cfg.xi_face)
+ 	{
 +#ifndef __FreeBSD__
- 		fcntl(sock , F_SETFL , O_SYNC);
+ 		fcntl(sock , F_SETFL , O_NONBLOCK);
+-
 +#endif
- 	}
- #endif
- 	if ((rsock < 0) && ((rsock = accept(sock, (struct sockaddr*)&caller, &p)) == -1))
+ 		rsock = accept(sock, (struct sockaddr*)&caller, &p);
+ 		if ((rsock < 0) && (errno != EWOULDBLOCK))
+ 		{
diff --git a/ftp/pavuk/pkg-plist b/ftp/pavuk/pkg-plist
index 088720e08fe2..7970338c0d2a 100644
--- a/ftp/pavuk/pkg-plist
+++ b/ftp/pavuk/pkg-plist
@@ -2,7 +2,6 @@ bin/pavuk
 etc/pavukrc.sample
 etc/pavuk_authinfo.sample
 share/doc/pavuk/AUTHORS
-share/doc/pavuk/COPYING
 share/doc/pavuk/ChangeLog
 share/doc/pavuk/README
 share/doc/pavuk/THANK_TO