Fix DragonFly support. Since it was compilable before, but didn't

work correctly, bump revision.

4 files changed, 33 insertions, 15 deletions

diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index 0ce2d22be0e..c992ec2d4c6 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2005/01/30 12:44:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/03 01:35:36 joerg Exp $
 #
 
 DISTNAME=	py152
 PKGNAME=	python15-1.5.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	lang python
 MASTER_SITES=	http://www.python.org/ftp/python/src/
 EXTRACT_SUFX=	.tgz
diff --git a/lang/python15/distinfo b/lang/python15/distinfo
index 22fab071c04..a803d3ebdc8 100644
--- a/lang/python15/distinfo
+++ b/lang/python15/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2005/07/29 13:27:26 drochner Exp $
+$NetBSD: distinfo,v 1.7 2005/12/03 01:35:36 joerg Exp $
 
 SHA1 (py152.tgz) = 2d648d07b1aa1aab32a3a24851c33715141779b9
 RMD160 (py152.tgz) = 25717d98fe7c01d42a78ffb08b8abc660ec2daa6
 Size (py152.tgz) = 2533053 bytes
-SHA1 (patch-aa) = d8ad652ad5900da9f5384a1d577626e0d16b51ce
+SHA1 (patch-aa) = 26581208900545f32ed65da00a70b7f77f7bc1f6
 SHA1 (patch-ab) = 7cbbae8a41e9e0d530561c80009c20bb838ebc15
-SHA1 (patch-ac) = 1cd8d555b70527f52c4f762b84a1d1d4464aeb47
+SHA1 (patch-ac) = c5f062c268792c1a3e769e1b28492007834864ec
 SHA1 (patch-ad) = 6207499c945b31e2da43ecc2dd2dd5fef195ad5b
 SHA1 (patch-ae) = 276541b325e23dbff94b306726583dab8e951884
 SHA1 (patch-af) = 0897b660c663c1a06e2cd3f5c354ccb2b12f6a10
diff --git a/lang/python15/patches/patch-aa b/lang/python15/patches/patch-aa
index f48483920aa..c4f67794157 100644
--- a/lang/python15/patches/patch-aa
+++ b/lang/python15/patches/patch-aa
@@ -1,8 +1,26 @@
-$NetBSD: patch-aa,v 1.3 2003/06/16 16:33:35 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2005/12/03 01:35:36 joerg Exp $
 
 --- configure.orig	1999-04-10 18:02:18.000000000 +0200
 +++ configure	2003-06-16 18:25:53.000000000 +0200
-@@ -2498,46 +2498,6 @@
+@@ -2247,7 +2247,7 @@ then
+ 	Linux*) LDSHARED="gcc -shared";;
+ 	dgux*) LDSHARED="ld -G";;
+ 	FreeBSD*/3*) LDSHARED="gcc -shared";;
+-	FreeBSD*|OpenBSD*) LDSHARED="ld -Bshareable";;
++	FreeBSD*|OpenBSD*|DragonFly*) LDSHARED="ld -Bshareable";;
+ 	NetBSD*)
+ 		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
+ 		then
+@@ -2272,7 +2272,7 @@ then
+ 		 else CCSHARED="+z";
+ 		 fi;;
+ 	Linux*) CCSHARED="-fpic";;
+-	FreeBSD*|OpenBSD*) CCSHARED="-fpic";;
++	FreeBSD*|OpenBSD*|DragonFly*) CCSHARED="-fpic";;
+ 	NetBSD*) CCSHARED="-fPIC";;
+ 	SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
+ 	IRIX*/6*)  case $CC in
+@@ -2498,46 +2498,6 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
  else
    echo "$ac_t""no" 1>&6
  fi
@@ -49,7 +67,7 @@ $NetBSD: patch-aa,v 1.3 2003/06/16 16:33:35 drochner Exp $
   # BeOS
  ;;
  esac
-@@ -2601,507 +2561,8 @@
+@@ -2601,507 +2561,8 @@ else
  fi
  
  
@@ -158,11 +176,11 @@ $NetBSD: patch-aa,v 1.3 2003/06/16 16:33:35 drochner Exp $
 -cat >> confdefs.h <<\EOF
 -#define _POSIX_THREADS 1
 -EOF
- 
+-
 -LIBOBJS="$LIBOBJS thread.o"
 -else
 -  echo "$ac_t""no" 1>&6
- 
+-
 -ac_safe=`echo "kernel/OS.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for kernel/OS.h""... $ac_c" 1>&6
 -echo "configure:2717: checking for kernel/OS.h" >&5
@@ -293,12 +311,12 @@ $NetBSD: patch-aa,v 1.3 2003/06/16 16:33:35 drochner Exp $
 -cat >> confdefs.h <<\EOF
 -#define _POSIX_THREADS 1
 -EOF
--
+ 
 -LIBS="$LIBS -lpthread"
 -LIBOBJS="$LIBOBJS thread.o"
 -else
 -  echo "$ac_t""no" 1>&6
--
+ 
 -echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
 -echo "configure:2852: checking for pthread_create in -lc_r" >&5
 -ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
diff --git a/lang/python15/patches/patch-ac b/lang/python15/patches/patch-ac
index eb6f79b3cbc..687b2ace9ae 100644
--- a/lang/python15/patches/patch-ac
+++ b/lang/python15/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2004/06/23 15:54:08 minskim Exp $
+$NetBSD: patch-ac,v 1.2 2005/12/03 01:35:36 joerg Exp $
 
 --- Lib/dos-8x3/posixfil.py.orig	1999-04-08 15:27:43.000000000 -0500
 +++ Lib/dos-8x3/posixfil.py
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.1 2004/06/23 15:54:08 minskim Exp $
          # additions for AIX by Vladimir.Marangozov@imag.fr
          import sys, os
 -        if sys.platform in ('netbsd1',
-+        if sys.platform in ('netbsd1', 'netbsd2',
++        if sys.platform in ('netbsd1', 'netbsd2', 'dragonfly1',
                              'freebsd2', 'freebsd3',
                              'bsdos2', 'bsdos3', 'bsdos4'):
              flock = struct.pack('lxxxxlxxxxlhh', \
@@ -16,7 +16,7 @@ $NetBSD: patch-ac,v 1.1 2004/06/23 15:54:08 minskim Exp $
  
          if '?' in how:
 -            if sys.platform in ('netbsd1',
-+            if sys.platform in ('netbsd1', 'netbsd2',
++            if sys.platform in ('netbsd1', 'netbsd2', 'dragonfly1',
                                  'freebsd2', 'freebsd3',
                                  'bsdos2', 'bsdos3', 'bsdos4'):
                  l_start, l_len, l_pid, l_type, l_whence = \