5 files changed, 44 insertions, 35 deletions

diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index af77f3a4a065..edbd7eb17e78 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	wzdftpd
-PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTVERSION=	0.7.2
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,12 +14,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Modular FTP server configurable online using SITE commands
 
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	wzdftpd.sh
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	pkgconfig
-CONFIGURE_ARGS+=	--without-pam --without-pgsql --disable-bonjour
+CONFIGURE_ARGS+=	--without-pam --disable-pgsql --disable-bonjour --mandir=${MANPREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="${CPPLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -72,8 +71,8 @@ LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--disable-gnutls
 .endif
 
-.if defined(WITH_IPV6)
-CONFIGURE_ARGS+=	--enable-ipv6
+.if !defined(WITH_IPV6)
+CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .if !defined(WITH_PERL)
@@ -88,7 +87,7 @@ PLIST_SUB+=	PERL=""
 USE_MYSQL=	yes
 PLIST_SUB+=	MYSQL=""
 .else
-CONFIGURE_ARGS+=	--without-mysql
+CONFIGURE_ARGS+=	--disable-mysql
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
@@ -126,14 +125,11 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
-	@${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; \
+	@if test ! -f ${PREFIX}/etc/wzdftpd/wzd.cfg; then \
+		${CP} ${PREFIX}/etc/wzdftpd/wzd.cfg.sample ${PREFIX}/etc/wzdftpd/wzd.cfg; \
 	fi
-	@if test ! -f ${PREFIX}/etc/users; then \
-		${CP} ${PREFIX}/etc/users.sample ${PREFIX}/etc/users; \
+	@if test ! -f ${PREFIX}/etc/wzdftpd/users; then \
+		${CP} ${PREFIX}/etc/wzdftpd/users.sample ${PREFIX}/etc/wzdftpd/users; \
 	fi
 
 .include <bsd.port.post.mk>
diff --git a/ftp/wzdftpd/distinfo b/ftp/wzdftpd/distinfo
index 94faa03a63a9..859f3d71b241 100644
--- a/ftp/wzdftpd/distinfo
+++ b/ftp/wzdftpd/distinfo
@@ -1,3 +1,3 @@
-MD5 (wzdftpd-0.6.1.tar.gz) = 4cffafcf1c3b76504b82250b92d73cdf
-SHA256 (wzdftpd-0.6.1.tar.gz) = ad0045dac6f061830aa784fdc1a18da28874a97c0005b6e665c0467dd0c48672
-SIZE (wzdftpd-0.6.1.tar.gz) = 888206
+MD5 (wzdftpd-0.7.2.tar.gz) = 92ed2975f5a2ddcbd1f34301d6d0d7be
+SHA256 (wzdftpd-0.7.2.tar.gz) = c2ecea11b9d864e320c6af82de1eeecd4ad1ad458e588e6a65886d715754a749
+SIZE (wzdftpd-0.7.2.tar.gz) = 895046
diff --git a/ftp/wzdftpd/files/patch-modules-zeroconf-libwzd_avahi.h b/ftp/wzdftpd/files/patch-modules-zeroconf-libwzd_avahi.h
new file mode 100644
index 000000000000..5d53ed46acb6
--- /dev/null
+++ b/ftp/wzdftpd/files/patch-modules-zeroconf-libwzd_avahi.h
@@ -0,0 +1,10 @@
+--- modules/zeroconf/libwzd_avahi.h.orig	Wed May 31 14:55:16 2006
++++ modules/zeroconf/libwzd_avahi.h	Wed May 31 14:56:17 2006
+@@ -29,6 +29,7 @@
+ #include <stdlib.h>

+ #include <assert.h>

+ #include <string.h>

++#include <pthread.h>

+ 

+ #include <libwzd-core/wzd_structs.h>

+ #include <libwzd-core/wzd_log.h>

diff --git a/ftp/wzdftpd/files/wzdftpd.sh b/ftp/wzdftpd/files/wzdftpd.sh.in
index 25a14fc945ec..25a14fc945ec 100644
--- a/ftp/wzdftpd/files/wzdftpd.sh
+++ b/ftp/wzdftpd/files/wzdftpd.sh.in
diff --git a/ftp/wzdftpd/pkg-plist b/ftp/wzdftpd/pkg-plist
index bd915a60bc9e..683441772791 100644
--- a/ftp/wzdftpd/pkg-plist
+++ b/ftp/wzdftpd/pkg-plist
@@ -3,18 +3,17 @@ bin/siteconfig
 bin/siteuptime
 bin/sitewho
 bin/wzd-config
-etc/rc.d/wzdftpd.sh
-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
+etc/wzdftpd/wzd.pem
+etc/wzdftpd/file_ginfo.txt
+etc/wzdftpd/file_help.txt
+etc/wzdftpd/file_swho.txt
+etc/wzdftpd/file_user.txt
+etc/wzdftpd/file_group.txt
+etc/wzdftpd/file_rules.txt
+etc/wzdftpd/file_users.txt
+etc/wzdftpd/file_vfs.txt
+etc/wzdftpd/file_who.txt
+etc/wzdftpd/file_groups.txt
 include/wzdftpd/libwzd-auth/wzd_auth.h
 include/wzdftpd/libwzd-auth/wzd_base64.h
 include/wzdftpd/libwzd-auth/wzd_crypt.h
@@ -80,11 +79,11 @@ include/wzdftpd/libwzd_tls.h
 lib/libwzd_core.a
 lib/libwzd_core.la
 lib/libwzd_core.so
-lib/libwzd_core.so.1
+lib/libwzd_core.so.700
 lib/libwzd.a
 lib/libwzd.la
 lib/libwzd.so
-lib/libwzd.so.1
+lib/libwzd.so.700
 share/aclocal/wzd.m4
 sbin/wzdftpd
 %%DATADIR%%/backends/libwzdplaintext.a
@@ -93,6 +92,9 @@ sbin/wzdftpd
 %%MYSQL%%%%DATADIR%%/backends/libwzdmysql.a
 %%MYSQL%%%%DATADIR%%/backends/libwzdmysql.la
 %%MYSQL%%%%DATADIR%%/backends/libwzdmysql.so
+%%DATADIR%%/modules/libwzd_debug.so
+%%DATADIR%%/modules/libwzd_debug.la
+%%DATADIR%%/modules/libwzd_debug.a
 %%DATADIR%%/modules/libwzd_sfv.a
 %%DATADIR%%/modules/libwzd_sfv.la
 %%DATADIR%%/modules/libwzd_sfv.so
@@ -113,7 +115,8 @@ sbin/wzdftpd
 @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
-etc/wzd.cfg.sample
-etc/users.sample
+@unexec if cmp -s %D/etc/wzdftpd/wzd.cfg %D/etc/wzdftpd/wzd.cfg.sample; then rm -f %D/etc/wzdftpd/wzd.cfg; fi
+@unexec if cmp -s %D/etc/wzdftpd/users %D/etc/wzdftpd/users.sample; then rm -f %D/etc/wzdftpd/users; fi
+etc/wzdftpd/wzd.cfg.sample
+etc/wzdftpd/users.sample
+@dirrmtry etc/wzdftpd