- Update to 1.2.2

- Add gnutls support

ftp/moftpd/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	moftpd
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.morth.org/moftpd/ \
 		${MASTER_SITE_LOCAL}
@@ -15,18 +15,29 @@ MASTER_SITE_SUBDIR=	clement
 MAINTAINER=	clement@FreeBSD.org
 COMMENT=	A powerful FTP server supporting IPv6, TLS, and much more
 
-GNU_CONFIGURE=	yes
-USE_OPENSSL=	yes
+USE_AUTOCONF_VER=259
 USE_GMAKE=	yes
 USE_RC_SUBR=	yes
 USE_PERL5_BUILD=yes
-CONFIGURE_ENV+=	LIBS="${LIBS}"
+CONFIGURE_ENV+=	LIBS="${LIBS}" CFLAGS="${CFLAGS}"
 CONFIGURE_ARGS=	--localstatedir=/var
 
 MAN8=		moftpd.8 moftpadmin.8
 LIBS+=		-lcrypt
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
+.if defined(WITHOUT_TLS)
+CONFIGURE_ARGS+=	--without-tls
+.elif defined(WITH_GNUTLS)
+CONFIGURE_ARGS+=	--without-openssl
+LIB_DEPENDS+=		gnutls.12:${PORTSDIR}/security/gnutls
+LIBS=			-L${LOCALBASE}/lib -lgnutls
+CFLAGS+=		-I${LOCALBASE}/include
+.else
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=	--without-gnutls
+.endif
+
 .if defined(WITH_MYSQL)
 CFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib/mysql

ftp/moftpd/distinfo

@@ -1,2 +1,2 @@
-MD5 (moftpd-1.2.1.tar.gz) = bee65a20f338fe77b6e921efab15d507
-SIZE (moftpd-1.2.1.tar.gz) = 466165
+MD5 (moftpd-1.2.2.tar.gz) = 480a2b7f165fd4ed9861d57d378acdc4
+SIZE (moftpd-1.2.2.tar.gz) = 471574