Fix build on FreeBSD.

2 files changed, 19 insertions, 11 deletions

diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index c52e083a314..710332a7af3 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2006/11/03 07:15:41 joerg Exp $
+$NetBSD: distinfo,v 1.23 2006/12/27 20:49:04 joerg Exp $
 
 SHA1 (Python-2.4.3.tar.bz2) = d6b81e1aec0045b5acff99676f2abe303da1b384
 RMD160 (Python-2.4.3.tar.bz2) = c86247554975e6c44f91d05e44e68e280d5244dc
@@ -14,7 +14,7 @@ SHA1 (patch-ah) = 8d56adee024b29e5d538a9fcd1994e38eb2b33c1
 SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8
 SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac
 SHA1 (patch-ak) = f2e1d4087a94490bd3589a8c829ec72e04f31f72
-SHA1 (patch-al) = 3dccd19d56685ab447c3629c4c360881dcca4c3d
+SHA1 (patch-al) = bc5afee33587598e369799db2a15cbcace90f68b
 SHA1 (patch-am) = a8be9e5d3558c27e38d4323601335ad3bcde1f85
 SHA1 (patch-an) = 0ae5b3d547c7dbe1366c5ae6c60c11516e4550b8
 SHA1 (patch-ao) = 0e8564ec8157fb5c48c801294213c66ae89a55a1
diff --git a/lang/python24/patches/patch-al b/lang/python24/patches/patch-al
index 1915bd2eaa8..58fbeaa165b 100644
--- a/lang/python24/patches/patch-al
+++ b/lang/python24/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.10 2006/04/12 20:21:48 drochner Exp $
+$NetBSD: patch-al,v 1.11 2006/12/27 20:49:04 joerg Exp $
 
---- configure.orig	2006-02-17 09:39:55.000000000 +0100
+--- configure.orig	2006-02-17 08:39:55.000000000 +0000
 +++ configure
 @@ -312,7 +312,7 @@ ac_includes_default="\
  # include <unistd.h>
@@ -864,7 +864,7 @@ $NetBSD: patch-al,v 1.10 2006/04/12 20:21:48 drochner Exp $
  	case $ac_sys_system in
  	AIX*)
  	   exp_extra="\"\""
-@@ -3413,7 +3506,7 @@ _ACEOF
+@@ -3413,15 +3506,10 @@ _ACEOF
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
            ;;
@@ -873,7 +873,15 @@ $NetBSD: patch-al,v 1.10 2006/04/12 20:21:48 drochner Exp $
  	  LDLIBRARY='libpython$(VERSION).so'
  	  BLDLIBRARY='-L. -lpython$(VERSION)'
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-@@ -3837,7 +3930,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
+-	  case $ac_sys_system in
+-	      FreeBSD*)
+-		SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
+-		;;
+-	  esac
+ 	  INSTSONAME="$LDLIBRARY".$SOVERSION
+ 	  ;;
+     hp*|HP*)
+@@ -3837,7 +3925,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
  	    ;;
  	# is there any other compiler on Darwin besides gcc?
  	Darwin*)
@@ -887,7 +895,7 @@ $NetBSD: patch-al,v 1.10 2006/04/12 20:21:48 drochner Exp $
  	    ;;
      esac
      ;;
-@@ -10373,12 +10471,12 @@ then
+@@ -10373,12 +10466,12 @@ then
  				LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  			else
  				# No framework, use the Python app as bundle-loader
@@ -903,7 +911,7 @@ $NetBSD: patch-al,v 1.10 2006/04/12 20:21:48 drochner Exp $
  	BSD/OS*/4*) LDSHARED="gcc -shared";;
  	OpenBSD*|FreeBSD*)
  		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
-@@ -10388,6 +10486,7 @@ then
+@@ -10388,6 +10481,7 @@ then
  			LDSHARED="ld -Bshareable ${LDFLAGS}"
  		fi;;
  	NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
@@ -911,7 +919,7 @@ $NetBSD: patch-al,v 1.10 2006/04/12 20:21:48 drochner Exp $
  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes"
  		then LDSHARED='$(CC) -shared'
-@@ -10421,6 +10520,7 @@ then
+@@ -10421,6 +10515,7 @@ then
  	Linux*|GNU*) CCSHARED="-fPIC";;
  	BSD/OS*/4*) CCSHARED="-fpic";;
  	FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
@@ -919,7 +927,7 @@ $NetBSD: patch-al,v 1.10 2006/04/12 20:21:48 drochner Exp $
  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes"
  		then CCSHARED="-fPIC"
-@@ -10478,6 +10578,7 @@ then
+@@ -10478,6 +10573,7 @@ then
  		then
  			LINKFORSHARED="-Wl,--export-dynamic"
  		fi;;
@@ -927,7 +935,7 @@ $NetBSD: patch-al,v 1.10 2006/04/12 20:21:48 drochner Exp $
  	SunOS/5*) case $CC in
  		  *gcc*)
  		    if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
-@@ -21203,15 +21304,15 @@ s,@SGI_ABI@,$SGI_ABI,;t t
+@@ -21203,15 +21299,15 @@ s,@SGI_ABI@,$SGI_ABI,;t t
  s,@EXTRAPLATDIR@,$EXTRAPLATDIR,;t t
  s,@EXTRAMACHDEPPATH@,$EXTRAMACHDEPPATH,;t t
  s,@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@,$CONFIGURE_MACOSX_DEPLOYMENT_TARGET,;t t