Sun Apr 19 15:20:00 2009 UTC ()
Fix libpython version number on Darwin.


(snj)
diff -r1.1.1.1 -r1.2 pkgsrc/lang/python26/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/lang/python26/patches/patch-au
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/python26/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python26/Attic/distinfo 2009/04/19 14:42:50 1.1.1.1
+++ pkgsrc/lang/python26/Attic/distinfo 2009/04/19 15:20:00 1.2
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: distinfo,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $ 1$NetBSD: distinfo,v 1.2 2009/04/19 15:20:00 snj Exp $
2 2
3SHA1 (Python-2.6.2.tar.bz2) = 125d4ed90f82de1d44f288150bbbda23a6cd27a4 3SHA1 (Python-2.6.2.tar.bz2) = 125d4ed90f82de1d44f288150bbbda23a6cd27a4
4RMD160 (Python-2.6.2.tar.bz2) = 85fa3540cbacf4d0547d2381eb3aa76bef35c2e1 4RMD160 (Python-2.6.2.tar.bz2) = 85fa3540cbacf4d0547d2381eb3aa76bef35c2e1
5Size (Python-2.6.2.tar.bz2) = 11156901 bytes 5Size (Python-2.6.2.tar.bz2) = 11156901 bytes
6SHA1 (patch-aa) = d44e67645dc86ff14f5daf5705de02c6f330cc48 6SHA1 (patch-aa) = d44e67645dc86ff14f5daf5705de02c6f330cc48
7SHA1 (patch-ab) = d35025df83e70d129f9fbcd277652b0eea83b026 7SHA1 (patch-ab) = d35025df83e70d129f9fbcd277652b0eea83b026
8SHA1 (patch-ac) = 858580a4e5c7474127eafb27bdfa96dc96cafad5 8SHA1 (patch-ac) = 858580a4e5c7474127eafb27bdfa96dc96cafad5
9SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b 9SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b
10SHA1 (patch-ag) = 95be54a4c8fe291cd7edd14a9180bbcb07bba2ce 10SHA1 (patch-ag) = 95be54a4c8fe291cd7edd14a9180bbcb07bba2ce
11SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa 11SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa
12SHA1 (patch-ai) = 53815e5cd82bf889ec3130b31f8f6ac202dd0948 12SHA1 (patch-ai) = 53815e5cd82bf889ec3130b31f8f6ac202dd0948
13SHA1 (patch-aj) = a75d680a6b8b1ad3c9222dcb841f4fb10db6d16d 13SHA1 (patch-aj) = a75d680a6b8b1ad3c9222dcb841f4fb10db6d16d
14SHA1 (patch-ak) = 948362c15ad59abeef46971f9b870b70655a62c7 14SHA1 (patch-ak) = 948362c15ad59abeef46971f9b870b70655a62c7
15SHA1 (patch-al) = c39144cfa4a540900fac879b5faa990628fcee3e 15SHA1 (patch-al) = c39144cfa4a540900fac879b5faa990628fcee3e
16SHA1 (patch-am) = 2af42cd2b89ceec61a957cae48924dd3c09aa702 16SHA1 (patch-am) = 2af42cd2b89ceec61a957cae48924dd3c09aa702
17SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab 17SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
18SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2 18SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2
19SHA1 (patch-ap) = ad1b43a149438d9060263acd0cca92fd4d26148c 19SHA1 (patch-ap) = ad1b43a149438d9060263acd0cca92fd4d26148c
20SHA1 (patch-ar) = 2a0c3f9a798afdfda7af4823e67579b2e000c072 20SHA1 (patch-ar) = 2a0c3f9a798afdfda7af4823e67579b2e000c072
21SHA1 (patch-at) = 04d5a5ab691587d750b3d0a4053555e846074b98 21SHA1 (patch-at) = 04d5a5ab691587d750b3d0a4053555e846074b98
22SHA1 (patch-au) = 3f4beacb7baceb884f7293da1f830aa5ccd0c286 22SHA1 (patch-au) = cf68c1975f60d18bf37262fa41cbfef1585aeb55
23SHA1 (patch-av) = a1d41cb3a93879d54f0964ff84a63a297c333156 23SHA1 (patch-av) = a1d41cb3a93879d54f0964ff84a63a297c333156
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/python26/patches/Attic/patch-au (expand / switch to unified diff)

--- pkgsrc/lang/python26/patches/Attic/patch-au 2009/04/19 14:42:50 1.1.1.1
+++ pkgsrc/lang/python26/patches/Attic/patch-au 2009/04/19 15:20:00 1.2
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: patch-au,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $ 1$NetBSD: patch-au,v 1.2 2009/04/19 15:20:00 snj Exp $
2 2
3--- Makefile.pre.in.orig 2009-02-24 11:07:44.000000000 +0000 3--- Makefile.pre.in.orig 2009-02-24 11:07:44.000000000 +0000
4+++ Makefile.pre.in 4+++ Makefile.pre.in
5@@ -425,6 +425,12 @@ libpython$(VERSION).dylib: $(LIBRARY_OBJ 5@@ -425,6 +425,12 @@ libpython$(VERSION).dylib: $(LIBRARY_OBJ
6 libpython$(VERSION).sl: $(LIBRARY_OBJS) 6 libpython$(VERSION).sl: $(LIBRARY_OBJS)
7 $(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST) 7 $(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST)
8  8
9+libpython$(VERSION).dylib: $(LIBRARY_OBJS) 9+libpython$(VERSION).dylib: $(LIBRARY_OBJS)
10+ $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ \ 10+ $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ \
11+ -current_version 2.5.2 -compatibility_version $(VERSION) \ 11+ -current_version 2.6.2 -compatibility_version $(VERSION) \
12+ -o $@ -flat_namespace -undefined suppress $(LDFLAGS) \ 12+ -o $@ -flat_namespace -undefined suppress $(LDFLAGS) \
13+ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) 13+ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
14+ 14+
15 # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary 15 # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
16 # minimal framework (not including the Lib directory and such) in the current 16 # minimal framework (not including the Lib directory and such) in the current
17 # directory. 17 # directory.
18@@ -785,7 +791,8 @@ altbininstall: $(BUILDPYTHON) 18@@ -785,7 +791,8 @@ altbininstall: $(BUILDPYTHON)
19 (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) $(LDLIBRARY)) \ 19 (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) $(LDLIBRARY)) \
20 fi \ 20 fi \
21 fi; \ 21 fi; \
22- else true; \ 22- else true; \
23+ elif test -f $(INSTSONAME); then \ 23+ elif test -f $(INSTSONAME); then \
24+ $(INSTALL_SHARED) $(INSTSONAME) $(DESTDIR)$(LIBDIR); \ 24+ $(INSTALL_SHARED) $(INSTSONAME) $(DESTDIR)$(LIBDIR); \