pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang Add devel/gettext-lib as dependency to avoid prob...
details: https://anonhg.NetBSD.org/pkgsrc/rev/088ab5ec45ee
branches: trunk
changeset: 496579:088ab5ec45ee
user: recht <recht%pkgsrc.org@localhost>
date: Sun Jul 03 19:49:06 2005 +0000
description:
Add devel/gettext-lib as dependency to avoid problems with the locale module not being built.
- fix suggested by Simon Kuhn in PR 29735
Add a patch from Antoine Reilles submitted in PR 30466 to fix the buid of some modules on OS X 10.4.
Bump PKGREVISION
diffstat:
lang/python23-nth/Makefile | 3 +-
lang/python23-pth/Makefile | 7 ++---
lang/python23/Makefile | 3 +-
lang/python23/Makefile.common | 3 +-
lang/python23/distinfo | 4 +-
lang/python23/patches/patch-al | 45 ++++++++++++++++++++++++++++-------------
6 files changed, 42 insertions(+), 23 deletions(-)
diffs (200 lines):
diff -r 33a5460b6d1f -r 088ab5ec45ee lang/python23-nth/Makefile
--- a/lang/python23-nth/Makefile Sun Jul 03 19:48:22 2005 +0000
+++ b/lang/python23-nth/Makefile Sun Jul 03 19:49:06 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2005/02/15 12:25:07 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/03 19:49:06 recht Exp $
#
PKGNAME= python23-nth-2.3.5
+PKGREVISION= 1
CONFLICTS+= python-[0-9]*
diff -r 33a5460b6d1f -r 088ab5ec45ee lang/python23-pth/Makefile
--- a/lang/python23-pth/Makefile Sun Jul 03 19:48:22 2005 +0000
+++ b/lang/python23-pth/Makefile Sun Jul 03 19:49:06 2005 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:46:16 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/07/03 19:49:06 recht Exp $
#
-DISTNAME= Python-2.3.4
-PKGNAME= python23-pth-2.3.4
-PKGREVISION= 3
+DISTNAME= Python-2.3.5
+PKGNAME= python23-pth-2.3.5
CATEGORIES= lang python
MASTER_SITES= # empty
DISTFILES= # empty
diff -r 33a5460b6d1f -r 088ab5ec45ee lang/python23/Makefile
--- a/lang/python23/Makefile Sun Jul 03 19:48:22 2005 +0000
+++ b/lang/python23/Makefile Sun Jul 03 19:49:06 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2005/02/15 12:25:07 drochner Exp $
+# $NetBSD: Makefile,v 1.28 2005/07/03 19:49:06 recht Exp $
#
PKGNAME= python23-2.3.5
+PKGREVISION= 1
CONFLICTS+= python-[0-9]*
diff -r 33a5460b6d1f -r 088ab5ec45ee lang/python23/Makefile.common
--- a/lang/python23/Makefile.common Sun Jul 03 19:48:22 2005 +0000
+++ b/lang/python23/Makefile.common Sun Jul 03 19:49:06 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2005/04/11 21:46:16 tv Exp $
+# $NetBSD: Makefile.common,v 1.27 2005/07/03 19:49:06 recht Exp $
#
DISTNAME= Python-2.3.5
@@ -106,6 +106,7 @@
${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
diff -r 33a5460b6d1f -r 088ab5ec45ee lang/python23/distinfo
--- a/lang/python23/distinfo Sun Jul 03 19:48:22 2005 +0000
+++ b/lang/python23/distinfo Sun Jul 03 19:49:06 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2005/06/30 03:38:22 minskim Exp $
+$NetBSD: distinfo,v 1.31 2005/07/03 19:49:06 recht Exp $
SHA1 (Python-2.3.5.tgz) = 2729d068f5d1abe7b743f32012d4f7c4b0508a3c
RMD160 (Python-2.3.5.tgz) = 2104a393ca7c91b72b990ced53a0da752ccf42ef
@@ -9,7 +9,7 @@
SHA1 (patch-ae) = 3dcf150147333342b333871b41fe6fa92bced2d9
SHA1 (patch-af) = d23d42d5d5fc31aeaf1fca89448873cc4179ccf6
SHA1 (patch-ah) = 6740fb09c3a1fca8cd25642a683d65d6d66760f8
-SHA1 (patch-al) = 626b24ff5e6ed0a88a6504a1f261927cb528fc3a
+SHA1 (patch-al) = c96a93c03b68c35fc9797c442d6400d289e1aa20
SHA1 (patch-am) = df5c858b32a9a5aa118c84f6742f9d3547c0c7f3
SHA1 (patch-bb) = 7c6fe21b6328dddce2a079b0a1c7ae0bee817bae
SHA1 (patch-ca) = 95f5a515fe3dafd75d077e0591e88a34447152ff
diff -r 33a5460b6d1f -r 088ab5ec45ee lang/python23/patches/patch-al
--- a/lang/python23/patches/patch-al Sun Jul 03 19:48:22 2005 +0000
+++ b/lang/python23/patches/patch-al Sun Jul 03 19:49:06 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.12 2005/06/30 03:38:22 minskim Exp $
+$NetBSD: patch-al,v 1.13 2005/07/03 19:49:06 recht Exp $
---- configure.orig 2005-01-11 07:48:52.000000000 -0600
-+++ configure
-@@ -1481,6 +1481,8 @@ case $ac_sys_system/$ac_sys_release in
+--- configure.orig 2005-01-11 14:48:52.000000000 +0100
++++ configure 2005-07-01 15:27:58.000000000 +0200
+@@ -1481,6 +1481,8 @@
# Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
OpenBSD/2.* | OpenBSD/3.[01234])
define_xopen_source=no;;
@@ -11,7 +11,15 @@
# On Solaris 2.6, sys/wait.h is inconsistent in the usage
# of union __?sigval. Reported by Stuart Bishop.
SunOS/5.6)
-@@ -1505,6 +1507,11 @@ case $ac_sys_system/$ac_sys_release in
+@@ -1498,13 +1500,18 @@
+ # it craps out if _XOPEN_EXTENDED_SOURCE is defined. Apparently,
+ # this is fixed in 10.3, which identifies itself as Darwin/7.*
+ # This should hopefully be fixed in FreeBSD 4.9
+- FreeBSD/4.8* | Darwin/6* )
++ FreeBSD/4.8* | Darwin/6* | Darwin/8* )
+ define_xopen_source=no;;
+ # On AIX 4, mbstate_t is defined only when _XOPEN_SOURCE == 500 but used in
+ # wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined or
# has another value. By not (re)defining it, the defaults come in place.
AIX/4)
define_xopen_source=no;;
@@ -23,7 +31,7 @@
esac
if test $define_xopen_source = yes
-@@ -3733,7 +3740,7 @@ _ACEOF
+@@ -3733,7 +3740,7 @@
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
@@ -32,7 +40,7 @@
LDLIBRARY='libpython$(VERSION).so'
BLDLIBRARY='-L. -lpython$(VERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-@@ -3754,6 +3761,14 @@ _ACEOF
+@@ -3754,6 +3761,14 @@
BLDLIBRARY='-L. -lpython$(VERSION)'
RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
;;
@@ -47,7 +55,7 @@
esac
# DG/UX requires some fancy ld contortions to produce a .so from an .a
case $MACHDEP in
-@@ -4152,7 +4167,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
+@@ -4152,7 +4167,12 @@
;;
# is there any other compiler on Darwin besides gcc?
Darwin*)
@@ -61,7 +69,7 @@
;;
esac
;;
-@@ -10979,7 +10999,7 @@ then
+@@ -10979,7 +10999,7 @@
LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework. Ignore undefined symbols, assuming they come from Python
@@ -70,7 +78,7 @@
fi ;;
Darwin/1.4*|Darwin/5.*|Darwin/6.*)
LDSHARED='$(CC) $(LDFLAGS) -bundle'
-@@ -11009,12 +11029,12 @@ then
+@@ -11009,12 +11029,12 @@
LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
@@ -86,7 +94,7 @@
dgux*) LDSHARED="ld -G";;
BSD/OS*/4*) LDSHARED="gcc -shared";;
OpenBSD*|FreeBSD*)
-@@ -11024,7 +11044,8 @@ then
+@@ -11024,7 +11044,8 @@
else
LDSHARED="ld -Bshareable ${LDFLAGS}"
fi;;
@@ -96,7 +104,7 @@
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then LDSHARED='$(CC) -shared'
-@@ -11057,6 +11078,7 @@ then
+@@ -11057,6 +11078,7 @@
Linux*|GNU*) CCSHARED="-fPIC";;
BSD/OS*/4*) CCSHARED="-fpic";;
FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fPIC";;
@@ -104,7 +112,7 @@
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then CCSHARED="-fPIC"
-@@ -11116,6 +11138,7 @@ then
+@@ -11116,6 +11138,7 @@
then
LINKFORSHARED="-Wl,--export-dynamic"
fi;;
@@ -112,7 +120,16 @@
SunOS/5*) case $CC in
*gcc*)
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
-@@ -15127,6 +15150,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -13357,7 +13380,7 @@
+ _ACEOF
+
+ ;;
+- SunOS/5.8)
++ SunOS/5.8 | Darwin/8* )
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_BROKEN_POSIX_SEMAPHORES 1
+ _ACEOF
+@@ -15127,6 +15150,7 @@
/* end confdefs.h. */
#include "confdefs.h"
Home |
Main Index |
Thread Index |
Old Index