From sam@ada.eu.org  Mon Oct  9 08:29:42 2000
Return-Path: <sam@ada.eu.org>
Received: from ada.eu.org (marvin.enst.fr [137.194.161.2])
	by hub.freebsd.org (Postfix) with ESMTP id 91C0437B503
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  9 Oct 2000 08:29:41 -0700 (PDT)
Received: by ada.eu.org (Postfix, from userid 10)
	id 3265719017; Mon,  9 Oct 2000 17:29:39 +0200 (CEST)
Received: by trillian.enst.fr (Postfix, from userid 1000)
	id 7210120C; Mon,  9 Oct 2000 17:29:23 +0200 (CEST)
Message-Id: <20001009152923.7210120C@trillian.enst.fr>
Date: Mon,  9 Oct 2000 17:29:23 +0200 (CEST)
From: sam@inf.enst.fr
Sender: sam@ada.eu.org
Reply-To: sam@inf.enst.fr
To: FreeBSD-gnats-submit@freebsd.org
Subject: Port update: devel/perforce
X-Send-Pr-Version: 3.2

>Number:         21863
>Category:       ports
>Synopsis:       Port update: devel/perforce
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 09 08:30:05 PDT 2000
>Closed-Date:    Fri Oct 27 18:34:26 PDT 2000
>Last-Modified:  Fri Oct 27 18:34:38 PDT 2000
>Originator:     Samuel Tardieu
>Release:        FreeBSD 4.1-STABLE i386
>Organization:
TELECOM Paris
>Environment:
>Description:

	Perforce port update

>How-To-Repeat:
>Fix:

Please apply the following patch, and manually add files/perforce and
files/perforce.sh.in.

--- perforce/Makefile.orig	Mon Oct  9 16:56:35 2000
+++ perforce/Makefile	Mon Oct  9 17:22:16 2000
@@ -6,28 +6,36 @@
 #
 
 PORTNAME= 	perforce
-PORTVERSION= 	99.2
+PORTVERSION= 	00.1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.freebsd/ \
 		http://www.dsmit.com/p4/ \
 		ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/doc/man/
 EXTRACT_SUFX=
-DISTFILES=	p4 p4d p4.1 p4d.1
+DISTFILES=	p4 p4d p4web p4.1 p4d.1
 DIST_SUBDIR=	perforce
 
 MAINTAINER=	sam@inf.enst.fr
 
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
-NO_BUILD=	yes
 MAN1=		p4.1 p4d.1
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
 
+do-build:
+	${SED} -e "s,@PREFIX@,${PREFIX},g" \
+		< files/perforce.sh.in > ${WRKSRC}/perforce.sh
+
 do-install:
-	${INSTALL_PROGRAM} ${DISTDIR}/${DIST_SUBDIR}/p4 ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${DISTDIR}/${DIST_SUBDIR}/p4d ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${DISTDIR}/${DIST_SUBDIR}/p4 ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${DISTDIR}/${DIST_SUBDIR}/p4web ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${DISTDIR}/${DIST_SUBDIR}/p4d ${PREFIX}/sbin/
+	if [ ! -f ${PREFIX}/etc/perforce ]; then \
+	  ${INSTALL_DATA} files/perforce ${PREFIX}/etc/; \
+	fi
+	${INSTALL_SCRIPT} ${WRKSRC}/perforce.sh ${PREFIX}/etc/rc.d/
 .for PERFMAN in p4 p4d
 	${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/${PERFMAN}.1 ${PREFIX}/man/man1
 .endfor
--- perforce/distinfo.orig	Mon Oct  9 16:58:34 2000
+++ perforce/distinfo	Mon Oct  9 17:01:36 2000
@@ -1,4 +1,5 @@
-MD5 (perforce/p4) = 6394c00f803fec549b3d22539bbdbe4a
-MD5 (perforce/p4d) = 0e14a67349b32ac413876b010ad41024
-MD5 (perforce/p4.1) = 316b0cf0e0c6e0ff63ecdb612e45f58a
-MD5 (perforce/p4d.1) = e2f1b2c60690ac4d4d3881faee5aa5e0
+MD5 (perforce/p4) = 9456775cd3acbdf7b61fa5cc9abaa929
+MD5 (perforce/p4d) = f85238c698d4fe724289edd62809a16c
+MD5 (perforce/p4web) = efe8d09184767fd1c8d9b63ce6d9f7d4
+MD5 (perforce/p4.1) = ff71fd46bccf768a1681252d358b2b49
+MD5 (perforce/p4d.1) = 17383209ae44dd2383f62cb47fe4ba78
--- perforce/pkg-plist.orig	Mon Oct  9 16:58:50 2000
+++ perforce/pkg-plist	Mon Oct  9 17:21:15 2000
@@ -1,2 +1,5 @@
 bin/p4
+bin/p4web
 sbin/p4d
+etc/perforce
+etc/rc.d/perforce.sh
--- /dev/null	Mon Oct  9 17:23:48 2000
+++ perforce/files/perforce	Mon Oct  9 17:17:56 2000
@@ -0,0 +1,18 @@
+#
+# Perforce FreeBSD configuration file
+#
+
+#
+# Perforce ROOT
+#
+PERFORCE_ROOT="/usr/p4root"
+
+#
+# Perforce options (see man p4d)
+#
+PERFORCE_OPTIONS="-v server=1 -L /var/log/perforce"
+
+#
+# Uncomment this line to have the server started automatically
+#
+#PERFORCE_START=yes
--- /dev/null	Mon Oct  9 17:23:48 2000
+++ perforce/files/perforce.sh.in	Mon Oct  9 17:15:29 2000
@@ -0,0 +1,11 @@
+#!/bin/sh
+case $1 in
+  start)
+    [ -f @PREFIX@/etc/perforce ] && . @PREFIX@/etc/perforce
+    if [ x$PERFORCE_START = xyes ]; then
+      echo -n " perforce server"
+      p4d -r $PERFORCE_ROOT $PERFORCE_OPTIONS
+    fi
+    ;;
+  *) ;;
+esac



>Release-Note:
>Audit-Trail:

From: Peter Pentchev <roam@orbitel.bg>
To: sam@inf.enst.fr
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/21863: Port update: devel/perforce
Date: Mon, 9 Oct 2000 18:42:09 +0300

 On Mon, Oct 09, 2000 at 05:29:23PM +0200, sam@inf.enst.fr wrote:
 > 
 > >Number:         21863
 > >Category:       ports
 > >Synopsis:       Port update: devel/perforce
 
 [snip]
 
 >  PORTNAME= 	perforce
 > -PORTVERSION= 	99.2
 > +PORTVERSION= 	00.1
 >  CATEGORIES=	devel
 
 This version 'unbump' sounds like a very likely candidate for a PORTEPOCH=1
 to me..
 
 G'luck,
 Peter
 
 -- 
 This sentence no verb.
 
State-Changed-From-To: open->closed 
State-Changed-By: jeh 
State-Changed-When: Fri Oct 27 18:34:26 PDT 2000 
State-Changed-Why:  
Committed.  Thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=21863 
>Unformatted:
