4 files changed, 59 insertions, 81 deletions

diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 183a70a87b03..cb4f77af7373 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wzdftpd
-PORTVERSION=	0.5.5
+PORTVERSION=	0.6.0
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +19,7 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:13:inc
+USE_AUTOTOOLS=	libtool:13
 CONFIGURE_ARGS+=	--without-pam --without-pgsql
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -55,13 +55,14 @@ PLIST_SUB+=	TCL="@comment "
 .endif
 
 .if defined(WITH_SSL)
-USE_OPENSSL=	yes
+#USE_OPENSSL=	yes
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
 .else
 CONFIGURE_ARGS+=	--disable-openssl
 .endif
 
 .if defined(WITH_GNUTLS)
-LIB_DEPENDS+=	gnutls.12:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls-devel
 .else
 CONFIGURE_ARGS+=	--disable-gnutls
 .endif
diff --git a/ftp/wzdftpd/distinfo b/ftp/wzdftpd/distinfo
index 6acd75e407d5..895b314b7deb 100644
--- a/ftp/wzdftpd/distinfo
+++ b/ftp/wzdftpd/distinfo
@@ -1,2 +1,3 @@
-MD5 (wzdftpd-0.5.5.tar.gz) = 1775a54dbbc71cea8a0e18676e627ce7
-SIZE (wzdftpd-0.5.5.tar.gz) = 813070
+MD5 (wzdftpd-0.6.0.tar.gz) = dde958a1614e50d2c0a04831bf9d3900
+SHA256 (wzdftpd-0.6.0.tar.gz) = 1cb97aab41c8c3a85b70e7817a28a2e2e64d6a35d5c44b0d9a9dc76d80549d21
+SIZE (wzdftpd-0.6.0.tar.gz) = 914418
diff --git a/ftp/wzdftpd/files/patch-src-wzd_types.h b/ftp/wzdftpd/files/patch-src-wzd_types.h
deleted file mode 100644
index c1bc551624c1..000000000000
--- a/ftp/wzdftpd/files/patch-src-wzd_types.h
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/wzd_types.h.orig	Sat Jul 16 23:12:40 2005
-+++ src/wzd_types.h	Sat Jul 16 23:13:32 2005
-@@ -359,21 +359,19 @@
- /* definitions for windows 2000 */
- #if defined(_MSC_VER) && defined(WINVER) && (WINVER < 0x0501)
- #define in6_addr in_addr6 /* funny ! */
--
- #define socklen_t	unsigned int
--
--#ifndef IN6_IS_ADDR_V4MAPPED
--#define IN6_IS_ADDR_V4MAPPED(a) \
--	((((const ULONG *)(a))[0] == 0) \
--	&& (((const ULONG *)(a))[1] == 0) \
--	&& (((const ULONG *)(a))[2] == htonl (0xffff)))
--#endif
- #endif /* WINVER */
- 
- #ifndef INADDR_NONE
- # define INADDR_NONE ((unsigned long int) 0xffffffff)
- #endif
- 
-+#ifndef IN6_IS_ADDR_V4MAPPED
-+#define IN6_IS_ADDR_V4MAPPED(a) \
-+	((((const ULONG *)(a))[0] == 0) \
-+	&& (((const ULONG *)(a))[1] == 0) \
-+	&& (((const ULONG *)(a))[2] == htonl (0xffff)))
-+#endif /* IN6_IS_ADDR_V4MAPPED */
- 
- #ifndef MAX
- #define MAX(x,y) ((x) > (y) ? (x) : (y))
diff --git a/ftp/wzdftpd/pkg-plist b/ftp/wzdftpd/pkg-plist
index 8151136d0e7f..1bb45b964887 100644
--- a/ftp/wzdftpd/pkg-plist
+++ b/ftp/wzdftpd/pkg-plist
@@ -16,81 +16,85 @@ etc/file_vfs.txt
 etc/file_who.txt
 etc/file_groups.txt
 include/wzdftpd/libwzd-auth/wzd_auth.h
+include/wzdftpd/libwzd-auth/wzd_base64.h
 include/wzdftpd/libwzd-auth/wzd_crypt.h
+include/wzdftpd/libwzd-auth/wzd_krb5.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_sha1.h
 include/wzdftpd/libwzd-auth/wzd_tls.h
