6 files changed, 14 insertions, 10 deletions

diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index 62eff5650a73..efcef5e82098 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -13,7 +13,8 @@ MASTER_SITES=	ftp://ftp.tos.net/pub/proftpd/
 
 MAINTAINER=	mharo@FreeBSD.org
 
-MAN1=	ftpcount.1
+MAN1=	ftpcount.1 ftpwho.1
+MAN5=	xferlog.5
 MAN8=	proftpd.8 ftpshut.8
 
 USE_GMAKE=	yes
@@ -39,13 +40,14 @@ post-configure:
 	@${SED}	-e 's:/usr/bin:${PREFIX}/bin:' \
 		< ${WRKSRC}/src/ftpcount.1.pre_sed > ${WRKSRC}/src/ftpcount.1
 
-#STRIP=
 do-install:
-	@${MKDIR} /var/run/proftpd
 	@${INSTALL_PROGRAM} ${WRKSRC}/ftpcount ${PREFIX}/bin/ftpcount
+	@(cd ${PREFIX}/bin && ${LN} -s ftpcount ftpwho)
 	@${INSTALL_PROGRAM} ${WRKSRC}/proftpd ${PREFIX}/libexec/proftpd
 	@${INSTALL_PROGRAM} ${WRKSRC}/ftpshut ${PREFIX}/sbin/ftpshut
 	@${INSTALL_MAN} ${WRKSRC}/src/ftpcount.1 ${PREFIX}/man/man1/ftpcount.1
+	@${INSTALL_MAN} ${WRKSRC}/src/ftpwho.1 ${PREFIX}/man/man1/ftpwho.1
+	@${INSTALL_MAN} ${WRKSRC}/src/xferlog.5 ${PREFIX}/man/man5/xferlog.5
 	@${INSTALL_MAN} ${WRKSRC}/src/ftpshut.8 ${PREFIX}/man/man8/ftpshut.8
 	@${INSTALL_MAN} ${WRKSRC}/src/proftpd.8 ${PREFIX}/man/man8/proftpd.8
 	@${INSTALL_DATA} \
diff --git a/ftp/proftpd-devel/files/proftpd.sh.sample b/ftp/proftpd-devel/files/proftpd.sh.sample
index d2598672f5e2..ad976fa3984f 100644
--- a/ftp/proftpd-devel/files/proftpd.sh.sample
+++ b/ftp/proftpd-devel/files/proftpd.sh.sample
@@ -3,6 +3,7 @@
 case "$1" in
 
 start)
+	/bin/mkdir -p /var/run/proftpd
 	if [ -x /usr/local/libexec/proftpd ]; then
 		/usr/local/libexec/proftpd && echo -n ' proftpd'
 	fi
diff --git a/ftp/proftpd-devel/pkg-plist b/ftp/proftpd-devel/pkg-plist
index a0c97c6b7ffa..37cffafd954a 100644
--- a/ftp/proftpd-devel/pkg-plist
+++ b/ftp/proftpd-devel/pkg-plist
@@ -1,8 +1,7 @@
 bin/ftpcount
+bin/ftpwho
 etc/proftpd.conf.default
 etc/rc.d/proftpd.sh.sample
 @exec if [ ! -f %D/etc/proftpd.conf ] ; then cp -p %D/%F %B/proftpd.conf; fi
 libexec/proftpd
 sbin/ftpshut
-@exec /bin/mkdir /var/run/proftpd
-@unexec /bin/rmdir /var/run/proftpd
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 62eff5650a73..efcef5e82098 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -13,7 +13,8 @@ MASTER_SITES=	ftp://ftp.tos.net/pub/proftpd/
 
 MAINTAINER=	mharo@FreeBSD.org
 
-MAN1=	ftpcount.1
+MAN1=	ftpcount.1 ftpwho.1
+MAN5=	xferlog.5
 MAN8=	proftpd.8 ftpshut.8
 
 USE_GMAKE=	yes
@@ -39,13 +40,14 @@ post-configure:
 	@${SED}	-e 's:/usr/bin:${PREFIX}/bin:' \
 		< ${WRKSRC}/src/ftpcount.1.pre_sed > ${WRKSRC}/src/ftpcount.1
 
-#STRIP=
 do-install:
-	@${MKDIR} /var/run/proftpd
 	@${INSTALL_PROGRAM} ${WRKSRC}/ftpcount ${PREFIX}/bin/ftpcount
+	@(cd ${PREFIX}/bin && ${LN} -s ftpcount ftpwho)
 	@${INSTALL_PROGRAM} ${WRKSRC}/proftpd ${PREFIX}/libexec/proftpd
 	@${INSTALL_PROGRAM} ${WRKSRC}/ftpshut ${PREFIX}/sbin/ftpshut
 	@${INSTALL_MAN} ${WRKSRC}/src/ftpcount.1 ${PREFIX}/man/man1/ftpcount.1
+	@${INSTALL_MAN} ${WRKSRC}/src/ftpwho.1 ${PREFIX}/man/man1/ftpwho.1
+	@${INSTALL_MAN} ${WRKSRC}/src/xferlog.5 ${PREFIX}/man/man5/xferlog.5
 	@${INSTALL_MAN} ${WRKSRC}/src/ftpshut.8 ${PREFIX}/man/man8/ftpshut.8
 	@${INSTALL_MAN} ${WRKSRC}/src/proftpd.8 ${PREFIX}/man/man8/proftpd.8
 	@${INSTALL_DATA} \
diff --git a/ftp/proftpd/files/proftpd.sh.sample b/ftp/proftpd/files/proftpd.sh.sample
index d2598672f5e2..ad976fa3984f 100644
--- a/ftp/proftpd/files/proftpd.sh.sample
+++ b/ftp/proftpd/files/proftpd.sh.sample
@@ -3,6 +3,7 @@
 case "$1" in
 
 start)
+	/bin/mkdir -p /var/run/proftpd
 	if [ -x /usr/local/libexec/proftpd ]; then
 		/usr/local/libexec/proftpd && echo -n ' proftpd'
 	fi
diff --git a/ftp/proftpd/pkg-plist b/ftp/proftpd/pkg-plist
index a0c97c6b7ffa..37cffafd954a 100644
--- a/ftp/proftpd/pkg-plist
+++ b/ftp/proftpd/pkg-plist
@@ -1,8 +1,7 @@
 bin/ftpcount
+bin/ftpwho
 etc/proftpd.conf.default
 etc/rc.d/proftpd.sh.sample
 @exec if [ ! -f %D/etc/proftpd.conf ] ; then cp -p %D/%F %B/proftpd.conf; fi
 libexec/proftpd
 sbin/ftpshut
-@exec /bin/mkdir /var/run/proftpd
-@unexec /bin/rmdir /var/run/proftpd