Date: 4 Jan 2003 06:08:20 -0000 From: David Marshall <marshall@chezmarshall.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46745: update perforce port to 2002.2 Message-ID: <20030104060820.68125.qmail@chezmarshall.com>
next in thread | raw e-mail | index | archive | help
>Number: 46745 >Category: ports >Synopsis: update perforce port to 2002.2 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jan 03 22:10:01 PST 2003 >Closed-Date: >Last-Modified: >Originator: David Marshall >Release: FreeBSD 4.7-p1-RELEASE i386 >Organization: >Environment: System: FreeBSD server1.chezmarshall.com 4.7-p1-RELEASE FreeBSD 4.7-p1-RELEASE #0: Wed Oct 23 22:24:01 EDT 2002 marshall@server1.chezmarshall.com:/disk3/obj/disk2/src/sys/CHEZMARSHALL i386 >Description: Perforce has released new version for i386, 2002.2 >How-To-Repeat: Implement following patch, also available at http://www.chezmarshall.com/perforce.2002.2.diff Note that Perforce has added a new proxy server, p4p. Index: Makefile =================================================================== RCS file: /home/ncvs/ports/devel/perforce/Makefile,v retrieving revision 1.14 diff -c -r1.14 Makefile *** Makefile 2002/11/01 11:24:00 1.14 --- Makefile 2003/01/04 05:51:39 *************** *** 36,48 **** PERFORCE_ROOT?= ${PERFORCE_HOME}/root PERFORCE_LOGS?= ${PERFORCE_HOME}/logs PERFORCE_PORT?= 1666 .if ${ARCH} == i386 ! VERSION= 02.1 ! REVISION= 2 PLATFORM= freebsd4 BIN_FILES= p4 p4web ! SBIN_FILES= p4d p4ftpd .elif ${ARCH} == alpha VERSION= 99.1 REVISION= 1 --- 36,50 ---- 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.2 ! REVISION= 1 PLATFORM= freebsd4 BIN_FILES= p4 p4web ! SBIN_FILES= p4d p4ftpd p4p .elif ${ARCH} == alpha VERSION= 99.1 REVISION= 1 *************** *** 58,63 **** --- 60,67 ---- -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 Index: distinfo =================================================================== RCS file: /home/ncvs/ports/devel/perforce/distinfo,v retrieving revision 1.10 diff -c -r1.10 distinfo *** distinfo 2002/06/25 17:24:36 1.10 --- distinfo 2003/01/04 05:51:39 *************** *** 1,9 **** ! 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/99.1/alpha/p4) = 7c1300a82ab03b7ede46cf8a02c48fd9 MD5 (perforce/99.1/alpha/p4d) = 8f34c41c18185011ed848aaf450cffa5 MD5 (perforce/99.1/alpha/p4.1) = 4a9d035eb5ef96342c2f701a02da40f9 --- 1,10 ---- ! MD5 (perforce/02.2/i386/p4) = e690ede7a75256cfedb4315ac7ba255c ! MD5 (perforce/02.2/i386/p4web) = 3ea1605445b722083dab352a1ba740cf ! MD5 (perforce/02.2/i386/p4d) = 3b42eed8605984eff69a89d87c595ab7 ! MD5 (perforce/02.2/i386/p4ftpd) = 02cd016c774088c6696178235c099e48 ! MD5 (perforce/02.2/i386/p4p) = 03890c94af09fdb3e1ef031986101e47 ! 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 Index: files/perforce.conf.in =================================================================== RCS file: /home/ncvs/ports/devel/perforce/files/perforce.conf.in,v retrieving revision 1.1 diff -c -r1.1 perforce.conf.in *** files/perforce.conf.in 2001/09/01 18:57:08 1.1 --- files/perforce.conf.in 2003/01/04 05:51:39 *************** *** 15,25 **** PERFORCE_USER="@PERFORCE_USER@" # ! # p4d port (default: 1666) # PERFORCE_PORT="@PERFORCE_PORT@" # # p4d options (see man p4d) # PERFORCE_OPTIONS="-d -p $PERFORCE_PORT -v server=1 -L @PERFORCE_LOGS@/p4d.log" --- 15,35 ---- PERFORCE_USER="@PERFORCE_USER@" # ! # 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,40 **** --- 48,60 ---- # 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 Index: files/perforce.sh.in =================================================================== RCS file: /home/ncvs/ports/devel/perforce/files/perforce.sh.in,v retrieving revision 1.3 diff -c -r1.3 perforce.sh.in *** files/perforce.sh.in 2001/09/01 18:57:08 1.3 --- files/perforce.sh.in 2003/01/04 05:51:39 *************** *** 4,9 **** --- 4,10 ---- p4d=@PREFIX@/sbin/p4d p4ftpd=@PREFIX@/sbin/p4ftpd + p4p=@PREFIX@/sbin/p4p case $1 in start) *************** *** 16,21 **** --- 17,26 ---- 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 *************** *** 24,29 **** --- 29,37 ---- fi 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) >Fix: >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030104060820.68125.qmail>