+include/wzdftpd/libwzd-base/dlist.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-base/wzd_strtok_r.h
+include/wzdftpd/libwzd-core/arch/bsd.h
+include/wzdftpd/libwzd-core/arch/win32.h
+include/wzdftpd/libwzd-core/ls.h
+include/wzdftpd/libwzd-core/wzd_ClientThread.h
+include/wzdftpd/libwzd-core/wzd_action.h
+include/wzdftpd/libwzd-core/wzd_all.h
+include/wzdftpd/libwzd-core/wzd_backend.h
+include/wzdftpd/libwzd-core/wzd_cache.h
+include/wzdftpd/libwzd-core/wzd_commands.h
+include/wzdftpd/libwzd-core/wzd_configfile.h
+include/wzdftpd/libwzd-core/wzd_configloader.h
+include/wzdftpd/libwzd-core/wzd_crc32.h
+include/wzdftpd/libwzd-core/wzd_crontab.h
+include/wzdftpd/libwzd-core/wzd_data.h
+include/wzdftpd/libwzd-core/wzd_debug.h
+include/wzdftpd/libwzd-core/wzd_dir.h
+include/wzdftpd/libwzd-core/wzd_events.h
+include/wzdftpd/libwzd-core/wzd_file.h
+include/wzdftpd/libwzd-core/wzd_fs.h
+include/wzdftpd/libwzd-core/wzd_hardlimits.h
+include/wzdftpd/libwzd-core/wzd_ip.h
+include/wzdftpd/libwzd-core/wzd_libmain.h
+include/wzdftpd/libwzd-core/wzd_log.h
+include/wzdftpd/libwzd-core/wzd_messages.h
+include/wzdftpd/libwzd-core/wzd_misc.h
+include/wzdftpd/libwzd-core/wzd_mod.h
+include/wzdftpd/libwzd-core/wzd_mutex.h
+include/wzdftpd/libwzd-core/wzd_perm.h
+include/wzdftpd/libwzd-core/wzd_ratio.h
+include/wzdftpd/libwzd-core/wzd_section.h
+include/wzdftpd/libwzd-core/wzd_shm.h
+include/wzdftpd/libwzd-core/wzd_site.h
+include/wzdftpd/libwzd-core/wzd_site_group.h
+include/wzdftpd/libwzd-core/wzd_site_user.h
+include/wzdftpd/libwzd-core/wzd_socket.h
+include/wzdftpd/libwzd-core/wzd_string.h
+include/wzdftpd/libwzd-core/wzd_structs.h
+include/wzdftpd/libwzd-core/wzd_threads.h
+include/wzdftpd/libwzd-core/wzd_tls.h
+include/wzdftpd/libwzd-core/wzd_types.h
+include/wzdftpd/libwzd-core/wzd_utf8.h
+include/wzdftpd/libwzd-core/wzd_vars.h
+include/wzdftpd/libwzd-core/wzd_vfs.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
-include/wzdftpd/wzd_fs.h
-include/wzdftpd/wzd_hardlimits.h
-include/wzdftpd/wzd_ip.h
-include/wzdftpd/wzd_libmain.h
-include/wzdftpd/wzd_log.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_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_threads.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.la
 lib/libwzd.so
 lib/libwzd.so.1
-lib/libwzd.la
 share/aclocal/wzd.m4
 sbin/wzdftpd
-%%DATADIR%%/backends/libwzdplaintext.a
-%%DATADIR%%/backends/libwzdplaintext.so
 %%DATADIR%%/backends/libwzdplaintext.la
-%%MYSQL%%%%DATADIR%%/backends/libwzdmysql.a
+%%DATADIR%%/backends/libwzdplaintext.so
 %%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
-%%PERL%%%%DATADIR%%/modules/libwzd_perl.a
 %%PERL%%%%DATADIR%%/modules/libwzd_perl.la
 %%PERL%%%%DATADIR%%/modules/libwzd_perl.so
-%%TCL%%%%DATADIR%%/modules/libwzd_tcl.a
 %%TCL%%%%DATADIR%%/modules/libwzd_tcl.la
 %%TCL%%%%DATADIR%%/modules/libwzd_tcl.so
 @dirrm %%DATADIR%%/modules/
@@ -98,6 +102,8 @@ sbin/wzdftpd
 @dirrm %%DATADIR%%/
 @dirrm include/wzdftpd/libwzd-auth
 @dirrm include/wzdftpd/libwzd-base
+@dirrm include/wzdftpd/libwzd-core/arch
+@dirrm include/wzdftpd/libwzd-core
 @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