Index: head/ftp/smbftpd/Makefile
===================================================================
--- head/ftp/smbftpd/Makefile	(revision 299912)
+++ head/ftp/smbftpd/Makefile	(revision 299913)
@@ -1,59 +1,56 @@
 # New ports collection makefile for:	smbftpd
 # Date created:		2006-01-22
 # Whom:			Jui-Nan Lin <jnlin@csie.nctu.edu.tw>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	smbftpd
-PORTVERSION=	2.3
+PORTVERSION=	2.4
 CATEGORIES=	ftp
 MASTER_SITES=	SF/${PORTNAME}/SmbFTPD/${PORTVERSION}	\
 		http://www.twbsd.org/download/download.php?file=smbftpd/
 
 MAINTAINER=	jnlin@csie.nctu.edu.tw
 COMMENT=	FTP daemon using Samba-like share management mechanism
 
-OPTIONS=	MYSQL "Users database is a MySQL database" off \
-		PGSQL "Users database is a PostgreSQL database" off \
-		SSL "Enable SSL/TLS support" off \
-		ICONV "Enable codepage to unicode conversion for UTF-8 FTP" off
+OPTIONS_DEFINE=	MYSQL PGSQL SSL ICONV
+MYSQL_DESC=	Users database is a MySQL database
+PGSQL_DESC=	Users database is a PostgreSQL database
+SSL_DESC=	Enable SSL/TLS support
+ICONV_DESC=	Enable codepage to unicode conversion for UTF-8 FTP
 
 HAS_CONFIGURE=	yes
 MAKE_ENV=	OSTYPE=FreeBSD
 CONFIGURE_ARGS=	"--prefix=${PREFIX}"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_PERL5=	yes
 USE_RC_SUBR=	${PORTNAME}.sh
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	"--with-mysql"
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=	"--with-pgsql"
 .endif
 
-.if defined(WITH_ICONV)
+.if ${PORT_OPTIONS:MICONV}
 USE_ICONV=	yes
 CONFIGURE_ARGS+=	"--with-iconv"
 .endif
 
-.if defined(WITH_SSL)
+.if ${PORT_OPTIONS:MSSL}
 CONFIGURE_ARGS+=	"--with-ssl"
-.endif
-
-.if ${OSVERSION} > 900007
-BROKEN=		fails to build with new utmpx
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^CONFIGS = / s|\.conf|&.sample|g' ${WRKSRC}/Makefile
 	@cd ${WRKSRC}/conf/ && (${LS} *.conf | ${XARGS} -I % ${MV} % %.sample)
 
 .include <bsd.port.post.mk>

Property changes on: head/ftp/smbftpd/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property
Index: head/ftp/smbftpd/distinfo
===================================================================
--- head/ftp/smbftpd/distinfo	(revision 299912)
+++ head/ftp/smbftpd/distinfo	(revision 299913)
@@ -1,2 +1,2 @@
-SHA256 (smbftpd-2.3.tar.gz) = e80f30623b75a343eb3e35da4340e6d600b07eaf510eda6813955a1ba8c21fdc
-SIZE (smbftpd-2.3.tar.gz) = 139472
+SHA256 (smbftpd-2.4.tar.gz) = 2ed59e76d1e30b7a930954a5585a30eeaf8a5d7da11670e5fcf7bbc4d20d20d5
+SIZE (smbftpd-2.4.tar.gz) = 139650

Property changes on: head/ftp/smbftpd/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/ftp/smbftpd/pkg-plist
===================================================================
--- head/ftp/smbftpd/pkg-plist	(revision 299912)
+++ head/ftp/smbftpd/pkg-plist	(revision 299913)
@@ -1,8 +1,7 @@
-@comment $FreeBSD$
 bin/smbftpd-user
 %%ETCDIR%%/smbftpd.conf.sample
-%%ETCDIR%%/smbftpd_share.conf.sample
 %%ETCDIR%%/smbftpd_mysql.conf.sample
 %%ETCDIR%%/smbftpd_pgsql.conf.sample
+%%ETCDIR%%/smbftpd_share.conf.sample
 sbin/smbftpd
 @dirrmtry %%ETCDIR%%

Property changes on: head/ftp/smbftpd/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property