From norn@norn.ca.eu.org Sat May 15 13:45:31 1999
Return-Path: <norn@norn.ca.eu.org>
Received: from norn.ca.eu.org (cr965240-b.abtsfd1.bc.wave.home.com [24.113.19.137])
	by hub.freebsd.org (Postfix) with ESMTP id A6E5614FB0
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 15 May 1999 13:45:30 -0700 (PDT)
	(envelope-from norn@norn.ca.eu.org)
Received: by norn.ca.eu.org (Postfix, from userid 1000)
	id B9CA613C4; Sat, 15 May 1999 13:45:20 -0700 (PDT)
Message-Id: <19990515204520.B9CA613C4@norn.ca.eu.org>
Date: Sat, 15 May 1999 13:45:20 -0700 (PDT)
From: cpiazza@home.net
Sender: norn@norn.ca.eu.org
Reply-To: cpiazza@home.net
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update: net/gftp
X-Send-Pr-Version: 3.2

>Number:         11726
>Category:       ports
>Synopsis:       Update: net/gftp
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 15 13:50:01 PDT 1999
>Closed-Date:    Mon May 17 12:52:05 PDT 1999
>Last-Modified:  Mon May 17 12:52:15 PDT 1999
>Originator:     Chris Piazza
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
n/a
>Environment:

4.0-CURRENT i386

>Description:

Update to 2.0.0.
Files removed: patch-ad patch-ae

>How-To-Repeat:

>Fix:
	

Index: gftp/Makefile
===================================================================
RCS file: /cvs/FreeBSD/ports/net/gftp/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	1999/04/27 00:37:35	1.2
+++ Makefile	1999/05/15 20:40:43
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	gftp
-# Version required:	1.13
+# Version required:	2.0.0
 # Date Created:		21 Feb 1999
 # Whom:			Damjan Marion <dmarion@open.hr>
 #
 # $Id: Makefile,v 1.2 1999/04/27 00:37:35 taoka Exp $
 #
 
-DISTNAME=	gftp-1.13
+DISTNAME=	gftp-2.0.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.newwave.net/~masneyb/
 
@@ -17,10 +17,14 @@
 USE_AUTOCONF=	yes
 USE_X_PREFIX=	yes
 
