Fix merge issues, remove excess files - match perl-5.30.1 dist

Timing is good deraadt@, OK sthen@

1 files changed, 9 insertions, 16 deletions

diff --git a/gnu/usr.bin/perl/hints/openbsd.sh b/gnu/usr.bin/perl/hints/openbsd.sh
index c36b9acadae..66db8e2ce1e 100644
--- a/gnu/usr.bin/perl/hints/openbsd.sh
+++ b/gnu/usr.bin/perl/hints/openbsd.sh
@@ -84,8 +84,6 @@ esac
 # around for old NetBSD binaries.
 libswanted=`echo $libswanted | sed 's/ crypt / /'`
 
-libswanted=`echo $libswanted | sed 's/ util / /'`
-
 # Configure can't figure this out non-interactively
 d_suidsafe=$define
 
@@ -103,13 +101,6 @@ m88k-3.4)
    ;;
 esac
 
-# Special per-arch specific ccflags
-case "${ARCH}-${osvers}" in
-    vax-*)
-    ccflags="-DUSE_PERL_ATOF=0 $ccflags"
-    ;;
-esac
-
 # This script UU/usethreads.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use threads.
 cat > UU/usethreads.cbu <<'EOCBU'
@@ -131,9 +122,6 @@ $define|true|[yY]*)
         	# Broken up to OpenBSD 3.6, fixed in OpenBSD 3.7
 		d_getservbyname_r=$undef ;;
 	esac
-	;;
-*)
-	libswanted=`echo $libswanted | sed 's/ pthread / /'`
 esac
 EOCBU
 
@@ -152,14 +140,19 @@ case "$openbsd_distribution" in
 	siteprefix='/usr/local'
 	siteprefixexp='/usr/local'
 	# Ports installs non-std libs in /usr/local/lib so look there too
-	locincpth=''
-	loclibpth=''
+	locincpth='/usr/local/include'
+	loclibpth='/usr/local/lib'
 	# Link perl with shared libperl
-	if [ "$usedl" = "$define" -a -r $src/shlib_version ]; then
+	if [ "$usedl" = "$define" -a -r shlib_version ]; then
 		useshrplib=true
-		libperl=`. $src/shlib_version; echo libperl.so.${major}.${minor}`
+		libperl=`. ./shlib_version; echo libperl.so.${major}.${minor}`
 	fi
 	;;
 esac
 
+# openbsd has a problem regarding newlocale()
+# https://marc.info/?l=openbsd-bugs&m=155364568608759&w=2
+# which is being fixed.  In the meantime, forbid POSIX 2008 locales
+d_newlocale="$undef"
+
 # end