Apply first part (creation of libpython.so) of the patch provided by

Michal Pasternak in PR 24599.
Leave the RUNSHARED part for now until it's proven that it's really needed
and a cleaner has been found.

4 files changed, 26 insertions, 8 deletions

diff --git a/lang/python23-pth/distinfo b/lang/python23-pth/distinfo
index b3caba64289..33cf28f3c60 100644
--- a/lang/python23-pth/distinfo
+++ b/lang/python23-pth/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2004/01/26 12:11:57 grant Exp $
+$NetBSD: distinfo,v 1.11 2004/03/01 00:16:35 recht Exp $
 
 SHA1 (Python-2.3.3.tgz) = 034d2e3ed011ea753d4fee7efab16e31029b1e5e
 Size (Python-2.3.3.tgz) = 8491380 bytes
@@ -8,5 +8,5 @@ SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e
 SHA1 (patch-ae) = 544af90b9b7c5eb5cbad0ba0cefa3d9496b5efe3
 SHA1 (patch-af) = 2989a1975c8ea435903eafc9add57cb7c4d7de14
 SHA1 (patch-ah) = 4bc95e775a2b3f4f1997d0779c561db2e9e7b575
-SHA1 (patch-al) = af6df0437cdc31dbc66b4590210c72023432cc2f
+SHA1 (patch-al) = 2dfed1a40493b571e3477cfb56c2d0ed1b1deddf
 SHA1 (patch-am) = 669721695a3983638218267ac59f228cd2a8e93d
diff --git a/lang/python23-pth/patches/patch-al b/lang/python23-pth/patches/patch-al
index eeeb4a5a37f..4f5009bc82b 100644
--- a/lang/python23-pth/patches/patch-al
+++ b/lang/python23-pth/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.5 2003/12/23 17:24:42 recht Exp $
+$NetBSD: patch-al,v 1.6 2004/03/01 00:16:35 recht Exp $
 
 --- configure.orig	2003-11-18 20:59:36.000000000 +0100
-+++ configure	2003-12-23 12:47:01.000000000 +0100
++++ configure	2004-03-01 00:58:59.000000000 +0100
 @@ -1318,7 +1318,7 @@
  mv confdefs.h.new confdefs.h
  
@@ -20,6 +20,15 @@ $NetBSD: patch-al,v 1.5 2003/12/23 17:24:42 recht Exp $
    # On Solaris 2.6, sys/wait.h is inconsistent in the usage
    # of union __?sigval. Reported by Stuart Bishop.
    SunOS/5.6)
+@@ -3602,7 +3604,7 @@
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+ 	  INSTSONAME="$LDLIBRARY".$SOVERSION
+           ;;
+-    Linux*|GNU*|NetBSD*)
++    Linux*|GNU*|NetBSD*|FreeBSD*)
+ 	  LDLIBRARY='libpython$(VERSION).so'
+ 	  BLDLIBRARY='-L. -lpython$(VERSION)'
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
 @@ -13854,6 +13856,7 @@
  /* end confdefs.h.  */
  
diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index d3d91e0b2b8..da471c54dd1 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2004/01/26 12:10:24 grant Exp $
+$NetBSD: distinfo,v 1.11 2004/03/01 00:16:35 recht Exp $
 
 SHA1 (Python-2.3.3.tgz) = 034d2e3ed011ea753d4fee7efab16e31029b1e5e
 Size (Python-2.3.3.tgz) = 8491380 bytes
@@ -7,5 +7,5 @@ SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e
 SHA1 (patch-ae) = 544af90b9b7c5eb5cbad0ba0cefa3d9496b5efe3
 SHA1 (patch-af) = 2989a1975c8ea435903eafc9add57cb7c4d7de14
 SHA1 (patch-ah) = 4bc95e775a2b3f4f1997d0779c561db2e9e7b575
-SHA1 (patch-al) = 3678af129442eb5602f2c8ccec7dc7030b554775
+SHA1 (patch-al) = 30941bb705d216d40d1bbdbaf68d6fb2a4714bd2
 SHA1 (patch-am) = 8580ec64d2d369f4426e30368e10d350aac82c03
diff --git a/lang/python23/patches/patch-al b/lang/python23/patches/patch-al
index 2a8a5a170cd..4839dfbaaa0 100644
--- a/lang/python23/patches/patch-al
+++ b/lang/python23/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.5 2003/12/23 17:24:42 recht Exp $
+$NetBSD: patch-al,v 1.6 2004/03/01 00:16:35 recht Exp $
 
 --- configure.orig	2003-11-18 20:59:36.000000000 +0100
-+++ configure	2003-12-23 12:29:27.000000000 +0100
++++ configure	2004-03-01 00:55:14.000000000 +0100
 @@ -1440,6 +1440,8 @@
    # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
    OpenBSD/2.* | OpenBSD/3.[01234])
@@ -11,6 +11,15 @@ $NetBSD: patch-al,v 1.5 2003/12/23 17:24:42 recht Exp $
    # On Solaris 2.6, sys/wait.h is inconsistent in the usage
    # of union __?sigval. Reported by Stuart Bishop.
    SunOS/5.6)
+@@ -3602,7 +3604,7 @@
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+ 	  INSTSONAME="$LDLIBRARY".$SOVERSION
+           ;;
+-    Linux*|GNU*|NetBSD*)
++    Linux*|GNU*|NetBSD*|FreeBSD*)
+ 	  LDLIBRARY='libpython$(VERSION).so'
+ 	  BLDLIBRARY='-L. -lpython$(VERSION)'
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
 @@ -13854,6 +13856,7 @@
  /* end confdefs.h.  */