- Update to 0.5.0

PR:		ports/77994
Submitted by:	maintainer

4 files changed, 77 insertions, 29 deletions

diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 3a669e26e711..bcafbcf03377 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wzdftpd
-PORTVERSION=	0.4.4
+PORTVERSION=	0.5.0
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,15 +20,17 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_INC_LIBTOOL_VER=13
-CONFIGURE_ARGS+=	--without-mysql --without-pam
+CONFIGURE_ARGS+=	--without-pam
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 OPTIONS=	UTF8 "Enable UTF8 support" off \
 		TCL "Enable TCL support" off \
 		SSL "Enable OpenSSL support" on \
+		GNUTLS "Enable gnutls support" off \
 		IPV6 "Enable IPv6 support" on \
-		PERL "Enable PERL support" off
+		PERL "Enable PERL support" off \
+		MYSQL "Enable MYSQL backend" off
 
 MAN1=	siteconfig.1 \
 	siteuptime.1 \
@@ -55,7 +57,13 @@ PLIST_SUB+=	TCL="@comment "
 .if defined(WITH_SSL)
 USE_OPENSSL=	yes
 .else
-CONFIGURE_ARGS+=	--with-openssl=/dev/null
+CONFIGURE_ARGS+=	--disable-openssl
+.endif
+
+.if defined(WITH_GNUTLS)
+LIB_DEPENDS+=	gnutls.12:${PORTSDIR}/security/gnutls
+.else
+CONFIGURE_ARGS+=	--disable-gnutls
 .endif
 
 .if defined(WITH_IPV6)
@@ -70,24 +78,34 @@ USE_PERL5=	yes
 PLIST_SUB+=	PERL=""
 .endif
 
+.if defined(WITH_MYSQL)
+USE_MYSQL=	yes
+PLIST_SUB+=	MYSQL=""
+.else
+CONFIGURE_ARGS+=	--without-mysql
+PLIST_SUB+=	MYSQL="@comment "
+.endif
+
 PORTDOCS=	AUTHORS Permissions.ReadMeFirst README TLS.ReadMeFirst ChangeLog
 
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} \
 		RC_SUBR=${RC_SUBR}
 
 post-install:
-	${MV} ${PREFIX}/etc/wzd.cfg ${PREFIX}/etc/wzd.cfg.sample
-	${MV} ${PREFIX}/etc/users ${PREFIX}/etc/users.sample
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
-	@${SED} -e 's,PREFIX,${PREFIX},g' ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
-	@${CAT} ${PKGMESSAGE}
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/wzdftpd.sh > ${PREFIX}/etc/rc.d/wzdftpd.sh
 	@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/wzdftpd.sh
+	@if test ! -f ${PREFIX}/etc/wzd.cfg; then \
+		${CP} ${PREFIX}/etc/wzd.cfg.sample ${PREFIX}/etc/wzd.cfg; \
+	fi
+	@if test ! -f ${PREFIX}/etc/users; then \
+		${CP} ${PREFIX}/etc/users.sample ${PREFIX}/etc/users; \
+	fi
 
 .include <bsd.port.post.mk>
diff --git a/ftp/wzdftpd/distinfo b/ftp/wzdftpd/distinfo
index 9f3e1700a1bc..7a4d7f92653d 100644
--- a/ftp/wzdftpd/distinfo
+++ b/ftp/wzdftpd/distinfo
@@ -1,2 +1,2 @@
-MD5 (wzdftpd-0.4.4.tar.gz) = e08d3ce20779ec3c61940293d0042cdd
-SIZE (wzdftpd-0.4.4.tar.gz) = 744775
+MD5 (wzdftpd-0.5.0.tar.gz) = b8da91483230490cb7148e9be286e35e
+SIZE (wzdftpd-0.5.0.tar.gz) = 806802
diff --git a/ftp/wzdftpd/files/pkg-message.in b/ftp/wzdftpd/files/pkg-message.in
deleted file mode 100644
index 1fac5bda79f3..000000000000
--- a/ftp/wzdftpd/files/pkg-message.in
+++ /dev/null
@@ -1,4 +0,0 @@
---------------------------------------------------------------------------
-Sample config file can be found at PREFIX/etc/wzd.cfg.sample
-Sample users file can be found at PREFIX/etc/users.sample
---------------------------------------------------------------------------
diff --git a/ftp/wzdftpd/pkg-plist b/ftp/wzdftpd/pkg-plist
index 1710651d7072..3e3be1a2c4c7 100644
--- a/ftp/wzdftpd/pkg-plist
+++ b/ftp/wzdftpd/pkg-plist
@@ -4,14 +4,41 @@ bin/siteuptime
 bin/sitewho
 bin/wzd-config
 etc/rc.d/wzdftpd.sh
-etc/users.sample
-etc/wzd.cfg.sample
 etc/wzd.pem
