From 2f641bf7dc0803ce1e8d8d45297a3933c4d6a33b Mon Sep 17 00:00:00 2001
From: kevlo <kevlo@openbsd.org>
Date: Tue, 5 Jun 2001 05:01:27 +0000
Subject: [PATCH] - add gtk+ flavor - fix library linking -- Thanks naddy@

---
 net/axyftp/Makefile                | 15 +++++++++++----
 net/axyftp/patches/patch-configure | 11 +++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 net/axyftp/patches/patch-configure

diff --git a/net/axyftp/Makefile b/net/axyftp/Makefile
index aa988653969..a602b255969 100644
--- a/net/axyftp/Makefile
+++ b/net/axyftp/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2001/06/04 03:05:18 kevlo Exp $
+# $OpenBSD: Makefile,v 1.10 2001/06/05 05:01:27 kevlo Exp $
 
 COMMENT=	"ftp client for X window system"
 
 DISTNAME=	axyftp-0.5.1
 CATEGORIES=	net
-NEED_VERSION=	1.402
+NEED_VERSION=	1.414
 MASTER_SITES=	ftp://ftp.wxftp.seul.org/pub/wxftp/0.5.1/
 
 HOMEPAGE=	http://www.wxftp.seul.org/
@@ -16,10 +16,17 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM="no fee"
 PERMIT_DISTFILES_FTP=   Yes
 
-LIB_DEPENDS=	gtk.1.2::x11/gtk+
-
 USE_X11=	Yes
 CONFIGURE_STYLE= gnu
+
+USE_MOTIF=	any
+
+FLAVORS=	gtk
+FLAVOR?=
+
+.if ${FLAVOR:L:Mgtk}
+LIB_DEPENDS=    gtk.1.2::x11/gtk+
 CONFIGURE_ARGS=	--with-gui=gtk
+.endif
 
 .include <bsd.port.mk>
diff --git a/net/axyftp/patches/patch-configure b/net/axyftp/patches/patch-configure
new file mode 100644
index 00000000000..00448730400
--- /dev/null
+++ b/net/axyftp/patches/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Tue Jun  5 11:37:19 2001
++++ configure	Tue Jun  5 11:38:11 2001
+@@ -3688,7 +3688,7 @@
+   AXYFTP_INCLUDES="\$(XMAXY_CFLAGS) \$(DT_CFLAGS) \$(MOTIF_CFLAGS) \
+                    $X_CFLAGS \$(XPM_CFLAGS)"
+   AXYFTP_LIBS="\$(XMAXY_LIBS) \$(DT_LIBS) \$(MOTIF_LIBS) \
+-               $X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS \$(XPM_LIBS)"
++               $X_LIBS -lXt -lXext $X_PRE_LIBS -lX11 $X_EXTRA_LIBS \$(XPM_LIBS)"
+   AXYFTP_GUI="BUILD_MOTIF"
+ else 
+   AXYFTP_INCLUDES="$GTK_CFLAGS"