From owner-cvs-all  Sun Jun 25  7:31:17 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 8131A37B618; Sun, 25 Jun 2000 07:31:11 -0700 (PDT)
	(envelope-from markm@FreeBSD.org)
Received: (from markm@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id HAA68732;
	Sun, 25 Jun 2000 07:31:11 -0700 (PDT)
	(envelope-from markm@FreeBSD.org)
Message-Id: <200006251431.HAA68732@freefall.freebsd.org>
From: Mark Murray <markm@FreeBSD.org>
Date: Sun, 25 Jun 2000 07:31:11 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/perl5 pp.c src/contrib/perl5/ext/POSIX
         Makefile.PL POSIX.xs src/contrib/perl5/hints freebsd.sh
         src/contrib/perl5/lib Cwd.pm src/contrib/perl5/lib/ExtUtils
         Install.pm Liblist.pm MM_Unix.pm MakeMaker.pm ...
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

markm       2000/06/25 07:31:11 PDT

  Modified files:
    contrib/perl5        pp.c 
    contrib/perl5/ext/POSIX Makefile.PL POSIX.xs 
    contrib/perl5/hints  freebsd.sh 
    contrib/perl5/lib    Cwd.pm 
    contrib/perl5/lib/ExtUtils Install.pm Liblist.pm MM_Unix.pm 
                               MakeMaker.pm 
    contrib/perl5/utils  h2ph.PL perlbug.PL 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.3       +1354 -709 src/contrib/perl5/pp.c
  1.4       +12 -1     src/contrib/perl5/ext/POSIX/Makefile.PL
  1.4       +269 -46   src/contrib/perl5/ext/POSIX/POSIX.xs
  1.6       +39 -41    src/contrib/perl5/hints/freebsd.sh
  1.4       +28 -12    src/contrib/perl5/lib/Cwd.pm
  1.3       +10 -15    src/contrib/perl5/lib/ExtUtils/Install.pm
  1.4       +26 -27    src/contrib/perl5/lib/ExtUtils/Liblist.pm
  1.5       +368 -121  src/contrib/perl5/lib/ExtUtils/MM_Unix.pm
  1.3       +151 -99   src/contrib/perl5/lib/ExtUtils/MakeMaker.pm
  1.4       +6 -3      src/contrib/perl5/utils/h2ph.PL
  1.4       +126 -43   src/contrib/perl5/utils/perlbug.PL



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message