pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/python27 Add a minor cleanup to my last commit.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5e6b4a660bdf
branches:  trunk
changeset: 594555:5e6b4a660bdf
user:      sbd <sbd%pkgsrc.org@localhost>
date:      Mon Oct 31 06:49:58 2011 +0000

description:
Add a minor cleanup to my last commit.

diffstat:

 lang/python27/distinfo         |   4 ++--
 lang/python27/patches/patch-am |  11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diffs (59 lines):

diff -r c5c2fabdc3cc -r 5e6b4a660bdf lang/python27/distinfo
--- a/lang/python27/distinfo    Mon Oct 31 05:52:26 2011 +0000
+++ b/lang/python27/distinfo    Mon Oct 31 06:49:58 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2011/10/31 04:17:24 sbd Exp $
+$NetBSD: distinfo,v 1.12 2011/10/31 06:49:58 sbd Exp $
 
 SHA1 (Python-2.7.2.tar.bz2) = 417bdeea77abfaf1b9257fc6b4a04aaa209f4547
 RMD160 (Python-2.7.2.tar.bz2) = c3bf4f09b7c429a4d9f4cc251c795304cd5232c5
@@ -12,7 +12,7 @@
 SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
 SHA1 (patch-ah) = 8e9ee44c7a054f1387b6d8ef8dbe9c1b8dc8d891
 SHA1 (patch-al) = b97c2e73b9038e22f55ec226c2cbcc671466ad19
-SHA1 (patch-am) = 7154c710bb42b9e0f4c65cefd80285d4f26ce873
+SHA1 (patch-am) = 7cb89371d4afb32e9263aacee81c3a0ff7fef228
 SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
 SHA1 (patch-ao) = 9996a444fc0034c9f01fd18f4ad7bf714a8c8d04
 SHA1 (patch-au) = 18fce68df48e43c2927cc83e6b4b404b5e1103b7
diff -r c5c2fabdc3cc -r 5e6b4a660bdf lang/python27/patches/patch-am
--- a/lang/python27/patches/patch-am    Mon Oct 31 05:52:26 2011 +0000
+++ b/lang/python27/patches/patch-am    Mon Oct 31 06:49:58 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.5 2011/10/31 04:17:24 sbd Exp $
+$NetBSD: patch-am,v 1.6 2011/10/31 06:49:59 sbd Exp $
 
 Disabled modules for normal build:
 bsddb
@@ -307,11 +307,10 @@
                          # Some systems have -lndbm, others don't
                          if self.compiler.find_library_file(lib_dirs,
                                                                 'ndbm'):
-@@ -1192,19 +1035,16 @@ class PyBuildExt(build_ext):
-                                     ],
+@@ -1193,18 +1036,14 @@ class PyBuildExt(build_ext):
                                  libraries = gdbm_libs)
                              break
--                elif cand == "bdb":
+                 elif cand == "bdb":
 -                    if db_incs is not None:
 -                        print "building dbm using bdb"
 -                        dbmext = Extension('dbm', ['dbmmodule.c'],
@@ -324,8 +323,6 @@
 -                                               ],
 -                                           libraries=dblibs)
 -                        break
-+
-+                if cand == "bdb" and dbmext is None:
 +                  print "building dbm using bdb"
 +                  dbmext = Extension('dbm', ['dbmmodule.c'],
 +                                     define_macros=[
@@ -337,7 +334,7 @@
              if dbmext is not None:
                  exts.append(dbmext)
              else:
-@@ -2066,9 +1906,9 @@ def main():
+@@ -2066,9 +1905,9 @@ def main():
            ext_modules=[Extension('_struct', ['_struct.c'])],
  
            # Scripts to install



Home | Main Index | Thread Index | Old Index