upgrade to 2.0.14

PR:		46020
Submitted by:	maintainer

1 files changed, 41 insertions, 7 deletions

diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
index 5a88cae012ab..297c6105bfab 100644
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@@ -6,33 +6,67 @@
 #
 
 PORTNAME=	gftp
-PORTVERSION=	2.0.13
+PORTVERSION=	2.0.14
 CATEGORIES=	ftp
 MASTER_SITES=	http://gftp.seul.org/ \
 		ftp://gftp.seul.org/pub/gftp/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
 MAINTAINER=	lehmann@ans-netz.de
 
-USE_X_PREFIX=	yes
-USE_GNOMENG=	yes
-WANT_GNOME=	yes
-USE_GNOME=	gtk12 gnomehack
 GNU_CONFIGURE=	yes
+
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-MAN1=		gftp.1
+USE_GNOMENG=	yes
+USE_GNOME+=	gnomehack
+
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=	--disable-gtkport --disable-gtk20
+PKGNAMESUFFIX=	-nox11
+LIB_DEPENDS+=	glib12.3:${PORTSDIR}/devel/glib12
+.else
+USE_X_PREFIX=	yes
+WANT_GNOME=	yes
+.if defined(WITH_GTK2)
+RUN_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkgconfig
+LIB_DEPENDS+=	glib-2.0.0:${PORTSDIR}/devel/glib20 \
+		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+CONFIGURE_ENV+=	_GTHREAD_LIBS="-lgthread-2.0"
+.else
+CONFIGURE_ARGS+=	--disable-gtk20
+USE_GNOME+=	gtk12
+CONFIGURE_ENV+=	_GTHREAD_LIBS="-lgthread12"
+.endif
+.endif
 
 .include <bsd.port.pre.mk>
 
+MAN1=		gftp.1
+
+.if defined(WITHOUT_X11)
+PLIST_SUB+=	NOX11:="@comment "
+.else
+PLIST_SUB+=	NOX11:=""
+.endif
+
 .if ${HAVE_GNOME:Mgnomelibs}!=""
 USE_GNOME+=	gnomeprefix gnomelibs
 PKGNAMESUFFIX=	-gnome
 PLIST_SUB=	DATADIR="share/gnome"
 .else
-PLIST_SUB=	DATADIR="share"
+PLIST_SUB+=	DATADIR="share"
 .endif
 
+pre-everything::
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "	WITHOUT_X11=yes		Only build the text frontend."
+	@${ECHO} "	WITH_GTK2=yes		Use gtk 2.x instead of 1.x"
+	@${ECHO} ""
+
 post-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \