From owner-cvs-usrsbin  Sun May  5 09:21:24 1996
Return-Path: owner-cvs-usrsbin
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id JAA25129
          for cvs-usrsbin-outgoing; Sun, 5 May 1996 09:21:24 -0700 (PDT)
Received: from spinner.DIALix.COM (spinner.DIALix.COM [192.203.228.67])
          by freefall.freebsd.org (8.7.3/8.7.3) with ESMTP id JAA25122
          Sun, 5 May 1996 09:21:12 -0700 (PDT)
Received: from spinner.DIALix.COM (localhost.DIALix.oz.au [127.0.0.1]) by spinner.DIALix.COM (8.7.5/8.7.3) with ESMTP id AAA21426; Mon, 6 May 1996 00:21:03 +0800 (WST)
Message-Id: <199605051621.AAA21426@spinner.DIALix.COM>
X-Mailer: exmh version 1.6.6 3/24/96
To: Joerg Wunsch <joerg@freefall.freebsd.org>
cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org,
        cvs-usrsbin@freefall.freebsd.org
Subject: Re: cvs commit: src/usr.sbin/lpr - Imported sources 
In-reply-to: Your message of "Sun, 05 May 1996 07:04:54 MST."
             <199605051404.HAA18121@freefall.freebsd.org> 
Date: Mon, 06 May 1996 00:21:03 +0800
From: Peter Wemm <peter@spinner.DIALix.COM>
Sender: owner-cvs-usrsbin@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

>joerg       96/05/05 07:04:53
>
>  src/usr.sbin/lpr - Imported sources
>  Update of /home/ncvs/src/usr.sbin/lpr
>  In directory freefall.freebsd.org:/a/joerg/lpr
>  
>  Revision/Branch: 1.1.1
>  
>  Log Message:
>  Vendor-branch import of the 4.4BSD-Lite2 code for lpr.  There are
>  several bugfixes in it that are worth considering.
>  
>  Don't be alarmed about the import conflicts...
>  
>  Obtained from: 4.4BSD-Lite2

I am alarmed, for starters:

===> lpd
cc -O -pipe -I/home/src/usr.sbin/lpr/lpd/../common_source   -c 
/home/src/usr.sbi
n/lpr/lpd/lpd.c
cc -O -pipe -I/home/src/usr.sbin/lpr/lpd/../common_source   -c 
/home/src/usr.sbi
n/lpr/lpd/printjob.c
cc -O -pipe -I/home/src/usr.sbin/lpr/lpd/../common_source   -c 
/home/src/usr.sbi
n/lpr/lpd/recvjob.c
cc -O -pipe -I/home/src/usr.sbin/lpr/lpd/../common_source   -c 
/home/src/usr.sbi
n/lpr/lpd/../common_source/displayq.c
/home/src/usr.sbin/lpr/lpd/../common_source/displayq.c: In function 
`displayq':
/home/src/usr.sbin/lpr/lpd/../common_source/displayq.c:128: `remote' 
undeclared
(first use this function)
/home/src/usr.sbin/lpr/lpd/../common_source/displayq.c:128: (Each 
undeclared ide
ntifier is reported only once
/home/src/usr.sbin/lpr/lpd/../common_source/displayq.c:128: for each 
function it
 appears in.)
/home/src/usr.sbin/lpr/lpd/../common_source/displayq.c:219: too many 
arguments t
o function `getport'
/home/src/usr.sbin/lpr/lpd/../common_source/displayq.c: In function `warn':
/home/src/usr.sbin/lpr/lpd/../common_source/displayq.c:241: `remote' 
undeclared
(first use this function)
/home/src/usr.sbin/lpr/lpd/../common_source/displayq.c: In function 
`inform':
/home/src/usr.sbin/lpr/lpd/../common_source/displayq.c:275: `remote' 
undeclared
(first use this function)
*** Error code 1

Stop.
*** Error code 1

Stop.

There were about 8 files that were updated because the HEAD revision is 
still on the vendor branch for much of the user-land stuff.

My last 'cvs -q update -d -P':
   ....
   U usr.sbin/lpr/common_source/aux.c
   U usr.sbin/lpr/common_source/aux.h
   U usr.sbin/lpr/common_source/displayq.c
   U usr.sbin/lpr/common_source/printcap.c
   U usr.sbin/lpr/common_source/rmjob.c
   U usr.sbin/lpr/lpc/lpc.c
   U usr.sbin/lpr/lpd/lpd.c
   U usr.sbin/lpr/lpq/lpq.1
   U usr.sbin/lpr/lpq/lpq.c
   ....

Can you please finish what you've started?

Incidently, this is why we have not bulk-imported Lite-2 into the 
user-land area..  It was mostly a no-op for the kernel as all files had 
been modified and the mainline had seperated from the vendor branch.  For 
the user stuff, probably 70% of the files have not been modified, so an 
import will bring 70% of the files up to Lite2, leaving the unmodified 
files back at Lite-1+patches.  CVS/RCS really sucks at doing this. :-(  
(Insert shameless free plug for P3 here.. :-)

Cheers,
-Peter