+etc/file_ginfo.txt
+etc/file_help.txt
+etc/file_swho.txt
+etc/file_user.txt
+etc/file_group.txt
+etc/file_rules.txt
+etc/file_users.txt
+etc/file_vfs.txt
+etc/file_who.txt
+etc/file_groups.txt   
+include/wzdftpd/libwzd-auth/wzd_auth.h
+include/wzdftpd/libwzd-auth/wzd_crypt.h
+include/wzdftpd/libwzd-auth/wzd_md5.h
+include/wzdftpd/libwzd-auth/wzd_md5crypt.h
+include/wzdftpd/libwzd-auth/wzd_pam.h
+include/wzdftpd/libwzd-auth/wzd_tls.h
+include/wzdftpd/libwzd-base/hash.h
+include/wzdftpd/libwzd-base/list.h
+include/wzdftpd/libwzd-base/stack.h
+include/wzdftpd/libwzd-base/wzd_strlcat.h
+include/wzdftpd/libwzd.h
+include/wzdftpd/libwzd_pv.h
+include/wzdftpd/libwzd_socket.h
+include/wzdftpd/libwzd_tls.h
+include/wzdftpd/ls.h
+include/wzdftpd/wzd_ClientThread.h
 include/wzdftpd/wzd_action.h
+include/wzdftpd/wzd_all.h
 include/wzdftpd/wzd_backend.h
 include/wzdftpd/wzd_cache.h
+include/wzdftpd/wzd_commands.h
 include/wzdftpd/wzd_crc32.h
 include/wzdftpd/wzd_crontab.h
+include/wzdftpd/wzd_data.h
 include/wzdftpd/wzd_debug.h
 include/wzdftpd/wzd_dir.h
 include/wzdftpd/wzd_file.h
@@ -19,40 +46,41 @@ include/wzdftpd/wzd_hardlimits.h
 include/wzdftpd/wzd_ip.h
 include/wzdftpd/wzd_libmain.h
 include/wzdftpd/wzd_log.h
-include/wzdftpd/wzd_md5.h
 include/wzdftpd/wzd_messages.h
 include/wzdftpd/wzd_misc.h
 include/wzdftpd/wzd_mod.h
 include/wzdftpd/wzd_mutex.h
 include/wzdftpd/wzd_perm.h
+include/wzdftpd/wzd_ratio.h
 include/wzdftpd/wzd_section.h
 include/wzdftpd/wzd_shm.h
-include/wzdftpd/wzd_strlcat.h
-include/wzdftpd/wzd_strtok_r.h
+include/wzdftpd/wzd_site.h
+include/wzdftpd/wzd_site_group.h
+include/wzdftpd/wzd_site_user.h
+include/wzdftpd/wzd_socket.h
+include/wzdftpd/wzd_string.h
 include/wzdftpd/wzd_structs.h
+include/wzdftpd/wzd_tls.h
 include/wzdftpd/wzd_types.h
 include/wzdftpd/wzd_utf8.h
 include/wzdftpd/wzd_vars.h
 include/wzdftpd/wzd_vfs.h
+lib/libwzd_core.a
+lib/libwzd_core.la
+lib/libwzd_core.so
+lib/libwzd_core.so.1
 lib/libwzd.a
 lib/libwzd.so
 lib/libwzd.so.1
 lib/libwzd.la
 share/aclocal/wzd.m4
 sbin/wzdftpd
-etc/file_ginfo.txt
-etc/file_help.txt
-etc/file_swho.txt
-etc/file_user.txt
-etc/file_group.txt
-etc/file_rules.txt
-etc/file_users.txt
-etc/file_vfs.txt
-etc/file_who.txt
-etc/file_groups.txt
 %%DATADIR%%/backends/libwzdplaintext.a
 %%DATADIR%%/backends/libwzdplaintext.so
 %%DATADIR%%/backends/libwzdplaintext.la
+%%MYSQL%%%%DATADIR%%/backends/libwzdmysql.a
+%%MYSQL%%%%DATADIR%%/backends/libwzdmysql.la
+%%MYSQL%%%%DATADIR%%/backends/libwzdmysql.so
 %%DATADIR%%/modules/libwzd_sfv.la
 %%DATADIR%%/modules/libwzd_sfv.a
 %%DATADIR%%/modules/libwzd_sfv.so
@@ -65,4 +93,10 @@ etc/file_groups.txt
 @dirrm %%DATADIR%%/modules/
 @dirrm %%DATADIR%%/backends/
 @dirrm %%DATADIR%%/
+@dirrm include/wzdftpd/libwzd-auth
+@dirrm include/wzdftpd/libwzd-base
 @dirrm include/wzdftpd
+@unexec if cmp -s %D/etc/wzd.cfg %D/etc/wzd.cfg.sample; then rm -f %D/etc/wzd.cfg; fi
+@unexec if cmp -s %D/etc/users %D/etc/users.sample; then rm -f %D/etc/users; fi
+etc/wzd.cfg.sample
+etc/users.sample