Index: head/ftp/vsftpd-ext/pkg-deinstall
===================================================================
--- head/ftp/vsftpd-ext/pkg-deinstall	(revision 394235)
+++ head/ftp/vsftpd-ext/pkg-deinstall	(nonexistent)
@@ -1,16 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/ftp/vsftpd-ext/pkg-deinstall,v 1.1 2009-06-16 03:53:39 pgollucci Exp $
-#
-
-if [ "$2" != "POST-DEINSTALL" ]; then
-    exit 0
-fi
-
-USER=ftp
-
-if pw usershow "${USER}" 2>/dev/null 1>&2; then
-        echo "To delete FTP user permanently, use 'pw userdel ${USER}'"
-        echo "Don't do this if you're using FreeBSD's anonymous FTP server"
-fi
-
-exit 0

Property changes on: head/ftp/vsftpd-ext/pkg-deinstall
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/ftp/vsftpd-ext/pkg-install
===================================================================
--- head/ftp/vsftpd-ext/pkg-install	(revision 394235)
+++ head/ftp/vsftpd-ext/pkg-install	(nonexistent)
@@ -1,36 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/ftp/vsftpd-ext/pkg-install,v 1.1 2009-06-16 03:53:39 pgollucci Exp $
-#
-
-if [ "$2" != "PRE-INSTALL" ]; then
-    exit 0
-fi
-
-if ! pw groupshow operator >/dev/null; then
-	if pw groupadd operator 5; then
-		echo "Added group operator for vsftpd"
-	else
-		echo "Failed to add group operator as gid 5" >&2
-		exit 1
-	fi
-fi
-
-if ! pw usershow ftp >/dev/null; then
-	if pw useradd ftp -g operator -u 14 -h - -d /var/ftp -s /nonexistent -c "Anonymous Ftp"; then
-		echo "Added user ftp for vsftpd"
-	else
-		echo "Failed to add user ftp as gid 14" >&2
-		exit 1
-	fi
-fi
-
-# uid=14(ftp) gid=5(operator) groups=5(operator)
-view="$(id ftp)"
-view="${view%% *}"
-if test "${view}" = "uid=14(ftp)"; then
-	exit 0
-fi
-
-echo "User ftp should have uid 14"; >&2
-exit 1
-# eof

Property changes on: head/ftp/vsftpd-ext/pkg-install
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/ftp/vsftpd-ext/Makefile
===================================================================
--- head/ftp/vsftpd-ext/Makefile	(revision 394235)
+++ head/ftp/vsftpd-ext/Makefile	(revision 394236)
@@ -1,122 +1,119 @@
 # Created by: Maxim Ignatenko
 # $FreeBSD$
 
 PORTNAME=	vsftpd-ext
 PORTVERSION=	${UPSTREAMVERSION}.${EXTVERSION}
 PORTREVISION=	2
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	http://vsftpd.devnet.ru/files/${UPSTREAMVERSION}/ext.${EXTVERSION}/
 PKGNAMESUFFIX?=	${SSL_SUFFIX}${PKGNAMESUFFIX2}
 DISTNAME=	vsFTPd-${UPSTREAMVERSION}-ext${EXTVERSION}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	xjflyttp@gmail.com
 COMMENT=	FTP daemon that aims to be "very secure". Extended build
 
-BROKEN_FreeBSD_9_i386=	does not link
-
 LICENSE=	GPLv2
 
 UPSTREAMVERSION=3.0.2
 EXTVERSION=	1
 
-USES=		alias gmake
+USES=		alias gmake tar:tgz
 WRKSRC=		${WRKDIR}/vsFTPd-${UPSTREAMVERSION}-ext.${EXTVERSION}
 ALL_TARGET=	vsftpd
 
 USERS=		ftp
 GROUPS=		ftp
 
 DOCFILES=	AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL LICENSE \
 		README README.security README.ssl REFS REWARD \
 		SIZE SPEED TODO TUNING
 
 OPTIONS_DEFINE=	RC_SCRIPT VSFTPD_SSL DOCS
 OPTIONS_DEFAULT=RC_SCRIPT DOCS
 RC_SCRIPT_DESC=	install RC_SCRIPT
 
 VSFTPD_SSL_DESC=Include support for SSL
 
 CONFLICTS=	vsftpd-3* vsftpd${SSL_SUFFIX}${PKGNAMESUFFIX2}-3*
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 902001
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
+.if exists(/usr/bin/clang)
+CC=		clang
+.else
 BUILD_DEPENDS+=	clang33:${PORTSDIR}/lang/clang33
 CC=		clang33
