4 files changed, 48 insertions, 14 deletions

diff --git a/devel/p4ftpd/Makefile b/devel/p4ftpd/Makefile
index 629500ba2167..e8bd666e26f5 100644
--- a/devel/p4ftpd/Makefile
+++ b/devel/p4ftpd/Makefile
@@ -36,13 +36,15 @@ PERFORCE_HOME?=		${LOCALBASE}/perforce
 PERFORCE_ROOT?=		${PERFORCE_HOME}/root
 PERFORCE_LOGS?=		${PERFORCE_HOME}/logs
 PERFORCE_PORT?=		1666
+PERFORCE_CACHE?=      ${PERFORCE_HOME}/cache
+PERFORCE_TARGET?=     perforce:1666
 
 .if ${ARCH} == i386
-VERSION=	02.1
+VERSION=	02.2
 REVISION=	2
 PLATFORM=	freebsd4
 BIN_FILES=	p4 p4web
-SBIN_FILES=	p4d p4ftpd
+SBIN_FILES=	p4d p4ftpd p4p
 .elif ${ARCH} == alpha
 VERSION=	99.1
 REVISION=	1
@@ -54,10 +56,12 @@ IGNORE=		"Unsupported platform, sorry."
 .endif
 
 do-build:
-	${SED} -e "s,@PERFORCE_ROOT@,${PERFORCE_ROOT},g" \
-	       -e "s,@PERFORCE_LOGS@,${PERFORCE_LOGS},g" \
-	       -e "s,@PERFORCE_USER@,${PERFORCE_USER},g" \
-	       -e "s,@PERFORCE_PORT@,${PERFORCE_PORT},g" \
+	${SED}	-e "s,@PERFORCE_ROOT@,${PERFORCE_ROOT},g" \
+		-e "s,@PERFORCE_LOGS@,${PERFORCE_LOGS},g" \
+		-e "s,@PERFORCE_USER@,${PERFORCE_USER},g" \
+		-e "s,@PERFORCE_PORT@,${PERFORCE_PORT},g" \
+		-e "s,@PERFORCE_CACHE@,${PERFORCE_CACHE},g" \
+		-e "s,@PERFORCE_TARGET@,${PERFORCE_TARGET},g" \
 		< ${FILESDIR}/perforce.conf.in > ${WRKSRC}/perforce.conf
 	${SED} -e "s,@PREFIX@,${PREFIX},g" \
 		< ${FILESDIR}/perforce.sh.in > ${WRKSRC}/perforce.sh
@@ -102,6 +106,6 @@ post-install:
 .for f in ${SBIN_FILES}
 	${ECHO_CMD} sbin/${f} >> ${TMPPLIST}
 .endfor
-	${ECHO_CMD} "@unexec /bin/rmdir ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec ${RMDIR} ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/devel/p4ftpd/distinfo b/devel/p4ftpd/distinfo
index 61a77b76e38d..02ab4f418675 100644
--- a/devel/p4ftpd/distinfo
+++ b/devel/p4ftpd/distinfo
@@ -1,9 +1,10 @@
-MD5 (perforce/02.1/i386/p4) = 74e7d85461e5ec5c32b43ab6ce2751c1
-MD5 (perforce/02.1/i386/p4d) = da9a44c23d841699d74c1b3b4ea34f7e
-MD5 (perforce/02.1/i386/p4ftpd) = afe586e372af2371da484761b9dd8294
-MD5 (perforce/02.1/i386/p4web) = 14a3d7cd263c6cb5be5fe2c92494c80f
-MD5 (perforce/02.1/i386/p4.1) = f5ab07d3fe1d8387f7685fca03053461
-MD5 (perforce/02.1/i386/p4d.1) = 721b40e0e2f5f41e6cfae52450127283
+MD5 (perforce/02.2/i386/p4) = ff6c60445470c88bf8ee584021a1da5f
+MD5 (perforce/02.2/i386/p4web) = ccd7d116688c69cdb251300bc07d771f
+MD5 (perforce/02.2/i386/p4d) = c16a5d0beae160558c0ed5348daea981
+MD5 (perforce/02.2/i386/p4ftpd) = e9c921f222994c77a232b12cca6f5e89
+MD5 (perforce/02.2/i386/p4p) = 2e9ba7d4ac9bd752218677cb229a4a72
+MD5 (perforce/02.2/i386/p4.1) = 88b8b8c33e32092a96cb409bf635b40d
+MD5 (perforce/02.2/i386/p4d.1) = 382614735981ad5a80b7b679b36f48c0
 MD5 (perforce/99.1/alpha/p4) = 7c1300a82ab03b7ede46cf8a02c48fd9
 MD5 (perforce/99.1/alpha/p4d) = 8f34c41c18185011ed848aaf450cffa5
 MD5 (perforce/99.1/alpha/p4.1) = 4a9d035eb5ef96342c2f701a02da40f9
