Index: head/ftp/gftp/Makefile
===================================================================
--- head/ftp/gftp/Makefile	(revision 248013)
+++ head/ftp/gftp/Makefile	(revision 248014)
@@ -1,81 +1,82 @@
 # New ports collection makefile for:	gftp
 # Date Created:		21 Feb 1999
 # Whom:			Damjan Marion <dmarion@open.hr>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gftp
 PORTVERSION=	2.0.19
 PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	http://gftp.seul.org/ \
 		ftp://gftp.seul.org/pub/gftp/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A free multithreaded GTK-based GUI ftp and sftp client
 
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--without-included-gettext
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 WANT_GNOME=	yes
 
 OPTIONS=	X11	"Build with X11 frontend"			on \
 		NLS	"Native Language Support via gettext utilities"	on
 
 .if !defined(WITHOUT_X11)
 USE_XORG=	x11
 .endif
 
 .include <bsd.port.pre.mk>
 
 USE_GNOME+=	gnomehack
 
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=--disable-gtkport
 PKGNAMESUFFIX=	-nox11
 USE_GNOME+=	glib20
 PLIST_SUB+=	NOX11:="@comment "
 .else
 PLIST_SUB+=	NOX11:=""
 WANT_GNOME=	yes
 USE_GNOME+=	gtk20
 CONFIGURE_ENV+=	_GTHREAD_LIBS="-lgthread-2.0"
 .endif
 
 MAN1=		gftp.1
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${HAVE_GNOME:Mgnomelibs}!="" && !defined(WITH_GTK2)
 USE_GNOME+=	gnomeprefix gnomelibs
 PKGNAMESUFFIX+=	-gnome
 PLIST_SUB+=	MYGNOME=""
 MAKE_ENV=	HAVE_GNOME=1
 .else
 PLIST_SUB+=	MYGNOME="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		s|pty.h|utmpx.h &|g ; \
 		s|"-lssl |& -lcrypto|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|size_t dest_len|size_t *dest_len|g ; \
 		s|\(gftp_filename_from_utf8 (gftp_request \* request,\) int force_local,|\1|' \
 		${WRKSRC}/lib/charset-conv.c
 .if defined(WITHOUT_X11)
 	@${REINPLACE_CMD} -e 's|: install-pkgdataDATA|: |' \
 		${WRKSRC}/docs/sample.gftp/Makefile.in
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/ftp/gftp/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.64
\ No newline at end of property
+1.65
\ No newline at end of property
Index: head/ftp/gftp/files/patch-config.h.in
===================================================================
--- head/ftp/gftp/files/patch-config.h.in	(nonexistent)
+++ head/ftp/gftp/files/patch-config.h.in	(revision 248014)
@@ -0,0 +1,12 @@
+--- config.h.in.orig	2010-01-17 16:28:14.000000000 +0100
++++ config.h.in	2010-01-17 16:28:38.000000000 +0100
+@@ -198,6 +198,9 @@
+ /* Define if the POSIX multithreading library has read/write locks. */
+ #undef HAVE_PTHREAD_RWLOCK
+ 
++/* Define to 1 if you have the <utmpx.h> header file. */
++#undef HAVE_UTMPX_H
++
+ /* Define to 1 if you have the <pty.h> header file. */
+ #undef HAVE_PTY_H
+ 

Property changes on: head/ftp/gftp/files/patch-config.h.in
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/ftp/gftp/files/patch-lib::pty.c
===================================================================
--- head/ftp/gftp/files/patch-lib::pty.c	(revision 248013)
+++ head/ftp/gftp/files/patch-lib::pty.c	(revision 248014)
@@ -1,102 +1,110 @@
 --- lib/pty.c.orig	Mon Nov 15 18:09:32 2004
 +++ lib/pty.c	Mon Nov 15 18:18:21 2004
-@@ -59,6 +59,49 @@
+@@ -59,6 +59,57 @@
    return (new_fds);
  }
  
 +#elif HAVE_OPENPTY
 +
 +#ifdef HAVE_PTY_H
 +#include <pty.h>
++#ifdef HAVE_UTMPX_H
++#include <utmpx.h>
++#else
 +#include <utmp.h> /* for login_tty */
++#endif
 +#elif HAVE_LIBUTIL_H
 +#include <libutil.h>
++#ifdef HAVE_UTMPX_H
++#include <utmpx.h>
++#else
 +#include <utmp.h> /* for login_tty */
++#endif
 +#else
 +extern int openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize * winp);
 +extern int login_tty(int fd);
 +#endif
 +
 +char *
 +gftp_get_pty_impl (void)
 +{
 +  return ("openpty");
 +}
 +
 +
 +static int
 +_gftp_ptym_open (char *pts_name, size_t len, int *fds)
 +{
 +  int fdm;
 +
 +  if (openpty (&fdm, fds, pts_name, NULL, NULL) < 0)
 +    return (GFTP_ERETRYABLE);
 +
 +  ioctl (*fds, TIOCSCTTY, NULL);
 +
 +  return (fdm);
 +}
 +
 +
 +static int
 +_gftp_ptys_open (int fdm, int fds, char *pts_name)
 +{
 +  if (login_tty (fds) < 0)
 +    return (GFTP_EFATAL);
 +
 +  return (fds);
 +}
 +
  #elif HAVE_GRANTPT
  
  #include <stropts.h>
 @@ -123,49 +166,6 @@
  #endif
  
    return (new_fds);
 -}
 -
 -#elif HAVE_OPENPTY
 -
 -#ifdef HAVE_PTY_H
 -#include <pty.h>
 -#include <utmp.h> /* for login_tty */
 -#elif HAVE_LIBUTIL_H
 -#include <libutil.h>
 -#include <utmp.h> /* for login_tty */
 -#else
 -extern int openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize * winp);
 -extern int login_tty(int fd);
 -#endif
 -
 -char *
 -gftp_get_pty_impl (void)
 -{
 -  return ("openpty");
 -}
 -
 -
 -static int
 -_gftp_ptym_open (char *pts_name, size_t len, int *fds)
 -{
 -  int fdm;
 -
 -  if (openpty (&fdm, fds, pts_name, NULL, NULL) < 0)
 -    return (GFTP_ERETRYABLE);
 -
 -  ioctl (*fds, TIOCSCTTY, NULL);
 -
 -  return (fdm);
 -}
 -
 -
 -static int
 -_gftp_ptys_open (int fdm, int fds, char *pts_name)
 -{
 -  if (login_tty (fds) < 0)
 -    return (GFTP_EFATAL);
 -
 -  return (fds);
  }
  
  #else

Property changes on: head/ftp/gftp/files/patch-lib::pty.c
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property