From a7ad9cfc693626da454b187ea9e980a2e860aaed Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 7 May 2007 15:06:03 +0000
Subject: [PATCH] - make the no_x11 FLAVOR build again - fix WANTLIB and
 depends - regen PLIST

---
 net/gftp/Makefile  | 17 +++++++++--------
 net/gftp/pkg/PLIST | 10 +---------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/net/gftp/Makefile b/net/gftp/Makefile
index 9adeb296dc3..5416fdf2880 100755
--- a/net/gftp/Makefile
+++ b/net/gftp/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2007/01/04 20:19:54 steven Exp $
+# $OpenBSD: Makefile,v 1.12 2007/05/07 15:06:03 ajacoutot Exp $
 
 COMMENT=	"multithreaded gtk2 file transfer client"
 
 DISTNAME=	gftp-2.0.18
-PKGNAME=	${DISTNAME}p5
+PKGNAME=	${DISTNAME}p6
 CATEGORIES=	net
 
 HOMEPAGE=	http://gftp.seul.org/
@@ -23,7 +23,6 @@ WANTLIB=	readline c m ncurses util
 
 EXTRACT_SUFX=	.tar.bz2
 
-MODULES=	devel/gettext
 CONFIGURE_STYLE=gnu
 
 CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
@@ -36,15 +35,17 @@ FLAVORS=	no_x11
 FLAVOR?=
 
 .if ${FLAVOR:L:Mno_x11}
-LIB_DEPENDS=	glib.1::devel/glib
+BUILD_DEPENDS=	::devel/gettext
+LIB_DEPENDS=	glib.>=1::devel/glib
 CONFIGURE_ARGS+=--disable-gtkport --disable-gtk20
 .else
 USE_X11=	Yes
+MODULES=	devel/gettext
 LIB_DEPENDS=	gtk-x11-2.0.>=600.10,gdk_pixbuf-2.0.>=600.0,gdk-x11-2.0.>=600.0::x11/gtk+2
-WANTLIB+=	freetype pthread X11 Xext Xrender fontconfig z \
-		gthread-2.0 glib-2.0 gmodule-2.0 glitz png \
-		gobject-2.0 atk-1.0 pango-1.0 pangocairo-1.0 \
-		pangoft2-1.0 cairo
+WANTLIB+=	X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \
+		Xrender atk-1.0 cairo expat fontconfig freetype \
+		glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0 \
+		pango-1.0 pangocairo-1.0 pangoft2-1.0 png pthread z
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/gftp/pkg/PLIST b/net/gftp/pkg/PLIST
index e2d9da806e5..be0919d2046 100644
--- a/net/gftp/pkg/PLIST
+++ b/net/gftp/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/11/02 20:19:29 alek Exp $
+@comment $OpenBSD: PLIST,v 1.2 2007/05/07 15:06:03 ajacoutot Exp $
 bin/gftp
 bin/gftp-text
 @man man/man1/gftp.1
@@ -42,15 +42,11 @@ share/locale/ar/LC_MESSAGES/gftp.mo
 share/locale/az/
 share/locale/az/LC_MESSAGES/
 share/locale/az/LC_MESSAGES/gftp.mo
-share/locale/be/
-share/locale/be/LC_MESSAGES/
 share/locale/be/LC_MESSAGES/gftp.mo
 share/locale/bg/LC_MESSAGES/gftp.mo
 share/locale/bn/
 share/locale/bn/LC_MESSAGES/
 share/locale/bn/LC_MESSAGES/gftp.mo
-share/locale/ca/
-share/locale/ca/LC_MESSAGES/
 share/locale/ca/LC_MESSAGES/gftp.mo
 share/locale/cs/LC_MESSAGES/gftp.mo
 share/locale/da/LC_MESSAGES/gftp.mo
@@ -65,8 +61,6 @@ share/locale/en_GB/LC_MESSAGES/gftp.mo
 share/locale/es/LC_MESSAGES/gftp.mo
 share/locale/fi/LC_MESSAGES/gftp.mo
 share/locale/fr/LC_MESSAGES/gftp.mo
-share/locale/ga/
-share/locale/ga/LC_MESSAGES/
 share/locale/ga/LC_MESSAGES/gftp.mo
 share/locale/hr/LC_MESSAGES/gftp.mo
 share/locale/hu/LC_MESSAGES/gftp.mo
@@ -96,8 +90,6 @@ share/locale/sk/LC_MESSAGES/gftp.mo
 share/locale/sq/
 share/locale/sq/LC_MESSAGES/
 share/locale/sq/LC_MESSAGES/gftp.mo
-share/locale/sr/
-share/locale/sr/LC_MESSAGES/
 share/locale/sr/LC_MESSAGES/gftp.mo
 share/locale/sr@Latn/
 share/locale/sr@Latn/LC_MESSAGES/