diff --git a/devel/p4ftpd/files/perforce.conf.in b/devel/p4ftpd/files/perforce.conf.in
index a98aa38b842b..5db4fded51a2 100644
--- a/devel/p4ftpd/files/perforce.conf.in
+++ b/devel/p4ftpd/files/perforce.conf.in
@@ -15,11 +15,21 @@ PERFORCE_ROOT="@PERFORCE_ROOT@"
 PERFORCE_USER="@PERFORCE_USER@"
 
 #
-# p4d port (default: 1666)
+# p4d/p4p port (default: 1666)
 #
 PERFORCE_PORT="@PERFORCE_PORT@"
 
 #
+# p4p cache directory
+#
+PERFORCE_PROXY_CACHE="@PERFORCE_CACHE@"
+
+#
+# p4p target server (default: perforce:1666)
+#
+PERFORCE_PROXY_TARGET="@PERFORCE_TARGET@"
+
+#
 # p4d options (see man p4d)
 #
 PERFORCE_OPTIONS="-d -p $PERFORCE_PORT -v server=1 -L @PERFORCE_LOGS@/p4d.log"
@@ -38,3 +48,13 @@ PERFORCE_FTPD_OPTIONS="-d -p $PERFORCE_PORT -v server=1 -L @PERFORCE_LOGS@/p4ftp
 # Uncomment this line to have the server started automatically
 #
 #PERFORCE_FTPD_START=yes
+
+#
+# p4p options (see p4p -h)
+#
+PERFORCE_PROXY_OPTIONS="-d -p $PERFORCE_PORT -t $PERFORCE_PROXY_TARGET -r $PERFORCE_PROXY_CACHE -v server=1 -L @PERFORCE_LOGS@/p4p.log"
+
+#
+# Uncomment this line to have the proxy server started automatically
+#
+#PERFORCE_PROXY_START=yes
diff --git a/devel/p4ftpd/files/perforce.sh.in b/devel/p4ftpd/files/perforce.sh.in
index 38cdb146e00e..4590c510b5e6 100644
--- a/devel/p4ftpd/files/perforce.sh.in
+++ b/devel/p4ftpd/files/perforce.sh.in
@@ -4,6 +4,7 @@
 
 p4d=@PREFIX@/sbin/p4d
 p4ftpd=@PREFIX@/sbin/p4ftpd
+p4p=@PREFIX@/sbin/p4p
 
 case $1 in
 start)
@@ -16,6 +17,11 @@ start)
 	echo -n ' p4ftpd'
 	$p4ftpd $PERFORCE_FTPD_OPTIONS
     fi
+    if [ -x $p4p -a x$PERFORCE_PROXY_START = xyes ]; then
+        echo -n ' p4p'
+        $p4p $PERFORCE_PROXY_OPTIONS
+    fi
+
     ;;
 stop)
     [ -f @PREFIX@/etc/perforce.conf ] && . @PREFIX@/etc/perforce.conf
@@ -25,6 +31,9 @@ stop)
     if [ -x $p4d ]; then
 	killall -u $PERFORCE_USER p4d >/dev/null 2>&1 && echo -n ' p4d'
     fi
+    if [ -x $p4p ]; then
+        killall -u 0 p4p > /dev/null 2>&1 && echo -n ' p4p'
+    fi
     ;;
 restart)
     $0 stop