Add NetBSD RCS Id.

Add default directories for Perl's Configure script to search on
NetBSD.  Now why can't it grab these from the installer's path or
other environment variables?

2 files changed, 50 insertions, 2 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index bb1e6ca05c7..77b9afa3cce 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,3 +1,4 @@
+# $NetBSD: Makefile,v 1.2 1997/10/06 15:27:55 agc Exp $
 # New ports collection makefile for:	perl5
 # Version required:	5.004_01
 # Date created:		16 April 1995
@@ -62,7 +63,13 @@ MAN3PREFIX=	${PREFIX}/lib/perl5
 test:
 	@(cd ${WRKSRC}; make test)
 
+OPSYS!= uname -s
+
 post-install:
+	@strip ${PREFIX}/bin/perl
+.if (${OPSYS} != "NetBSD")
+# agc - no suidperl???
 	@strip ${PREFIX}/bin/perl ${PREFIX}/bin/suidperl
+.endif
 
 .include <bsd.port.mk>
diff --git a/lang/perl5/patches/patch-aa b/lang/perl5/patches/patch-aa
index 7beb8b7ec2e..b2e88165402 100644
--- a/lang/perl5/patches/patch-aa
+++ b/lang/perl5/patches/patch-aa
@@ -1,5 +1,14 @@
---- Configure.ORIG	Tue May 13 19:20:34 1997
-+++ Configure	Fri May 23 11:33:40 1997
+--- Configure.orig	Wed Jun 11 00:28:03 1997
++++ Configure	Thu Oct  2 10:07:10 1997
+@@ -65,7 +65,7 @@
+ fi
+ 
+ : Proper PATH setting
+-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
++paths='/bin /usr/bin /usr/pkg/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
+ paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
+ paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
+ paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
 @@ -91,11 +91,11 @@
  *)	CDPATH='' ;;
  esac
@@ -17,3 +26,35 @@
  
  : Test and see if we are running under ksh, either blatantly or in disguise.
  if (PATH=.; alias -x) >/dev/null 2>&1; then
+@@ -725,7 +725,7 @@
+ archobjs=''
+ : Possible local include directories to search.
+ : Set locincpth to "" in a hint file to defeat local include searches.
+-locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
++locincpth="/usr/pkg/include /usr/local/include /opt/local/include /usr/gnu/include"
+ locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
+ :
+ : no include file wanted by default
+@@ -735,19 +735,19 @@
+ xlibpth='/usr/lib/386 /lib/386'
+ 
+ : Possible local library directories to search.
+-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
++loclibpth="/usr/pkg/lib /usr/local/lib /opt/local/lib /usr/gnu/lib"
+ loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
+ 
+ : general looking path for locating libraries
+ glibpth="/shlib /usr/shlib /lib/pa1.1 /usr/lib/large"
+ glibpth="$glibpth /lib /usr/lib $xlibpth"
+ glibpth="$glibpth /lib/large /usr/lib/small /lib/small"
+-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
++glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/pkg/lib /usr/local/lib"
+ 
+ : Private path used by Configure to find libraries.  Its value
+ : is prepended to libpth. This variable takes care of special
+ : machines, like the mips.  Usually, it should be empty.
+-plibpth=''
++plibpth='/usr/pkg/lib'
+ 
+ : full support for void wanted by default
+ defvoidused=15