4 files changed, 69 insertions, 36 deletions

diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 9a3b613989e6..8c0d57faa8ab 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wzdftpd
-PORTVERSION=	0.3.3
+PORTVERSION=	0.4.0
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,22 +17,24 @@ COMMENT=	Modular FTP server configurable online using SITE commands
 USE_RC_SUBR=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GETOPT_LONG=yes
+USE_PERL=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_INC_LIBTOOL_VER=13
-CONFIGURE_ARGS+=	--without-mysql
+CONFIGURE_ARGS+=	--without-mysql --without-pam
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-MAN8=	wzdftpd.8
+OPTIONS=	UFT8 "Enable UTF8 support" off \
+		TCL "Enable TCL support" off \
+		SSL "Enable OpenSSL support" on \
+		IPV6 "Enable IPv6 support" on
 
-.if defined(PACKAGE_BUILDING)
-WITH_UTF8=	yes
-WITH_TCL=	yes
-WITH_SSL=	yes
-WITH_IPV6=	yes
-.endif
+MAN1=	siteconfig.1 \
+	siteuptime.1 \
+	sitewho.1 \
+     	wzd-config.1
+MAN8=	wzdftpd.8
 
 .if defined(WITH_UTF8)
 USE_ICONV=	yes
@@ -41,38 +43,44 @@ CONFIGURE_ARGS+=	--enable-utf8
 
 .if defined(WITH_TCL)
 LIB_DEPENDS+=	tcl84:${PORTSDIR}/lang/tcl84
-CONFIGURE_ARGS+=	--with-tcl='${PREFIX}/include/tcl8.4:${PREFIX}/lib'
+CONFIGURE_ARGS+=	--with-tcl='${PREFIX}/lib/tcl8.4'
 PLIST_SUB+=	TCL=""
 .else
+CONFIGURE_ARGS+=	--without-tcl
 PLIST_SUB+=	TCL="@comment "
 .endif
 
 .if defined(WITH_SSL)
 USE_OPENSSL=	yes
-CONFIGURE_ARGS+=	--enable-ssl
+.else
+CONFIGURE_ARGS+=	--with-openssl=/dev/null
 .endif
 
 .if defined(WITH_IPV6)
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
-DOCS=		AUTHORS Permissions.ReadMeFirst README TLS.ReadMeFirst \
-		ChangeLog src/DOCS_XFERLOG_FORMAT src/KNOWN_BUGS src/TODO
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+PLIST_SUB+=	PERL="@comment "
+.else
+PLIST_SUB+=	PERL=""
+.endif
+
+PORTDOCS=	AUTHORS Permissions.ReadMeFirst README TLS.ReadMeFirst ChangeLog
 
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} \
 		RC_SUBR=${RC_SUBR}
 
-post-extract:
-.if defined(WITH_TCL)
-	@${REINPLACE_CMD} -e 's|-ltcl8.4|-ltcl84|g' ${WRKSRC}/configure
-.endif
-
 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}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${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}
@@ -80,4 +88,4 @@ post-install:
 		${FILESDIR}/wzdftpd.sh > ${PREFIX}/etc/rc.d/wzdftpd.sh
 	@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/wzdftpd.sh
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/ftp/wzdftpd/distinfo b/ftp/wzdftpd/distinfo
index 0a79e3052166..43c374997b41 100644
--- a/ftp/wzdftpd/distinfo
+++ b/ftp/wzdftpd/distinfo
@@ -1,2 +1,2 @@
-MD5 (wzdftpd-0.3.3.tar.gz) = 38222ee7e727a7d872fc301c6d449f95
-SIZE (wzdftpd-0.3.3.tar.gz) = 626454
+MD5 (wzdftpd-0.4.0.tar.gz) = 3d5dbf7b66170a9828d9b6e540af8857
+SIZE (wzdftpd-0.4.0.tar.gz) = 749260
diff --git a/ftp/wzdftpd/files/patch-src-wzd_ServerThread.c b/ftp/wzdftpd/files/patch-src-wzd_ServerThread.c
index ddeae0c2b28c..588dd1d0782b 100644
--- a/ftp/wzdftpd/files/patch-src-wzd_ServerThread.c
+++ b/ftp/wzdftpd/files/patch-src-wzd_ServerThread.c
@@ -1,5 +1,5 @@
---- src/wzd_ServerThread.c.orig	Thu Apr 15 10:27:07 2004
-+++ src/wzd_ServerThread.c	Tue Apr 20 10:52:06 2004
+--- src/wzd_ServerThread.c.orig	Sat Aug 28 19:48:52 2004
++++ src/wzd_ServerThread.c	Sat Aug 28 19:49:22 2004
 @@ -28,6 +28,7 @@
  #include <winsock2.h>
  #else
@@ -8,10 +8,10 @@
  #include <sys/socket.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>
-@@ -39,7 +40,6 @@
- #include <stdio.h>
+@@ -40,7 +41,6 @@
  #include <stdlib.h>
  #include <string.h>
+ #include <ctype.h> /* isspace */
 -#include <sys/types.h>
  #include <sys/stat.h>
  #include <time.h>
diff --git a/ftp/wzdftpd/pkg-plist b/ftp/wzdftpd/pkg-plist
index 00b7e7633e33..1ece467876f2 100644
--- a/ftp/wzdftpd/pkg-plist
+++ b/ftp/wzdftpd/pkg-plist
@@ -2,23 +2,44 @@
 bin/siteconfig
 bin/siteuptime
 bin/sitewho
+bin/wzd-config
 etc/rc.d/wzdftpd.sh
 etc/users.sample
 etc/wzd.cfg.sample
 etc/wzd.pem
+include/wzdftpd/wzd_action.h
+include/wzdftpd/wzd_backend.h
+include/wzdftpd/wzd_cache.h
+include/wzdftpd/wzd_crc32.h
+include/wzdftpd/wzd_crontab.h
+include/wzdftpd/wzd_debug.h
+include/wzdftpd/wzd_dir.h
+include/wzdftpd/wzd_file.h
+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_section.h
+include/wzdftpd/wzd_shm.h
+include/wzdftpd/wzd_strlcat.h
+include/wzdftpd/wzd_strtok_r.h
+include/wzdftpd/wzd_structs.h
+include/wzdftpd/wzd_types.h
+include/wzdftpd/wzd_utf8.h
+include/wzdftpd/wzd_vars.h
+include/wzdftpd/wzd_vfs.h
 lib/libwzd.a
 lib/libwzd.so
+lib/libwzd.so.1
 lib/libwzd.la
+share/aclocal/wzd.m4
 sbin/wzdftpd
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/Permissions.ReadMeFirst
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TLS.ReadMeFirst
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/DOCS_XFERLOG_FORMAT
-%%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 etc/file_ginfo.txt
 etc/file_help.txt
 etc/file_swho.txt
@@ -35,9 +56,13 @@ etc/file_groups.txt
 %%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/
 @dirrm %%DATADIR%%/backends/
 @dirrm %%DATADIR%%/
+@dirrm include/wzdftpd