-.if ${ARCH} == i386
-BROKEN=		does not build on 9.x i386
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MRC_SCRIPT}
 USE_RC_SUBR=	vsftpd
 .endif
 
 VSFTPD_OPTIMIZED=	${CFLAGS:M-O*}
 .if defined(CFLAGS) && !empty(VSFTPD_OPTIMIZED)
 VSFTPD_NO_OPTIMIZED=	-e "s|-O2 ||"
 .endif
 
 .if ${PORT_OPTIONS:MVSFTPD_SSL} && !defined(WITHOUT_SSL)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 SSL_SUFFIX=	-ssl
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 .endif
 
 do-configure:
 .if ${PORT_OPTIONS:MVSFTPD_SSL} && !defined(WITHOUT_SSL)
 	${REINPLACE_CMD} -e \
 		"s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \
 		-e "s|#undef VSF_BUILD_SSL|#define VSF_BUILD_SSL 1|" \
 		${WRKSRC}/builddefs.h
 .else
 	${REINPLACE_CMD} -e \
 		"s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \
 		${WRKSRC}/builddefs.h
 .endif
 	${REINPLACE_CMD} -e \
 		"s|#define VSF_CONFIG_PATH \"/etc/vsftpd/\"|#define VSF_CONFIG_PATH \"${PREFIX}/etc/\"|" \
 		-e "s|#define VSF_CONFIG_PREFIX \"\"|#define VSF_CONFIG_PREFIX \"vsftpd.\"|" \
 		${WRKSRC}/builddefs.h
 	${REINPLACE_CMD} -e "s|/etc/v|${PREFIX}/etc/v|" \
 		${WRKSRC}/vsftpd.8 ${WRKSRC}/vsftpd.conf.5
 	${REINPLACE_CMD} -e "s|/usr/share/empty|${PREFIX}/share/vsftpd/empty|" \
 		${WRKSRC}/tunables.c
 	${REINPLACE_CMD} ${VSFTPD_NO_OPTIMIZED} \
 		-e '/^CC/s/=/?=/' \
 		-e '/^CFLAGS/{s/=/+=/;s/-O[0-9]//;}' \
 		-e '/^LIBS/s|=.*|= `./vsf_findlibs.sh`|' \
 		-e '/^LINK/s/=.*/=/' \
 		-e 's|-Werror||' \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e '/-lutil/d' ${WRKSRC}/vsf_findlibs.sh
 
 	@${ECHO_CMD} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \
 		${WRKSRC}/vsftpd.conf
 	@${ECHO_CMD} >>${WRKSRC}/vsftpd.conf ""
 	@${ECHO_CMD} >>${WRKSRC}/vsftpd.conf \
 		"# If using vsftpd in standalone mode, uncomment the next two lines:"
 	@${ECHO_CMD} >>${WRKSRC}/vsftpd.conf "# listen=YES"
 	@${ECHO_CMD} >>${WRKSRC}/vsftpd.conf "# background=YES"
 	${REINPLACE_CMD} -e "s|^listen=.*|listen=NO|" \
 		${WRKSRC}/vsftpd.conf
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vsftpd ${STAGEDIR}${PREFIX}/libexec/
 	${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${STAGEDIR}${PREFIX}/etc/vsftpd.conf.sample
 	${INSTALL_MAN} ${WRKSRC}/vsftpd.conf.5 ${STAGEDIR}${PREFIX}/man/man5/
 	${INSTALL_MAN} ${WRKSRC}/vsftpd.8 ${STAGEDIR}${PREFIX}/man/man8/
 	${MKDIR} ${STAGEDIR}/var/ftp ${STAGEDIR}${PREFIX}/share/vsftpd/empty
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 .for i in EXAMPLE SECURITY
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
 	${CP} -p -R -L ${WRKSRC}/${i}/./ ${STAGEDIR}${DOCSDIR}/${i}/
-	${CHMOD} -R -L a+rX,go-w ${STAGEDIR}${DOCSDIR}/${i}/
 .endfor
 .endif
 
 .include <bsd.port.mk>
Index: head/ftp/vsftpd-ext/files/patch-utility
===================================================================
--- head/ftp/vsftpd-ext/files/patch-utility	(revision 394235)
+++ head/ftp/vsftpd-ext/files/patch-utility	(revision 394236)
@@ -1,13 +1,13 @@
---- utility.c.orig      Fri Jul  2 18:26:30 2004
-+++ utility.c   Mon Oct 10 01:19:02 2005
-@@ -33,6 +33,10 @@
+--- utility.c.orig	2012-10-26 20:05:38 UTC
++++ utility.c
+@@ -40,6 +40,10 @@ die2(const char* p_text1, const char* p_
  void
  bug(const char* p_text)
  {
 +  static int inside_bug = 0;
 +  if (inside_bug)
 +    vsf_sysutil_exit(1);
 +  inside_bug++;
    /* Rats. Try and write the reason to the network for diagnostics */
    vsf_sysutil_activate_noblock(VSFTP_COMMAND_FD);
    (void) vsf_sysutil_write_loop(VSFTP_COMMAND_FD, "500 OOPS: ", 10);