-post-install:
-	strip ${PREFIX}/bin/gftp
-
 pre-install:
 	find ${WRKSRC} -name \*.orig -exec ${RM} -f \{} \;
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/gftp ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/share/gftp
+.for i in sample.gftp/*
+	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/gftp
+.endfor
 
 .include <bsd.port.mk>
Index: gftp/files/md5
===================================================================
RCS file: /cvs/FreeBSD/ports/net/gftp/files/md5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 md5
--- md5	1999/04/03 01:38:52	1.1.1.1
+++ md5	1999/05/15 19:45:00
@@ -1 +1 @@
-MD5 (gftp-1.13.tar.gz) = c4fd2c2b21f5efeccf4ba2befb4fa564
+MD5 (gftp-2.0.0.tar.gz) = 322af4ddd82577f3186e22f0101896d0
Index: gftp/patches/patch-ab
===================================================================
RCS file: /cvs/FreeBSD/ports/net/gftp/patches/patch-ab,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ab
--- patch-ab	1999/04/03 01:38:52	1.1.1.1
+++ patch-ab	1999/05/15 20:33:59
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Fri Apr  2 13:21:58 1999
-+++ Makefile.in	Fri Apr  2 13:22:07 1999
-@@ -8,7 +8,7 @@
+--- Makefile.in.orig	Sat May 15 10:56:01 1999
++++ Makefile.in	Sat May 15 13:26:17 1999
+@@ -6,7 +6,7 @@
+ SHARE_DIR=$(PREFIX)/share/gftp
+ INSTALL=@INSTALL@
  MACHINE=`uname -m`-`uname -p`-`uname -s`
- # Add -DDEBUG to the CFLAGS line below if you want gFTP to print some extra
- # information to stdout
--CFLAGS=@CFLAGS@ -D_POSIX_SOURCE -D_REENTRANT -Wall -ansi -DSHARE_DIR=\"$(SHARE_DIR)\"
-+CFLAGS=@CFLAGS@ -pthread -Wall -ansi -DSHARE_DIR=\"$(SHARE_DIR)\"
+-CFLAGS=@CFLAGS@ -Wall -D_REENTRANT -DSHARE_DIR=\"$(SHARE_DIR)\"
++CFLAGS=@CFLAGS@ -pthread -DSHARE_DIR=\"$(SHARE_DIR)\"
  LIBS=@LIBS@
  EXE=gftp
- OBJS=cache.o chmod_dialog.o config_file.o connect_dialog.o delete_dialog.o \
+ OBJS=bookmarks.o cache.o chmod_dialog.o config_file.o \
Index: gftp/patches/patch-ac
===================================================================
RCS file: /cvs/FreeBSD/ports/net/gftp/patches/patch-ac,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ac
--- patch-ac	1999/04/03 01:38:52	1.1.1.1
+++ patch-ac	1999/05/15 19:50:53
@@ -1,14 +1,15 @@
---- gnome-ftp.h.orig	Fri Apr  2 13:29:30 1999
-+++ gnome-ftp.h	Fri Apr  2 13:29:46 1999
-@@ -22,9 +22,9 @@
+--- gnome-ftp.h.orig	Sat May 15 12:50:04 1999
++++ gnome-ftp.h	Sat May 15 12:50:37 1999
+@@ -22,10 +22,10 @@
  
  #include <glib.h>
  #include <netdb.h>
 -#include <netinet/in.h>
 -#include <sys/socket.h>
  #include <sys/types.h>
+ #include <sys/time.h>
 +#include <sys/socket.h>
 +#include <netinet/in.h>
- #include <sys/time.h>
  #include <stdlib.h>
  #include <errno.h>
+ #include <string.h>
Index: gftp/pkg/PLIST
===================================================================
RCS file: /cvs/FreeBSD/ports/net/gftp/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- PLIST	1999/04/03 01:38:52	1.1.1.1
+++ PLIST	1999/05/15 20:38:19
@@ -5,14 +5,13 @@
 share/gftp/dir.xpm
 share/gftp/doc.xpm
 share/gftp/dotdot.xpm
-share/gftp/down.xpm
 share/gftp/exe.xpm
 share/gftp/gftp-logo.xpm
 share/gftp/gftprc
 share/gftp/linkdir.xpm
 share/gftp/linkfile.xpm
 share/gftp/man.xpm
+share/gftp/open_dir.xpm
 share/gftp/tar.xpm
 share/gftp/txt.xpm
-share/gftp/up.xpm
 @dirrm share/gftp

-Chris

>Release-Note:
>Audit-Trail:

From: Chris Piazza <cpiazza@home.net>
To: cpiazza@home.net
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: RE: ports/11726: Update: net/gftp
Date: Mon, 17 May 1999 07:24:23 -0700 (PDT)

 Program was updated to 2.0.1, new patch below.
 As a reminder, remove patch-ad and patch-ae
 
 
 Index: gftp/Makefile
 ===================================================================
 RCS file: /cvs/FreeBSD/ports/net/gftp/Makefile,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile
 --- Makefile    1999/04/27 00:37:35     1.2
 +++ Makefile    1999/05/17 14:18:10
 @@ -1,12 +1,12 @@
  # New ports collection makefile for:   gftp
 -# Version required:    1.13
 +# Version required:    2.0.1
  # Date Created:                21 Feb 1999
  # Whom:                        Damjan Marion <dmarion@open.hr>
  #
  # $Id: Makefile,v 1.2 1999/04/27 00:37:35 taoka Exp $
  #
  
 -DISTNAME=      gftp-1.13
 +DISTNAME=      gftp-2.0.1
  CATEGORIES=    net
  MASTER_SITES=  http://www.newwave.net/~masneyb/
  
 @@ -17,10 +17,14 @@
  USE_AUTOCONF=  yes
  USE_X_PREFIX=  yes
  
 -post-install:
 -       strip ${PREFIX}/bin/gftp
 -
  pre-install:
         find ${WRKSRC} -name \*.orig -exec ${RM} -f \{} \;
 +
 +do-install:
 +       ${INSTALL_PROGRAM} ${WRKSRC}/gftp ${PREFIX}/bin
 +       @${MKDIR} ${PREFIX}/share/gftp
 +.for i in sample.gftp/*
 +       ${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/gftp
 +.endfor
  
  .include <bsd.port.mk>
 Index: gftp/files/md5
 ===================================================================
 RCS file: /cvs/FreeBSD/ports/net/gftp/files/md5,v
 retrieving revision 1.1.1.1
 diff -u -r1.1.1.1 md5
 --- md5 1999/04/03 01:38:52     1.1.1.1
 +++ md5 1999/05/17 14:19:46
 @@ -1 +1 @@
 -MD5 (gftp-1.13.tar.gz) = c4fd2c2b21f5efeccf4ba2befb4fa564
 +MD5 (gftp-2.0.1.tar.gz) = 66bbc2567cb0c94f6f80aa518656b26d
 Index: gftp/patches/patch-ab
 ===================================================================
 RCS file: /cvs/FreeBSD/ports/net/gftp/patches/patch-ab,v
 retrieving revision 1.1.1.1
 diff -u -r1.1.1.1 patch-ab
 --- patch-ab    1999/04/03 01:38:52     1.1.1.1
 +++ patch-ab    1999/05/17 14:17:35
 @@ -1,11 +1,11 @@
 ---- Makefile.in.orig   Fri Apr  2 13:21:58 1999
 -+++ Makefile.in        Fri Apr  2 13:22:07 1999
 -@@ -8,7 +8,7 @@
 +--- Makefile.in.orig   Sat May 15 10:56:01 1999
 ++++ Makefile.in        Sat May 15 13:26:17 1999
 +@@ -6,7 +6,7 @@
 + SHARE_DIR=$(PREFIX)/share/gftp
 + INSTALL=@INSTALL@
   MACHINE=`uname -m`-`uname -p`-`uname -s`
 - # Add -DDEBUG to the CFLAGS line below if you want gFTP to print some extra
 - # information to stdout
 --CFLAGS=@CFLAGS@ -D_POSIX_SOURCE -D_REENTRANT -Wall -ansi
 -DSHARE_DIR=\"$(SHARE_DIR)\"
 -+CFLAGS=@CFLAGS@ -pthread -Wall -ansi -DSHARE_DIR=\"$(SHARE_DIR)\"
 +-CFLAGS=@CFLAGS@ -Wall -D_REENTRANT -DSHARE_DIR=\"$(SHARE_DIR)\"
 ++CFLAGS=@CFLAGS@ -pthread -DSHARE_DIR=\"$(SHARE_DIR)\"
   LIBS=@LIBS@
   EXE=gftp
 - OBJS=cache.o chmod_dialog.o config_file.o connect_dialog.o delete_dialog.o \
 + OBJS=bookmarks.o cache.o chmod_dialog.o config_file.o \
 Index: gftp/patches/patch-ac
 ===================================================================
 RCS file: /cvs/FreeBSD/ports/net/gftp/patches/patch-ac,v
 retrieving revision 1.1.1.1
 diff -u -r1.1.1.1 patch-ac
 --- patch-ac    1999/04/03 01:38:52     1.1.1.1
 +++ patch-ac    1999/05/17 14:17:35
 @@ -1,14 +1,15 @@
 ---- gnome-ftp.h.orig   Fri Apr  2 13:29:30 1999
 -+++ gnome-ftp.h        Fri Apr  2 13:29:46 1999
 -@@ -22,9 +22,9 @@
 +--- gnome-ftp.h.orig   Sat May 15 12:50:04 1999
 ++++ gnome-ftp.h        Sat May 15 12:50:37 1999
 +@@ -22,10 +22,10 @@
   
   #include <glib.h>
   #include <netdb.h>
  -#include <netinet/in.h>
  -#include <sys/socket.h>
   #include <sys/types.h>
 + #include <sys/time.h>
  +#include <sys/socket.h>
  +#include <netinet/in.h>
 - #include <sys/time.h>
   #include <stdlib.h>
   #include <errno.h>
 + #include <string.h>
 Index: gftp/pkg/PLIST
 ===================================================================
 RCS file: /cvs/FreeBSD/ports/net/gftp/pkg/PLIST,v
 retrieving revision 1.1.1.1
 diff -u -r1.1.1.1 PLIST
 --- PLIST       1999/04/03 01:38:52     1.1.1.1
 +++ PLIST       1999/05/17 14:17:35
 @@ -5,14 +5,13 @@
  share/gftp/dir.xpm
  share/gftp/doc.xpm
  share/gftp/dotdot.xpm
 -share/gftp/down.xpm
  share/gftp/exe.xpm
  share/gftp/gftp-logo.xpm
  share/gftp/gftprc
  share/gftp/linkdir.xpm
  share/gftp/linkfile.xpm
  share/gftp/man.xpm
 +share/gftp/open_dir.xpm
  share/gftp/tar.xpm
  share/gftp/txt.xpm
 -share/gftp/up.xpm
  @dirrm share/gftp
 
 ---
 Chris Piazza    Abbotsford, BC, Canada
            cpiazza@home.net
 finger norn@norn.ca.eu.org for PGP key
 
State-Changed-From-To: open->closed 
State-Changed-By: mharo 
State-Changed-When: Mon May 17 12:52:05 PDT 1999 
State-Changed-Why:  
Committed, thanks 
>Unformatted:
