Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/bftpd/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile	22 Aug 2006 09:03:49 -0000	1.17
+++ Makefile	25 Mar 2007 01:24:23 -0000
@@ -6,35 +6,34 @@
 #
 
 PORTNAME=	bftpd
-PORTVERSION=	1.5
+PORTVERSION=	1.6
 CATEGORIES=	ftp
-MASTER_SITES=	http://bftpd.sourceforge.net/downloads/src/ \
-		http://www.alaskaparadise.com/freebsd/
+MASTER_SITES=	SF
 
-MAINTAINER=	beech@alaskaparadise.org
+MAINTAINER=	beech@alaskaparadise.com
 COMMENT=	Very configurable FTP server that can do chroot easily
 
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--enable-pam
 
+PLIST_FILES=	sbin/${PORTNAME} etc/${PORTNAME}.conf.sample
 MAN8=		bftpd.8
+PORTDOCS=	en pl
 
 post-patch:
-	@${REINPLACE_CMD} -e "s@chmod 644 /var@#chmod 644 /var@g; \
-			s@touch /var@#touch /var@g; \
-			s@DESTDIR)/etc@prefix)/etc@g; \
-			s@bftpd.conf @bftpd.conf.sample @g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's,/etc/bftpd.conf,${PREFIX}/etc/bftpd.conf,' \
 		${WRKSRC}/mypaths.h
 	@${REINPLACE_CMD} -e "s@-ldl@@" ${WRKSRC}/configure
-	@${CP} ${WRKSRC}/bftpd.conf ${WRKSRC}/bftpd.conf.sample
+	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -rf
 
-post-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${MAN8PREFIX}/man/man8/
+	${INSTALL_DATA} ${WRKSRC}/bftpd.conf ${PREFIX}/etc/bftpd.conf.sample
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/en/bftpddoc-en.txt ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/en/*.html ${DOCSDIR}
+	${INSTALL} -d ${DOCSDIR}/
+	${CP} -R ${WRKSRC}/doc/ ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/ftp/bftpd/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo	22 Aug 2006 09:03:49 -0000	1.9
+++ distinfo	25 Mar 2007 01:24:23 -0000
@@ -1,3 +1,3 @@
-MD5 (bftpd-1.5.tar.gz) = 52930d87091ea68184bf575ba37f11b1
-SHA256 (bftpd-1.5.tar.gz) = 10ebf1eeb36d01449070b632637f2b0ddeb6c0601636e95fcb165beb0398eb3b
-SIZE (bftpd-1.5.tar.gz) = 96051
+MD5 (bftpd-1.6.tar.gz) = 203ebbe285857a4b001d4a9872cffce4
+SHA256 (bftpd-1.6.tar.gz) = abbb20380f7ca4606e0e7d7586ad74d457b637839d560502e9547d8e91a2c986
+SIZE (bftpd-1.6.tar.gz) = 112303
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- pkg-plist	8 May 2006 01:37:35 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-@unexec if cmp -s %D/etc/bftpd.conf %D/etc/bftpd.conf.sample; then rm -f %D/etc/bftpd.conf; fi
-etc/bftpd.conf.sample
-sbin/bftpd
-%%PORTDOCS%%%%DOCSDIR%%/bftpddoc-en-1.html
-%%PORTDOCS%%%%DOCSDIR%%/bftpddoc-en-2.html
-%%PORTDOCS%%%%DOCSDIR%%/bftpddoc-en-3.html
-%%PORTDOCS%%%%DOCSDIR%%/bftpddoc-en-4.html
-%%PORTDOCS%%%%DOCSDIR%%/bftpddoc-en-5.html
-%%PORTDOCS%%%%DOCSDIR%%/bftpddoc-en-6.html
-%%PORTDOCS%%%%DOCSDIR%%/bftpddoc-en.html
-%%PORTDOCS%%%%DOCSDIR%%/bftpddoc-en.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%