From owner-freebsd-ports  Sat Apr 22 06:02:05 1995
Return-Path: ports-owner
Received: (from majordom@localhost)
          by freefall.cdrom.com (8.6.10/8.6.6) id GAA22320
          for ports-outgoing; Sat, 22 Apr 1995 06:02:05 -0700
Received: from grunt.grondar.za (grunt.grondar.za [196.7.18.129])
          by freefall.cdrom.com (8.6.10/8.6.6) with ESMTP id GAA22306
          for <ports@freebsd.org>; Sat, 22 Apr 1995 06:01:36 -0700
Received: from localhost (localhost [127.0.0.1]) by grunt.grondar.za (8.6.11/8.6.9) with SMTP id PAA28622 for <ports@freebsd.org>; Sat, 22 Apr 1995 15:01:21 +0200
Message-Id: <199504221301.PAA28622@grunt.grondar.za>
X-Authentication-Warning: grunt.grondar.za: Host localhost didn't use HELO protocol
To: ports@FreeBSD.org
Subject: Perl5 maintenance fixes...
Date: Sat, 22 Apr 1995 15:01:20 +0200
From: Mark Murray <mark@grondar.za>
Sender: ports-owner@FreeBSD.org
Precedence: bulk

Hi Satoshi

Please apply this clean-up patch to perl5. Basically it replaces patch-aa
(which is mine and completely bogus), and fixes Makefile to reflect the fact
that this port is now BATCH, (noniniteractive). Could you also please remove
patch-ac. This patch performs its function.

------------------------------8<---------------------------------------
diff -cdPr perl5.old/Makefile perl5/Makefile
*** perl5.old/Makefile	Wed Apr 19 19:02:38 1995
--- perl5/Makefile	Sat Apr 22 14:47:31 1995
***************
*** 14,26 ****
  
  MAINTAINER=	markm@FreeBSD.ORG
  
- #
- # This isn't really interactive, but the Configure script checks for
- # file descriptor 0, so it won't run if you </dev/null to run a
- # nightly batch build....
- #
- IS_INTERACTIVE=		yes
- 
  HAS_CONFIGURE=		yes
  CONFIGURE_SCRIPT=	Configure
  CONFIGURE_ARGS=		-sde
--- 14,19 ----
diff -cdPr perl5.old/patches/patch-aa perl5/patches/patch-aa
*** perl5.old/patches/patch-aa	Mon Apr 17 13:41:41 1995
--- perl5/patches/patch-aa	Sat Apr 22 14:46:45 1995
***************
*** 1,19 ****
! *** installperl.old	Sun Apr 16 22:05:09 1995
! --- installperl	Sun Apr 16 22:05:37 1995
  ***************
! *** 159,165 ****
!   
!   # Offer to install perl in a "standard" location
!   
! ! $mainperl_is_instperl = 0;
    
!   if (-w $mainperldir && ! &samepath($mainperldir, $installbin) && !$nonono) {
!       # First make sure $mainperldir/perl is not already the same as
! --- 159,165 ----
    
!   # Offer to install perl in a "standard" location
    
! ! $mainperl_is_instperl = 1;
    
!   if (-w $mainperldir && ! &samepath($mainperldir, $installbin) && !$nonono) {
!       # First make sure $mainperldir/perl is not already the same as
--- 1,59 ----
! diff -cdPr ../perl5.001.org/Configure ./Configure
! *** ../perl5.001.org/Configure	Sun Mar 12 09:35:24 1995
! --- ./Configure	Sat Apr 22 13:07:33 1995
  ***************
! *** 75,85 ****
!   PATH=.:$PATH
!   export PATH
    
! ! : Sanity checks
! ! if test ! -t 0; then
! ! 	echo "Say 'sh $me', not 'sh <$me'"
! ! 	exit 1
! ! fi
    
!   : On HP-UX, large Configure scripts may exercise a bug in /bin/sh
!   if test -f /hp-ux -a -f /bin/ksh; then
! --- 75,86 ----
!   PATH=.:$PATH
!   export PATH
    
! ! #: Sanity checks (Disabled for FreeBSD build - users coming here [ws]ould
! ! #                 know what they are doing anyway) ;-) MarkM
! ! #if test ! -t 0; then
! ! #	echo "Say 'sh $me', not 'sh <$me'"
! ! #	exit 1
! ! #fi
    
!   : On HP-UX, large Configure scripts may exercise a bug in /bin/sh
!   if test -f /hp-ux -a -f /bin/ksh; then
! diff -cdPr ../perl5.001.org/installperl ./installperl
! *** ../perl5.001.org/installperl	Wed Feb 22 21:37:10 1995
! --- ./installperl	Sat Apr 22 13:14:50 1995
! ***************
! *** 174,183 ****
!   	      ((readlink "$mainperldir/perl") eq "$binexp/perl"));
!       }
!       if ((! $mainperl_is_instperl) &&
! ! 	(&yn("Many scripts expect perl to be installed as " .
! ! 	     "$mainperldir/perl.\n" . 
! ! 	     "Do you wish to have $mainperldir/perl be the same as\n" .
! ! 	     "$binexp/perl? [y] ")))
!       {	
!   	unlink("$mainperldir/perl");
!   	eval 'link("$installbin/perl", "$mainperldir/perl")' ||
! --- 174,187 ----
!   	      ((readlink "$mainperldir/perl") eq "$binexp/perl"));
!       }
!       if ((! $mainperl_is_instperl) &&
! ! 	0)
! ! #	Disable Perl5 from 'taking' over from the system Perl.
! ! #	(nasty hack, but it is only for the FreeBSD build, so WTH.
! ! #
! ! #	(&yn("Many scripts expect perl to be installed as " .
! ! #	     "$mainperldir/perl.\n" . 
! ! #	     "Do you wish to have $mainperldir/perl be the same as\n" .
! ! #	     "$binexp/perl? [y] ")))
!       {	
!   	unlink("$mainperldir/perl");
!   	eval 'link("$installbin/perl", "$mainperldir/perl")' ||
------------------------------8<---------------------------------------

Arrigato (sp?) Asami-san!

-- 
Mark Murray
46 Harvey Rd, Claremont, Cape Town 7700, South Africa
+27 21 61-3768 GMT+0200